Skip to content

Commit fef98d7

Browse files
author
Nic Bricknell
committed
mxSampleDetect: Add tip and edge annotations to output
1 parent 190a724 commit fef98d7

File tree

3 files changed

+292
-55
lines changed

3 files changed

+292
-55
lines changed

adPythonApp/Db/adPythonMxSampleDetect.template

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ record(longin, "$(P)$(R)TipX") {
238238
field(DTYP, "asynInt32")
239239
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))tip_x")
240240
}
241-
242241
record(longin, "$(P)$(R)TipY") {
243242
field(SCAN, "I/O Intr")
244243
field(DTYP, "asynInt32")
@@ -254,7 +253,6 @@ record(waveform, "$(P)$(R)Top")
254253
field(FTVL, "LONG")
255254
field(NELM, "1024")
256255
}
257-
258256
record(waveform, "$(P)$(R)Bottom")
259257
{
260258
field(SCAN, "I/O Intr")
@@ -264,7 +262,6 @@ record(waveform, "$(P)$(R)Bottom")
264262
field(NELM, "1024")
265263
}
266264

267-
268265
record(mbbo, "$(P)$(R)OutputArray") {
269266
field(PINI, "YES")
270267
field(DTYP, "asynInt32")
@@ -297,3 +294,48 @@ record(mbbi, "$(P)$(R)OutputArray_RBV") {
297294
field(FRST, "Closed edges")
298295
field(FRVL, "4")
299296
}
297+
298+
record(bo, "$(P)$(R)DrawTip") {
299+
field(PINI, "YES")
300+
field(DTYP, "asynInt32")
301+
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))draw_circle")
302+
field(ZNAM, "Disabled")
303+
field(ONAM, "Enabled")
304+
}
305+
record(bi, "$(P)$(R)DrawTip_RBV") {
306+
field(SCAN, "I/O Intr")
307+
field(DTYP, "asynInt32")
308+
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))draw_circle")
309+
field(ZNAM, "Disabled")
310+
field(ONAM, "Enabled")
311+
}
312+
313+
record(bo, "$(P)$(R)DrawEdges") {
314+
field(PINI, "YES")
315+
field(DTYP, "asynInt32")
316+
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))draw_edges")
317+
field(ZNAM, "Disabled")
318+
field(ONAM, "Enabled")
319+
}
320+
record(bi, "$(P)$(R)DrawEdges_RBV") {
321+
field(SCAN, "I/O Intr")
322+
field(DTYP, "asynInt32")
323+
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))draw_edges")
324+
field(ZNAM, "Disabled")
325+
field(ONAM, "Enabled")
326+
}
327+
328+
record(bo, "$(P)$(R)ForceColor") {
329+
field(PINI, "YES")
330+
field(DTYP, "asynInt32")
331+
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))force_color")
332+
field(ZNAM, "No")
333+
field(ONAM, "Yes")
334+
}
335+
record(bi, "$(P)$(R)ForceColor_RBV") {
336+
field(SCAN, "I/O Intr")
337+
field(DTYP, "asynInt32")
338+
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))force_color")
339+
field(ZNAM, "No")
340+
field(ONAM, "Yes")
341+
}

adPythonApp/opi/edl/adPythonMxSampleDetect.edl

Lines changed: 202 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ beginScreenProperties
33
major 4
44
minor 0
55
release 1
6-
x 715
7-
y 162
6+
x 729
7+
y 231
88
w 390
99
h 820
1010
font "arial-bold-r-12.0"
@@ -48,7 +48,7 @@ release 0
4848
x 230
4949
y 530
5050
w 155
51-
h 160
51+
h 255
5252
lineColor index 14
5353
fill
5454
fillColor index 3
@@ -690,47 +690,6 @@ value {
690690
}
691691
endObjectProperties
692692

693-
# (Menu Button)
694-
object activeMenuButtonClass
695-
beginObjectProperties
696-
major 4
697-
minor 0
698-
release 0
699-
x 250
700-
y 665
701-
w 115
702-
h 20
703-
fgColor index 25
704-
bgColor index 3
705-
inconsistentColor index 0
706-
topShadowColor index 1
707-
botShadowColor index 11
708-
controlPv "$(P)$(R)OutputArray"
709-
indicatorPv "$(P)$(R)OutputArray_RBV"
710-
font "arial-bold-r-12.0"
711-
endObjectProperties
712-
713-
# (Static Text)
714-
object activeXTextClass
715-
beginObjectProperties
716-
major 4
717-
minor 1
718-
release 1
719-
x 262
720-
y 635
721-
w 90
722-
h 35
723-
font "arial-bold-r-12.0"
724-
fontAlign "center"
725-
fgColor index 14
726-
bgColor index 3
727-
useDisplayBg
728-
value {
729-
"Image to send"
730-
"downstream:"
731-
}
732-
endObjectProperties
733-
734693
# (Static Text)
735694
object activeXTextClass
736695
beginObjectProperties
@@ -766,7 +725,7 @@ bgColor index 3
766725
topShadowColor index 1
767726
botShadowColor index 11
768727
font "arial-bold-r-12.0"
769-
buttonLabel "Edge arrays..."
728+
buttonLabel "Edge arrays"
770729
numPvs 4
771730
numDsps 1
772731
displayFileName {
@@ -869,3 +828,201 @@ endGroup
869828

870829
endObjectProperties
871830

831+
# (Static Text)
832+
object activeXTextClass
833+
beginObjectProperties
834+
major 4
835+
minor 1
836+
release 1
837+
x 245
838+
y 700
839+
w 125
840+
h 15
841+
font "arial-bold-r-12.0"
842+
fontAlign "center"
843+
fgColor index 14
844+
bgColor index 3
845+
useDisplayBg
846+
value {
847+
"Image annotations:"
848+
}
849+
endObjectProperties
850+
851+
# (Group)
852+
object activeGroupClass
853+
beginObjectProperties
854+
major 4
855+
minor 0
856+
release 0
857+
x 250
858+
y 640
859+
w 115
860+
h 50
861+
862+
beginGroup
863+
864+
# (Menu Button)
865+
object activeMenuButtonClass
866+
beginObjectProperties
867+
major 4
868+
minor 0
869+
release 0
870+
x 250
871+
y 670
872+
w 115
873+
h 20
874+
fgColor index 25
875+
bgColor index 3
876+
inconsistentColor index 0
877+
topShadowColor index 1
878+
botShadowColor index 11
879+
controlPv "$(P)$(R)OutputArray"
880+
indicatorPv "$(P)$(R)OutputArray_RBV"
881+
font "arial-bold-r-12.0"
882+
endObjectProperties
883+
884+
# (Static Text)
885+
object activeXTextClass
886+
beginObjectProperties
887+
major 4
888+
minor 1
889+
release 1
890+
x 262
891+
y 640
892+
w 90
893+
h 35
894+
font "arial-bold-r-12.0"
895+
fontAlign "center"
896+
fgColor index 14
897+
bgColor index 3
898+
useDisplayBg
899+
value {
900+
"Image to send"
901+
"downstream:"
902+
}
903+
endObjectProperties
904+
905+
endGroup
906+
907+
endObjectProperties
908+
909+
# (Static Text)
910+
object activeXTextClass
911+
beginObjectProperties
912+
major 4
913+
minor 1
914+
release 1
915+
x 245
916+
y 740
917+
w 37
918+
h 13
919+
font "arial-medium-r-12.0"
920+
fgColor index 14
921+
bgColor index 3
922+
useDisplayBg
923+
value {
924+
"Edges"
925+
}
926+
autoSize
927+
endObjectProperties
928+
929+
# (Menu Button)
930+
object activeMenuButtonClass
931+
beginObjectProperties
932+
major 4
933+
minor 0
934+
release 0
935+
x 290
936+
y 735
937+
w 80
938+
h 20
939+
fgColor index 25
940+
bgColor index 3
941+
inconsistentColor index 0
942+
topShadowColor index 1
943+
botShadowColor index 11
944+
controlPv "$(P)$(R)DrawEdges"
945+
indicatorPv "$(P)$(R)DrawEdges_RBV"
946+
font "arial-bold-r-12.0"
947+
endObjectProperties
948+
949+
# (Menu Button)
950+
object activeMenuButtonClass
951+
beginObjectProperties
952+
major 4
953+
minor 0
954+
release 0
955+
x 290
956+
y 715
957+
w 80
958+
h 20
959+
fgColor index 25
960+
bgColor index 3
961+
inconsistentColor index 0
962+
topShadowColor index 1
963+
botShadowColor index 11
964+
controlPv "$(P)$(R)DrawTip"
965+
indicatorPv "$(P)$(R)DrawTip_RBV"
966+
font "arial-bold-r-12.0"
967+
endObjectProperties
968+
969+
# (Static Text)
970+
object activeXTextClass
971+
beginObjectProperties
972+
major 4
973+
minor 1
974+
release 1
975+
x 245
976+
y 720
977+
w 17
978+
h 13
979+
font "arial-medium-r-12.0"
980+
fgColor index 14
981+
bgColor index 3
982+
useDisplayBg
983+
value {
984+
"Tip"
985+
}
986+
autoSize
987+
endObjectProperties
988+
989+
# (Static Text)
990+
object activeXTextClass
991+
beginObjectProperties
992+
major 4
993+
minor 1
994+
release 1
995+
x 245
996+
y 760
997+
w 70
998+
h 13
999+
font "arial-medium-r-12.0"
1000+
fgColor index 14
1001+
bgColor index 3
1002+
useDisplayBg
1003+
value {
1004+
"Force colour"
1005+
}
1006+
autoSize
1007+
endObjectProperties
1008+
1009+
# (Menu Button)
1010+
object activeMenuButtonClass
1011+
beginObjectProperties
1012+
major 4
1013+
minor 0
1014+
release 0
1015+
x 320
1016+
y 755
1017+
w 50
1018+
h 20
1019+
fgColor index 25
1020+
bgColor index 3
1021+
inconsistentColor index 0
1022+
topShadowColor index 1
1023+
botShadowColor index 11
1024+
controlPv "$(P)$(R)ForceColor"
1025+
indicatorPv "$(P)$(R)ForceColor_RBV"
1026+
font "arial-bold-r-12.0"
1027+
endObjectProperties
1028+

0 commit comments

Comments
 (0)