Skip to content

Commit 4c472af

Browse files
jmthomasjmthomas
committed
Fix applying subsettings, fix LimitscolumnWidget
1 parent c85245c commit 4c472af

File tree

11 files changed

+385
-521
lines changed

11 files changed

+385
-521
lines changed

‎openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST/screens/limits.txt

+33-27
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,33 @@ HORIZONTAL
66
VERTICALBOX "Limits Bars"
77
LIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
88
VALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
9+
SUBSETTING 0 WIDTH 130
910
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
1011
# The TEMP1 limits are defined as follow:
1112
# LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0 -20.0 20.0
1213
# Thus the following are examples of limiting the limitsbar
1314
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
14-
SUBSETTING 1 MIN_VALUE -80
15-
SUBSETTING 1 MAX_VALUE 80
15+
SUBSETTING 1 WIDTH 130
16+
SUBSETTING 2 MIN_VALUE -80
17+
SUBSETTING 2 MAX_VALUE 80
1618
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
17-
SUBSETTING 1 MIN_VALUE -75
18-
SUBSETTING 1 MAX_VALUE 70
19+
SUBSETTING 1 WIDTH 130
20+
SUBSETTING 2 MIN_VALUE -75
21+
SUBSETTING 2 MAX_VALUE 70
1922
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
20-
SUBSETTING 1 MIN_VALUE -70
21-
SUBSETTING 1 MAX_VALUE 60
23+
SUBSETTING 1 WIDTH 130
24+
SUBSETTING 2 MIN_VALUE -70
25+
SUBSETTING 2 MAX_VALUE 60
2226
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
23-
SUBSETTING 1 MIN_VALUE -50
24-
SUBSETTING 1 MAX_VALUE 50
27+
SUBSETTING 1 WIDTH 130
28+
SUBSETTING 2 MIN_VALUE -50
29+
SUBSETTING 2 MAX_VALUE 50
2530
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
26-
SUBSETTING 1 MIN_VALUE -20
27-
SUBSETTING 1 MAX_VALUE 20
28-
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
29-
SUBSETTING 1 MIN_VALUE -10
30-
SUBSETTING 1 MAX_VALUE 10
31+
SUBSETTING 0 TEXTCOLOR grey
32+
SUBSETTING 1 WIDTH 130
33+
SUBSETTING 1 BORDERCOLOR grey
34+
SUBSETTING 2 MIN_VALUE -20
35+
SUBSETTING 2 MAX_VALUE 20
3136
END
3237
VERTICAL
3338
VERTICALBOX "Range Bars 0-100"
@@ -46,21 +51,22 @@ END
4651
HORIZONTAL
4752
VERTICALBOX "Limits Columns"
4853
HORIZONTAL
49-
LIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2
50-
VALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2
51-
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
52-
# The TEMP2 limits are defined as follow:
53-
# LIMITS DEFAULT 1 ENABLED -60.0 -55.0 30.0 35.0
54+
LIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
55+
SETTING HEIGHT 200
56+
VALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
57+
SUBSETTING 0 WIDTH 130
58+
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
59+
SUBSETTING 1 WIDTH 130
60+
# The TEMP3 limits are defined as follow: RL/-25 YL/-10 YH/50 RH/55
5461
# Thus the following are examples of limiting the limitscolumn
55-
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
56-
SUBSETTING 1 MIN_VALUE -60
57-
SUBSETTING 1 MAX_VALUE 35
58-
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
59-
SUBSETTING 1 MIN_VALUE -55
60-
SUBSETTING 1 MAX_VALUE 30
61-
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
62-
SUBSETTING 1 MIN_VALUE -20
63-
SUBSETTING 1 MAX_VALUE 10
62+
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
63+
SUBSETTING 1 WIDTH 130
64+
SUBSETTING 2 MIN_VALUE -25
65+
SUBSETTING 2 MAX_VALUE 55
66+
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
67+
SUBSETTING 1 WIDTH 130
68+
SUBSETTING 2 MIN_VALUE -10
69+
SUBSETTING 2 MAX_VALUE 50
6470
END
6571
END
6672

‎openc3-cosmos-init/plugins/packages/openc3-cosmos-demo/targets/INST2/screens/limits.txt

+33-27
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,33 @@ HORIZONTAL
66
VERTICALBOX "Limits Bars"
77
LIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
88
VALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
9+
SUBSETTING 0 WIDTH 130
910
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
1011
# The TEMP1 limits are defined as follow:
1112
# LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0 -20.0 20.0
1213
# Thus the following are examples of limiting the limitsbar
1314
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
14-
SUBSETTING 1 MIN_VALUE -80
15-
SUBSETTING 1 MAX_VALUE 80
15+
SUBSETTING 1 WIDTH 130
16+
SUBSETTING 2 MIN_VALUE -80
17+
SUBSETTING 2 MAX_VALUE 80
1618
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
17-
SUBSETTING 1 MIN_VALUE -75
18-
SUBSETTING 1 MAX_VALUE 70
19+
SUBSETTING 1 WIDTH 130
20+
SUBSETTING 2 MIN_VALUE -75
21+
SUBSETTING 2 MAX_VALUE 70
1922
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
20-
SUBSETTING 1 MIN_VALUE -70
21-
SUBSETTING 1 MAX_VALUE 60
23+
SUBSETTING 1 WIDTH 130
24+
SUBSETTING 2 MIN_VALUE -70
25+
SUBSETTING 2 MAX_VALUE 60
2226
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
23-
SUBSETTING 1 MIN_VALUE -50
24-
SUBSETTING 1 MAX_VALUE 50
27+
SUBSETTING 1 WIDTH 130
28+
SUBSETTING 2 MIN_VALUE -50
29+
SUBSETTING 2 MAX_VALUE 50
2530
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
26-
SUBSETTING 1 MIN_VALUE -20
27-
SUBSETTING 1 MAX_VALUE 20
28-
LABELVALUELIMITSBAR <%= target_name %> HEALTH_STATUS TEMP1
29-
SUBSETTING 1 MIN_VALUE -10
30-
SUBSETTING 1 MAX_VALUE 10
31+
SUBSETTING 0 TEXTCOLOR grey
32+
SUBSETTING 1 WIDTH 130
33+
SUBSETTING 1 BORDERCOLOR grey
34+
SUBSETTING 2 MIN_VALUE -20
35+
SUBSETTING 2 MAX_VALUE 20
3136
END
3237
VERTICAL
3338
VERTICALBOX "Range Bars 0-100"
@@ -46,21 +51,22 @@ END
4651
HORIZONTAL
4752
VERTICALBOX "Limits Columns"
4853
HORIZONTAL
49-
LIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2
50-
VALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2
51-
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
52-
# The TEMP2 limits are defined as follow:
53-
# LIMITS DEFAULT 1 ENABLED -60.0 -55.0 30.0 35.0
54+
LIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
55+
SETTING HEIGHT 200
56+
VALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
57+
SUBSETTING 0 WIDTH 130
58+
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
59+
SUBSETTING 1 WIDTH 130
60+
# The TEMP3 limits are defined as follow: RL/-25 YL/-10 YH/50 RH/55
5461
# Thus the following are examples of limiting the limitscolumn
55-
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
56-
SUBSETTING 1 MIN_VALUE -60
57-
SUBSETTING 1 MAX_VALUE 35
58-
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
59-
SUBSETTING 1 MIN_VALUE -55
60-
SUBSETTING 1 MAX_VALUE 30
61-
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP2 WITH_UNITS 8
62-
SUBSETTING 1 MIN_VALUE -20
63-
SUBSETTING 1 MAX_VALUE 10
62+
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
63+
SUBSETTING 1 WIDTH 130
64+
SUBSETTING 2 MIN_VALUE -25
65+
SUBSETTING 2 MAX_VALUE 55
66+
LABELVALUELIMITSCOLUMN <%= target_name %> HEALTH_STATUS TEMP3
67+
SUBSETTING 1 WIDTH 130
68+
SUBSETTING 2 MIN_VALUE -10
69+
SUBSETTING 2 MAX_VALUE 50
6470
END
6571
END
6672

0 commit comments

Comments
 (0)