diff --git a/LSL2/OIWIN/RDS_TEST.json b/LSL2/OIWIN/RDS_TEST.json index b42ff89..683d21a 100644 --- a/LSL2/OIWIN/RDS_TEST.json +++ b/LSL2/OIWIN/RDS_TEST.json @@ -2679,13 +2679,13 @@ "<11,20>": "", "<11,21>": "", "<11,22>": "", - "<11,23>": "RDS_TEST", - "<11,24>": "RESISTIVITY", + "<11,23>": "", + "<11,24>": "", "<11,25>": "", "<11,26>": "", "<11,27>": "", "<11,28>": "<>", - "<11,29>": "<>", + "<11,29>": "MD4Z", "<11,30>": "<>", "<11,31>": "0", "<11,32>": "", @@ -2731,7 +2731,7 @@ "<11,41,13>": "-1", "<11,41,14>": "1" }, - "<11,42>": "16418", + "<11,42>": "2147500066", "<11,43>": "55", "<11,44>": "Resistivity", "<11,45>": "", @@ -2785,9 +2785,44 @@ "<11,93>": "", "<11,94>": "", "<11,95>": "", - "<11,96>": "", - "<11,97>": "", - "<11,98>": "", + "<11,96>": { + "<11,96,1>": { + "<11,96,1,1>": "", + "<11,96,1,2>": "" + } + }, + "<11,97>": { + "<11,97,1>": { + "<11,97,1,1>": "Tahoma", + "<11,97,1,2>": "-11", + "<11,97,1,3>": "400", + "<11,97,1,4>": "0", + "<11,97,1,5>": "0", + "<11,97,1,6>": "0", + "<11,97,1,7>": "0", + "<11,97,1,8>": "34", + "<11,97,1,9>": "0", + "<11,97,1,10>": "3", + "<11,97,1,11>": "2", + "<11,97,1,12>": "1" + } + }, + "<11,98>": { + "<11,98,1>": { + "<11,98,1,1>": "Tahoma", + "<11,98,1,2>": "-11", + "<11,98,1,3>": "400", + "<11,98,1,4>": "0", + "<11,98,1,5>": "0", + "<11,98,1,6>": "0", + "<11,98,1,7>": "0", + "<11,98,1,8>": "34", + "<11,98,1,9>": "0", + "<11,98,1,10>": "3", + "<11,98,1,11>": "2", + "<11,98,1,12>": "1" + } + }, "<11,99>": { "<11,99,1>": { "<11,99,1,1>": "-2", diff --git a/LSL2/STPROC/COMM_RDS_TEST.txt b/LSL2/STPROC/COMM_RDS_TEST.txt index 580f431..337fac2 100644 --- a/LSL2/STPROC/COMM_RDS_TEST.txt +++ b/LSL2/STPROC/COMM_RDS_TEST.txt @@ -36,7 +36,7 @@ $INSERT SPC_QUEUE_EQUATES EQU CRLF$ TO \0D0A\ -EQU SHEETRHO_SPEC_UNITS$ TO 'ê/Ü' +EQU SHEETRHO_SPEC_UNITS$ TO 'ê/Ü' EQU RES_SPEC_UNITS$ TO \EA2D636D\ EQU TAB$ TO CHAR(9) @@ -388,6 +388,20 @@ END ELSE END END +Savewarn = Get_Property(@Window, 'SAVEWARN') +If Savewarn EQ False$ then + ThisMetNo = Get_Property(@Window: '.MET_NO', 'TEXT') + ThisMetRec = Database_Services('ReadDataRow', 'RDS_TEST', ThisMetNo) + ResReadings = obj_RDS_Test('Resistivity',ThisMetNo:@RM:ThisMetRec:@RM:1) + + for i = 1 to DCount(ResReadings, @VM) + ResReading = ResReadings<1,i> + ResReadings<1,i> = OConv(ResReading,'MD4Z') + Next i + + Set_Property(@Window : '.RES_READINGS', 'ARRAY', ResReadings) +end + Set_Property(Ctrls,Props,Vals) @@ -943,7 +957,16 @@ IF ReadingCnt > 0 THEN *END END -Post_Event(@WINDOW:'.RES_READINGS','CALCULATE',1) +//Post_Event(@WINDOW:'.RES_READINGS','CALCULATE',1) +UpdatedRec = Get_Property(@Window, 'ATRECORD') +ThisMetNo = Get_Property(@Window: '.MET_NO', 'TEXT') +ResReadings = obj_RDS_Test('Resistivity',ThisMetNo:@RM:UpdatedRec:@RM:1) + +for i = 1 to DCount(ResReadings, @VM) + ResReading = ResReadings<1,i> + ResReadings<1,i> = OConv(ResReading,'MD4Z') +Next i +Set_Property(@Window : '.RES_READINGS', 'ARRAY', ResReadings) Send_Event(@WINDOW:'.GROWTH_RATE','CALCULATE') @@ -966,7 +989,18 @@ END ELSE end END -Send_Event(@WINDOW:'.RES_READINGS','CALCULATE') +//Problem line here. Removed 10/25/2024 +//Send_Event(@WINDOW:'.RES_READINGS','CALCULATE') + +UpdatedRec = Get_Property(@Window, 'ATRECORD') +ThisMetNo = Get_Property(@Window: '.MET_NO', 'TEXT') +ResReadings = obj_RDS_Test('Resistivity',ThisMetNo:@RM:UpdatedRec:@RM:1) + +for i = 1 to DCount(ResReadings, @VM) + ResReading = ResReadings<1,i> + ResReadings<1,i> = OConv(ResReading,'MD4Z') +Next i +Set_Property(@Window : '.RES_READINGS', 'ARRAY', ResReadings) Readings = Get_Property(CurrCtrl,'ARRAY') Conversion = Get_Property(CurrCtrl,'CONV')<1,1,1> @@ -1052,7 +1086,7 @@ RETURN * * * * * * * ReadingsIns: * * * * * * * - +return RowIndex = Parm1 CurrCtrl = Get_Property(@WINDOW,'FOCUS') @@ -2341,3 +2375,4 @@ RETURN +