From eaa0c3d067f3cba1a19578d92e6250e64d991a58 Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Mon, 26 Mar 2007 09:28:36 +0000
Subject: [PATCH] BugID: 1042
added GCFPaPsState point to trigger statechanges
removed childstate from clockboard snd SPUboard
---
MAC/Navigator/panels/nav_usr/CS1/Station_Subrack-CS1.pnl | 2 +-
.../panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl | 8 +++-----
.../panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl | 8 +++-----
MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl | 2 ++
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/MAC/Navigator/panels/nav_usr/CS1/Station_Subrack-CS1.pnl b/MAC/Navigator/panels/nav_usr/CS1/Station_Subrack-CS1.pnl
index 2ac3fe706e5..4b4a224e2ff 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/Station_Subrack-CS1.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/Station_Subrack-CS1.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 14 Subrack Detail
-PANEL,245 109 951 694 N "_3DFace" 2
+PANEL,320 184 951 694 N "_3DFace" 2
"$datapoint"
"$referenceDatapoint"
"main()
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl
index fa5b9202968..6bcea88be0c 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 17 SubrackClockBoard
-PANEL,245 109 735 210 N "_3DFace" 1
+PANEL,459 137 735 210 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -10,8 +10,6 @@ PANEL,245 109 735 210 N "_3DFace" 1
navPMLloadPropertySet(baseDP);
- // connect for childUpdates
- showChildState(baseDP);
// connect for selfUpdates
showSelfState(baseDP);
@@ -59,7 +57,7 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"childStateBorder"
+"border1"
""
1 50 140 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
@@ -70,7 +68,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 50 70 663 140
+E E 0 1 1 0 1 E U 1 E 50 70 663 140
2 1
"Text1"
""
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl
index d7f825771c1..777c16819f4 100644
--- a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl
@@ -1,7 +1,7 @@
V 10
1
LANG:1 15 SubRackSPUBoard
-PANEL,252 141 745 269 N "_3DFace" 1
+PANEL,459 137 745 269 N "_3DFace" 1
"$datapoint"
"main()
{
@@ -9,8 +9,6 @@ PANEL,252 141 745 269 N "_3DFace" 1
// load propertysets from datapoints
navPMLloadPropertySet(baseDP);
- // connect for childUpdates
- showChildState(baseDP);
// connect for selfUpdates
showSelfState(baseDP);
@@ -53,7 +51,7 @@ LAYER, 0
1
LANG:1 6 Layer1
6 0
-"childStateBorder"
+"border1"
""
1 50 140 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
E E
@@ -64,7 +62,7 @@ EE E
LANG:1 0
1
"dashclr"N "_Transparent"
-E E 0 3 1 0 1 E U 1 E 50 70 663 140
+E E 0 1 1 0 1 E U 1 E 50 70 663 140
2 1
"Text1"
""
diff --git a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl
index e42d145af3e..eae52027020 100644
--- a/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl
+++ b/MAC/Navigator/scripts/libs/nav_fw/gcfpa-prep.ctl
@@ -31,6 +31,7 @@ main()
dyn_string types;
types = dpTypes("GCF*");
+ handleType(types, "GCFPaPsState", DPEL_STRING);
handleType(types, "GCFPaPsEnabled", DPEL_STRING);
handleType(types, "GCFPaPsIndication", DPEL_STRING);
handleType(types, "GCFDistPort", DPEL_BLOB);
@@ -53,6 +54,7 @@ main()
DebugN("Add type " + type);
dpCreate("__gcf_wd", type);
dpCreate("__pa_PSIndication", "GCFPaPsIndication");
+ dpCreate("__pa_PSState", "GCFPaPsState");
}
deleteDPs(string type)
--
GitLab