Skip to content

P
proview
Commit 59598fa6 authored by Claes Sjofors's avatar Claes Sjofors Committed by Claes Sjöfors
Browse files
Options

Xtt, di filter displayed in object graph and with pixmap in navigator

parent b7c97cbe
Show whitespace changes
Inline Side-by-side
Showing with 741 additions and 26 deletions
xtt/exp/ge/src/pwr_c_di.pwg
View file @ 59598fa6
0! DefaultWidth 834 0! DefaultWidth 835
0! DefaultHeight 198 0! DefaultHeight 230
199 199
!/** !/**
! TempSwitch ! TempSwitch
...@@ -29,21 +29,21 @@ ...@@ -29,21 +29,21 @@
100 20 100 20
135 20 135 20
101 20 101 20
102 10 102 -4
103 -30 103 -83
104 3.31865 104 3.89525
136 3.31865 136 3.89525
105 100 105 100
106 1 106 0
107 -4 107 -16
108 46 108 46
109 1 109 1
110 13.5282 110 15.0315
111 0.5 111 0.5
116 0 116 0
117 0 117 0
118 192 118 145
119 112 119 118
120 1 120 1
121 Claes context 121 Claes context
122 0 122 0
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
134 134
22 22
2200 0 2200 0
2201 508 2201 516
2202 pwr_c_di 2202 pwr_c_di
2203 310 2203 310
2205 0 2205 0
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
2209 2.65 2209 2.65
2210 1 2210 1
2211 44.4 2211 44.4
2212 10.9 2212 12.5
2213 4 2213 4
2214 2214
pwrp_pop: pwrp_pop:
...@@ -4089,7 +4089,7 @@ pwr_exe: ...@@ -4089,7 +4089,7 @@ pwr_exe:
3000 0.63148 3000 0.63148
3001 0.23148 3001 0.23148
3002 0.696505 3002 0.696505
3003 0.146505 3003 0.246505
3008 0 3008 0
3010 4 3010 4
3011 2 3011 2
...@@ -6468,10 +6468,10 @@ pwr_exe: ...@@ -6468,10 +6468,10 @@ pwr_exe:
99 99
19 19
1904 O234 1904 O234
1900 44.0146 1900 44.0437
1901 2.97081 1901 2.99999
1902 13.5 1902 15
1903 10.5 1903 12
1908 0 1908 0
1909 318 1909 318
1910 318 1910 318
...@@ -6513,10 +6513,10 @@ pwr_exe: ...@@ -6513,10 +6513,10 @@ pwr_exe:
28 28
2800 1.54882 2800 1.54882
2801 0 2801 0
2802 -1.67566 2802 -1.64647
2803 0 2803 0
2804 1 2804 1
2805 -27.5 2805 -26
2806 0 2806 0
99 99
99 99
...@@ -7220,7 +7220,7 @@ pwr_exe: ...@@ -7220,7 +7220,7 @@ pwr_exe:
1904 O229 1904 O229
1900 46 1900 46
1901 44 1901 44
1902 13.5109 1902 15.0122
1903 0.5 1903 0.5
1908 0 1908 0
1909 318 1909 318
...@@ -7265,7 +7265,7 @@ pwr_exe: ...@@ -7265,7 +7265,7 @@ pwr_exe:
2801 0 2801 0
2802 14.5 2802 14.5
2803 0 2803 0
2804 0.31734 2804 0.353956
2805 0.5 2805 0.5
2806 0 2806 0
99 99
...@@ -7328,8 +7328,8 @@ pwr_exe: ...@@ -7328,8 +7328,8 @@ pwr_exe:
1904 O235 1904 O235
1900 3 1900 3
1901 1 1901 1
1902 13.5282 1902 15.0315
1903 0.5 1903 0.500001
1908 0 1908 0
1909 318 1909 318
1910 318 1910 318
...@@ -7373,8 +7373,8 @@ pwr_exe: ...@@ -7373,8 +7373,8 @@ pwr_exe:
2801 0 2801 0
2802 0 2802 0
2803 0 2803 0
2804 0.321685 2804 0.358803
2805 0.339158 2805 0.320599
2806 0 2806 0
99 99
99 99
...@@ -7512,6 +7512,8 @@ pwr_exe: ...@@ -7512,6 +7512,8 @@ pwr_exe:
1202 1 1202 1
1203 1 1203 1
1204 0 1204 0
1205
1206 0
99 99
99 99
99 99
...@@ -7916,6 +7918,8 @@ pwr_exe: ...@@ -7916,6 +7918,8 @@ pwr_exe:
1202 1 1202 1
1203 1 1203 1
1204 0 1204 0
1205
1206 0
99 99
99 99
99 99
...@@ -8259,6 +8263,8 @@ pwr_exe: ...@@ -8259,6 +8263,8 @@ pwr_exe:
1202 1 1202 1
1203 1 1203 1
1204 0 1204 0
1205
1206 0
99 99
13 13
1302 4 1302 4
...@@ -8269,6 +8275,8 @@ pwr_exe: ...@@ -8269,6 +8275,8 @@ pwr_exe:
1307 1307
1308 1308
1309 0 1309 0
1310 0
1311 0
99 99
99 99
99 99
...@@ -8819,6 +8827,8 @@ pwr_exe: ...@@ -8819,6 +8827,8 @@ pwr_exe:
1202 1 1202 1
1203 1 1203 1
1204 0 1204 0
1205
1206 0
99 99
13 13
1302 0 1302 0
...@@ -8829,6 +8839,8 @@ pwr_exe: ...@@ -8829,6 +8839,8 @@ pwr_exe:
1307 1307
1308 1308
1309 0 1309 0
1310 0
1311 0
99 99
99 99
99 99
...@@ -8938,6 +8950,10 @@ pwr_exe: ...@@ -8938,6 +8950,10 @@ pwr_exe:
2305 2305
2306 $local.HoldTrend##Boolean 2306 $local.HoldTrend##Boolean
2307 $local.ScanTime##Float32 2307 $local.ScanTime##Float32
2308
2309
2310 9999
2311 9999
99 99
99 99
99 99
...@@ -9458,5 +9474,684 @@ pwr_exe: ...@@ -9458,5 +9474,684 @@ pwr_exe:
99 99
99 99
99 99
35
3500
27
2703 10000
2704 10000
2731 10000
2722 10000
2705 10000
2723 10000
2706 10000
2732 10000
2708 0
2709 0
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 Grp515_
1002 Grp515_
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 21.5176
1007 4.0556
1008 11.8143
1009 10.7
1013 21.5176
1014 4.0556
1015 11.8143
1016 10.7
1003
0
0
0
0
0
0
0
0
0
0
1004
1001
7
700 0
701 0
99
1010
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 35454972
1028 0
1029
99
2707
28
2800 1
2801 0
2802 0
2803 0
2804 1
2805 0
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 9999
2730 0
2721
1
100 128
105 0
101 0
106 0
102 35454972
103 0
9
900 !$object.FilterType##Int32
901 0
902 1
903 1
99
99
99
3501
36
3600
3
300 Grp515_
301
2
27
2703 370
2704 410
2731 10000
2722 10000
2705 410
2723 10000
2706 370
2732 10000
2708 0
2709 0
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwr_indsquare
1002 O508
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 9.37692
1007 8.5
1008 11.7
1009 10.75
1013 9.37692
1014 8.5
1015 11.7
1016 10.75
1003
0
0
0
0
0
0
0
0
0
0
1004
1001
7
700 11.15
701 7.9
99
1010
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 33619964
1028 0
1029
99
2707
28
2800 1.46154
2801 0
2802 8.28077
2803 0
2804 1.46154
2805 10.6038
2806 0
99
2716 0
2718
2717
2719 0
2724 0
2727 0
2728 303
2729 9999
2730 0
2721
1
100 0
105 0
101 1
106 0
102 33619964
103 0
99
99
30
3004 O509
3000 5.8556
3001 4.0556
3002 11.6605
3003 10.8105
3008 326
3010 4
3011 2
3007 0
3006
3005
9
900 4
901 303
904 326
902 Filter
903
7
700 1.1
701 2.5
99
99
3009
28
2800 1
2801 0
2802 2.9556
2803 0
2804 1
2805 9.01052
2806 0
99
99
27
2703 334
2704 330
2731 310
2722 338
2705 330
2723 338
2706 334
2732 10000
2708 0
2709 0
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwrct_valueinputmediumbg
1002 O510
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 19.0176
1007 16.7
1008 11.8143
1009 10.7
1013 19.0176
1014 16.7
1015 11.8143
1016 10.7
1003
0
0
0
0
0
0
0
0
0
0
1004
1001
7
700 3.95
701 7.55
99
1010
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 35454972
1028 0
1029
99
2707
28
2800 0.702327
2801 0
2802 16.8053
2803 0
2804 0.857143
2805 10.8286
2806 0
99
2716 0
2718
2717
2719 0
2724 1
2727 0
2728 303
2729 4
2730 0
2721
1
100 1024
105 0
101 4096
106 0
102 6
103 0
12
1200 $object.FilterAttribute[0]##Float32
1201 %4.2f
1202 1
1203 1
1204 0
1205
1206 0
99
13
1302 0
1303 0
1304 0
1305 0
1306 0
1307
1308
1309 0
1310 0
1311 0
99
99
99
27
2703 334
2704 330
2731 310
2722 338
2705 330
2723 338
2706 334
2732 10000
2708 0
2709 0
2710 0
2711 0
2712 0
2713 0
2714 0
2715 0
2720 0
2725 0
2726 0
2702 0
2701
2700
10
1000 pwrct_valueinputmediumbg
1002 O512
1005
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
1006 21.5176
1007 19.2
1008 11.8143
1009 10.7
1013 21.5176
1014 19.2
1015 11.8143
1016 10.7
1003
0
0
0
0
0
0
0
0
0
0
1004
1001
7
700 3.95
701 7.55
99
1010
1011
1018
1019
1020
1021
1022
1023
1024
1025
1012 0
1017 9999
1027 9999
1026 35454972
1028 0
1029
99
2707
28
2800 0.702327
2801 0
2802 19.3053
2803 0
2804 0.857143
2805 10.8286
2806 0
99
2716 0
2718
2717
2719 0
2724 1
2727 0
2728 303
2729 4
2730 0
2721
1
100 1024
105 0
101 4096
106 0
102 6
103 0
12
1200 $object.FilterAttribute[1]##Float32
1201 %4.2f
1202 1
1203 1
1204 0
1205
1206 0
99
13
1302 0
1303 0
1304 0
1305 0
1306 0
1307
1308
1309 0
1310 0
1311 0
99
99
99
30
3004 O513
3000 15.9
3001 10
3002 11.65
3003 10.8
3008 0
3010 4
3011 2
3007 0
3006
3005
9
900 4
901 303
904 0
902 Set/Reset delay
903
7
700 10.25
701 11.35
99
99
3009
28
2800 1
2801 0
2802 -0.25
2803 0
2804 1
2805 0.15
2806 0
99
99
99
302 0
304 0
303
305 0
306
307
308 0
330 0
321 0
331 0
309 0
313 0
322 0
323 0
324 0
325 0
326 0
327 0
310 0
311 0
312
314
315 1
316 1
317 0
318 0
319 0
320 0
328 0
332 0
99
99
99
99 99
99 99
xtt/lib/xtt/src/xtt_item.cpp
View file @ 59598fa6
...@@ -3062,6 +3062,7 @@ static void xnav_set_sigchan_flags( ...@@ -3062,6 +3062,7 @@ static void xnav_set_sigchan_flags(
int is_signal = 0; int is_signal = 0;
pwr_tBoolean inv; pwr_tBoolean inv;
pwr_tBoolean conv; pwr_tBoolean conv;
pwr_tEnum filtertype = 0;
pwr_tBoolean test; pwr_tBoolean test;
pwr_tAttrRef aref; pwr_tAttrRef aref;
pwr_tAttrRef chanaref; pwr_tAttrRef chanaref;
...@@ -3103,6 +3104,20 @@ static void xnav_set_sigchan_flags( ...@@ -3103,6 +3104,20 @@ static void xnav_set_sigchan_flags(
} }
} }
switch (cid) {
case pwr_cClass_Di:
sts = gdh_ArefANameToAref(arp, "FilterType", &aref);
if (EVEN(sts))
return;
sts = gdh_GetObjectInfoAttrref(&aref, &filtertype, sizeof(filtertype));
if (EVEN(sts))
return;
break;
default: ;
}
if (is_signal) { if (is_signal) {
// Get channel // Get channel
sts = gdh_ArefANameToAref(arp, "SigChanCon", &aref); sts = gdh_ArefANameToAref(arp, "SigChanCon", &aref);
...@@ -3420,6 +3435,8 @@ static void xnav_set_sigchan_flags( ...@@ -3420,6 +3435,8 @@ static void xnav_set_sigchan_flags(
brow_SetAnnotPixmap(node, annot, brow->pixmap_teston); brow_SetAnnotPixmap(node, annot, brow->pixmap_teston);
else if (inv) else if (inv)
brow_SetAnnotPixmap(node, annot, brow->pixmap_inverted); brow_SetAnnotPixmap(node, annot, brow->pixmap_inverted);
else if (filtertype)
brow_SetAnnotPixmap(node, annot, brow->pixmap_filter);
else else
brow_RemoveAnnotPixmap(node, annot); brow_RemoveAnnotPixmap(node, annot);
} }
xtt/lib/xtt/src/xtt_xnav_brow.cpp
View file @ 59598fa6
...@@ -98,6 +98,7 @@ void XNavBrow::free_pixmaps() ...@@ -98,6 +98,7 @@ void XNavBrow::free_pixmaps()
brow_FreeAnnotPixmap(ctx, pixmap_inverted); brow_FreeAnnotPixmap(ctx, pixmap_inverted);
brow_FreeAnnotPixmap(ctx, pixmap_teston); brow_FreeAnnotPixmap(ctx, pixmap_teston);
brow_FreeAnnotPixmap(ctx, pixmap_offline); brow_FreeAnnotPixmap(ctx, pixmap_offline);
brow_FreeAnnotPixmap(ctx, pixmap_filter);
} }
// //
...@@ -125,6 +126,7 @@ void XNavBrow::allocate_pixmaps() ...@@ -125,6 +126,7 @@ void XNavBrow::allocate_pixmaps()
brow_LoadPBMs(ctx, "xnav_bitmap_crrwrite", &pixmap_crrwrite); brow_LoadPBMs(ctx, "xnav_bitmap_crrwrite", &pixmap_crrwrite);
brow_LoadPBM(ctx, "xnav_bitmap_curve", &pixmap_curve); brow_LoadPBM(ctx, "xnav_bitmap_curve", &pixmap_curve);
brow_LoadPBM(ctx, "xnav_bitmap_file", &pixmap_file); brow_LoadPBM(ctx, "xnav_bitmap_file", &pixmap_file);
brow_LoadPBMs(ctx, "xnav_bitmap_filter", &pixmap_filter);
brow_LoadPBM(ctx, "xnav_bitmap_graph", &pixmap_graph); brow_LoadPBM(ctx, "xnav_bitmap_graph", &pixmap_graph);
brow_LoadPBMs(ctx, "xnav_bitmap_inverted", &pixmap_inverted); brow_LoadPBMs(ctx, "xnav_bitmap_inverted", &pixmap_inverted);
brow_LoadPBMs(ctx, "xnav_bitmap_leaf", &pixmap_leaf); brow_LoadPBMs(ctx, "xnav_bitmap_leaf", &pixmap_leaf);
......
xtt/lib/xtt/src/xtt_xnav_brow.h
View file @ 59598fa6
...@@ -92,6 +92,7 @@ public: ...@@ -92,6 +92,7 @@ public:
flow_sAnnotPixmap* pixmap_inverted; flow_sAnnotPixmap* pixmap_inverted;
flow_sAnnotPixmap* pixmap_teston; flow_sAnnotPixmap* pixmap_teston;
flow_sAnnotPixmap* pixmap_offline; flow_sAnnotPixmap* pixmap_offline;
flow_sAnnotPixmap* pixmap_filter;
char push_command[200]; char push_command[200];
void free_pixmaps(); void free_pixmaps();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7