Skip to content
Snippets Groups Projects
Commit ed2dce58 authored by Arthur Coolen's avatar Arthur Coolen
Browse files

Task #10099: GCFCommon (and prod/test) handled childstate the old way. ... 

Task #10099: GCFCommon (and prod/test) handled childstate the old way.  repaired this, added REPAIRED and MISSING to states
parent 6c09f2f4
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
MAC/Navigator2/panels/Popups/Popup_SetState.pnl
+ 6
− 2
View file @ ed2dce58
......@@ -20,6 +20,7 @@ mapping _mStateNr;
string messageCode = \"\";
dyn_string HBAmodes = makeDynString(\"Free choice\",
\"REPAIRED (REPAIRED)\",
\"OSCILLATION (OSC)\",
\"FLAT (FLAT)\",
\"HIGH NOISE (HN)\",
......@@ -30,16 +31,19 @@ dyn_string HBAmodes = makeDynString(\"Free choice\",
\"C-SUMMATOR (CSUM)\",
\"JITTER > 3dB (JIT)\",
\"RF element FAIL (E_FAIL)\",
\"MODEM element FAIL (MODEM)\");
\"MODEM element FAIL (MODEM)\",
\"MISSING (MISSING)\");
dyn_string LBAmodes = makeDynString(\"Free choice\",
\"REPAIRED (REPAIRED)\",
\"OSCILLATION (OSC)\",
\"FLAT (FLAT)\",
\"HIGH NOISE (HN)\",
\"SHORT (SHORT)\",
\"SPURIOUS (SPUR)\",
\"LOW NOISE (LN)\",
\"DOWN (DOWN)\");
\"DOWN (DOWN)\",
\"MISSING (MISSING)\");
void Init()
......
MAC/Navigator2/panels/navigator.pnl
+ 0
− 33
View file @ ed2dce58
......@@ -244,39 +244,6 @@ LANG:1 12 PUSH_BUTTON1
"main()
{
navFunct_handleUndockClick();
}" 0
E E E
13 93
"b_iltSwitch"
""
1 1010.405 11 E E E 1 E 1 E N "_ButtonText" E N "_Button" E E
E E
32 0 0 0 0 0
E E E
0
1
LANG:1 0
0
1
LANG:1 35 MS Shell Dlg 2,-1,11,5,75,0,0,0,0,0
0 991 3 1062 27
T
1
LANG:1 9 iltSwitch
"main()
{
bool localmode;
g_involved_stations = makeDynString(\"\");
dpGet(\"MCU001:LOFAR_PIC_Europe_DE601.localMode.stationSwitch\",localmode);
localmode = !localmode;
dpSet(\"MCU001:LOFAR_PIC_Europe_DE601.localMode.stationSwitch\",localmode);
dynAppend(g_involved_stations,\"DE601:\");
navCtrl_handleNavigatorEvent(\"\",\"ILTSwitched\",\"GCFCWD.ctl\");
}" 0
E E E
1 173 21 "0.0" 18
......
MAC/Navigator2/scripts/libs/GCFCommon.ctl
+ 6
− 5
View file @ ed2dce58
......@@ -207,12 +207,12 @@ void showSelfState(string aDP) {
///////////////////////////////////////////////////////////////////////////
void showChildState(string aDP) {
// check if the requiered datapoint for this view are accessible
if (dpExists(aDP+".status.childState")) {
if (dpConnect("updateChildState",aDP + ".status.childSumAlert:_alert_hdl.._act_state_color", aDP + ".status.childState:_online.._invalid") == -1) {
if (dpExists(aDP+".status.childSumAlert")) {
if (dpConnect("updateChildState",aDP + ".status.childSumAlert:_alert_hdl.._act_state_color", aDP + ".status.state:_online.._invalid") == -1) {
setValue("childStateBorder","foreCol","Lofar_invalid");
}
if (!navFunct_dpReachable(aDP+".status.childState")) {
updateChildState("",0,"","","",true);
if (!navFunct_dpReachable(aDP+".status.childSumAlert")) {
updateChildState("","Lofar_dpOffline","",true);
}
}
else {
......@@ -232,6 +232,7 @@ void showChildState(string aDP) {
updateChildState(string dp1, string state, string dp2, bool invalid) {
string SymbolCol;
if (invalid) {
if (dp1 == "") {
SymbolCol = "Lofar_dpOffline";
......
MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
+ 10
− 9
View file @ ed2dce58
......@@ -99,7 +99,7 @@ void initLofarColors() {
stateNumber ["broken"] = 50;
stateNumber ["broken_went"] = 53;
stateNumber ["broken_came"] = 56;
stateNumber ["broken_repair"] = 60;
stateNumber ["beyond_repair"] = 60;
stateNumber ["dpOffline"] = 70;
}
......@@ -207,12 +207,12 @@ void showSelfState(string aDP) {
///////////////////////////////////////////////////////////////////////////
void showChildState(string aDP) {
// check if the requiered datapoint for this view are accessible
if (dpExists(aDP+".status.childState")) {
if (dpConnect("updateChildState",aDP + ".status.childState", aDP + ".status.childState:_online.._invalid") == -1) {
if (dpExists(aDP+".status.childSumAlert")) {
if (dpConnect("updateChildState",aDP + ".status.childSumAlert:_alert_hdl.._act_state_color", aDP + ".status.state:_online.._invalid") == -1) {
setValue("childStateBorder","foreCol","Lofar_invalid");
}
if (!navFunct_dpReachable(aDP+".status.childState")) {
updateChildState("",0,"","","",true);
if (!navFunct_dpReachable(aDP+".status.childSumAlert")) {
updateChildState("","Lofar_dpOffline","",true);
}
}
else {
......@@ -229,9 +229,10 @@ void showChildState(string aDP) {
//
// Added 3-3-2007 A.Coolen
///////////////////////////////////////////////////////////////////////////
updateChildState(string dp1, int state, string dp2, bool invalid) {
updateChildState(string dp1, string state, string dp2, bool invalid) {
string SymbolCol;
if (invalid) {
if (dp1 == "") {
SymbolCol = "Lofar_dpOffline";
......@@ -240,7 +241,7 @@ updateChildState(string dp1, int state, string dp2, bool invalid) {
}
}
else {
SymbolCol = getStateColor(state);
SymbolCol = state;
}
setValue("childStateBorder", "foreCol", SymbolCol);
}
......
MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
+ 8
− 7
View file @ ed2dce58
......@@ -207,12 +207,12 @@ void showSelfState(string aDP) {
///////////////////////////////////////////////////////////////////////////
void showChildState(string aDP) {
// check if the requiered datapoint for this view are accessible
if (dpExists(aDP+".status.childState")) {
if (dpConnect("updateChildState",aDP + ".status.childState", aDP + ".status.childState:_online.._invalid") == -1) {
if (dpExists(aDP+".status.childSumAlert")) {
if (dpConnect("updateChildState",aDP + ".status.childSumAlert:_alert_hdl.._act_state_color", aDP + ".status.state:_online.._invalid") == -1) {
setValue("childStateBorder","foreCol","Lofar_invalid");
}
if (!navFunct_dpReachable(aDP+".status.childState")) {
updateChildState("",0,"","","",true);
if (!navFunct_dpReachable(aDP+".status.childSumAlert")) {
updateChildState("","Lofar_dpOffline","",true);
}
}
else {
......@@ -229,9 +229,10 @@ void showChildState(string aDP) {
//
// Added 3-3-2007 A.Coolen
///////////////////////////////////////////////////////////////////////////
updateChildState(string dp1, int state, string dp2, bool invalid) {
updateChildState(string dp1, string state, string dp2, bool invalid) {
string SymbolCol;
if (invalid) {
if (dp1 == "") {
SymbolCol = "Lofar_dpOffline";
......@@ -240,7 +241,7 @@ updateChildState(string dp1, int state, string dp2, bool invalid) {
}
}
else {
SymbolCol = getStateColor(state);
SymbolCol = state;
}
setValue("childStateBorder", "foreCol", SymbolCol);
}
......
MAC/Navigator2/scripts/transferMPs.ctl
+ 1
− 1
View file @ ed2dce58
......@@ -152,7 +152,7 @@ private bool setLeaf() {
int aVal;
int err;
query = "SELECT '_online.._value' FROM '{_mp_**.**.status.leaf}'";
query = "SELECT '_online.._value' FROM '_mp_**.**.status.leaf' WHERE '_online.._value' == 1";
if (bDebug) DebugN("transferMPs.ctl:setLeaf|Query: ",query);
err = dpQuery(query, tab);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment