diff --git a/MAC/Navigator2/panels/objects/Hardware/Station-2Cabinets.pnl b/MAC/Navigator2/panels/objects/Hardware/Station-2Cabinets.pnl index 1f939bbd69c80f97a35a06aaed999833b9dd1f63..4e426095ae89a2f3560c2f79cc8933009761961a 100644 --- a/MAC/Navigator2/panels/objects/Hardware/Station-2Cabinets.pnl +++ b/MAC/Navigator2/panels/objects/Hardware/Station-2Cabinets.pnl @@ -68,7 +68,7 @@ LANG:1 6 Layer1 6 2032 "Border1" "" -1 0 541 E E E 1 E 1 E N "_Transparent" E N "_3DFace" E E +1 0 541 E E E 1 E 1 E N "_Transparent" E N "_Transparent" E E E E 816 0 0 0 0 0 E E E @@ -79,195 +79,195 @@ LANG:1 0 1 "dashclr"N "_Transparent" E E 0 1 1 0 1 E 1 0 1 0 -10 2 0 3 "pictures/small-station-sized.bmp" 13434828 E 0 10 933 543 -1 2037 97 "" 2190 +1 2138 97 "" 2190 0 -1 2038 97 "" 2188 +1 2139 97 "" 2188 0 -1 2039 97 "86" 1 +1 2140 97 "86" 1 0 -1 2040 97 "" 2187 +1 2141 97 "" 2187 0 -1 2033 96 "" 2190 +1 2134 96 "" 2190 0 -1 2034 96 "" 2188 +1 2135 96 "" 2188 0 -1 2035 96 "86" 1 +1 2136 96 "86" 1 0 -1 2036 96 "" 2187 +1 2137 96 "" 2187 0 -1 2041 100 "" 914 +1 2142 100 "" 914 0 -1 2042 100 "" 901 +1 2143 100 "" 901 0 -1 2043 100 "" 908 +1 2144 100 "" 908 0 -1 2044 100 "" 907 +1 2145 100 "" 907 0 -1 2045 100 "" 906 +1 2146 100 "" 906 0 -1 2046 100 "" 905 +1 2147 100 "" 905 0 -1 2047 100 "" 904 +1 2148 100 "" 904 0 -1 2048 100 "" 903 +1 2149 100 "" 903 0 -1 2049 100 "" 902 +1 2150 100 "" 902 0 -1 2050 100 "" 0 +1 2151 100 "" 0 0 -1 2051 100 "" 909 +1 2152 100 "" 909 0 -1 2052 100 "1" 1 +1 2153 100 "1" 1 0 -1 2053 100 "" 912 +1 2154 100 "" 912 0 -1 2054 101 "" 914 +1 2155 101 "" 914 0 -1 2055 101 "" 901 +1 2156 101 "" 901 0 -1 2056 101 "" 908 +1 2157 101 "" 908 0 -1 2057 101 "" 907 +1 2158 101 "" 907 0 -1 2058 101 "" 906 +1 2159 101 "" 906 0 -1 2059 101 "" 905 +1 2160 101 "" 905 0 -1 2060 101 "" 904 +1 2161 101 "" 904 0 -1 2061 101 "" 903 +1 2162 101 "" 903 0 -1 2062 101 "" 902 +1 2163 101 "" 902 0 -1 2063 101 "" 0 +1 2164 101 "" 0 0 -1 2064 101 "" 909 +1 2165 101 "" 909 0 -1 2065 101 "1" 1 +1 2166 101 "1" 1 0 -1 2066 101 "" 912 +1 2167 101 "" 912 0 -1 2067 102 "" 914 +1 2168 102 "" 914 0 -1 2068 102 "" 901 +1 2169 102 "" 901 0 -1 2069 102 "" 908 +1 2170 102 "" 908 0 -1 2070 102 "" 907 +1 2171 102 "" 907 0 -1 2071 102 "" 906 +1 2172 102 "" 906 0 -1 2072 102 "" 905 +1 2173 102 "" 905 0 -1 2073 102 "" 904 +1 2174 102 "" 904 0 -1 2074 102 "" 903 +1 2175 102 "" 903 0 -1 2075 102 "" 902 +1 2176 102 "" 902 0 -1 2076 102 "" 0 +1 2177 102 "" 0 0 -1 2077 102 "" 909 +1 2178 102 "" 909 0 -1 2078 102 "1" 1 +1 2179 102 "1" 1 0 -1 2079 102 "" 912 +1 2180 102 "" 912 0 -1 2080 103 "" 0 +1 2181 103 "" 0 0 -1 2081 103 "" 13 +1 2182 103 "" 13 0 -1 2082 103 "" 15 +1 2183 103 "" 15 0 -1 2083 103 "" 16 +1 2184 103 "" 16 0 -1 2084 103 "" 18 +1 2185 103 "" 18 0 -1 2085 103 "" 19 +1 2186 103 "" 19 0 -1 2086 103 "" 20 +1 2187 103 "" 20 0 -1 2087 103 "" 21 +1 2188 103 "" 21 0 -1 2088 103 "" 22 +1 2189 103 "" 22 0 -1 2089 103 "" 24 +1 2190 103 "" 24 0 -1 2090 103 "" 25 +1 2191 103 "" 25 0 -1 2091 103 "" 26 +1 2192 103 "" 26 0 -1 2092 103 "" 27 +1 2193 103 "" 27 0 -1 2093 103 "" 28 +1 2194 103 "" 28 0 -1 2094 103 "" 29 +1 2195 103 "" 29 0 -1 2095 103 "" 30 +1 2196 103 "" 30 0 -1 2096 103 "" 31 +1 2197 103 "" 31 0 -1 2097 103 "" 32 +1 2198 103 "" 32 0 -1 2098 103 "" 33 +1 2199 103 "" 33 0 -1 2099 103 "" 34 +1 2200 103 "" 34 0 -1 2100 103 "" 35 +1 2201 103 "" 35 0 -1 2101 103 "" 36 +1 2202 103 "" 36 0 -1 2102 103 "" 38 +1 2203 103 "" 38 0 -1 2103 103 "" 39 +1 2204 103 "" 39 0 -1 2104 104 "" 0 +1 2205 104 "" 0 0 -1 2105 104 "" 13 +1 2206 104 "" 13 0 -1 2106 104 "" 15 +1 2207 104 "" 15 0 -1 2107 104 "" 16 +1 2208 104 "" 16 0 -1 2108 104 "" 18 +1 2209 104 "" 18 0 -1 2109 104 "" 19 +1 2210 104 "" 19 0 -1 2110 104 "" 20 +1 2211 104 "" 20 0 -1 2111 104 "" 21 +1 2212 104 "" 21 0 -1 2112 104 "" 22 +1 2213 104 "" 22 0 -1 2113 104 "" 24 +1 2214 104 "" 24 0 -1 2114 104 "" 25 +1 2215 104 "" 25 0 -1 2115 104 "" 26 +1 2216 104 "" 26 0 -1 2116 104 "" 27 +1 2217 104 "" 27 0 -1 2117 104 "" 28 +1 2218 104 "" 28 0 -1 2118 104 "" 29 +1 2219 104 "" 29 0 -1 2119 104 "" 30 +1 2220 104 "" 30 0 -1 2120 104 "" 31 +1 2221 104 "" 31 0 -1 2121 104 "" 32 +1 2222 104 "" 32 0 -1 2122 104 "" 33 +1 2223 104 "" 33 0 -1 2123 104 "" 34 +1 2224 104 "" 34 0 -1 2124 104 "" 35 +1 2225 104 "" 35 0 -1 2125 104 "" 36 +1 2226 104 "" 36 0 -1 2126 104 "" 38 +1 2227 104 "" 38 0 -1 2127 104 "" 39 +1 2228 104 "" 39 0 6 2128 "power48" @@ -313,7 +313,7 @@ LANG:1 0 E E 0 1 1 2 1 E U 1 E 587 371 642 385 0 2 2 "0s" 0 0 0 192 0 0 587 371 1 1 -LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-*-80-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg +LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg 0 "" 1 LANG:1 10 Power 48 V @@ -333,7 +333,7 @@ LANG:1 0 E E 0 1 1 2 1 E U 1 E 587 399 648 413 0 2 2 "0s" 0 0 0 192 0 0 587 399 1 1 -LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-*-80-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg +LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg 0 "" 1 LANG:1 11 Power 220 V diff --git a/MAC/Navigator2/panels/objects/Hardware/Station-3Cabinets.pnl b/MAC/Navigator2/panels/objects/Hardware/Station-3Cabinets.pnl index 4260b7fdc2c80059afd99f21298521562bcd3865..655966aa497441372e5e064f2615d8542945ec90 100644 --- a/MAC/Navigator2/panels/objects/Hardware/Station-3Cabinets.pnl +++ b/MAC/Navigator2/panels/objects/Hardware/Station-3Cabinets.pnl @@ -2,7 +2,59 @@ V 10 1 LANG:1 7 Station PANEL,-1 -1 980 746 N "_3DFace" 0 -E E E E E 1 -1 -1 0 0 0 +"main() +{ + //get current database name to determine the station + string station = strrtrim(dpSubStr(g_currentDatapoint,DPSUB_SYS),\":\"); + + string mainStationDP=MainDBName+\"LOFAR_PIC_\"+navFunct_getRingFromStation(station)+\"_\"+station; + + if (dpExists(mainStationDP+\".power48On\") ){ + dpConnect(\"updatePower48\",mainStationDP+\".power48On\", + mainStationDP+\".power48On:_online.._invalid\"); + } else { + setValue(\"power48On\",\"backCol\",\"_dpdoesnotexist\"); + } + + if (dpExists(mainStationDP+\".power220On\") ) { + dpConnect(\"updatePower220\",mainStationDP+\".power220On\", + mainStationDP+\".power220On:_online.._invalid\"); + } else { + setValue(\"power220On\",\"backCol\",\"_dpdoesnotexist\"); + } + +} + +void updatePower48(string dp1, bool on, + string dp2, bool invalid) { + + if (!invalid) { + string color=\"Lofar_broken\"; + if (on) { + color=\"Lofar_operational\"; + } + setValue(\"power48On\",\"backCol\",color); + + } else { + setValue(\"power48On\",\"backCol\",\"Lofar_invalid\"); + } +} + +void updatePower220(string dp1, bool on, + string dp2, bool invalid) { + + if (!invalid) { + string color=\"Lofar_broken\"; + if (on) { + color=\"Lofar_operational\"; + } + setValue(\"power220On\",\"backCol\",color); + + } else { + setValue(\"power220On\",\"backCol\",\"Lofar_invalid\"); + } +}" 0 + E E E E 1 -1 -1 0 0 0 ""0 1 E E 2 "CBRef" "1" @@ -251,94 +303,202 @@ E E 0 1 1 0 1 E 1 0 1 0 -10 2 0 3 "pictures/station-sized.bmp" 13434828 E 0 10 0 1 2144 107 "" 36 0 -1 2145 108 "" 0 +1 2145 107 "" 38 +0 +1 2146 107 "" 39 +0 +1 2147 108 "" 0 +0 +1 2148 108 "" 13 +0 +1 2149 108 "" 15 +0 +1 2150 108 "" 16 +0 +1 2151 108 "" 18 +0 +1 2152 108 "" 19 0 -1 2146 108 "" 13 +1 2153 108 "" 20 0 -1 2147 108 "" 15 +1 2154 108 "" 21 0 -1 2148 108 "" 16 +1 2155 108 "" 22 0 -1 2149 108 "" 18 +1 2156 108 "" 24 0 -1 2150 108 "" 19 +1 2157 108 "" 25 0 -1 2151 108 "" 20 +1 2158 108 "" 26 0 -1 2152 108 "" 21 +1 2159 108 "" 27 0 -1 2153 108 "" 22 +1 2160 108 "" 28 0 -1 2154 108 "" 24 +1 2161 108 "" 29 0 -1 2155 108 "" 25 +1 2162 108 "" 30 0 -1 2156 108 "" 26 +1 2163 108 "" 31 0 -1 2157 108 "" 27 +1 2164 108 "" 32 0 -1 2158 108 "" 28 +1 2165 108 "" 33 0 -1 2159 108 "" 29 +1 2166 108 "" 34 0 -1 2160 108 "" 30 +1 2167 108 "" 35 0 -1 2161 108 "" 31 +1 2168 108 "" 36 0 -1 2162 108 "" 32 +1 2169 108 "" 38 0 -1 2163 108 "" 33 +1 2170 108 "" 39 0 -1 2164 108 "" 34 +1 2171 109 "" 0 0 -1 2165 108 "" 35 +1 2172 109 "" 13 0 -1 2166 108 "" 36 +1 2173 109 "" 15 0 -1 2167 109 "" 0 +1 2174 109 "" 16 0 -1 2168 109 "" 13 +1 2175 109 "" 18 0 -1 2169 109 "" 15 +1 2176 109 "" 19 0 -1 2170 109 "" 16 +1 2177 109 "" 20 0 -1 2171 109 "" 18 +1 2178 109 "" 21 0 -1 2172 109 "" 19 +1 2179 109 "" 22 0 -1 2173 109 "" 20 +1 2180 109 "" 24 0 -1 2174 109 "" 21 +1 2181 109 "" 25 0 -1 2175 109 "" 22 +1 2182 109 "" 26 0 -1 2176 109 "" 24 +1 2183 109 "" 27 0 -1 2177 109 "" 25 +1 2184 109 "" 28 0 -1 2178 109 "" 26 +1 2185 109 "" 29 0 -1 2179 109 "" 27 +1 2186 109 "" 30 0 -1 2180 109 "" 28 +1 2187 109 "" 31 0 -1 2181 109 "" 29 +1 2188 109 "" 32 0 -1 2182 109 "" 30 +1 2189 109 "" 33 0 -1 2183 109 "" 31 +1 2190 109 "" 34 0 -1 2184 109 "" 32 +1 2191 109 "" 35 0 -1 2185 109 "" 33 +1 2192 109 "" 36 +0 +1 2193 109 "" 38 +0 +1 2194 109 "" 39 +0 +6 2195 +"power48" +"" +1 580 367 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E + E E +872 0 0 0 0 0 +E E E +0 +1 +LANG:1 0 + +1 +"dashclr"N "_Transparent" +E E 0 1 1 2 1 E 1 0 1 110 -1 1 E 580 367 700 389 +6 2196 +"RECTANGLE2" +"" +1 580 370 E E E 1 E 1 E N {0,0,0} E N "_3DFace" E E + E E +874 0 0 0 0 0 +E E E +0 +1 +LANG:1 0 + +1 +"dashclr"N "_Transparent" +E E 0 1 1 2 1 E 1 0 1 110 0 1 E 580 390 700 421 +2 2197 +"PRIMITIVE_TEXT10" +"" +1 697 371 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E + E E +876 0 0 0 0 0 +E E E 0 -1 2186 109 "" 34 +1 +LANG:1 0 + +1 +"dashclr"N "_Transparent" +E E 0 1 1 2 1 E U 1 E 697 371 752 385 +0 2 2 "0s" 0 0 0 192 0 0 697 371 1 +1 +LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg +0 "" +1 +LANG:1 10 Power 48 V +2 2198 +"PRIMITIVE_TEXT11" +"" +1 697 399 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E + E E +878 0 0 0 0 0 +E E E 0 -1 2187 109 "" 35 +1 +LANG:1 0 + +1 +"dashclr"N "_Transparent" +E E 0 1 1 2 1 E U 1 E 697 399 758 413 +0 2 2 "0s" 0 0 0 192 0 0 697 399 1 +1 +LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg +0 "" +1 +LANG:1 11 Power 220 V +7 2199 +"power48On" +"" +1 75.00000000000011 575 E E E 1 E 1 E N {0,0,0} E N "Lofar_off" E E + E E +880 0 0 0 0 0 +E E E 0 -1 2188 109 "" 36 +1 +LANG:1 0 + +1 +"dashclr"N "_Transparent" +E E 0 1 1 2 1 E 1.190082644628099 0 1.190082644628099 700.7438016528926 -307.2975206611569 1 E 75 575 5 5 +7 2200 +"power220On" +"" +1 75 575 E E E 1 E 1 E N {0,0,0} E N "Lofar_off" E E + E E +882 0 0 0 0 0 +E E E 0 +1 +LANG:1 0 + +1 +"dashclr"N "_Transparent" +E E 0 1 1 2 1 E 1.190082644628099 0 1.190082644628099 700.7438016528926 -278.2975206611569 1 E 75 575 5 5 0 LAYER, 1 1 @@ -411,15 +571,15 @@ LANG:1 6 Layer8 "$CabinetNr""2" "$SubrackNr""5" 3 107 "PANEL_REF108" -"objects/Hardware\\Cabinet_Top.pnl" 50 540 T 869 1 0 1 0 -15 +"objects\\Hardware\\Cabinet_Top.pnl" 50 540 T 869 1 0 1 0 -15 1 "$CabinetNr""0" 3 108 "PANEL_REF109" -"objects/Hardware\\Cabinet_Top.pnl" 260 550 T 870 1 0 1 0 -25 +"objects\\Hardware\\Cabinet_Top.pnl" 260 550 T 870 1 0 1 0 -25 1 "$CabinetNr""1" 3 109 "PANEL_REF110" -"objects/Hardware\\Cabinet_Top.pnl" 470 550 T 871 1 0 1 0 -25 +"objects\\Hardware\\Cabinet_Top.pnl" 470 550 T 871 1 0 1 0 -25 1 "$CabinetNr""3" 0 \ No newline at end of file diff --git a/MAC/Navigator2/panels/objects/navigator_viewSelection.pnl b/MAC/Navigator2/panels/objects/navigator_viewSelection.pnl index 60d9ae9cf9be2879654a01bc93fb7b4ac0ed2628..d2ec87b7dfed7017f83afa2e89ea33a51c843cde 100644 --- a/MAC/Navigator2/panels/objects/navigator_viewSelection.pnl +++ b/MAC/Navigator2/panels/objects/navigator_viewSelection.pnl @@ -210,7 +210,7 @@ LANG:1 6 state: 13 13 "testButton" "" -1 920 2 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E +1 920 2 E E E 1 E 0 E N "_ButtonText" E N "_Button" E E E E 14 0 0 0 0 0 E E E @@ -220,7 +220,7 @@ LANG:1 0 0 1 -LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-*-80-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg +LANG:1 98 -*-MS Shell Dlg-*-r-normal-*-11-*-100-100-*-*-iso8859-1|-11,0,0,0,505,0,0,0,0,0,0,0,0,MS Shell Dlg 0 "" 918 0 1017 26