From 66d2096ce1c79b6eb8c7ba7830a1f3a96fbaa5bb Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 22 Oct 2024 16:53:23 +0100 Subject: [PATCH 1/2] add moving indicator, remove useless mode label --- .../chipir_collimator/chipircollimator.opi | 419 +++++++++--------- 1 file changed, 218 insertions(+), 201 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi index 5addc3d44d..d81765afa2 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi @@ -1,6 +1,6 @@ - + - + false -1 @@ -8,11 +8,11 @@ false - + 5.1.0 - + 6 600 @@ -21,10 +21,11 @@ $(P) $(P)MOT:COL: MOT:JAWSINOUT + $(P)MOT:MTR0201 $(NAME) - - + + true true true @@ -36,13 +37,13 @@ -1 -1 - + false - + - + 0 1 @@ -51,21 +52,21 @@ ISIS_Header1_NEW - + 37 0 Label - + true true false - + false CHIPIR Collimator & Jaws - + false 1 true @@ -77,13 +78,13 @@ 6 - + false - + - + 0 1 @@ -92,21 +93,21 @@ ISIS_Header2_NEW - + 37 0 Label_1 - + true true false - + false $(NAME) - + false 1 true @@ -118,10 +119,10 @@ 42 - + false - + 0 1 @@ -131,25 +132,25 @@ false - + 1 - + Dummy 0 - - - + + + true true false - + - + false - + true Action Button 1 @@ -158,12 +159,12 @@ 108 - + - + - + 13 1 @@ -173,7 +174,7 @@ ISIS_GroupBox_NEW - + 523 false @@ -181,15 +182,15 @@ true Collimator - + true true false - + true - + false true Grouping Container @@ -198,13 +199,13 @@ 3 78 - + false - + - + 0 1 @@ -213,21 +214,21 @@ ISIS_Label_NEW - + 20 2 Label - + true true false - + false Target position: - + false 1 true @@ -239,16 +240,16 @@ 6 - + false false false - + true - + 0 1 @@ -258,7 +259,7 @@ false - + 0 20 @@ -267,15 +268,15 @@ 0 true $(COL)TARGET_POS:SP:RBV - + 0.0 - + true true false - + true ###### $(pv_name) @@ -291,27 +292,27 @@ $(pv_value) 6 - + false false false - + false - + 3 1 - + true ISIS_Value_NEW false - + 0 20 @@ -322,15 +323,15 @@ $(pv_value) 0 false $(COL)TARGET_POS:SP - + 0.0 - + true true false - + 0 false @@ -346,13 +347,13 @@ $(pv_value) 6 - + false - + - + 0 1 @@ -361,21 +362,21 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_2 - + true true false - + false Current position: - + false 1 true @@ -387,16 +388,16 @@ $(pv_value) 30 - + false false false - + true - + 0 1 @@ -406,7 +407,7 @@ $(pv_value) false - + 0 20 @@ -415,15 +416,15 @@ $(pv_value) 0 true $(COL)CURR_POS - + 0.0 - + true true false - + true ###### $(pv_name) @@ -439,13 +440,13 @@ $(pv_value) 30 - + false - + - + 0 1 @@ -454,21 +455,21 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_2 - + true true false - + false Previous position: - + false 1 true @@ -480,16 +481,16 @@ $(pv_value) 54 - + false false false - + true - + 0 1 @@ -499,7 +500,7 @@ $(pv_value) false - + 0 20 @@ -508,15 +509,15 @@ $(pv_value) 0 true $(COL)PREV_POS - + 0.0 - + true true false - + true ###### $(pv_name) @@ -532,13 +533,13 @@ $(pv_value) 54 - + false - + - + 0 1 @@ -547,21 +548,21 @@ $(pv_value) ISIS_Label_NEW - + 20 2 Label_2 - + true true false - + false - Mode: - + Moving: + false 1 true @@ -572,67 +573,15 @@ $(pv_value) 6 78 - - - false - false - false - - - - true - - - - 0 - 1 - true - - ISIS_Value_NEW - - false - - - - 0 - 20 - 0 - Text Update - 0 - true - $(COL)MODE - - 0.0 - - - true - true - false - - - true - ###### - $(pv_name) -$(pv_value) - true - 1 - true - Text Update - 85 - false - 3678fe54:18fceb05548:-7d52 - 120 - 78 - - + false true - + - + 0 1 @@ -648,7 +597,7 @@ $(pv_value) Default - + 292 collimator.png @@ -664,15 +613,15 @@ $(pv_value) 1.0 - + true true false - + false - + false true Image @@ -682,13 +631,13 @@ $(pv_value) 180 - + false - + - + 0 1 @@ -697,27 +646,27 @@ $(pv_value) ISIS_Label_NEW - + 139 0 Label_5 - + true true false - + false - 0 - Shut - 1 - 150mm - 2 - 300mm - 3 - 200mm - 4 - 100mm - 5 - 50mm + 0 - Shut + 1 - 150mm + 2 - 300mm + 3 - 200mm + 4 - 100mm + 5 - 50mm 6 - 400mm - + false 1 true @@ -728,14 +677,82 @@ $(pv_value) 222 30 + + + false + false + + + + -1 + true + + + + 0 + 1 + 3 + + + + 0 + true + true + + Default + + false + + + + 25 + LED_1 + + + + In Position + + + + Moving + $(COLMOT).MOVN + + + + + 1 + + + 0 + + $(P)$(MOTION_SET_POINT):POSN + + + + true + true + true + + + false + false + $(pv_name) +$(pv_value) + true + LED + 25 + -6a273375:192b4e9e32e:-7f8b + 120 + 75 + - + - + - + 13 1 @@ -745,7 +762,7 @@ $(pv_value) ISIS_GroupBox_NEW - + 523 false @@ -753,15 +770,15 @@ $(pv_value) true Jaws - + true true false - + true - + false true Grouping Container @@ -770,12 +787,12 @@ $(pv_value) 378 78 - + - + - + 0 1 @@ -784,9 +801,9 @@ $(pv_value) ISIS_GroupBox_NEW - + - + 223 true @@ -795,14 +812,14 @@ $(pv_value) A Linking Container That Looks Like a Group Box_1 ../stage/motion_setpoint_position_part.opi 2 - + true true false - - + + true Linking Container 421 @@ -811,12 +828,12 @@ $(pv_value) 12 - + - + - + 0 1 @@ -825,9 +842,9 @@ $(pv_value) ISIS_GroupBox_NEW - + - + 236 true @@ -835,14 +852,14 @@ $(pv_value) A Linking Container That Looks Like a Group Box_1 ../jaws/single_jaw_manager.opi 1 - + true true false - - + + true Linking Container 452 @@ -852,10 +869,10 @@ $(pv_value) - + false - + 0 1 @@ -865,25 +882,25 @@ $(pv_value) false - + 1 - + Dummy 0 - - - + + + true true false - + - + false - + true Action Button 1 @@ -891,4 +908,4 @@ $(pv_value) 3 108 - + \ No newline at end of file From 6fe19b7a09825ddada62d8f6e7eaab15eded1ea4 Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Fri, 15 Nov 2024 10:55:51 +0000 Subject: [PATCH 2/2] hide jaws in/out if not in manager mode --- .../chipir_collimator/chipircollimator.opi | 171 ++++++++++++++++-- 1 file changed, 156 insertions(+), 15 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi index d81765afa2..79fa152ea5 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/chipir_collimator/chipircollimator.opi @@ -782,7 +782,7 @@ $(pv_value) false true Grouping Container - 469 + 487 3678fe54:18fceb05548:-78ba 378 78 @@ -804,14 +804,13 @@ $(pv_value) - 223 + 236 true - 2 A Linking Container That Looks Like a Group Box_1 - ../stage/motion_setpoint_position_part.opi - 2 + ../jaws/single_jaw_manager.opi + 1 true @@ -822,10 +821,144 @@ $(pv_value) true Linking Container - 421 - 3678fe54:18fceb05548:-7944 + 452 + 3678fe54:18fceb05548:-79af -3 - 12 + 234 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 24 + 2 + Label_2 + + + true + true + false + + + false + To move jaws in/out enable manager mode + + false + 1 + true + Label + 243 + true + -3326528:19320ae9bbc:-7e7b + 101 + 78 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_1 + + + true + true + false + + + false + Current position: + + false + 1 + true + Label + 103 + true + -3326528:19320ae9bbc:-7e70 + 114 + 114 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 0 + Text Update + 0 + true + $(P)$(MOTION_SET_POINT):POSN + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + -3326528:19320ae9bbc:-7e6f + 228 + 114 @@ -845,14 +978,22 @@ $(pv_value) - 236 + 223 true + 2 A Linking Container That Looks Like a Group Box_1 - ../jaws/single_jaw_manager.opi - 1 - + ../stage/motion_setpoint_position_part.opi + 2 + + + + false + + $(P)CS:MANAGER.RVAL + + true true @@ -862,10 +1003,10 @@ $(pv_value) true Linking Container - 452 - 3678fe54:18fceb05548:-79af + 421 + 3678fe54:18fceb05548:-7944 -3 - 234 + 6