From 6396264e64f5df8f624cf7caf68662e66c259a4f Mon Sep 17 00:00:00 2001 From: "Infineon\\StieberD" Date: Thu, 24 Jul 2025 09:05:19 -0700 Subject: [PATCH] added combobox dropdown options to the CALIB_LIST form --- LSL2/OIWIN/CALIB_LIST.json | 899 +++++++++++++++++++------------------ LSL2/STPROC/CALIB_LIST.txt | 303 ++++++------- 2 files changed, 591 insertions(+), 611 deletions(-) diff --git a/LSL2/OIWIN/CALIB_LIST.json b/LSL2/OIWIN/CALIB_LIST.json index 331d0c7..480e110 100644 --- a/LSL2/OIWIN/CALIB_LIST.json +++ b/LSL2/OIWIN/CALIB_LIST.json @@ -398,7 +398,7 @@ "<1,31>": "", "<1,32>": "", "<1,33>": "", - "<1,34>": "", + "<1,34>": "LSL2*IMAGE*ICO*INFINEON", "<1,35>": "", "<1,36>": "", "<1,37>": { @@ -491,27 +491,27 @@ }, "record3": { "<1>": { - "<1,1>": "CL_NO", + "<1,1>": "STDLOC", "<1,2>": "", - "<1,3>": "EDITFIELD", + "<1,3>": "COMBOBOX", "<1,4>": "CALIB_LIST", - "<1,5>": "93", - "<1,6>": "99", - "<1,7>": "36", - "<1,8>": "21", + "<1,5>": "115", + "<1,6>": "307", + "<1,7>": "196", + "<1,8>": "20", "<1,9>": "", "<1,10>": { - "<1,10,1>": "0x56000080", - "<1,10,2>": "0x200" + "<1,10,1>": "0x56200002", + "<1,10,2>": "0x0" }, "<1,11>": { - "<1,11,1>": "0x4", - "<1,11,2>": "0x80000000" + "<1,11,1>": "0x0", + "<1,11,2>": "0x80000C00" }, - "<1,12>": "1", + "<1,12>": "52", "<1,13>": { - "<1,13,1>": "8454143", - "<1,13,2>": "8454143", + "<1,13,1>": "-2", + "<1,13,2>": "-2", "<1,13,3>": "" }, "<1,14>": "0", @@ -541,22 +541,19 @@ "<1,21>": "", "<1,22>": "", "<1,23>": "CALIB_LIST", - "<1,24>": "CL_NO", + "<1,24>": "STD_LOC", "<1,25>": "", "<1,26>": "", "<1,27>": "", "<1,28>": "", "<1,29>": "", - "<1,30>": "<>", + "<1,30>": "<>", "<1,31>": "0", "<1,32>": "", "<1,33>": "", "<1,34>": "", "<1,35>": "", - "<1,36>": { - "<1,36,1>": "0", - "<1,36,2>": "0" - }, + "<1,36>": "", "<1,37>": "", "<1,38>": "", "<1,39>": "", @@ -584,10 +581,18 @@ "<1,61>": "", "<1,62>": "0", "<1,63>": "", - "<1,64>": "", - "<1,65>": "", - "<1,66>": "", - "<1,67>": "", + "<1,64>": { + "<1,64,1>": "", + "<1,64,2>": "", + "<1,64,3>": "" + }, + "<1,65>": "-2", + "<1,66>": { + "<1,66,1>": "", + "<1,66,2>": "", + "<1,66,3>": "" + }, + "<1,67>": "-2", "<1,68>": "", "<1,69>": "", "<1,70>": "", @@ -631,27 +636,27 @@ "<1,108>": "" }, "<2>": { - "<2,1>": "CL_NO_LABEL", + "<2,1>": "CL_NO", "<2,2>": "", - "<2,3>": "STATIC", + "<2,3>": "EDITFIELD", "<2,4>": "CALIB_LIST", - "<2,5>": "55", - "<2,6>": "102", - "<2,7>": "33", - "<2,8>": "15", - "<2,9>": "CL No:", + "<2,5>": "93", + "<2,6>": "99", + "<2,7>": "36", + "<2,8>": "21", + "<2,9>": "", "<2,10>": { - "<2,10,1>": "0x56000000", - "<2,10,2>": "0x0" + "<2,10,1>": "0x56000080", + "<2,10,2>": "0x200" }, "<2,11>": { - "<2,11,1>": "0x0", + "<2,11,1>": "0x4", "<2,11,2>": "0x80000000" }, - "<2,12>": "2", + "<2,12>": "1", "<2,13>": { - "<2,13,1>": "-1", - "<2,13,2>": "-1", + "<2,13,1>": "8454143", + "<2,13,2>": "8454143", "<2,13,3>": "" }, "<2,14>": "0", @@ -680,20 +685,23 @@ "<2,20>": "", "<2,21>": "", "<2,22>": "", - "<2,23>": "", - "<2,24>": "", + "<2,23>": "CALIB_LIST", + "<2,24>": "CL_NO", "<2,25>": "", "<2,26>": "", "<2,27>": "", "<2,28>": "", "<2,29>": "", - "<2,30>": "", - "<2,31>": "", + "<2,30>": "<>", + "<2,31>": "0", "<2,32>": "", "<2,33>": "", "<2,34>": "", "<2,35>": "", - "<2,36>": "", + "<2,36>": { + "<2,36,1>": "0", + "<2,36,2>": "0" + }, "<2,37>": "", "<2,38>": "", "<2,39>": "", @@ -720,22 +728,9 @@ "<2,60>": "", "<2,61>": "", "<2,62>": "0", - "<2,63>": { - "<2,63,1>": "", - "<2,63,2>": "", - "<2,63,3>": "", - "<2,63,4>": "", - "<2,63,5>": "", - "<2,63,6>": "", - "<2,63,7>": "", - "<2,63,8>": "" - }, - "<2,64>": { - "<2,64,1>": "", - "<2,64,2>": "", - "<2,64,3>": "" - }, - "<2,65>": "-2", + "<2,63>": "", + "<2,64>": "", + "<2,65>": "", "<2,66>": "", "<2,67>": "", "<2,68>": "", @@ -760,8 +755,8 @@ "<2,87>": "", "<2,88>": "", "<2,89>": "", - "<2,90>": "0", - "<2,91>": "0", + "<2,90>": "", + "<2,91>": "", "<2,92>": "", "<2,93>": "", "<2,94>": "", @@ -781,27 +776,27 @@ "<2,108>": "" }, "<3>": { - "<3,1>": "CL_TYPE", + "<3,1>": "CL_NO_LABEL", "<3,2>": "", - "<3,3>": "EDITFIELD", + "<3,3>": "STATIC", "<3,4>": "CALIB_LIST", - "<3,5>": "93", - "<3,6>": "126", - "<3,7>": "36", - "<3,8>": "21", - "<3,9>": "", + "<3,5>": "55", + "<3,6>": "102", + "<3,7>": "33", + "<3,8>": "15", + "<3,9>": "CL No:", "<3,10>": { - "<3,10,1>": "0x56000088", - "<3,10,2>": "0x200" + "<3,10,1>": "0x56000000", + "<3,10,2>": "0x0" }, "<3,11>": { "<3,11,1>": "0x0", "<3,11,2>": "0x80000000" }, - "<3,12>": "3", + "<3,12>": "2", "<3,13>": { - "<3,13,1>": "-2", - "<3,13,2>": "-2", + "<3,13,1>": "-1", + "<3,13,2>": "-1", "<3,13,3>": "" }, "<3,14>": "0", @@ -830,30 +825,20 @@ "<3,20>": "", "<3,21>": "", "<3,22>": "", - "<3,23>": "CALIB_LIST", - "<3,24>": "CL_TYPE", + "<3,23>": "", + "<3,24>": "", "<3,25>": "", "<3,26>": "", "<3,27>": "", - "<3,28>": { - "<3,28,1>": { - "<3,28,1,1>": { - "<3,28,1,1,1>": "'E'", - "<3,28,1,1,2>": "'S'" - } - } - }, + "<3,28>": "", "<3,29>": "", - "<3,30>": "<>", - "<3,31>": "0", + "<3,30>": "", + "<3,31>": "", "<3,32>": "", "<3,33>": "", "<3,34>": "", "<3,35>": "", - "<3,36>": { - "<3,36,1>": "0", - "<3,36,2>": "0" - }, + "<3,36>": "", "<3,37>": "", "<3,38>": "", "<3,39>": "", @@ -880,9 +865,22 @@ "<3,60>": "", "<3,61>": "", "<3,62>": "0", - "<3,63>": "", - "<3,64>": "", - "<3,65>": "", + "<3,63>": { + "<3,63,1>": "", + "<3,63,2>": "", + "<3,63,3>": "", + "<3,63,4>": "", + "<3,63,5>": "", + "<3,63,6>": "", + "<3,63,7>": "", + "<3,63,8>": "" + }, + "<3,64>": { + "<3,64,1>": "", + "<3,64,2>": "", + "<3,64,3>": "" + }, + "<3,65>": "-2", "<3,66>": "", "<3,67>": "", "<3,68>": "", @@ -907,8 +905,8 @@ "<3,87>": "", "<3,88>": "", "<3,89>": "", - "<3,90>": "", - "<3,91>": "", + "<3,90>": "0", + "<3,91>": "0", "<3,92>": "", "<3,93>": "", "<3,94>": "", @@ -928,27 +926,27 @@ "<3,108>": "" }, "<4>": { - "<4,1>": "CL_TYPE_LABEL", + "<4,1>": "CL_TYPE", "<4,2>": "", - "<4,3>": "STATIC", + "<4,3>": "EDITFIELD", "<4,4>": "CALIB_LIST", - "<4,5>": "43", - "<4,6>": "129", - "<4,7>": "45", - "<4,8>": "15", - "<4,9>": "Cl Type:", + "<4,5>": "93", + "<4,6>": "126", + "<4,7>": "36", + "<4,8>": "21", + "<4,9>": "", "<4,10>": { - "<4,10,1>": "0x56000800", - "<4,10,2>": "0x0" + "<4,10,1>": "0x56000088", + "<4,10,2>": "0x200" }, "<4,11>": { "<4,11,1>": "0x0", "<4,11,2>": "0x80000000" }, - "<4,12>": "4", + "<4,12>": "3", "<4,13>": { - "<4,13,1>": "-1", - "<4,13,2>": "-1", + "<4,13,1>": "-2", + "<4,13,2>": "-2", "<4,13,3>": "" }, "<4,14>": "0", @@ -977,20 +975,30 @@ "<4,20>": "", "<4,21>": "", "<4,22>": "", - "<4,23>": "", - "<4,24>": "", + "<4,23>": "CALIB_LIST", + "<4,24>": "CL_TYPE", "<4,25>": "", "<4,26>": "", "<4,27>": "", - "<4,28>": "", + "<4,28>": { + "<4,28,1>": { + "<4,28,1,1>": { + "<4,28,1,1,1>": "'E'", + "<4,28,1,1,2>": "'S'" + } + } + }, "<4,29>": "", - "<4,30>": "", - "<4,31>": "", + "<4,30>": "<>", + "<4,31>": "0", "<4,32>": "", "<4,33>": "", "<4,34>": "", "<4,35>": "", - "<4,36>": "", + "<4,36>": { + "<4,36,1>": "0", + "<4,36,2>": "0" + }, "<4,37>": "", "<4,38>": "", "<4,39>": "", @@ -1017,22 +1025,9 @@ "<4,60>": "", "<4,61>": "", "<4,62>": "0", - "<4,63>": { - "<4,63,1>": "", - "<4,63,2>": "", - "<4,63,3>": "", - "<4,63,4>": "", - "<4,63,5>": "", - "<4,63,6>": "", - "<4,63,7>": "", - "<4,63,8>": "" - }, - "<4,64>": { - "<4,64,1>": "", - "<4,64,2>": "", - "<4,64,3>": "" - }, - "<4,65>": "-2", + "<4,63>": "", + "<4,64>": "", + "<4,65>": "", "<4,66>": "", "<4,67>": "", "<4,68>": "", @@ -1057,8 +1052,8 @@ "<4,87>": "", "<4,88>": "", "<4,89>": "", - "<4,90>": "0", - "<4,91>": "0", + "<4,90>": "", + "<4,91>": "", "<4,92>": "", "<4,93>": "", "<4,94>": "", @@ -1078,27 +1073,27 @@ "<4,108>": "" }, "<5>": { - "<5,1>": "EQ_DESC", + "<5,1>": "CL_TYPE_LABEL", "<5,2>": "", - "<5,3>": "EDITFIELD", + "<5,3>": "STATIC", "<5,4>": "CALIB_LIST", - "<5,5>": "115", - "<5,6>": "191", - "<5,7>": "327", - "<5,8>": "21", - "<5,9>": "", + "<5,5>": "43", + "<5,6>": "129", + "<5,7>": "45", + "<5,8>": "15", + "<5,9>": "Cl Type:", "<5,10>": { - "<5,10,1>": "0x56000080", - "<5,10,2>": "0x200" + "<5,10,1>": "0x56000800", + "<5,10,2>": "0x0" }, "<5,11>": { "<5,11,1>": "0x0", "<5,11,2>": "0x80000000" }, - "<5,12>": "5", + "<5,12>": "4", "<5,13>": { - "<5,13,1>": "-2", - "<5,13,2>": "-2", + "<5,13,1>": "-1", + "<5,13,2>": "-1", "<5,13,3>": "" }, "<5,14>": "0", @@ -1127,23 +1122,20 @@ "<5,20>": "", "<5,21>": "", "<5,22>": "", - "<5,23>": "CALIB_LIST", - "<5,24>": "EQ_DESC", + "<5,23>": "", + "<5,24>": "", "<5,25>": "", "<5,26>": "", "<5,27>": "", "<5,28>": "", "<5,29>": "", - "<5,30>": "<>", - "<5,31>": "0", + "<5,30>": "", + "<5,31>": "", "<5,32>": "", "<5,33>": "", "<5,34>": "", "<5,35>": "", - "<5,36>": { - "<5,36,1>": "0", - "<5,36,2>": "0" - }, + "<5,36>": "", "<5,37>": "", "<5,38>": "", "<5,39>": "", @@ -1170,9 +1162,22 @@ "<5,60>": "", "<5,61>": "", "<5,62>": "0", - "<5,63>": "", - "<5,64>": "", - "<5,65>": "", + "<5,63>": { + "<5,63,1>": "", + "<5,63,2>": "", + "<5,63,3>": "", + "<5,63,4>": "", + "<5,63,5>": "", + "<5,63,6>": "", + "<5,63,7>": "", + "<5,63,8>": "" + }, + "<5,64>": { + "<5,64,1>": "", + "<5,64,2>": "", + "<5,64,3>": "" + }, + "<5,65>": "-2", "<5,66>": "", "<5,67>": "", "<5,68>": "", @@ -1197,8 +1202,8 @@ "<5,87>": "", "<5,88>": "", "<5,89>": "", - "<5,90>": "", - "<5,91>": "", + "<5,90>": "0", + "<5,91>": "0", "<5,92>": "", "<5,93>": "", "<5,94>": "", @@ -1218,27 +1223,27 @@ "<5,108>": "" }, "<6>": { - "<6,1>": "EQ_DESC_LABEL", + "<6,1>": "EQ_DESC", "<6,2>": "", - "<6,3>": "STATIC", + "<6,3>": "EDITFIELD", "<6,4>": "CALIB_LIST", - "<6,5>": "80", - "<6,6>": "194", - "<6,7>": "31", - "<6,8>": "15", - "<6,9>": "Desc:", + "<6,5>": "115", + "<6,6>": "191", + "<6,7>": "327", + "<6,8>": "21", + "<6,9>": "", "<6,10>": { - "<6,10,1>": "0x56000800", - "<6,10,2>": "0x0" + "<6,10,1>": "0x56000080", + "<6,10,2>": "0x200" }, "<6,11>": { "<6,11,1>": "0x0", "<6,11,2>": "0x80000000" }, - "<6,12>": "6", + "<6,12>": "5", "<6,13>": { - "<6,13,1>": "-1", - "<6,13,2>": "-1", + "<6,13,1>": "-2", + "<6,13,2>": "-2", "<6,13,3>": "" }, "<6,14>": "0", @@ -1267,20 +1272,23 @@ "<6,20>": "", "<6,21>": "", "<6,22>": "", - "<6,23>": "", - "<6,24>": "", + "<6,23>": "CALIB_LIST", + "<6,24>": "EQ_DESC", "<6,25>": "", "<6,26>": "", "<6,27>": "", "<6,28>": "", "<6,29>": "", - "<6,30>": "", - "<6,31>": "", + "<6,30>": "<>", + "<6,31>": "0", "<6,32>": "", "<6,33>": "", "<6,34>": "", "<6,35>": "", - "<6,36>": "", + "<6,36>": { + "<6,36,1>": "0", + "<6,36,2>": "0" + }, "<6,37>": "", "<6,38>": "", "<6,39>": "", @@ -1307,22 +1315,9 @@ "<6,60>": "", "<6,61>": "", "<6,62>": "0", - "<6,63>": { - "<6,63,1>": "", - "<6,63,2>": "", - "<6,63,3>": "", - "<6,63,4>": "", - "<6,63,5>": "", - "<6,63,6>": "", - "<6,63,7>": "", - "<6,63,8>": "" - }, - "<6,64>": { - "<6,64,1>": "", - "<6,64,2>": "", - "<6,64,3>": "" - }, - "<6,65>": "-2", + "<6,63>": "", + "<6,64>": "", + "<6,65>": "", "<6,66>": "", "<6,67>": "", "<6,68>": "", @@ -1347,8 +1342,8 @@ "<6,87>": "", "<6,88>": "", "<6,89>": "", - "<6,90>": "0", - "<6,91>": "0", + "<6,90>": "", + "<6,91>": "", "<6,92>": "", "<6,93>": "", "<6,94>": "", @@ -1368,27 +1363,27 @@ "<6,108>": "" }, "<7>": { - "<7,1>": "EQ_SN", + "<7,1>": "EQ_DESC_LABEL", "<7,2>": "", - "<7,3>": "EDITFIELD", + "<7,3>": "STATIC", "<7,4>": "CALIB_LIST", - "<7,5>": "530", - "<7,6>": "191", - "<7,7>": "89", - "<7,8>": "21", - "<7,9>": "", + "<7,5>": "80", + "<7,6>": "194", + "<7,7>": "31", + "<7,8>": "15", + "<7,9>": "Desc:", "<7,10>": { - "<7,10,1>": "0x56000080", - "<7,10,2>": "0x200" + "<7,10,1>": "0x56000800", + "<7,10,2>": "0x0" }, "<7,11>": { "<7,11,1>": "0x0", "<7,11,2>": "0x80000000" }, - "<7,12>": "7", + "<7,12>": "6", "<7,13>": { - "<7,13,1>": "-2", - "<7,13,2>": "-2", + "<7,13,1>": "-1", + "<7,13,2>": "-1", "<7,13,3>": "" }, "<7,14>": "0", @@ -1417,23 +1412,20 @@ "<7,20>": "", "<7,21>": "", "<7,22>": "", - "<7,23>": "CALIB_LIST", - "<7,24>": "EQ_SN", + "<7,23>": "", + "<7,24>": "", "<7,25>": "", "<7,26>": "", "<7,27>": "", "<7,28>": "", "<7,29>": "", - "<7,30>": "<>", - "<7,31>": "0", + "<7,30>": "", + "<7,31>": "", "<7,32>": "", "<7,33>": "", "<7,34>": "", "<7,35>": "", - "<7,36>": { - "<7,36,1>": "0", - "<7,36,2>": "0" - }, + "<7,36>": "", "<7,37>": "", "<7,38>": "", "<7,39>": "", @@ -1460,9 +1452,22 @@ "<7,60>": "", "<7,61>": "", "<7,62>": "0", - "<7,63>": "", - "<7,64>": "", - "<7,65>": "", + "<7,63>": { + "<7,63,1>": "", + "<7,63,2>": "", + "<7,63,3>": "", + "<7,63,4>": "", + "<7,63,5>": "", + "<7,63,6>": "", + "<7,63,7>": "", + "<7,63,8>": "" + }, + "<7,64>": { + "<7,64,1>": "", + "<7,64,2>": "", + "<7,64,3>": "" + }, + "<7,65>": "-2", "<7,66>": "", "<7,67>": "", "<7,68>": "", @@ -1487,8 +1492,8 @@ "<7,87>": "", "<7,88>": "", "<7,89>": "", - "<7,90>": "", - "<7,91>": "", + "<7,90>": "0", + "<7,91>": "0", "<7,92>": "", "<7,93>": "", "<7,94>": "", @@ -1508,27 +1513,27 @@ "<7,108>": "" }, "<8>": { - "<8,1>": "EQ_SN_LABEL", + "<8,1>": "EQ_SN", "<8,2>": "", - "<8,3>": "STATIC", + "<8,3>": "EDITFIELD", "<8,4>": "CALIB_LIST", - "<8,5>": "493", - "<8,6>": "194", - "<8,7>": "33", - "<8,8>": "15", - "<8,9>": "Serial:", + "<8,5>": "530", + "<8,6>": "191", + "<8,7>": "89", + "<8,8>": "21", + "<8,9>": "", "<8,10>": { - "<8,10,1>": "0x56000800", - "<8,10,2>": "0x0" + "<8,10,1>": "0x56000080", + "<8,10,2>": "0x200" }, "<8,11>": { "<8,11,1>": "0x0", "<8,11,2>": "0x80000000" }, - "<8,12>": "8", + "<8,12>": "7", "<8,13>": { - "<8,13,1>": "-1", - "<8,13,2>": "-1", + "<8,13,1>": "-2", + "<8,13,2>": "-2", "<8,13,3>": "" }, "<8,14>": "0", @@ -1557,20 +1562,23 @@ "<8,20>": "", "<8,21>": "", "<8,22>": "", - "<8,23>": "", - "<8,24>": "", + "<8,23>": "CALIB_LIST", + "<8,24>": "EQ_SN", "<8,25>": "", "<8,26>": "", "<8,27>": "", "<8,28>": "", "<8,29>": "", - "<8,30>": "", - "<8,31>": "", + "<8,30>": "<>", + "<8,31>": "0", "<8,32>": "", "<8,33>": "", "<8,34>": "", "<8,35>": "", - "<8,36>": "", + "<8,36>": { + "<8,36,1>": "0", + "<8,36,2>": "0" + }, "<8,37>": "", "<8,38>": "", "<8,39>": "", @@ -1597,22 +1605,9 @@ "<8,60>": "", "<8,61>": "", "<8,62>": "0", - "<8,63>": { - "<8,63,1>": "", - "<8,63,2>": "", - "<8,63,3>": "", - "<8,63,4>": "", - "<8,63,5>": "", - "<8,63,6>": "", - "<8,63,7>": "", - "<8,63,8>": "" - }, - "<8,64>": { - "<8,64,1>": "", - "<8,64,2>": "", - "<8,64,3>": "" - }, - "<8,65>": "-2", + "<8,63>": "", + "<8,64>": "", + "<8,65>": "", "<8,66>": "", "<8,67>": "", "<8,68>": "", @@ -1637,8 +1632,8 @@ "<8,87>": "", "<8,88>": "", "<8,89>": "", - "<8,90>": "0", - "<8,91>": "0", + "<8,90>": "", + "<8,91>": "", "<8,92>": "", "<8,93>": "", "<8,94>": "", @@ -1658,15 +1653,15 @@ "<8,108>": "" }, "<9>": { - "<9,1>": "EQ_LOC_LABEL", + "<9,1>": "EQ_SN_LABEL", "<9,2>": "", "<9,3>": "STATIC", "<9,4>": "CALIB_LIST", - "<9,5>": "64", - "<9,6>": "220", - "<9,7>": "48", + "<9,5>": "493", + "<9,6>": "194", + "<9,7>": "33", "<9,8>": "15", - "<9,9>": "Location:", + "<9,9>": "Serial:", "<9,10>": { "<9,10,1>": "0x56000800", "<9,10,2>": "0x0" @@ -1675,7 +1670,7 @@ "<9,11,1>": "0x0", "<9,11,2>": "0x80000000" }, - "<9,12>": "9", + "<9,12>": "8", "<9,13>": { "<9,13,1>": "-1", "<9,13,2>": "-1", @@ -1808,24 +1803,24 @@ "<9,108>": "" }, "<10>": { - "<10,1>": "EQ_LEVEL_LABEL", + "<10,1>": "EQ_LOC_LABEL", "<10,2>": "", "<10,3>": "STATIC", "<10,4>": "CALIB_LIST", - "<10,5>": "319", + "<10,5>": "64", "<10,6>": "220", - "<10,7>": "36", + "<10,7>": "48", "<10,8>": "15", - "<10,9>": "Level:", + "<10,9>": "Location:", "<10,10>": { - "<10,10,1>": "0x46000800", + "<10,10,1>": "0x56000800", "<10,10,2>": "0x0" }, "<10,11>": { "<10,11,1>": "0x0", "<10,11,2>": "0x80000000" }, - "<10,12>": "10", + "<10,12>": "9", "<10,13>": { "<10,13,1>": "-1", "<10,13,2>": "-1", @@ -1958,15 +1953,15 @@ "<10,108>": "" }, "<11>": { - "<11,1>": "EQ_CAL_CLASS_LABEL", + "<11,1>": "EQ_LEVEL_LABEL", "<11,2>": "", "<11,3>": "STATIC", "<11,4>": "CALIB_LIST", - "<11,5>": "448", - "<11,6>": "219", - "<11,7>": "77", + "<11,5>": "319", + "<11,6>": "220", + "<11,7>": "36", "<11,8>": "15", - "<11,9>": "Cal/PM Class:", + "<11,9>": "Level:", "<11,10>": { "<11,10,1>": "0x46000800", "<11,10,2>": "0x0" @@ -1975,7 +1970,7 @@ "<11,11,1>": "0x0", "<11,11,2>": "0x80000000" }, - "<11,12>": "11", + "<11,12>": "10", "<11,13>": { "<11,13,1>": "-1", "<11,13,2>": "-1", @@ -2108,27 +2103,27 @@ "<11,108>": "" }, "<12>": { - "<12,1>": "STD_DESC", + "<12,1>": "EQ_CAL_CLASS_LABEL", "<12,2>": "", - "<12,3>": "EDITFIELD", + "<12,3>": "STATIC", "<12,4>": "CALIB_LIST", - "<12,5>": "115", - "<12,6>": "282", - "<12,7>": "316", - "<12,8>": "21", - "<12,9>": "", + "<12,5>": "448", + "<12,6>": "219", + "<12,7>": "77", + "<12,8>": "15", + "<12,9>": "Cal/PM Class:", "<12,10>": { - "<12,10,1>": "0x56000080", - "<12,10,2>": "0x200" + "<12,10,1>": "0x46000800", + "<12,10,2>": "0x0" }, "<12,11>": { "<12,11,1>": "0x0", "<12,11,2>": "0x80000000" }, - "<12,12>": "12", + "<12,12>": "11", "<12,13>": { - "<12,13,1>": "-2", - "<12,13,2>": "-2", + "<12,13,1>": "-1", + "<12,13,2>": "-1", "<12,13,3>": "" }, "<12,14>": "0", @@ -2157,23 +2152,20 @@ "<12,20>": "", "<12,21>": "", "<12,22>": "", - "<12,23>": "CALIB_LIST", - "<12,24>": "STD_DESC", + "<12,23>": "", + "<12,24>": "", "<12,25>": "", "<12,26>": "", "<12,27>": "", "<12,28>": "", "<12,29>": "", - "<12,30>": "<>", - "<12,31>": "0", + "<12,30>": "", + "<12,31>": "", "<12,32>": "", "<12,33>": "", "<12,34>": "", "<12,35>": "", - "<12,36>": { - "<12,36,1>": "0", - "<12,36,2>": "0" - }, + "<12,36>": "", "<12,37>": "", "<12,38>": "", "<12,39>": "", @@ -2200,9 +2192,22 @@ "<12,60>": "", "<12,61>": "", "<12,62>": "0", - "<12,63>": "", - "<12,64>": "", - "<12,65>": "", + "<12,63>": { + "<12,63,1>": "", + "<12,63,2>": "", + "<12,63,3>": "", + "<12,63,4>": "", + "<12,63,5>": "", + "<12,63,6>": "", + "<12,63,7>": "", + "<12,63,8>": "" + }, + "<12,64>": { + "<12,64,1>": "", + "<12,64,2>": "", + "<12,64,3>": "" + }, + "<12,65>": "-2", "<12,66>": "", "<12,67>": "", "<12,68>": "", @@ -2227,8 +2232,8 @@ "<12,87>": "", "<12,88>": "", "<12,89>": "", - "<12,90>": "", - "<12,91>": "", + "<12,90>": "0", + "<12,91>": "0", "<12,92>": "", "<12,93>": "", "<12,94>": "", @@ -2248,27 +2253,27 @@ "<12,108>": "" }, "<13>": { - "<13,1>": "STD_DESC_LABEL", + "<13,1>": "STD_DESC", "<13,2>": "", - "<13,3>": "STATIC", + "<13,3>": "EDITFIELD", "<13,4>": "CALIB_LIST", - "<13,5>": "81", - "<13,6>": "285", - "<13,7>": "30", - "<13,8>": "15", - "<13,9>": "Desc:", + "<13,5>": "115", + "<13,6>": "282", + "<13,7>": "316", + "<13,8>": "21", + "<13,9>": "", "<13,10>": { - "<13,10,1>": "0x56000800", - "<13,10,2>": "0x0" + "<13,10,1>": "0x56000080", + "<13,10,2>": "0x200" }, "<13,11>": { "<13,11,1>": "0x0", "<13,11,2>": "0x80000000" }, - "<13,12>": "13", + "<13,12>": "12", "<13,13>": { - "<13,13,1>": "-1", - "<13,13,2>": "-1", + "<13,13,1>": "-2", + "<13,13,2>": "-2", "<13,13,3>": "" }, "<13,14>": "0", @@ -2297,20 +2302,23 @@ "<13,20>": "", "<13,21>": "", "<13,22>": "", - "<13,23>": "", - "<13,24>": "", + "<13,23>": "CALIB_LIST", + "<13,24>": "STD_DESC", "<13,25>": "", "<13,26>": "", "<13,27>": "", "<13,28>": "", "<13,29>": "", - "<13,30>": "", - "<13,31>": "", + "<13,30>": "<>", + "<13,31>": "0", "<13,32>": "", "<13,33>": "", "<13,34>": "", "<13,35>": "", - "<13,36>": "", + "<13,36>": { + "<13,36,1>": "0", + "<13,36,2>": "0" + }, "<13,37>": "", "<13,38>": "", "<13,39>": "", @@ -2337,22 +2345,9 @@ "<13,60>": "", "<13,61>": "", "<13,62>": "0", - "<13,63>": { - "<13,63,1>": "", - "<13,63,2>": "", - "<13,63,3>": "", - "<13,63,4>": "", - "<13,63,5>": "", - "<13,63,6>": "", - "<13,63,7>": "", - "<13,63,8>": "" - }, - "<13,64>": { - "<13,64,1>": "", - "<13,64,2>": "", - "<13,64,3>": "" - }, - "<13,65>": "-2", + "<13,63>": "", + "<13,64>": "", + "<13,65>": "", "<13,66>": "", "<13,67>": "", "<13,68>": "", @@ -2377,8 +2372,8 @@ "<13,87>": "", "<13,88>": "", "<13,89>": "", - "<13,90>": "0", - "<13,91>": "0", + "<13,90>": "", + "<13,91>": "", "<13,92>": "", "<13,93>": "", "<13,94>": "", @@ -2398,27 +2393,27 @@ "<13,108>": "" }, "<14>": { - "<14,1>": "STD_SN", + "<14,1>": "STD_DESC_LABEL", "<14,2>": "", - "<14,3>": "EDITFIELD", + "<14,3>": "STATIC", "<14,4>": "CALIB_LIST", - "<14,5>": "496", + "<14,5>": "81", "<14,6>": "285", - "<14,7>": "89", - "<14,8>": "21", - "<14,9>": "", + "<14,7>": "30", + "<14,8>": "15", + "<14,9>": "Desc:", "<14,10>": { - "<14,10,1>": "0x56000080", - "<14,10,2>": "0x200" + "<14,10,1>": "0x56000800", + "<14,10,2>": "0x0" }, "<14,11>": { "<14,11,1>": "0x0", "<14,11,2>": "0x80000000" }, - "<14,12>": "14", + "<14,12>": "13", "<14,13>": { - "<14,13,1>": "-2", - "<14,13,2>": "-2", + "<14,13,1>": "-1", + "<14,13,2>": "-1", "<14,13,3>": "" }, "<14,14>": "0", @@ -2447,23 +2442,20 @@ "<14,20>": "", "<14,21>": "", "<14,22>": "", - "<14,23>": "CALIB_LIST", - "<14,24>": "STD_SN", + "<14,23>": "", + "<14,24>": "", "<14,25>": "", "<14,26>": "", "<14,27>": "", "<14,28>": "", "<14,29>": "", - "<14,30>": "<>", - "<14,31>": "0", + "<14,30>": "", + "<14,31>": "", "<14,32>": "", "<14,33>": "", "<14,34>": "", "<14,35>": "", - "<14,36>": { - "<14,36,1>": "0", - "<14,36,2>": "0" - }, + "<14,36>": "", "<14,37>": "", "<14,38>": "", "<14,39>": "", @@ -2490,9 +2482,22 @@ "<14,60>": "", "<14,61>": "", "<14,62>": "0", - "<14,63>": "", - "<14,64>": "", - "<14,65>": "", + "<14,63>": { + "<14,63,1>": "", + "<14,63,2>": "", + "<14,63,3>": "", + "<14,63,4>": "", + "<14,63,5>": "", + "<14,63,6>": "", + "<14,63,7>": "", + "<14,63,8>": "" + }, + "<14,64>": { + "<14,64,1>": "", + "<14,64,2>": "", + "<14,64,3>": "" + }, + "<14,65>": "-2", "<14,66>": "", "<14,67>": "", "<14,68>": "", @@ -2517,8 +2522,8 @@ "<14,87>": "", "<14,88>": "", "<14,89>": "", - "<14,90>": "", - "<14,91>": "", + "<14,90>": "0", + "<14,91>": "0", "<14,92>": "", "<14,93>": "", "<14,94>": "", @@ -2538,27 +2543,27 @@ "<14,108>": "" }, "<15>": { - "<15,1>": "STD_SN_LABEL", + "<15,1>": "STD_SN", "<15,2>": "", - "<15,3>": "STATIC", + "<15,3>": "EDITFIELD", "<15,4>": "CALIB_LIST", - "<15,5>": "456", - "<15,6>": "287", - "<15,7>": "36", - "<15,8>": "15", - "<15,9>": "Serial:", + "<15,5>": "496", + "<15,6>": "285", + "<15,7>": "89", + "<15,8>": "21", + "<15,9>": "", "<15,10>": { - "<15,10,1>": "0x56000800", - "<15,10,2>": "0x0" + "<15,10,1>": "0x56000080", + "<15,10,2>": "0x200" }, "<15,11>": { "<15,11,1>": "0x0", "<15,11,2>": "0x80000000" }, - "<15,12>": "15", + "<15,12>": "14", "<15,13>": { - "<15,13,1>": "-1", - "<15,13,2>": "-1", + "<15,13,1>": "-2", + "<15,13,2>": "-2", "<15,13,3>": "" }, "<15,14>": "0", @@ -2587,20 +2592,23 @@ "<15,20>": "", "<15,21>": "", "<15,22>": "", - "<15,23>": "", - "<15,24>": "", + "<15,23>": "CALIB_LIST", + "<15,24>": "STD_SN", "<15,25>": "", "<15,26>": "", "<15,27>": "", "<15,28>": "", "<15,29>": "", - "<15,30>": "", - "<15,31>": "", + "<15,30>": "<>", + "<15,31>": "0", "<15,32>": "", "<15,33>": "", "<15,34>": "", "<15,35>": "", - "<15,36>": "", + "<15,36>": { + "<15,36,1>": "0", + "<15,36,2>": "0" + }, "<15,37>": "", "<15,38>": "", "<15,39>": "", @@ -2627,22 +2635,9 @@ "<15,60>": "", "<15,61>": "", "<15,62>": "0", - "<15,63>": { - "<15,63,1>": "", - "<15,63,2>": "", - "<15,63,3>": "", - "<15,63,4>": "", - "<15,63,5>": "", - "<15,63,6>": "", - "<15,63,7>": "", - "<15,63,8>": "" - }, - "<15,64>": { - "<15,64,1>": "", - "<15,64,2>": "", - "<15,64,3>": "" - }, - "<15,65>": "-2", + "<15,63>": "", + "<15,64>": "", + "<15,65>": "", "<15,66>": "", "<15,67>": "", "<15,68>": "", @@ -2667,8 +2662,8 @@ "<15,87>": "", "<15,88>": "", "<15,89>": "", - "<15,90>": "0", - "<15,91>": "0", + "<15,90>": "", + "<15,91>": "", "<15,92>": "", "<15,93>": "", "<15,94>": "", @@ -2688,27 +2683,27 @@ "<15,108>": "" }, "<16>": { - "<16,1>": "STD_LOC", + "<16,1>": "STD_SN_LABEL", "<16,2>": "", - "<16,3>": "EDITFIELD", + "<16,3>": "STATIC", "<16,4>": "CALIB_LIST", - "<16,5>": "115", - "<16,6>": "307", - "<16,7>": "186", - "<16,8>": "21", - "<16,9>": "", + "<16,5>": "456", + "<16,6>": "287", + "<16,7>": "36", + "<16,8>": "15", + "<16,9>": "Serial:", "<16,10>": { - "<16,10,1>": "0x56000080", - "<16,10,2>": "0x200" + "<16,10,1>": "0x56000800", + "<16,10,2>": "0x0" }, "<16,11>": { "<16,11,1>": "0x0", "<16,11,2>": "0x80000000" }, - "<16,12>": "16", + "<16,12>": "15", "<16,13>": { - "<16,13,1>": "-2", - "<16,13,2>": "-2", + "<16,13,1>": "-1", + "<16,13,2>": "-1", "<16,13,3>": "" }, "<16,14>": "0", @@ -2737,23 +2732,20 @@ "<16,20>": "", "<16,21>": "", "<16,22>": "", - "<16,23>": "CALIB_LIST", - "<16,24>": "STD_LOC", + "<16,23>": "", + "<16,24>": "", "<16,25>": "", "<16,26>": "", "<16,27>": "", "<16,28>": "", "<16,29>": "", - "<16,30>": "<>", - "<16,31>": "0", + "<16,30>": "", + "<16,31>": "", "<16,32>": "", "<16,33>": "", "<16,34>": "", "<16,35>": "", - "<16,36>": { - "<16,36,1>": "0", - "<16,36,2>": "0" - }, + "<16,36>": "", "<16,37>": "", "<16,38>": "", "<16,39>": "", @@ -2780,9 +2772,22 @@ "<16,60>": "", "<16,61>": "", "<16,62>": "0", - "<16,63>": "", - "<16,64>": "", - "<16,65>": "", + "<16,63>": { + "<16,63,1>": "", + "<16,63,2>": "", + "<16,63,3>": "", + "<16,63,4>": "", + "<16,63,5>": "", + "<16,63,6>": "", + "<16,63,7>": "", + "<16,63,8>": "" + }, + "<16,64>": { + "<16,64,1>": "", + "<16,64,2>": "", + "<16,64,3>": "" + }, + "<16,65>": "-2", "<16,66>": "", "<16,67>": "", "<16,68>": "", @@ -2807,8 +2812,8 @@ "<16,87>": "", "<16,88>": "", "<16,89>": "", - "<16,90>": "", - "<16,91>": "", + "<16,90>": "0", + "<16,91>": "0", "<16,92>": "", "<16,93>": "", "<16,94>": "", @@ -2845,7 +2850,7 @@ "<17,11,1>": "0x0", "<17,11,2>": "0x80000000" }, - "<17,12>": "17", + "<17,12>": "16", "<17,13>": { "<17,13,1>": "-1", "<17,13,2>": "-1", @@ -2995,7 +3000,7 @@ "<18,11,1>": "0x0", "<18,11,2>": "0x80000000" }, - "<18,12>": "18", + "<18,12>": "17", "<18,13>": { "<18,13,1>": "-2", "<18,13,2>": "-2", @@ -3135,7 +3140,7 @@ "<19,11,1>": "0x0", "<19,11,2>": "0x80000000" }, - "<19,12>": "19", + "<19,12>": "18", "<19,13>": { "<19,13,1>": "-1", "<19,13,2>": "-1", @@ -3285,7 +3290,7 @@ "<20,11,1>": "0x0", "<20,11,2>": "0x80000000" }, - "<20,12>": "20", + "<20,12>": "19", "<20,13>": { "<20,13,1>": "-2", "<20,13,2>": "-2", @@ -3425,7 +3430,7 @@ "<21,11,1>": "0x0", "<21,11,2>": "0x80000000" }, - "<21,12>": "21", + "<21,12>": "20", "<21,13>": { "<21,13,1>": "-1", "<21,13,2>": "-1", @@ -3575,7 +3580,7 @@ "<22,11,1>": "0x60000", "<22,11,2>": "0x80000000" }, - "<22,12>": "22", + "<22,12>": "21", "<22,13>": { "<22,13,1>": "-2", "<22,13,2>": "-2", @@ -4050,7 +4055,7 @@ "<23,11,1>": "0x0", "<23,11,2>": "0x80000000" }, - "<23,12>": "23", + "<23,12>": "22", "<23,13>": { "<23,13,1>": "-1", "<23,13,2>": "-1", @@ -4200,7 +4205,7 @@ "<24,11,1>": "0x0", "<24,11,2>": "0x80000000" }, - "<24,12>": "24", + "<24,12>": "23", "<24,13>": { "<24,13,1>": "-2", "<24,13,2>": "-2", @@ -4373,7 +4378,7 @@ "<25,11,1>": "0x0", "<25,11,2>": "0x80000000" }, - "<25,12>": "25", + "<25,12>": "24", "<25,13>": { "<25,13,1>": "-2", "<25,13,2>": "-2", @@ -4546,7 +4551,7 @@ "<26,11,1>": "0x0", "<26,11,2>": "0x80000000" }, - "<26,12>": "26", + "<26,12>": "25", "<26,13>": { "<26,13,1>": "-2", "<26,13,2>": "-2", @@ -4719,7 +4724,7 @@ "<27,11,1>": "0x0", "<27,11,2>": "0x80000000" }, - "<27,12>": "27", + "<27,12>": "26", "<27,13>": { "<27,13,1>": "-2", "<27,13,2>": "-2", @@ -4892,7 +4897,7 @@ "<28,11,1>": "0x0", "<28,11,2>": "0x80000000" }, - "<28,12>": "28", + "<28,12>": "27", "<28,13>": { "<28,13,1>": "-2", "<28,13,2>": "-2", @@ -5065,7 +5070,7 @@ "<29,11,1>": "0x0", "<29,11,2>": "0x80000000" }, - "<29,12>": "29", + "<29,12>": "28", "<29,13>": { "<29,13,1>": "-2", "<29,13,2>": "-2", @@ -5238,7 +5243,7 @@ "<30,11,1>": "0x0", "<30,11,2>": "0x80000000" }, - "<30,12>": "30", + "<30,12>": "29", "<30,13>": { "<30,13,1>": "-2", "<30,13,2>": "-2", @@ -5411,7 +5416,7 @@ "<31,11,1>": "0x0", "<31,11,2>": "0x80000000" }, - "<31,12>": "31", + "<31,12>": "30", "<31,13>": { "<31,13,1>": "-2", "<31,13,2>": "-2", @@ -5584,7 +5589,7 @@ "<32,11,1>": "0x0", "<32,11,2>": "0x80000000" }, - "<32,12>": "32", + "<32,12>": "31", "<32,13>": { "<32,13,1>": "-2", "<32,13,2>": "-2", @@ -5757,7 +5762,7 @@ "<33,11,1>": "0x0", "<33,11,2>": "0x80000000" }, - "<33,12>": "33", + "<33,12>": "32", "<33,13>": { "<33,13,1>": "-2", "<33,13,2>": "-2", @@ -5930,7 +5935,7 @@ "<34,11,1>": "0x6000", "<34,11,2>": "0x80000000" }, - "<34,12>": "34", + "<34,12>": "33", "<34,13>": { "<34,13,1>": "15724527", "<34,13,2>": "15724527", @@ -6070,7 +6075,7 @@ "<35,11,1>": "0x0", "<35,11,2>": "0x80000000" }, - "<35,12>": "35", + "<35,12>": "34", "<35,13>": { "<35,13,1>": "12639424", "<35,13,2>": "12639424", @@ -6210,7 +6215,7 @@ "<36,11,1>": "0x0", "<36,11,2>": "0x80000000" }, - "<36,12>": "36", + "<36,12>": "35", "<36,13>": { "<36,13,1>": "12639424", "<36,13,2>": "12639424", @@ -6350,7 +6355,7 @@ "<37,11,1>": "0x0", "<37,11,2>": "0x80000000" }, - "<37,12>": "37", + "<37,12>": "36", "<37,13>": { "<37,13,1>": "-2", "<37,13,2>": "-2", @@ -6532,7 +6537,7 @@ "<38,11,1>": "0x0", "<38,11,2>": "0x80000000" }, - "<38,12>": "38", + "<38,12>": "37", "<38,13>": { "<38,13,1>": "-2", "<38,13,2>": "-2", @@ -6714,7 +6719,7 @@ "<39,11,1>": "0x0", "<39,11,2>": "0x80000000" }, - "<39,12>": "39", + "<39,12>": "38", "<39,13>": { "<39,13,1>": "-2", "<39,13,2>": "-2", @@ -6896,7 +6901,7 @@ "<40,11,1>": "0x0", "<40,11,2>": "0x80000000" }, - "<40,12>": "40", + "<40,12>": "39", "<40,13>": { "<40,13,1>": "-2", "<40,13,2>": "-2", @@ -7067,7 +7072,7 @@ "<41,11,1>": "0x0", "<41,11,2>": "0x80000000" }, - "<41,12>": "41", + "<41,12>": "40", "<41,13>": { "<41,13,1>": "12639424", "<41,13,2>": "12639424", @@ -7207,7 +7212,7 @@ "<42,11,1>": "0x0", "<42,11,2>": "0x80000000" }, - "<42,12>": "42", + "<42,12>": "41", "<42,13>": { "<42,13,1>": "-1", "<42,13,2>": "-1", @@ -7357,7 +7362,7 @@ "<43,11,1>": "0x0", "<43,11,2>": "0x80000000" }, - "<43,12>": "43", + "<43,12>": "42", "<43,13>": { "<43,13,1>": "12639424", "<43,13,2>": "12639424", @@ -7497,7 +7502,7 @@ "<44,11,1>": "0x0", "<44,11,2>": "0x80000000" }, - "<44,12>": "44", + "<44,12>": "43", "<44,13>": { "<44,13,1>": "-1", "<44,13,2>": "-1", @@ -7647,7 +7652,7 @@ "<45,11,1>": "0x0", "<45,11,2>": "0x80000000" }, - "<45,12>": "45", + "<45,12>": "44", "<45,13>": { "<45,13,1>": "-2", "<45,13,2>": "-2", @@ -7819,7 +7824,7 @@ "<46,11,1>": "0x210", "<46,11,2>": "0x80000000" }, - "<46,12>": "46", + "<46,12>": "45", "<46,13>": { "<46,13,1>": "-1", "<46,13,2>": "-1", @@ -7974,7 +7979,7 @@ "<47,11,1>": "0x0", "<47,11,2>": "0x80000C00" }, - "<47,12>": "47", + "<47,12>": "46", "<47,13>": { "<47,13,1>": "-2", "<47,13,2>": "-2", @@ -8119,7 +8124,7 @@ "<48,11,1>": "0x0", "<48,11,2>": "0x80000C00" }, - "<48,12>": "48", + "<48,12>": "47", "<48,13>": { "<48,13,1>": "-2", "<48,13,2>": "-2", @@ -8264,7 +8269,7 @@ "<49,11,1>": "0x0", "<49,11,2>": "0x80000C00" }, - "<49,12>": "49", + "<49,12>": "48", "<49,13>": { "<49,13,1>": "-2", "<49,13,2>": "-2", @@ -8409,7 +8414,7 @@ "<50,11,1>": "0x0", "<50,11,2>": "0x80000000" }, - "<50,12>": "50", + "<50,12>": "49", "<50,13>": { "<50,13,1>": "-1", "<50,13,2>": "-1", @@ -8559,7 +8564,7 @@ "<51,11,1>": "0x0", "<51,11,2>": "0x80000000" }, - "<51,12>": "51", + "<51,12>": "50", "<51,13>": { "<51,13,1>": "-1", "<51,13,2>": "-1", @@ -8709,7 +8714,7 @@ "<52,11,1>": "0x5000", "<52,11,2>": "0x80000000" }, - "<52,12>": "52", + "<52,12>": "51", "<52,13>": { "<52,13,1>": "-1", "<52,13,2>": "-1", diff --git a/LSL2/STPROC/CALIB_LIST.txt b/LSL2/STPROC/CALIB_LIST.txt index 1ca4190..eefa2fe 100644 --- a/LSL2/STPROC/CALIB_LIST.txt +++ b/LSL2/STPROC/CALIB_LIST.txt @@ -67,25 +67,22 @@ END RETURN Result - * * * * * * * Create: * * * * * * * + IF MemberOf(@USER4,'CALIBRATION') ELSE + ErrMsg('Only authorized personnel may update the Calibration List.') + End_Window(@WINDOW) + RETURN + END -IF MemberOf(@USER4,'CALIBRATION') ELSE - ErrMsg('Only authorized personnel may update the Calibration List.') - End_Window(@WINDOW) - RETURN -END + obj_Appwindow('Create',@WINDOW) - -obj_Appwindow('Create',@WINDOW) - -Set_List_Box_Data( @WINDOW ) -// Use to determine whether or not the New Calibration label was just clicked -Set_Property(@Window : '.CALIBRATIONS', '@PrintLabel', False$) -GOSUB Refresh + Set_List_Box_Data( @WINDOW ) + // Use to determine whether or not the New Calibration label was just clicked + Set_Property(@Window : '.CALIBRATIONS', '@PrintLabel', False$) + GOSUB Refresh RETURN @@ -95,81 +92,76 @@ Clear: * * * * * * * -IF Get_Property(@WINDOW,'@READONLY') THEN - obj_AppWindow('ReadOnly',@RM:1) ;* Reenables data bound controls - Set_Property(@WINDOW,'@READONLY',0) ;* Clear flag on window -END + IF Get_Property(@WINDOW,'@READONLY') THEN + obj_AppWindow('ReadOnly',@RM:1) ;* Reenables data bound controls + Set_Property(@WINDOW,'@READONLY',0) ;* Clear flag on window + END * * * * * * * Refresh: * * * * * * * -* QBF buttons + * QBF buttons -Ctrls = @WINDOW:'.QBF_FIRST_FIX':@RM ; Props = 'ENABLED':@RM -Ctrls := @WINDOW:'.QBF_PREV_FIX':@RM ; Props := 'ENABLED':@RM -Ctrls := @WINDOW:'.QBF_ABS_FIX':@RM ; Props := 'ENABLED':@RM -Ctrls := @WINDOW:'.QBF_NEXT_FIX':@RM ; Props := 'ENABLED':@RM -Ctrls := @WINDOW:'.QBF_LAST_FIX':@RM ; Props := 'ENABLED':@RM -Ctrls := @WINDOW:'.QBF_STOP_FIX' ; Props := 'ENABLED' + Ctrls = @WINDOW:'.QBF_FIRST_FIX':@RM ; Props = 'ENABLED':@RM + Ctrls := @WINDOW:'.QBF_PREV_FIX':@RM ; Props := 'ENABLED':@RM + Ctrls := @WINDOW:'.QBF_ABS_FIX':@RM ; Props := 'ENABLED':@RM + Ctrls := @WINDOW:'.QBF_NEXT_FIX':@RM ; Props := 'ENABLED':@RM + Ctrls := @WINDOW:'.QBF_LAST_FIX':@RM ; Props := 'ENABLED':@RM + Ctrls := @WINDOW:'.QBF_STOP_FIX' ; Props := 'ENABLED' -IF Get_Property(@WINDOW,'QBFLIST') = '' THEN - Vals = 0:@RM:0:@RM:0:@RM:0:@RM:0:@RM:0 -END ELSE - Vals = 1:@RM:1:@RM:1:@RM:1:@RM:1:@RM:1 -END + IF Get_Property(@WINDOW,'QBFLIST') = '' THEN + Vals = 0:@RM:0:@RM:0:@RM:0:@RM:0:@RM:0 + END ELSE + Vals = 1:@RM:1:@RM:1:@RM:1:@RM:1:@RM:1 + END -Set_Property(Ctrls,Props,Vals) + Set_Property(Ctrls,Props,Vals) -* Turn edit table symbolic column backgrounds to green + * Turn edit table symbolic column backgrounds to green -ETSymbolics = Get_Property(@WINDOW,'@ET_SYMBOLICS') ;* Loaded during 'Create' in obj_Appwindow + ETSymbolics = Get_Property(@WINDOW,'@ET_SYMBOLICS') ;* Loaded during 'Create' in obj_Appwindow -ETCtrls = ETSymbolics<1> -ETCols = ETSymbolics<2> - -FOR I = 1 TO COUNT(ETCtrls,@VM) + (ETCtrls NE '') - ETCtrl = ETCtrls<1,I> - ETList = Get_Property(ETCtrl,'LIST') - FOR Line = 1 TO COUNT(ETList,@FM) + (ETList NE '') - IF ETList NE '' THEN - FOR N = 1 TO COUNT(ETCols<1,Line>,@SVM) + (ETCols<1,Line> NE '') - stat = Send_Message(ETCtrl,'COLOR_BY_POS',ETCols<1,Line,N>,Line,GREEN$) - NEXT N - END - NEXT Line -NEXT I + ETCtrls = ETSymbolics<1> + ETCols = ETSymbolics<2> + FOR I = 1 TO COUNT(ETCtrls,@VM) + (ETCtrls NE '') + ETCtrl = ETCtrls<1,I> + ETList = Get_Property(ETCtrl,'LIST') + FOR Line = 1 TO COUNT(ETList,@FM) + (ETList NE '') + IF ETList NE '' THEN + FOR N = 1 TO COUNT(ETCols<1,Line>,@SVM) + (ETCols<1,Line> NE '') + stat = Send_Message(ETCtrl,'COLOR_BY_POS',ETCols<1,Line,N>,Line,GREEN$) + NEXT N + END + NEXT Line + NEXT I RETURN - - - * * * * * * * Read: * * * * * * * -CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') + CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') -IF RowExists('CALIB_LIST',CLNo) ELSE - IF Get_Property(@WINDOW:'.ENTER_DTM','DEFPROP') = '' THEN - CurrDTM = OCONV(Date(),'D4/'):' ':OCONV(Time(),'MTH') - Set_Property(@WINDOW:'.ENTER_DTM','DEFPROP',CurrDTM) - + IF RowExists('CALIB_LIST',CLNo) ELSE + IF Get_Property(@WINDOW:'.ENTER_DTM','DEFPROP') = '' THEN + CurrDTM = OCONV(Date(),'D4/'):' ':OCONV(Time(),'MTH') + Set_Property(@WINDOW:'.ENTER_DTM','DEFPROP',CurrDTM) + END END -END -GOSUB Refresh -// Use to determine whether or not the New Calibration button was just clicked and print if it was -PrintCheck = Get_Property(@Window : '.CALIBRATIONS', '@PrintLabel') -If PrintCheck EQ True$ then - Gosub PrintMostRecentLabel -end -// Reset flag after read regardless -Set_Property(@Window : '.CALIBRATIONS', '@PrintLabel', False$) + GOSUB Refresh + // Use to determine whether or not the New Calibration button was just clicked and print if it was + PrintCheck = Get_Property(@Window : '.CALIBRATIONS', '@PrintLabel') + If PrintCheck EQ True$ then + Gosub PrintMostRecentLabel + end + // Reset flag after read regardless + Set_Property(@Window : '.CALIBRATIONS', '@PrintLabel', False$) RETURN @@ -187,14 +179,6 @@ RETURN Delete: * * * * * * * -/* -IF Security_Check('Order',Delete$) THEN - Result = 1 ;* Proceed with delete -END ELSE - Security_Err_Msg('Order',Delete$) - Result = 0 ;* Stop event chain -END -*/ RETURN @@ -203,13 +187,12 @@ RETURN NewItem: * * * * * * * -CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') - -IF CLNo = '' THEN - NextCLNo = NextKey('CALIB_LIST') - obj_Appwindow('LoadFormKeys',@WINDOW:@RM:NextCLNo) -END + CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') + IF CLNo = '' THEN + NextCLNo = NextKey('CALIB_LIST') + obj_Appwindow('LoadFormKeys',@WINDOW:@RM:NextCLNo) + END RETURN @@ -218,37 +201,35 @@ RETURN LUCalibItem: * * * * * * * -CLKeys = Popup(@WINDOW,'','CALIB_LIST') + CLKeys = Popup(@WINDOW,'','CALIB_LIST') -IF Get_Status(errCode) THEN ErrMsg(ErrCode) + IF Get_Status(errCode) THEN ErrMsg(ErrCode) -CONVERT @VM TO @FM IN CLKeys - -IF INDEX(CLKeys,@FM,1) THEN - Send_Event(@WINDOW,'QBFINIT') - Set_Property(@WINDOW,'QBFLIST',CLKeys) - GOSUB Refresh - Send_Event(@WINDOW,'QBFIRST') -END ELSE - obj_Appwindow('LoadFormKeys',@WINDOW:@RM:CLKeys) -END + CONVERT @VM TO @FM IN CLKeys + IF INDEX(CLKeys,@FM,1) THEN + Send_Event(@WINDOW,'QBFINIT') + Set_Property(@WINDOW,'QBFLIST',CLKeys) + GOSUB Refresh + Send_Event(@WINDOW,'QBFIRST') + END ELSE + obj_Appwindow('LoadFormKeys',@WINDOW:@RM:CLKeys) + END RETURN - * * * * * * * LUCalibItemType: * * * * * * * -CLItemType = Popup(@WINDOW,'','CALIB_LIST_TYPE') + CLItemType = Popup(@WINDOW,'','CALIB_LIST_TYPE') -IF Get_Status(errCode) THEN ErrMsg(ErrCode) + IF Get_Status(errCode) THEN ErrMsg(ErrCode) -IF CLItemType NE '' THEN - obj_AppWindow('LUValReturn',CLItemType:@RM:@WINDOW:'.CL_TYPE') -END + IF CLItemType NE '' THEN + obj_AppWindow('LUValReturn',CLItemType:@RM:@WINDOW:'.CL_TYPE') + END RETURN @@ -257,27 +238,24 @@ RETURN LUCalibItemLoc: * * * * * * * -CLItemLoc = Popup(@WINDOW,'','CALIB_LIST_LOC') + CLItemLoc = Popup(@WINDOW,'','CALIB_LIST_LOC') -IF Get_Status(errCode) THEN ErrMsg(ErrCode) + IF Get_Status(errCode) THEN ErrMsg(ErrCode) -IF CLItemLoc NE '' THEN - obj_AppWindow('LUValReturn',CLItemLoc:@RM:@WINDOW:'.CAL_LOC') -END + IF CLItemLoc NE '' THEN + obj_AppWindow('LUValReturn',CLItemLoc:@RM:@WINDOW:'.CAL_LOC') + END RETURN - - * * * * * * Close: * * * * * * + obj_Notes('Inbox',@USER4) ;* Checks for any new messages -obj_Notes('Inbox',@USER4) ;* Checks for any new messages - -Send_Event('MASTER_CALIB_LIST','CREATE') + Send_Event('MASTER_CALIB_LIST','CREATE') RETURN @@ -287,35 +265,34 @@ RETURN CalibrationsDC: * * * * * * * -CtrlEntID = @WINDOW:'.CALIBRATIONS' + CtrlEntID = @WINDOW:'.CALIBRATIONS' -CurrPos = Get_Property(CtrlEntID,'SELPOS') -CurrCol = CurrPos<1> -CurrRow = CurrPos<2> + CurrPos = Get_Property(CtrlEntID,'SELPOS') + CurrCol = CurrPos<1> + CurrRow = CurrPos<2> -CalDt = Get_Property(CtrlEntID,'CELLPOS',COL$CAL_DT:@FM:CurrRow) + CalDt = Get_Property(CtrlEntID,'CELLPOS',COL$CAL_DT:@FM:CurrRow) -CalDt = ICONV(CalDt,'D') -CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') + CalDt = ICONV(CalDt,'D') + CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') + + IF CLNo NE '' AND CalDt NE '' THEN + + IF Get_Property(@WINDOW,'QBFLIST') = '' THEN + Send_Event(@WINDOW,'WRITE') + END + + oaParms = 'CALIBRATION':@RM + oaParms := CLNo:'*':CalDt:@RM + oaParms := '':@RM ;* Default Record + oaParms := CLNo:@RM + oaParms := @RM + oaParms := CtrlEntID:@RM + oaParms := CurrPos + + obj_Appwindow('ViewNewDetail', oaParms) -IF CLNo NE '' AND CalDt NE '' THEN - - IF Get_Property(@WINDOW,'QBFLIST') = '' THEN - Send_Event(@WINDOW,'WRITE') END - - oaParms = 'CALIBRATION':@RM - oaParms := CLNo:'*':CalDt:@RM - oaParms := '':@RM ;* Default Record - oaParms := CLNo:@RM - oaParms := @RM - oaParms := CtrlEntID:@RM - oaParms := CurrPos - - obj_Appwindow('ViewNewDetail', oaParms) - - -END RETURN @@ -324,51 +301,49 @@ RETURN NewCalibClick: * * * * * * * -CtrlEntID = @WINDOW:'.CALIBRATIONS' + CtrlEntID = @WINDOW:'.CALIBRATIONS' -CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') + CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') -IF CLNo NE '' THEN - - IF Get_Property(@WINDOW,'QBFLIST') = '' THEN - Send_Event(@WINDOW,'WRITE') + IF CLNo NE '' THEN + + IF Get_Property(@WINDOW,'QBFLIST') = '' THEN + Send_Event(@WINDOW,'WRITE') + END + + oaParms = 'CALIBRATION':@RM + oaParms := CLNo:@RM + oaParms := '':@RM ;* Default Record + oaParms := CLNo:@RM + oaParms := @RM + oaParms := CtrlEntID:@RM + oaParms := 1:@FM:1 + + obj_Appwindow('ViewNewDetail', oaParms) + // New Calibration label was just clicked, set to true + Set_Property(@Window : '.CALIBRATIONS', '@PrintLabel', True$) + END - - oaParms = 'CALIBRATION':@RM - oaParms := CLNo:@RM - oaParms := '':@RM ;* Default Record - oaParms := CLNo:@RM - oaParms := @RM - oaParms := CtrlEntID:@RM - oaParms := 1:@FM:1 - - obj_Appwindow('ViewNewDetail', oaParms) - // New Calibration label was just clicked, set to true - Set_Property(@Window : '.CALIBRATIONS', '@PrintLabel', True$) - -END RETURN + ********************* PrintMostRecentLabel: ********************* -CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') + CLNo = Get_Property(@WINDOW:'.CL_NO','DEFPROP') -IF CLNo NE '' THEN - TableList = Get_Property(@WINDOW:'.CALIBRATIONS', 'LIST') - EquipmentID = Get_Property(@WINDOW:'.EQ_DESC', 'TEXT') - LastCalibration = Get_Property(@WINDOW:'.LAST_CAL_DT', 'TEXT') - FrequencyVal = Get_Property(@WINDOW:'.CAL_INTERVAL', 'TEXT') - FrequencyUnit = 'Months' - NextCalibration = Get_Property(@WINDOW:'.NEXT_CAL_DT', 'TEXT') - CalibratedBy = TableList<1,2> - Labeling_Services('PrintCalibrationLabel', EquipmentID, LastCalibration, NextCalibration, CalibratedBy, FrequencyVal, FrequencyUnit, '') -end + IF CLNo NE '' THEN + TableList = Get_Property(@WINDOW:'.CALIBRATIONS', 'LIST') + EquipmentID = Get_Property(@WINDOW:'.EQ_DESC', 'TEXT') + LastCalibration = Get_Property(@WINDOW:'.LAST_CAL_DT', 'TEXT') + FrequencyVal = Get_Property(@WINDOW:'.CAL_INTERVAL', 'TEXT') + FrequencyUnit = 'Months' + NextCalibration = Get_Property(@WINDOW:'.NEXT_CAL_DT', 'TEXT') + CalibratedBy = TableList<1,2> + Labeling_Services('PrintCalibrationLabel', EquipmentID, LastCalibration, NextCalibration, CalibratedBy, FrequencyVal, FrequencyUnit, '') + end return - - -