From e1c7544facc08687aee7f01d3d94ed2c5bd6d178 Mon Sep 17 00:00:00 2001 From: Chase Tucker Date: Fri, 8 Aug 2025 11:45:22 -0700 Subject: [PATCH] Fixed bug for new PSN stage met tests --- LSL2/STPROC/COMM_PRS_STAGE.txt | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/LSL2/STPROC/COMM_PRS_STAGE.txt b/LSL2/STPROC/COMM_PRS_STAGE.txt index 2bcea16..a4a08ae 100644 --- a/LSL2/STPROC/COMM_PRS_STAGE.txt +++ b/LSL2/STPROC/COMM_PRS_STAGE.txt @@ -9,7 +9,7 @@ COMPILE FUNCTION Comm_PRS_Stage(EntID,Event,Parm1,Parm2,Parm3,Parm4,Parm5) DECLARE SUBROUTINE Set_Property, Set_Status, ErrMsg, Set_Property, obj_AppWindow, Send_Event, Security_Err_Msg DECLARE SUBROUTINE Send_Message, Btree.Extract, Comm_Prod_Spec, Forward_Event, Post_Event DECLARE FUNCTION Get_Property, Get_Status, Popup, Send_Message, Msg, Start_Window, MemberOf, Security_Check -DECLARE FUNCTION Comm_Prod_Spec +DECLARE FUNCTION Comm_Prod_Spec, obj_Popup $INSERT POPUP_EQUATES @@ -143,7 +143,7 @@ obj_Appwindow('Create',@WINDOW) **** Set Dropdown columns in .MET_TEST edit table **** -MetStyles = Send_Message(@WINDOW:'.MET_TEST','COLSTYLE',0,'') +MetStyles = Send_Message(@WINDOW:'.MET_TEST','COLSTYLE',0,'') MetStyles = BitOr(MetStyles,DROPDOWN_STYLE$) MetStyles = BitOr(MetStyles,DROPDOWN_STYLE$) @@ -192,7 +192,6 @@ NEXT I Send_Message(@WINDOW:'.MET_TEST','COLFORMAT',COL$MET_PROP,PropCodes) - * Class Tools is set in the POSCHANGED event for the edit table. /* @@ -235,6 +234,23 @@ Read: GOSUB Refresh +* Met Property Descriptions * + +PSNo = Get_Property(@WINDOW : '.PS_NO', 'TEXT') +Stage = Get_Property(@WINDOW:'.STAGE','DEFPROP') + +Props = Xlate('PRS_STAGE', PSNo:'*':Stage, PRS_STAGE_MET_PROP$, 'X') + +PropDescs = obj_Popup('CodeDesc','MET_PROPERTY':@RM:Props) + +CtrlEntID = @WINDOW:'.MET_TEST' +DescCount = DCount(PropDescs, @VM) +FOR Row = 1 to DescCount + PropDesc = PropDescs<1, Row> + + Set_Property(CtrlEntId,"CELLPOS",PropDesc,COL$MET_PROP_DESC:@FM:Row) +Next Row + RETURN @@ -722,8 +738,8 @@ CurrLine = Get_Property(CtrlEntID,'LIST') DefProp = '' -BEGIN CASE - +BEGIN CASE + CASE CurrCol = COL$MET_TOOL_CLASS PropCode = CurrLine<1,COL$MET_PROP> @@ -764,6 +780,12 @@ BEGIN CASE RETURN + CASE CurrCol = COL$MET_PROP_DESC + + PropCode = CurrLine<1,COL$MET_PROP> + + DefProp = obj_Popup('CodeDesc','MET_PROPERTY':@RM:PropCode) + CASE CurrCol = COL$MET_MIN AND CurrLine<1,COL$MET_MIN> = '' MetTest = CurrLine<1,COL$MET_TEST> @@ -1229,3 +1251,4 @@ return +