diff --git a/10-Top/BCM_ROIscript.bob b/10-Top/BCM_ROIscript.bob index 5d79d8c15de29e9a8365f2fb9597b430be7d384a..92d447543d1877fe8a4c74ac324b6ceb26a0c25a 100644 --- a/10-Top/BCM_ROIscript.bob +++ b/10-Top/BCM_ROIscript.bob @@ -179,8 +179,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm1' -widget.setPropertyValue('text', 'ISrc BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -230,12 +228,7 @@ ctrl01.setPropertyValue('macros', ctrl01_macros) history.setPropertyValue('macros', history_macros) # If BCM 1 is defined as not None, enable BCM btn 2 -bcm3btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -bcm3text = bcm3btn.getPropertyValue('text') -if bcm3text == 'None': - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -else: - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') +bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') bcm2btn.setPropertyValue('visible', 'true') # Force reload the embedded displays @@ -267,8 +260,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm1' -widget.setPropertyValue('text', 'LEBT BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -318,12 +309,7 @@ ctrl01.setPropertyValue('macros', ctrl01_macros) history.setPropertyValue('macros', history_macros) # If BCM 1 is defined as not None, enable BCM btn 2 -bcm3btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -bcm3text = bcm3btn.getPropertyValue('text') -if bcm3text == 'None': - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -else: - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') +bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') bcm2btn.setPropertyValue('visible', 'true') # Force reload the embedded displays @@ -355,8 +341,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm1' -widget.setPropertyValue('text', 'RFQ BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -406,12 +390,7 @@ ctrl01.setPropertyValue('macros', ctrl01_macros) history.setPropertyValue('macros', history_macros) # If BCM 1 is defined as not None, enable BCM btn 2 -bcm3btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -bcm3text = bcm3btn.getPropertyValue('text') -if bcm3text == 'None': - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -else: - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') +bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') bcm2btn.setPropertyValue('visible', 'true') # Force reload the embedded displays @@ -443,8 +422,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm1' -widget.setPropertyValue('text', 'MEBT BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -494,12 +471,7 @@ ctrl01.setPropertyValue('macros', ctrl01_macros) history.setPropertyValue('macros', history_macros) # If BCM 1 is defined as not None, enable BCM btn 2 -bcm3btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -bcm3text = bcm3btn.getPropertyValue('text') -if bcm3text == 'None': - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -else: - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') +bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') bcm2btn.setPropertyValue('visible', 'true') # Force reload the embedded displays @@ -531,8 +503,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm1' -widget.setPropertyValue('text', 'MEBT BCM 02') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -582,12 +552,7 @@ ctrl01.setPropertyValue('macros', ctrl01_macros) history.setPropertyValue('macros', history_macros) # If BCM 1 is defined as not None, enable BCM btn 2 -bcm3btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -bcm3text = bcm3btn.getPropertyValue('text') -if bcm3text == 'None': - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -else: - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') +bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') bcm2btn.setPropertyValue('visible', 'true') # Force reload the embedded displays @@ -619,8 +584,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm1' -widget.setPropertyValue('text', 'DTL1 BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -670,12 +633,7 @@ ctrl01.setPropertyValue('macros', ctrl01_macros) history.setPropertyValue('macros', history_macros) # If BCM 1 is defined as not None, enable BCM btn 2 -bcm3btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -bcm3text = bcm3btn.getPropertyValue('text') -if bcm3text == 'None': - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -else: - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') +bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') bcm2btn.setPropertyValue('visible', 'true') # Force reload the embedded displays @@ -707,8 +665,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm1' -widget.setPropertyValue('text', 'DTL2 BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -758,12 +714,7 @@ ctrl01.setPropertyValue('macros', ctrl01_macros) history.setPropertyValue('macros', history_macros) # If BCM 1 is defined as not None, enable BCM btn 2 -bcm3btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -bcm3text = bcm3btn.getPropertyValue('text') -if bcm3text == 'None': - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -else: - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') +bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') bcm2btn.setPropertyValue('visible', 'true') # Force reload the embedded displays @@ -790,8 +741,8 @@ from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil from org.csstudio.display.builder.runtime.pv import PVFactory from org.phoebus.framework.macros import MacroHandler -bcmpvmacro = 'loc://bcm_manual' -amcpvmacro = 'loc://amc_manual' +bcmpvmacro = 'loc://bcm1_manual' +amcpvmacro = 'loc://amc1_manual' # Find the BCM selection group sel01 = ScriptUtil.findWidgetByName(widget, 'BCMselectionGroup') @@ -819,15 +770,13 @@ PVUtil.writePV(str(amcPVobj),str(amcpvname),10) sel01.setPropertyValue('file', '../99-Shared/BCM/none.bob') sel01.setPropertyValue('file', '../99-Shared/BCM/select_BCMname.bob') sel01.setPropertyValue('visible', 'True') -btn = ScriptUtil.findWidgetByName(widget, 'BCMmanualCancelButton') -btn.setPropertyValue('visible', 'True') btn = ScriptUtil.findWidgetByName(widget, 'BCM1manualOKbtn') btn.setPropertyValue('visible', 'True')]]></text> </script> <description>Manual...</description> </action> </actions> - <text>None</text> + <text>BCM 1</text> <x>90</x> <y>70</y> <width>140</width> @@ -848,10 +797,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'ISrc BCM 01') -bcm2btn_1 = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -bcm2btn_1.setPropertyValue('text', 'ISrc BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -933,10 +878,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'LEBT BCM 01') -bcm2btn_1 = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -bcm2btn_1.setPropertyValue('text', 'LEBT BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1018,10 +959,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'RFQ BCM 01') -bcm2btn_1 = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -bcm2btn_1.setPropertyValue('text', 'RFQ BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1103,10 +1040,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'MEBT BCM 01') -bcm2btn_1 = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -bcm2btn_1.setPropertyValue('text', 'MEBT BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1188,10 +1121,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'MEBT BCM 02') -bcm2btn_1 = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -bcm2btn_1.setPropertyValue('text', 'MEBT BCM 02') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1273,10 +1202,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'DTL1 BCM 01') -bcm2btn_1 = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -bcm2btn_1.setPropertyValue('text', 'DTL1 BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1358,10 +1283,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'DTL2 BCM 01') -bcm2btn_1 = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -bcm2btn_1.setPropertyValue('text', 'DTL2 BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1438,8 +1359,8 @@ from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil from org.csstudio.display.builder.runtime.pv import PVFactory from org.phoebus.framework.macros import MacroHandler -bcmpvmacro = 'loc://bcm_manual' -amcpvmacro = 'loc://amc_manual' +bcmpvmacro = 'loc://bcm2_manual' +amcpvmacro = 'loc://amc2_manual' # Find the BCM selection group sel01 = ScriptUtil.findWidgetByName(widget, 'BCMselectionGroup') @@ -1467,15 +1388,13 @@ PVUtil.writePV(str(amcPVobj),str(amcpvname),10) sel01.setPropertyValue('file', '../99-Shared/BCM/none.bob') sel01.setPropertyValue('file', '../99-Shared/BCM/select_BCMname.bob') sel01.setPropertyValue('visible', 'True') -btn = ScriptUtil.findWidgetByName(widget, 'BCMmanualCancelButton') -btn.setPropertyValue('visible', 'True') btn = ScriptUtil.findWidgetByName(widget, 'BCM2manualOKbtn') btn.setPropertyValue('visible', 'True')]]></text> </script> <description>Manual...</description> </action> </actions> - <text>None</text> + <text>BCM 2</text> <x>90</x> <y>120</y> <width>140</width> @@ -1497,10 +1416,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'ISrc BCM 01') -bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -bcm2btn.setPropertyValue('text', 'ISrc BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1582,10 +1497,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'LEBT BCM 01') -bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -bcm2btn.setPropertyValue('text', 'LEBT BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1667,10 +1578,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'RFQ BCM 01') -bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -bcm2btn.setPropertyValue('text', 'RFQ BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1752,10 +1659,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'MEBT BCM 01') -bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -bcm2btn.setPropertyValue('text', 'MEBT BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1837,10 +1740,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'MEBT BCM 02') -bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -bcm2btn.setPropertyValue('text', 'MEBT BCM 02') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -1922,10 +1821,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'DTL1 BCM 01') -bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -bcm2btn.setPropertyValue('text', 'DTL1 BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -2007,10 +1902,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'DTL2 BCM 01') -bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -bcm2btn.setPropertyValue('text', 'DTL2 BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -2092,10 +1983,6 @@ amcpvname = 'None' pvBCMnumber = 'PVbcm2' -widget.setPropertyValue('text', 'None') -bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -bcm2btn.setPropertyValue('text', 'None') - # Macro names bcm_xpv = '' bcm_ypv = '' @@ -2172,8 +2059,8 @@ from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil from org.csstudio.display.builder.runtime.pv import PVFactory from org.phoebus.framework.macros import MacroHandler -bcmpvmacro = 'loc://bcm_manual' -amcpvmacro = 'loc://amc_manual' +bcmpvmacro = 'loc://bcm2_manual' +amcpvmacro = 'loc://amc2_manual' # Find the BCM selection group sel01 = ScriptUtil.findWidgetByName(widget, 'BCMselectionGroup') @@ -2201,15 +2088,13 @@ PVUtil.writePV(str(amcPVobj),str(amcpvname),10) sel01.setPropertyValue('file', '../99-Shared/BCM/none.bob') sel01.setPropertyValue('file', '../99-Shared/BCM/select_BCMname.bob') sel01.setPropertyValue('visible', 'True') -btn = ScriptUtil.findWidgetByName(widget, 'BCMmanualCancelButton') -btn.setPropertyValue('visible', 'True') btn = ScriptUtil.findWidgetByName(widget, 'BCM2manualOKbtn') btn.setPropertyValue('visible', 'True')]]></text> </script> <description>Manual...</description> </action> </actions> - <text>None</text> + <text>BCM 2</text> <x>90</x> <y>120</y> <width>140</width> @@ -2231,8 +2116,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm3' -widget.setPropertyValue('text', 'ISrc BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -2316,8 +2199,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm3' -widget.setPropertyValue('text', 'LEBT BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -2401,8 +2282,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm3' -widget.setPropertyValue('text', 'RFQ BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -2486,8 +2365,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm3' -widget.setPropertyValue('text', 'MEBT BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -2571,8 +2448,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm3' -widget.setPropertyValue('text', 'MEBT BCM 02') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -2656,8 +2531,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm3' -widget.setPropertyValue('text', 'DTL1 BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -2741,8 +2614,6 @@ amcpvname = 'PBI-BCM01:Ctrl-AMC-110:' pvBCMnumber = 'PVbcm3' -widget.setPropertyValue('text', 'DTL2 BCM 01') - # Macro names bcm_xpv = bcmpvname+'PRC-TR1-ArrayTimeUs' bcm_ypv = bcmpvname+'PRC-TR1-ArrayData' @@ -2826,8 +2697,6 @@ amcpvname = 'None' pvBCMnumber = 'PVbcm3' -widget.setPropertyValue('text', 'None') - # Macro names bcm_xpv = '' bcm_ypv = '' @@ -2906,8 +2775,8 @@ from org.csstudio.display.builder.runtime.script import PVUtil, ScriptUtil from org.csstudio.display.builder.runtime.pv import PVFactory from org.phoebus.framework.macros import MacroHandler -bcmpvmacro = 'loc://bcm_manual' -amcpvmacro = 'loc://amc_manual' +bcmpvmacro = 'loc://bcm3_manual' +amcpvmacro = 'loc://amc3_manual' # Find the BCM selection group sel01 = ScriptUtil.findWidgetByName(widget, 'BCMselectionGroup') @@ -2935,15 +2804,13 @@ PVUtil.writePV(str(amcPVobj),str(amcpvname),10) sel01.setPropertyValue('file', '../99-Shared/BCM/none.bob') sel01.setPropertyValue('file', '../99-Shared/BCM/select_BCMname.bob') sel01.setPropertyValue('visible', 'True') -btn = ScriptUtil.findWidgetByName(widget, 'BCMmanualCancelButton') -btn.setPropertyValue('visible', 'True') btn = ScriptUtil.findWidgetByName(widget, 'BCM3manualOKbtn') btn.setPropertyValue('visible', 'True')]]></text> </script> <description>Manual...</description> </action> </actions> - <text>None</text> + <text>BCM 3</text> <x>90</x> <y>170</y> <width>140</width> @@ -3036,22 +2903,9 @@ history.setPropertyValue('file', '../99-Shared/BCM/none.bob') history.setPropertyValue('file', '../99-Shared/BCM/historyplot.bob') # Show the embedded displays -daq01.setPropertyValue('visible', 'true') -meas01.setPropertyValue('visible', 'true') -ctrl01.setPropertyValue('visible', 'true') - -# Change text on button to "Manual" -selectionBtn = ScriptUtil.findWidgetByName(widget, 'SelectBCM1') -selectionBtn.setPropertyValue('text', 'Manual') - -# If BCM 1 is defined as not None, enable BCM btn 2 -bcm3btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -bcm3text = bcm3btn.getPropertyValue('text') -if bcm3text == 'None': - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -else: - bcm2btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -bcm2btn.setPropertyValue('visible', 'true') +daq01.setPropertyValue('visible', false) +meas01.setPropertyValue('visible', false) +ctrl01.setPropertyValue('visible', false) # Find and hide the BCM selection group (this window) sel01 = ScriptUtil.findWidgetByName(widget, "BCMselectionGroup") @@ -3148,19 +3002,9 @@ history.setPropertyValue('file', '../99-Shared/BCM/none.bob') history.setPropertyValue('file', '../99-Shared/BCM/historyplot.bob') # Show the embedded displays -daq01.setPropertyValue('visible', 'true') -meas01.setPropertyValue('visible', 'true') -ctrl01.setPropertyValue('visible', 'true') - -# Change text on button to "Manual" -selectionBtn = ScriptUtil.findWidgetByName(widget, 'SelectBCM2') -selectionBtn.setPropertyValue('text', 'Manual') -selectionBtn2 = ScriptUtil.findWidgetByName(widget, 'SelectBCM2_1') -selectionBtn2.setPropertyValue('text', 'Manual') - -# If BCM 2 is defined as not None, enable BCM btn 3 -bcm3btn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -bcm3btn.setPropertyValue('visible', 'true') +daq01.setPropertyValue('visible', false) +meas01.setPropertyValue('visible', false) +ctrl01.setPropertyValue('visible', false) # Find and hide the BCM selection group (this window) sel01 = ScriptUtil.findWidgetByName(widget, "BCMselectionGroup") @@ -3257,13 +3101,9 @@ history.setPropertyValue('file', '../99-Shared/BCM/none.bob') history.setPropertyValue('file', '../99-Shared/BCM/historyplot.bob') # Show the embedded displays -daq01.setPropertyValue('visible', 'true') -meas01.setPropertyValue('visible', 'true') -ctrl01.setPropertyValue('visible', 'true') - -# Change text on button to "Manual" -selectionBtn = ScriptUtil.findWidgetByName(widget, 'SelectBCM3') -selectionBtn.setPropertyValue('text', 'Manual') +daq01.setPropertyValue('visible', false) +meas01.setPropertyValue('visible', false) +ctrl01.setPropertyValue('visible', false) # Find and hide the BCM selection group (this window) sel01 = ScriptUtil.findWidgetByName(widget, "BCMselectionGroup")