diff --git a/xxxApp/op/ui/xxx.ui b/xxxApp/op/ui/xxx.ui index 56c890f40246666f1ad82c4c7de842f334106269..1ce9f4742a652eee4b7d2667043a3fed1d1e470b 100644 --- a/xxxApp/op/ui/xxx.ui +++ b/xxxApp/op/ui/xxx.ui @@ -70,7 +70,7 @@ QPushButton <property name="font"> <font> <family>Verdana</family> - <pointsize>14</pointsize> + <pointsize>13</pointsize> <weight>75</weight> <bold>true</bold> </font> @@ -91,6 +91,13 @@ QPushButton <blue>228</blue> </color> </property> + <property name="background"> + <color alpha="0"> + <red>160</red> + <green>160</green> + <blue>164</blue> + </color> + </property> </widget> </item> </layout> @@ -1223,7 +1230,7 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <property name="args"> <string>P=xxx:,N=1,M_x=m7,M_rIn=m6,M_rOut=m8;P=xxx:,N=1,M_x=m7,M_rIn=m6,M_rOut=m8</string> </property> - <property name="fontScaleMode" stdset="0"> + <property name="fontScaleMode"> <enum>EPushButton::WidthAndHeight</enum> </property> <property name="stackingMode" stdset="0"> @@ -1556,14 +1563,14 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </item> </layout> </widget> - <widget class="QWidget" name="tab_2"> + <widget class="QWidget" name="tab_4"> <property name="Fill" stdset="0"> <string>True</string> </property> <attribute name="title"> - <string> Direct I/O </string> + <string> Detectors </string> </attribute> - <layout class="QGridLayout" name="gridLayout_2" rowstretch="1,1,1,1" columnstretch="1,1,1,1,1"> + <layout class="QGridLayout" name="gridLayout_4" rowstretch="0,0,0,0" columnstretch="0,0,0,0,0"> <property name="horizontalSpacing"> <number>10</number> </property> @@ -1573,10 +1580,10 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <property name="margin"> <number>10</number> </property> - <item row="0" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_27"> + <item row="1" column="3"> + <widget class="caRelatedDisplay" name="carelateddisplay_66"> <property name="label"> - <string notr="true">-Serial 1-8 </string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -1593,26 +1600,23 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>asyn record serial1;asyn record serial2;asyn record serial3;asyn record serial4;asyn record serial5;asyn record serial6;asyn record serial7;asyn record serial8</string> + <string>1</string> </property> <property name="files"> - <string>asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl</string> + <string>1</string> </property> <property name="args"> - <string>P=xxx:,R=asyn_1;P=xxx:,R=asyn_2;P=xxx:,R=asyn_3;P=xxx:,R=asyn_4;P=xxx:,R=asyn_5;P=xxx:,R=asyn_6;P=xxx:,R=asyn_7;P=xxx:,R=asyn_8</string> + <string>1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false</string> - </property> </widget> </item> - <item row="0" column="2"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_22"> + <item row="2" column="2"> + <widget class="caRelatedDisplay" name="carelateddisplay_67"> <property name="label"> - <string notr="true">- VME DAC </string> + <string notr="true">- Oxford X1k</string> </property> <property name="foreground"> <color> @@ -1629,26 +1633,28 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>vme DAC 1 Chans 1-8;vme DAC 2 Chans 1-8;vme DAC 1 Chans 1-8</string> + <string>Oxford x1k</string> </property> <property name="files"> - <string>VME_DAC8.adl;VME_DAC8.adl;topDAC8.adl</string> + <string>Oxford_X1k.ui</string> </property> <property name="args"> - <string>P=xxx:,D=1;P=xxx:,D=2;P=xxx:,D=1</string> + <string>P=xxx:,S=s1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false</string> - </property> </widget> </item> - <item row="0" column="3"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_40"> + <item row="0" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_4"> + <property name="font"> + <font> + <family>Liberation Mono</family> + </font> + </property> <property name="label"> - <string notr="true">- IP330 ADC </string> + <string notr="true">- Scaler #1 </string> </property> <property name="foreground"> <color> @@ -1665,26 +1671,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>ADC 1;ADC 1 sweep;ADC 2 sweep;ADC 3 sweep;ADC 4 sweep;Slow feedback;Fast feedback;Async Slow feedback</string> + <string>Scaler 1;Scaler 1 (16 ch);Scaler 1 (32 ch);Scaler 1 (64 ch);Scaler 1 modCalc</string> </property> <property name="files"> - <string>Ip330Scan.adl;mca_small.adl;mca_small.adl;mca_small.adl;mca_small.adl;pid_control.adl;pid_control.adl;async_pid_control.adl</string> + <string>scaler16m.adl;scaler16.adl;scaler32.adl;scaler64.adl;scaler16m.adl</string> </property> <property name="args"> - <string>P=xxx:,R=IP330_;P=xxx:,M=mip330_1;P=xxx:,M=mip330_2;P=xxx:,M=mip330_3;P=xxx:,M=mip330_4;P=xxx:,PID=pid_slow,TITLE=Slow_Feedback;P=xxx:,PID=ip330PIDFast,TITLE=Fast_Feedback;P=xxx:,PID=async_pid_slow,TITLE=Slow_Feedback</string> + <string>P=xxx:,S=scaler1;P=xxx:,S=scaler1;P=xxx:,S=scaler1;P=xxx:,S=scaler1;P=xxx:,S=scaler1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false</string> + <string>false;false;false;false;false;false;false;false;false</string> </property> </widget> </item> - <item row="1" column="3"> - <widget class="caRelatedDisplay" name="carelateddisplay_30"> + <item row="0" column="3"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_26"> <property name="label"> - <string notr="true">-</string> + <string notr="true">- quadEM </string> </property> <property name="foreground"> <color> @@ -1700,39 +1706,27 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> - <property name="stackingMode" stdset="0"> - <enum>caRowColMenu::Menu</enum> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="caRelatedDisplay" name="carelateddisplay_29"> - <property name="label"> - <string notr="true">-</string> + <property name="labels"> + <string>Quad Electrometer Ch.1;Quad Electrometer Ch.2;Quad Electrometer Ch.3;Quad Electrometer Ch.4;Quad Electrometer MCAs;Vertical feedback;Horizontal feedback</string> </property> - <property name="foreground"> - <color> - <red>228</red> - <green>228</green> - <blue>228</blue> - </color> + <property name="files"> + <string>quadEM.adl;quadEM.adl;quadEM.adl;quadEM.adl;quadEM_med.adl;pid_control.adl;pid_control.adl</string> </property> - <property name="background"> - <color> - <red>53</red> - <green>132</green> - <blue>0</blue> - </color> + <property name="args"> + <string>P=xxx:,EM=EM1;P=xxx:,EM=EM2;P=xxx:,EM=EM3;P=xxx:,EM=EM4;P=xxx:quadEM:, P_FFT=xxx:quadEM_FFT:;P=xxx:, PID=quadEMVertical,TITLE=Vertical_Feedback;P=xxx:, PID=quadEMHorizontal,TITLE=Horizontal_Feedback</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false;false;false;false</string> + </property> </widget> </item> - <item row="1" column="1"> - <widget class="caRelatedDisplay" name="carelateddisplay_27"> + <item row="0" column="1"> + <widget class="caRelatedDisplay" name="carelateddisplay_15"> <property name="label"> - <string notr="true">- IpUnidig </string> + <string notr="true">- SIS3820 </string> </property> <property name="foreground"> <color> @@ -1749,13 +1743,13 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>IpUnidig I/O</string> + <string>SIS3820 Scaler8;SIS3820 Scaler32</string> </property> <property name="files"> - <string>IpUnidig_top.adl</string> + <string>scaler.ui;scaler32.ui</string> </property> <property name="args"> - <string>P=xxx:,R=Unidig1</string> + <string>P=xxx:3820:,S=scaler1;P=xxx:3820:,S=scaler1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> @@ -1763,9 +1757,9 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </widget> </item> <item row="1" column="2"> - <widget class="caRelatedDisplay" name="carelateddisplay_28"> + <widget class="caRelatedDisplay" name="carelateddisplay_13"> <property name="label"> - <string notr="true">- DAC 128V </string> + <string notr="true">-Prebuilt AD</string> </property> <property name="foreground"> <color> @@ -1782,21 +1776,21 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>dac128V 1 Chans 1-8</string> + <string>AD Top (prebuilts);Cam 1 Image;Cam 2 Image</string> </property> <property name="files"> - <string>topDAC8.adl</string> + <string>ADTop.ui;ad_cam_image.ui;ad_cam_image.ui</string> </property> <property name="args"> - <string>P=xxx:,D=3</string> + <string>;P=13SIM1:, R=cam1:;P=13SIM1:, R=cam2:</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="2" column="3"> - <widget class="caRelatedDisplay" name="carelateddisplay_31"> + <item row="3" column="2"> + <widget class="caRelatedDisplay" name="carelateddisplay_10"> <property name="label"> <string notr="true">-</string> </property> @@ -1819,10 +1813,10 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </property> </widget> </item> - <item row="3" column="1"> - <widget class="caRelatedDisplay" name="carelateddisplay_35"> + <item row="1" column="1"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_24"> <property name="label"> - <string notr="true">- VME </string> + <string notr="true">- SIS38XX </string> </property> <property name="foreground"> <color> @@ -1839,23 +1833,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>generic VME</string> + <string>SIS38XX</string> </property> <property name="files"> - <string>recVme.adl</string> + <string>SIS38XX.adl</string> </property> <property name="args"> - <string>P=xxx:,Q=vme1</string> + <string>P=xxx:3820:</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false</string> + </property> </widget> </item> - <item row="2" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_54"> + <item row="1" column="4"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_23"> <property name="label"> - <string notr="true">-Serial Extra</string> + <string notr="true">- multiMCA </string> </property> <property name="foreground"> <color> @@ -1872,26 +1869,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Serial Device;Serial Device;Serial Device;Serial Device;Serial Device;Serial Device;Serial Device;Serial Device</string> + <string>3 element detector;summed spectrum (mca0);sum control;HV power supply</string> </property> <property name="files"> - <string>asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl</string> + <string>3element.adl;mca_small.adl;mcaSum3.adl;xxIcbHVPS.adl</string> </property> <property name="args"> - <string>P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=</string> + <string>P=xxx:med:;P=xxx:med:,M=mca0;P=xxx:med:;P=xxx:med:,HVPS=hvps1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false</string> + <string>false;false;false;false</string> </property> </widget> </item> - <item row="3" column="2"> - <widget class="caRelatedDisplay" name="carelateddisplay_33"> + <item row="3" column="4"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_20"> <property name="label"> - <string notr="true">- CAMAC </string> + <string notr="true">- Four Step </string> </property> <property name="foreground"> <color> @@ -1908,23 +1905,29 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>generic CAMAC</string> + <string>4-step measurement</string> </property> <property name="files"> - <string>CAMAC_IO.adl</string> + <string>4step.adl</string> </property> <property name="args"> - <string>REC=xxx:camac1</string> + <string>P=xxx:</string> + </property> + <property name="fontScaleMode"> + <enum>EPushButton::WidthAndHeight</enum> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false</string> + </property> </widget> </item> <item row="3" column="3"> - <widget class="caRelatedDisplay" name="carelateddisplay_32"> + <widget class="caRelatedDisplay" name="carelateddisplay_9"> <property name="label"> - <string notr="true">- GPIB1 </string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -1940,24 +1943,20 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> - <property name="labels"> - <string>asyn GPIB</string> - </property> - <property name="files"> - <string>asynOctet.adl</string> - </property> - <property name="args"> - <string>P=xxx:,R=gpib1</string> - </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="2" column="1"> - <widget class="caRelatedDisplay" name="carelateddisplay_34"> + <item row="0" column="2"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_43"> + <property name="font"> + <font> + <family>Candara</family> + </font> + </property> <property name="label"> - <string notr="true">-</string> + <string notr="true">-simDetector</string> </property> <property name="foreground"> <color> @@ -1973,15 +1972,32 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> + <property name="labels"> + <string>Simulator #1 General;Simulator #1 Specific;Simulator #1 Image;---;Simulator #2 General;Simulator #2 Specific;Simulator #2 Image</string> + </property> + <property name="files"> + <string>ADBase.adl;simDetector.adl;ad_cam_image.ui;;ADBase.adl;simDetector.adl;ad_cam_image.ui</string> + </property> + <property name="args"> + <string>P=xxx:, R=SIM1:cam1:;P=xxx:, R=SIM1:cam1:;P=xxx:, R=cam1:;;P=xxx:, R=SIM1:cam2:;P=xxx:, R=SIM1:cam2:;P=xxx:, R=cam2:</string> + </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false</string> + </property> </widget> </item> - <item row="3" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_11"> + <item row="2" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_52"> + <property name="font"> + <font> + <family>Liberation Mono</family> + </font> + </property> <property name="label"> - <string notr="true">-devCmdReply</string> + <string notr="true">- Scaler #3 </string> </property> <property name="foreground"> <color> @@ -1998,26 +2014,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>deviceCmdReply 1;deviceCmdReply 2;deviceCmdReply 3;deviceCmdReply 4;deviceCmdReply 5;deviceCmdReply 6;deviceCmdReply 7;deviceCmdReply 8</string> + <string>Scaler 3;Scaler 3 (16 ch);Scaler 3 (32 ch);Scaler 3 (64 ch);Scaler 3 modCalc</string> </property> <property name="files"> - <string>deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl</string> + <string>scaler16m.adl;scaler16.adl;scaler32.adl;scaler64.adl;scaler16m.adl</string> </property> <property name="args"> - <string>P=xxx:,N=1;P=xxx:,N=2;P=xxx:,N=3;P=xxx:,N=4;P=xxx:,N=5;P=xxx:,N=6;P=xxx:,N=7;P=xxx:,N=8</string> + <string>P=xxx:,S=scaler3;P=xxx:,S=scaler3;P=xxx:,S=scaler3;P=xxx:,S=scaler3;P=xxx:,S=scaler3</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false;false;false;false</string> + <string>false;false;false;false;false;false;false;false;false</string> </property> </widget> </item> - <item row="0" column="1"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_25"> + <item row="3" column="1"> + <widget class="caRelatedDisplay" name="carelateddisplay_11"> <property name="label"> - <string notr="true">- Acromag </string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -2033,27 +2049,15 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> - <property name="labels"> - <string> Acromag 8 in; Acromag 8 out; Acromag 16 out; Acromag 16 in</string> - </property> - <property name="files"> - <string>Acromag_8in.adl;Acromag_8out.adl;Acromag_16out.adl;Acromag_16in.adl</string> - </property> - <property name="args"> - <string>P=xxx:,A=1,CH0=0,CH1=1,CH2=2,CH3=3,CH4=4,CH5=5,CH6=6,CH7=7;P=xxx:,A=1,CH0=0,CH1=1,CH2=2,CH3=3,CH4=4,CH5=5,CH6=6,CH7=7;P=xxx:,A=1;P=xxx:,A=1</string> - </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false;false</string> - </property> </widget> </item> - <item row="1" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_53"> + <item row="2" column="3"> + <widget class="caRelatedDisplay" name="carelateddisplay_68"> <property name="label"> - <string notr="true">-Serial 9-16</string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -2070,24 +2074,21 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>asyn record serial9;asyn record serial10;asyn record serial11;asyn record serial12;asyn record serial13;asyn record serial14;asyn record serial15;asyn record serial16</string> + <string>1</string> </property> <property name="files"> - <string>asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl</string> + <string>1</string> </property> <property name="args"> - <string>P=xxx:,R=asyn_9;P=xxx:,R=asyn_10;P=xxx:,R=asyn_11;P=xxx:,R=asyn_12;P=xxx:,R=asyn_13;P=xxx:,R=asyn_14;P=xxx:,R=asyn_15;P=xxx:,R=asyn_16</string> + <string>1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false</string> - </property> </widget> </item> - <item row="0" column="4"> - <widget class="caRelatedDisplay" name="carelateddisplay_57"> + <item row="3" column="0"> + <widget class="caRelatedDisplay" name="carelateddisplay_14"> <property name="label"> <string notr="true">-</string> </property> @@ -2105,24 +2106,15 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> - <property name="labels"> - <string>1</string> - </property> - <property name="files"> - <string>1</string> - </property> - <property name="args"> - <string>1</string> - </property> - <property name="stackingMode" stdset="0"> - <enum>caRowColMenu::Menu</enum> + <property name="stackingMode" stdset="0"> + <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="1" column="4"> - <widget class="caRelatedDisplay" name="carelateddisplay_58"> + <item row="0" column="4"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_19"> <property name="label"> - <string notr="true">-</string> + <string notr="true">- MCA </string> </property> <property name="foreground"> <color> @@ -2139,21 +2131,24 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>1</string> + <string>Canberra AIM Multichannel Analyzer;MCA with ROI's;ADC 1;TCA 1;HVPS 1;AMP 1;DSP 1;soft MCA</string> </property> <property name="files"> - <string>1</string> + <string>mca_small.adl;mca.adl;xxIcbAdc.adl;xxIcbTCA.adl;xxIcbHVPS.adl;xxIcbAmp.adl;dsp9660Gain.adl;mca_small.adl</string> </property> <property name="args"> - <string>1</string> + <string>P=xxx:,M=aim_adc1;P=xxx:,M=aim_adc1;P=xxx:,ADC=adc1;P=xxx:,TCA=tca1;P=xxx:,HVPS=hvps1;P=xxx:,AMP=amp1;P=xxx:,DSP=dsp1;P=xxx:,M=softMCA</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false;false;false;false;false</string> + </property> </widget> </item> <item row="2" column="4"> - <widget class="caRelatedDisplay" name="carelateddisplay_59"> + <widget class="caRelatedDisplay" name="carelateddisplay_65"> <property name="label"> <string notr="true">-</string> </property> @@ -2185,10 +2180,15 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </property> </widget> </item> - <item row="3" column="4"> - <widget class="caRelatedDisplay" name="carelateddisplay_60"> + <item row="1" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_51"> + <property name="font"> + <font> + <family>Liberation Mono</family> + </font> + </property> <property name="label"> - <string notr="true">-</string> + <string notr="true">- Scaler #2 </string> </property> <property name="foreground"> <color> @@ -2205,13 +2205,40 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>1</string> + <string>Scaler 2;Scaler 2 (16 ch);Scaler 2 (32 ch);Scaler 2 (64 ch);Scaler 2 modCalc</string> </property> <property name="files"> - <string>1</string> + <string>scaler16m.adl;scaler16.adl;scaler32.adl;scaler64.adl;scaler16m.adl</string> </property> <property name="args"> - <string>1</string> + <string>P=xxx:,S=scaler2;P=xxx:,S=scaler2;P=xxx:,S=scaler2;P=xxx:,S=scaler2;P=xxx:,S=scaler2</string> + </property> + <property name="stackingMode" stdset="0"> + <enum>caRowColMenu::Menu</enum> + </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false;false;false;false;false;false</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="caRelatedDisplay" name="carelateddisplay_12"> + <property name="label"> + <string notr="true">-</string> + </property> + <property name="foreground"> + <color> + <red>228</red> + <green>228</green> + <blue>228</blue> + </color> + </property> + <property name="background"> + <color> + <red>53</red> + <green>132</green> + <blue>0</blue> + </color> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> @@ -2220,14 +2247,14 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </item> </layout> </widget> - <widget class="QWidget" name="tab_5"> + <widget class="QWidget" name="tab_2"> <property name="Fill" stdset="0"> <string>True</string> </property> <attribute name="title"> - <string> Devices </string> + <string> Direct I/O </string> </attribute> - <layout class="QGridLayout" name="gridLayout_3"> + <layout class="QGridLayout" name="gridLayout_2" rowstretch="1,1,1,1" columnstretch="1,1,1,1,1"> <property name="horizontalSpacing"> <number>10</number> </property> @@ -2237,10 +2264,10 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <property name="margin"> <number>10</number> </property> - <item row="3" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_17"> + <item row="0" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_27"> <property name="label"> - <string notr="true">- Autocoll </string> + <string notr="true">-Serial 1-8 </string> </property> <property name="foreground"> <color> @@ -2257,26 +2284,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Autocollimator; </string> + <string>asyn record serial1;asyn record serial2;asyn record serial3;asyn record serial4;asyn record serial5;asyn record serial6;asyn record serial7;asyn record serial8</string> </property> <property name="files"> - <string>Elcomat.adl;Elcomat.adl</string> + <string>asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl</string> </property> <property name="args"> - <string>P=xxx:;P=xxx:</string> + <string>P=xxx:,R=asyn_1;P=xxx:,R=asyn_2;P=xxx:,R=asyn_3;P=xxx:,R=asyn_4;P=xxx:,R=asyn_5;P=xxx:,R=asyn_6;P=xxx:,R=asyn_7;P=xxx:,R=asyn_8</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> <property name="removeParent" stdset="0"> - <string>false;false</string> + <string>false;false;false;false;false;false;false;false</string> </property> </widget> </item> - <item row="0" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_35"> + <item row="0" column="2"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_22"> <property name="label"> - <string notr="true">- Preamps </string> + <string notr="true">- VME DAC </string> </property> <property name="foreground"> <color> @@ -2293,26 +2320,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>SRS 570 Current Preamplifier #A1;SRS 570 Current Preamplifier #A2;SRS 570 Current Preamplifier #A3;SRS 570 Current Preamplifier #A4;SRS 570 Current Preamplifier #A5;Femto Current Preamplifier</string> + <string>vme DAC 1 Chans 1-8;vme DAC 2 Chans 1-8;vme DAC 1 Chans 1-8</string> </property> <property name="files"> - <string>SR570_tiny.adl;SR570_tiny.adl;SR570_tiny.adl;SR570_tiny.adl;SR570_tiny.adl;femto.adl</string> + <string>VME_DAC8.adl;VME_DAC8.adl;topDAC8.adl</string> </property> <property name="args"> - <string>P=xxx:,A=A1;P=xxx:,A=A2;P=xxx:,A=A3;P=xxx:,A=A4;P=xxx:,A=A5;P=xxx:,H=fem01:,F=seq01:,AC=xxx:Unidig1Bo9</string> + <string>P=xxx:,D=1;P=xxx:,D=2;P=xxx:,D=1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false</string> + <string>false;false;false;false</string> </property> </widget> </item> - <item row="1" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_16"> + <item row="0" column="3"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_40"> <property name="label"> - <string notr="true">- Encoders </string> + <string notr="true">- IP330 ADC </string> </property> <property name="foreground"> <color> @@ -2329,26 +2356,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Heidenhain AWE1024;Heidenhain AWE1024;Heidenhain ND261;Heidenhain IK320</string> + <string>ADC 1;ADC 1 sweep;ADC 2 sweep;ADC 3 sweep;ADC 4 sweep;Slow feedback;Fast feedback;Async Slow feedback</string> </property> <property name="files"> - <string>HeidEncoder.adl;HeidEncoder.adl;HeidND261.adl;HeidIK320_group.adl</string> + <string>Ip330Scan.adl;mca_small.adl;mca_small.adl;mca_small.adl;mca_small.adl;pid_control.adl;pid_control.adl;async_pid_control.adl</string> </property> <property name="args"> - <string>P=xxx:, A=6;P=xxx:, A=7;P=xxx:;P=xxx:,card=card0,group=5</string> + <string>P=xxx:,R=IP330_;P=xxx:,M=mip330_1;P=xxx:,M=mip330_2;P=xxx:,M=mip330_3;P=xxx:,M=mip330_4;P=xxx:,PID=pid_slow,TITLE=Slow_Feedback;P=xxx:,PID=ip330PIDFast,TITLE=Fast_Feedback;P=xxx:,PID=async_pid_slow,TITLE=Slow_Feedback</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> <property name="removeParent" stdset="0"> - <string>false;false;false;false</string> + <string>false;false;false;false;false;false;false;false</string> </property> </widget> </item> - <item row="2" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_6"> + <item row="1" column="3"> + <widget class="caRelatedDisplay" name="carelateddisplay_30"> <property name="label"> - <string notr="true">- HP Laser </string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -2364,27 +2391,15 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> - <property name="labels"> - <string>HP Laser Axis 1;HP Laser Axis 2</string> - </property> - <property name="files"> - <string>HPLaserAxis.adl;HPLaserAxis.adl</string> - </property> - <property name="args"> - <string>P=xxx:,Q=HPLaser1;P=xxx:,Q=HPLaser2</string> - </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false</string> - </property> </widget> </item> - <item row="0" column="1"> - <widget class="caRelatedDisplay" name="carelateddisplay_24"> + <item row="2" column="2"> + <widget class="caRelatedDisplay" name="carelateddisplay_29"> <property name="label"> - <string notr="true">-Digitel Vac</string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -2400,24 +2415,15 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> - <property name="labels"> - <string>Digitel Pump</string> - </property> - <property name="files"> - <string>Pump.ui</string> - </property> - <property name="args"> - <string>P=xxx:,PUMP=ip1</string> - </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="0" column="4"> - <widget class="caRelatedDisplay" name="carelateddisplay_17"> + <item row="1" column="1"> + <widget class="caRelatedDisplay" name="carelateddisplay_27"> <property name="label"> - <string notr="true">-</string> + <string notr="true">- IpUnidig </string> </property> <property name="foreground"> <color> @@ -2433,15 +2439,24 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> + <property name="labels"> + <string>IpUnidig I/O</string> + </property> + <property name="files"> + <string>IpUnidig_top.adl</string> + </property> + <property name="args"> + <string>P=xxx:,R=Unidig1</string> + </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="1" column="1"> - <widget class="caRelatedDisplay" name="carelateddisplay_21"> + <item row="1" column="2"> + <widget class="caRelatedDisplay" name="carelateddisplay_28"> <property name="label"> - <string notr="true">-MPC IonPump</string> + <string notr="true">- DAC 128V </string> </property> <property name="foreground"> <color> @@ -2458,21 +2473,21 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>MPC Pump</string> + <string>dac128V 1 Chans 1-8</string> </property> <property name="files"> - <string>Pump.ui</string> + <string>topDAC8.adl</string> </property> <property name="args"> - <string>P=xxx:,PUMP=ip2</string> + <string>P=xxx:,D=3</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="1" column="4"> - <widget class="caRelatedDisplay" name="carelateddisplay_63"> + <item row="2" column="3"> + <widget class="caRelatedDisplay" name="carelateddisplay_31"> <property name="label"> <string notr="true">-</string> </property> @@ -2490,24 +2505,15 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> - <property name="labels"> - <string>1</string> - </property> - <property name="files"> - <string>1</string> - </property> - <property name="args"> - <string>1</string> - </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="2" column="1"> - <widget class="caRelatedDisplay" name="carelateddisplay_61"> + <item row="3" column="1"> + <widget class="caRelatedDisplay" name="carelateddisplay_35"> <property name="label"> - <string notr="true">-MPC TSPPump</string> + <string notr="true">- VME </string> </property> <property name="foreground"> <color> @@ -2524,23 +2530,23 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>MPC TSP Pump</string> + <string>generic VME</string> </property> <property name="files"> - <string>Pump.ui</string> + <string>recVme.adl</string> </property> <property name="args"> - <string>P=xxx:,PUMP=tsp1</string> + <string>P=xxx:,Q=vme1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="2" column="4"> - <widget class="caRelatedDisplay" name="carelateddisplay_62"> + <item row="2" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_54"> <property name="label"> - <string notr="true">-</string> + <string notr="true">-Serial Extra</string> </property> <property name="foreground"> <color> @@ -2557,23 +2563,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>1</string> + <string>Serial Device;Serial Device;Serial Device;Serial Device;Serial Device;Serial Device;Serial Device;Serial Device</string> </property> <property name="files"> - <string>1</string> + <string>asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl</string> </property> <property name="args"> - <string>1</string> + <string>P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=;P=xxx:,R=</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false;false;false;false;false</string> + </property> </widget> </item> - <item row="0" column="2"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_5"> + <item row="3" column="2"> + <widget class="caRelatedDisplay" name="carelateddisplay_33"> <property name="label"> - <string notr="true">-Keithley 2K</string> + <string notr="true">- CAMAC </string> </property> <property name="foreground"> <color> @@ -2590,26 +2599,23 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Keithley 2000 DMM #1;Keithley 2000 DMM #2;Keithley DMM (thermistors)</string> + <string>generic CAMAC</string> </property> <property name="files"> - <string>Keithley2kDMM_mf.adl;Keithley2kDMM_mf.adl;KeithleyDMM.adl</string> + <string>CAMAC_IO.adl</string> </property> <property name="args"> - <string>P=xxx:,Dmm=D1;P=xxx:,Dmm=D2;P=xxx:</string> + <string>REC=xxx:camac1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false</string> - </property> </widget> </item> - <item row="1" column="2"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_36"> + <item row="3" column="3"> + <widget class="caRelatedDisplay" name="carelateddisplay_32"> <property name="label"> - <string notr="true">- Eurotherm </string> + <string notr="true">- GPIB1 </string> </property> <property name="foreground"> <color> @@ -2626,24 +2632,21 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Eurotherm;Eurotherm 2k</string> + <string>asyn GPIB</string> </property> <property name="files"> - <string>Eurotherm.adl;Eurotherm2k.adl</string> + <string>asynOctet.adl</string> </property> <property name="args"> - <string>P=xxx:;P=xxx:,TC=1</string> + <string>P=xxx:,R=gpib1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false</string> - </property> </widget> </item> - <item row="1" column="3"> - <widget class="caRelatedDisplay" name="carelateddisplay_20"> + <item row="2" column="1"> + <widget class="caRelatedDisplay" name="carelateddisplay_34"> <property name="label"> <string notr="true">-</string> </property> @@ -2666,10 +2669,10 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </property> </widget> </item> - <item row="2" column="2"> - <widget class="caRelatedDisplay" name="carelateddisplay_19"> + <item row="3" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_11"> <property name="label"> - <string notr="true">- LakeShore </string> + <string notr="true">-devCmdReply</string> </property> <property name="foreground"> <color> @@ -2686,23 +2689,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>LakeShore Temp. Controller</string> + <string>deviceCmdReply 1;deviceCmdReply 2;deviceCmdReply 3;deviceCmdReply 4;deviceCmdReply 5;deviceCmdReply 6;deviceCmdReply 7;deviceCmdReply 8</string> </property> <property name="files"> - <string>LakeShore.adl</string> + <string>deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl;deviceCmdReply.adl</string> </property> <property name="args"> - <string>P=xxx:,Q=TC1</string> + <string>P=xxx:,N=1;P=xxx:,N=2;P=xxx:,N=3;P=xxx:,N=4;P=xxx:,N=5;P=xxx:,N=6;P=xxx:,N=7;P=xxx:,N=8</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false;false;false;false;false;false;false;false</string> + </property> </widget> </item> - <item row="2" column="3"> - <widget class="caRelatedDisplay" name="carelateddisplay_64"> + <item row="0" column="1"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_25"> <property name="label"> - <string notr="true">-</string> + <string notr="true">- Acromag </string> </property> <property name="foreground"> <color> @@ -2719,23 +2725,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>1</string> + <string> Acromag 8 in; Acromag 8 out; Acromag 16 out; Acromag 16 in</string> </property> <property name="files"> - <string>1</string> + <string>Acromag_8in.adl;Acromag_8out.adl;Acromag_16out.adl;Acromag_16in.adl</string> </property> <property name="args"> - <string>1</string> + <string>P=xxx:,A=1,CH0=0,CH1=1,CH2=2,CH3=3,CH4=4,CH5=5,CH6=6,CH7=7;P=xxx:,A=1,CH0=0,CH1=1,CH2=2,CH3=3,CH4=4,CH5=5,CH6=6,CH7=7;P=xxx:,A=1;P=xxx:,A=1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false;false</string> + </property> </widget> </item> - <item row="3" column="2"> - <widget class="caRelatedDisplay" name="carelateddisplay_23"> + <item row="1" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_53"> <property name="label"> - <string notr="true">- ILM202 </string> + <string notr="true">-Serial 9-16</string> </property> <property name="foreground"> <color> @@ -2752,23 +2761,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Oxford ILM202 Cryogen Level Meter;</string> + <string>asyn record serial9;asyn record serial10;asyn record serial11;asyn record serial12;asyn record serial13;asyn record serial14;asyn record serial15;asyn record serial16</string> </property> <property name="files"> - <string>Oxford_ILM202.ui</string> + <string>asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl;asynOctet.adl</string> </property> <property name="args"> - <string>P=xxx:,S=s1</string> + <string>P=xxx:,R=asyn_9;P=xxx:,R=asyn_10;P=xxx:,R=asyn_11;P=xxx:,R=asyn_12;P=xxx:,R=asyn_13;P=xxx:,R=asyn_14;P=xxx:,R=asyn_15;P=xxx:,R=asyn_16</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false;false;false;false;false</string> + </property> </widget> </item> - <item row="3" column="1"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_41"> + <item row="0" column="4"> + <widget class="caRelatedDisplay" name="carelateddisplay_57"> <property name="label"> - <string notr="true">- Octupole </string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -2785,24 +2797,21 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>OctupoleRamp;temp</string> + <string>1</string> </property> <property name="files"> - <string>OctupoleRamp.adl;octupoleTempRead.adl</string> + <string>1</string> </property> <property name="args"> - <string>P=xxx:,Q=octupole:;P=xxx:,Q=Oct:</string> + <string>1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false</string> - </property> </widget> </item> - <item row="3" column="3"> - <widget class="caRelatedDisplay" name="carelateddisplay_18"> + <item row="1" column="4"> + <widget class="caRelatedDisplay" name="carelateddisplay_58"> <property name="label"> <string notr="true">-</string> </property> @@ -2820,15 +2829,24 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> + <property name="labels"> + <string>1</string> + </property> + <property name="files"> + <string>1</string> + </property> + <property name="args"> + <string>1</string> + </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="0" column="3"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_31"> + <item row="2" column="4"> + <widget class="caRelatedDisplay" name="carelateddisplay_59"> <property name="label"> - <string notr="true">- Io </string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -2845,27 +2863,21 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Io</string> + <string>1</string> </property> <property name="files"> - <string>Io.adl</string> + <string>1</string> </property> <property name="args"> - <string>P=xxx:Io:,S=xxx:scaler1,MONO=xxx:BraggEAO</string> - </property> - <property name="fontScaleMode" stdset="0"> - <enum>EPushButton::WidthAndHeight</enum> + <string>1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false</string> - </property> </widget> </item> <item row="3" column="4"> - <widget class="caRelatedDisplay" name="carelateddisplay_22"> + <widget class="caRelatedDisplay" name="carelateddisplay_60"> <property name="label"> <string notr="true">-</string> </property> @@ -2883,6 +2895,15 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> + <property name="labels"> + <string>1</string> + </property> + <property name="files"> + <string>1</string> + </property> + <property name="args"> + <string>1</string> + </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> @@ -2890,14 +2911,14 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </item> </layout> </widget> - <widget class="QWidget" name="tab_4"> + <widget class="QWidget" name="tab_5"> <property name="Fill" stdset="0"> <string>True</string> </property> <attribute name="title"> - <string> Detectors </string> + <string> Devices </string> </attribute> - <layout class="QGridLayout" name="gridLayout_4" rowstretch="1,1,1,1" columnstretch="1,1,1,1,1"> + <layout class="QGridLayout" name="gridLayout_3"> <property name="horizontalSpacing"> <number>10</number> </property> @@ -2907,10 +2928,10 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <property name="margin"> <number>10</number> </property> - <item row="2" column="2"> - <widget class="caRelatedDisplay" name="carelateddisplay_13"> + <item row="3" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_17"> <property name="label"> - <string notr="true">-</string> + <string notr="true">- Autocoll </string> </property> <property name="foreground"> <color> @@ -2926,15 +2947,27 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> + <property name="labels"> + <string>Autocollimator; </string> + </property> + <property name="files"> + <string>Elcomat.adl;Elcomat.adl</string> + </property> + <property name="args"> + <string>P=xxx:;P=xxx:</string> + </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false</string> + </property> </widget> </item> - <item row="2" column="1"> - <widget class="caRelatedDisplay" name="carelateddisplay_12"> + <item row="0" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_35"> <property name="label"> - <string notr="true">-</string> + <string notr="true">- Preamps </string> </property> <property name="foreground"> <color> @@ -2950,15 +2983,27 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> + <property name="labels"> + <string>SRS 570 Current Preamplifier #A1;SRS 570 Current Preamplifier #A2;SRS 570 Current Preamplifier #A3;SRS 570 Current Preamplifier #A4;SRS 570 Current Preamplifier #A5;Femto Current Preamplifier</string> + </property> + <property name="files"> + <string>SR570_tiny.adl;SR570_tiny.adl;SR570_tiny.adl;SR570_tiny.adl;SR570_tiny.adl;femto.adl</string> + </property> + <property name="args"> + <string>P=xxx:,A=A1;P=xxx:,A=A2;P=xxx:,A=A3;P=xxx:,A=A4;P=xxx:,A=A5;P=xxx:,H=fem01:,F=seq01:,AC=xxx:Unidig1Bo9</string> + </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false;false;false</string> + </property> </widget> </item> - <item row="2" column="3"> - <widget class="caRelatedDisplay" name="carelateddisplay_68"> + <item row="1" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_16"> <property name="label"> - <string notr="true">-</string> + <string notr="true">- Encoders </string> </property> <property name="foreground"> <color> @@ -2975,23 +3020,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>1</string> + <string>Heidenhain AWE1024;Heidenhain AWE1024;Heidenhain ND261;Heidenhain IK320</string> </property> <property name="files"> - <string>1</string> + <string>HeidEncoder.adl;HeidEncoder.adl;HeidND261.adl;HeidIK320_group.adl</string> </property> <property name="args"> - <string>1</string> + <string>P=xxx:, A=6;P=xxx:, A=7;P=xxx:;P=xxx:,card=card0,group=5</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false;false;false</string> + </property> </widget> </item> - <item row="1" column="3"> - <widget class="caRelatedDisplay" name="carelateddisplay_66"> + <item row="2" column="0"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_6"> <property name="label"> - <string notr="true">-</string> + <string notr="true">- HP Laser </string> </property> <property name="foreground"> <color> @@ -3008,28 +3056,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>1</string> + <string>HP Laser Axis 1;HP Laser Axis 2</string> </property> <property name="files"> - <string>1</string> + <string>HPLaserAxis.adl;HPLaserAxis.adl</string> </property> <property name="args"> - <string>1</string> + <string>P=xxx:,Q=HPLaser1;P=xxx:,Q=HPLaser2</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false</string> + </property> </widget> </item> - <item row="0" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_4"> - <property name="font"> - <font> - <family>Liberation Mono</family> - </font> - </property> + <item row="0" column="1"> + <widget class="caRelatedDisplay" name="carelateddisplay_24"> <property name="label"> - <string notr="true">- Scaler #1 </string> + <string notr="true">-Digitel Vac</string> </property> <property name="foreground"> <color> @@ -3046,24 +3092,21 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Scaler 1;Scaler 1 (16 ch);Scaler 1 (32 ch);Scaler 1 (64 ch);Scaler 1 modCalc</string> + <string>Digitel Pump</string> </property> <property name="files"> - <string>scaler16m.adl;scaler16.adl;scaler32.adl;scaler64.adl;scaler16m.adl</string> + <string>Pump.ui</string> </property> <property name="args"> - <string>P=xxx:,S=scaler1;P=xxx:,S=scaler1;P=xxx:,S=scaler1;P=xxx:,S=scaler1;P=xxx:,S=scaler1</string> + <string>P=xxx:,PUMP=ip1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false;false</string> - </property> </widget> </item> - <item row="3" column="0"> - <widget class="caRelatedDisplay" name="carelateddisplay_14"> + <item row="0" column="4"> + <widget class="caRelatedDisplay" name="carelateddisplay_17"> <property name="label"> <string notr="true">-</string> </property> @@ -3086,15 +3129,10 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </property> </widget> </item> - <item row="1" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_51"> - <property name="font"> - <font> - <family>Liberation Mono</family> - </font> - </property> + <item row="1" column="1"> + <widget class="caRelatedDisplay" name="carelateddisplay_21"> <property name="label"> - <string notr="true">- Scaler #2 </string> + <string notr="true">-MPC IonPump</string> </property> <property name="foreground"> <color> @@ -3111,24 +3149,21 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Scaler 2;Scaler 2 (16 ch);Scaler 2 (32 ch);Scaler 2 (64 ch);Scaler 2 modCalc</string> + <string>MPC Pump</string> </property> <property name="files"> - <string>scaler16m.adl;scaler16.adl;scaler32.adl;scaler64.adl;scaler16m.adl</string> + <string>Pump.ui</string> </property> <property name="args"> - <string>P=xxx:,S=scaler2;P=xxx:,S=scaler2;P=xxx:,S=scaler2;P=xxx:,S=scaler2;P=xxx:,S=scaler2</string> + <string>P=xxx:,PUMP=ip2</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false;false</string> - </property> </widget> </item> - <item row="3" column="1"> - <widget class="caRelatedDisplay" name="carelateddisplay_11"> + <item row="1" column="4"> + <widget class="caRelatedDisplay" name="carelateddisplay_63"> <property name="label"> <string notr="true">-</string> </property> @@ -3146,20 +3181,24 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> + <property name="labels"> + <string>1</string> + </property> + <property name="files"> + <string>1</string> + </property> + <property name="args"> + <string>1</string> + </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="2" column="0"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_52"> - <property name="font"> - <font> - <family>Liberation Mono</family> - </font> - </property> + <item row="2" column="1"> + <widget class="caRelatedDisplay" name="carelateddisplay_61"> <property name="label"> - <string notr="true">- Scaler #3 </string> + <string notr="true">-MPC TSPPump</string> </property> <property name="foreground"> <color> @@ -3176,26 +3215,23 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Scaler 3;Scaler 3 (16 ch);Scaler 3 (32 ch);Scaler 3 (64 ch);Scaler 3 modCalc</string> + <string>MPC TSP Pump</string> </property> <property name="files"> - <string>scaler16m.adl;scaler16.adl;scaler32.adl;scaler64.adl;scaler16m.adl</string> + <string>Pump.ui</string> </property> <property name="args"> - <string>P=xxx:,S=scaler3;P=xxx:,S=scaler3;P=xxx:,S=scaler3;P=xxx:,S=scaler3;P=xxx:,S=scaler3</string> + <string>P=xxx:,PUMP=tsp1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false;false</string> - </property> </widget> </item> - <item row="0" column="1"> - <widget class="caRelatedDisplay" name="carelateddisplay_15"> + <item row="2" column="4"> + <widget class="caRelatedDisplay" name="carelateddisplay_62"> <property name="label"> - <string notr="true">- SIS3820 </string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -3212,23 +3248,23 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>SIS3820 Scaler8;SIS3820 Scaler32</string> + <string>1</string> </property> <property name="files"> - <string>scaler.ui;scaler32.ui</string> + <string>1</string> </property> <property name="args"> - <string>P=xxx:3820:,S=scaler1;P=xxx:3820:,S=scaler1</string> + <string>1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> </widget> </item> - <item row="3" column="3"> - <widget class="caRelatedDisplay" name="carelateddisplay_9"> + <item row="0" column="2"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_5"> <property name="label"> - <string notr="true">-</string> + <string notr="true">-Keithley 2K</string> </property> <property name="foreground"> <color> @@ -3244,15 +3280,27 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> + <property name="labels"> + <string>Keithley 2000 DMM #1;Keithley 2000 DMM #2;Keithley DMM (thermistors)</string> + </property> + <property name="files"> + <string>Keithley2kDMM_mf.adl;Keithley2kDMM_mf.adl;KeithleyDMM.adl</string> + </property> + <property name="args"> + <string>P=xxx:,Dmm=D1;P=xxx:,Dmm=D2;P=xxx:</string> + </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false;false</string> + </property> </widget> </item> - <item row="1" column="1"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_24"> + <item row="1" column="2"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_36"> <property name="label"> - <string notr="true">- SIS38XX </string> + <string notr="true">- Eurotherm </string> </property> <property name="foreground"> <color> @@ -3269,26 +3317,26 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>SIS38XX</string> + <string>Eurotherm;Eurotherm 2k</string> </property> <property name="files"> - <string>SIS38XX.adl</string> + <string>Eurotherm.adl;Eurotherm2k.adl</string> </property> <property name="args"> - <string>P=xxx:3820:</string> + <string>P=xxx:;P=xxx:,TC=1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> <property name="removeParent" stdset="0"> - <string>false</string> + <string>false;false;false;false</string> </property> </widget> </item> - <item row="0" column="4"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_19"> + <item row="1" column="3"> + <widget class="caRelatedDisplay" name="carelateddisplay_20"> <property name="label"> - <string notr="true">- MCA </string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -3304,27 +3352,15 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> - <property name="labels"> - <string>Canberra AIM Multichannel Analyzer;MCA with ROI's;ADC 1;TCA 1;HVPS 1;AMP 1;DSP 1;soft MCA</string> - </property> - <property name="files"> - <string>mca_small.adl;mca.adl;xxIcbAdc.adl;xxIcbTCA.adl;xxIcbHVPS.adl;xxIcbAmp.adl;dsp9660Gain.adl;mca_small.adl</string> - </property> - <property name="args"> - <string>P=xxx:,M=aim_adc1;P=xxx:,M=aim_adc1;P=xxx:,ADC=adc1;P=xxx:,TCA=tca1;P=xxx:,HVPS=hvps1;P=xxx:,AMP=amp1;P=xxx:,DSP=dsp1;P=xxx:,M=softMCA</string> - </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false</string> - </property> </widget> </item> - <item row="3" column="4"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_20"> + <item row="2" column="2"> + <widget class="caRelatedDisplay" name="carelateddisplay_19"> <property name="label"> - <string notr="true">- Four Step </string> + <string notr="true">- LakeShore </string> </property> <property name="foreground"> <color> @@ -3341,29 +3377,23 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>4-step measurement</string> + <string>LakeShore Temp. Controller</string> </property> <property name="files"> - <string>4step.adl</string> + <string>LakeShore.adl</string> </property> <property name="args"> - <string>P=xxx:</string> - </property> - <property name="fontScaleMode" stdset="0"> - <enum>EPushButton::WidthAndHeight</enum> + <string>P=xxx:,Q=TC1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false</string> - </property> </widget> </item> - <item row="1" column="4"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_23"> + <item row="2" column="3"> + <widget class="caRelatedDisplay" name="carelateddisplay_64"> <property name="label"> - <string notr="true">- multiMCA </string> + <string notr="true">-</string> </property> <property name="foreground"> <color> @@ -3380,31 +3410,23 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>3 element detector;summed spectrum (mca0);sum control;HV power supply</string> + <string>1</string> </property> <property name="files"> - <string>3element.adl;mca_small.adl;mcaSum3.adl;xxIcbHVPS.adl</string> + <string>1</string> </property> <property name="args"> - <string>P=xxx:med:;P=xxx:med:,M=mca0;P=xxx:med:;P=xxx:med:,HVPS=hvps1</string> + <string>1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false</string> - </property> </widget> </item> - <item row="0" column="2"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_43"> - <property name="font"> - <font> - <family>Candara</family> - </font> - </property> + <item row="3" column="2"> + <widget class="caRelatedDisplay" name="carelateddisplay_23"> <property name="label"> - <string notr="true">-simDetector</string> + <string notr="true">- ILM202 </string> </property> <property name="foreground"> <color> @@ -3421,26 +3443,23 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Simulator #1 General;Simulator #1 Specific;Simulator #2 General;Simulator #2 Specific;AD Top (prebuilts);Simulator #1 Image;Simulator #2 Image</string> + <string>Oxford ILM202 Cryogen Level Meter;</string> </property> <property name="files"> - <string>ADBase.adl;simDetector.adl;ADBase.adl;simDetector.adl;ADTop;ad_cam_image.ui;ad_cam_image.ui</string> + <string>Oxford_ILM202.ui</string> </property> <property name="args"> - <string>P=xxx:, R=SIM1:cam1:;P=xxx:, R=SIM1:cam1:;P=xxx:, R=SIM1:cam2:;P=xxx:, R=SIM1:cam2:;;P=13SIM1:, R=cam1:;P=13SIM1:, R=cam2:</string> + <string>P=xxx:,S=s1</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false</string> - </property> </widget> </item> - <item row="0" column="3"> - <widget class="caRelatedDisplay" name="caRelatedDisplay_26"> + <item row="3" column="1"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_41"> <property name="label"> - <string notr="true">- quadEM </string> + <string notr="true">- Octupole </string> </property> <property name="foreground"> <color> @@ -3457,24 +3476,24 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Quad Electrometer Ch.1;Quad Electrometer Ch.2;Quad Electrometer Ch.3;Quad Electrometer Ch.4;Quad Electrometer MCAs;Vertical feedback;Horizontal feedback</string> + <string>OctupoleRamp;temp</string> </property> <property name="files"> - <string>quadEM.adl;quadEM.adl;quadEM.adl;quadEM.adl;quadEM_med.adl;pid_control.adl;pid_control.adl</string> + <string>OctupoleRamp.adl;octupoleTempRead.adl</string> </property> <property name="args"> - <string>P=xxx:,EM=EM1;P=xxx:,EM=EM2;P=xxx:,EM=EM3;P=xxx:,EM=EM4;P=xxx:quadEM:, P_FFT=xxx:quadEM_FFT:;P=xxx:, PID=quadEMVertical,TITLE=Vertical_Feedback;P=xxx:, PID=quadEMHorizontal,TITLE=Horizontal_Feedback</string> + <string>P=xxx:,Q=octupole:;P=xxx:,Q=Oct:</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false</string> + <string>false;false</string> </property> </widget> </item> - <item row="3" column="2"> - <widget class="caRelatedDisplay" name="carelateddisplay_10"> + <item row="3" column="3"> + <widget class="caRelatedDisplay" name="carelateddisplay_18"> <property name="label"> <string notr="true">-</string> </property> @@ -3497,10 +3516,10 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </property> </widget> </item> - <item row="1" column="2"> - <widget class="caRelatedDisplay" name="carelateddisplay_67"> + <item row="0" column="3"> + <widget class="caRelatedDisplay" name="caRelatedDisplay_31"> <property name="label"> - <string notr="true">- Oxford X1k</string> + <string notr="true">- Io </string> </property> <property name="foreground"> <color> @@ -3517,21 +3536,27 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>Oxford x1k</string> + <string>Io</string> </property> <property name="files"> - <string>Oxford_X1k.ui</string> + <string>Io.adl</string> </property> <property name="args"> - <string>P=xxx:,S=s1</string> + <string>P=xxx:Io:,S=xxx:scaler1,MONO=xxx:BraggEAO</string> + </property> + <property name="fontScaleMode"> + <enum>EPushButton::WidthAndHeight</enum> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> + <property name="removeParent" stdset="0"> + <string>false</string> + </property> </widget> </item> - <item row="2" column="4"> - <widget class="caRelatedDisplay" name="carelateddisplay_65"> + <item row="3" column="4"> + <widget class="caRelatedDisplay" name="carelateddisplay_22"> <property name="label"> <string notr="true">-</string> </property> @@ -3549,15 +3574,6 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>0</blue> </color> </property> - <property name="labels"> - <string>1</string> - </property> - <property name="files"> - <string>1</string> - </property> - <property name="args"> - <string>1</string> - </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> </property> @@ -3682,7 +3698,7 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <property name="args"> <string>P=xxx:,Q=fgen</string> </property> - <property name="fontScaleMode" stdset="0"> + <property name="fontScaleMode"> <enum>EPushButton::WidthAndHeight</enum> </property> <property name="stackingMode" stdset="0"> @@ -4009,7 +4025,7 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <property name="args"> <string>P=xxx:;P=xxx:;P=xxx:,N=1;P=xxx:,Q=1</string> </property> - <property name="fontScaleMode" stdset="0"> + <property name="fontScaleMode"> <enum>EPushButton::WidthAndHeight</enum> </property> <property name="stackingMode" stdset="0"> @@ -4299,7 +4315,7 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <verstretch>0</verstretch> </sizepolicy> </property> - <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,1,1"> + <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,1"> <property name="spacing"> <number>10</number> </property> @@ -4371,13 +4387,13 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </color> </property> <property name="labels"> - <string>1 BM BPM info;1 ID BPM info;1 ID basic control;1 ID sync-scan control;new ID control;new ID control (us);24 hr. Beam History;24 hr. beam history, etc.</string> + <string notr="true">24 hr. Beam History;24 hr. beam history, etc.</string> </property> <property name="files"> - <string>xx_BM_BPM.adl;xx_ID_BPM.adl;IDControl.adl;IDSyncScan.adl;xxIDCtrl.adl;xxIDCtrl.adl;beamHistory.adl;beamHistory_full.adl</string> + <string notr="true">beamHistory.adl;beamHistory_full.adl</string> </property> <property name="args"> - <string>xx=28us;xx=28us;ID=28us;ID=28us;P=xxx:,xx=28;P=xxx:,xx=28us;P=xxx:,xx=28us;P=xxx:,xx=28us</string> + <string notr="true">P=xxx:,xx=28us;P=xxx:,xx=28us</string> </property> <property name="stackingMode" stdset="0"> <enum>caRowColMenu::Menu</enum> @@ -4387,42 +4403,6 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </property> </widget> </item> - <item> - <widget class="caRelatedDisplay" name="caRelatedDisplay_48"> - <property name="label"> - <string>-test</string> - </property> - <property name="foreground"> - <color> - <red>228</red> - <green>228</green> - <blue>228</blue> - </color> - </property> - <property name="background"> - <color> - <red>53</red> - <green>132</green> - <blue>0</blue> - </color> - </property> - <property name="labels"> - <string>CR74x;fieldVector;selector;beamEnergy;muir;tomography fly;hexFly;rock;Ensemble PSO Fly;calcTest;interlaceFly;compressGain;tablePSOFly;Security Control;waveformTypes menu</string> - </property> - <property name="files"> - <string>CR74x.adl;fieldVector.adl;selector.adl;beamEnergy.adl;yySseq.adl;tomoFly.adl;hexFly.adl;rock.adl;EnsemblePSOFly.adl;calcTest.adl;interlaceFly.adl;compress.adl;tablePSOFly.adl;Security_Control.adl;configMenu.adl</string> - </property> - <property name="args"> - <string>P=xxx:,Q=test:;P=4idc2:,Q=8p:;P=xxx:,R=obj;P=xxx:;P=xxx:,S=PresetHistoryAdd;P=xxx:,Q=tomoFly:;P=xxx:,Q=hexFly:;P=xxx:,Q=rock:;P=xxx:,Q=PSOFly:;P=xxx:;P=xxx:,Q=iFly:,QT=tableFly:;P=xxx:,Q=gain;P=xxx:,Q=tableFly:;P=xxx:;P=xxx:,CONFIG=waveformTypes</string> - </property> - <property name="stackingMode" stdset="0"> - <enum>caRowColMenu::Menu</enum> - </property> - <property name="removeParent" stdset="0"> - <string>false;false;false;false;false;false;false;false;false;false;false;false;false;false;false</string> - </property> - </widget> - </item> </layout> </widget> </item> @@ -4443,11 +4423,20 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <height>25</height> </rect> </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="font"> <font> - <pointsize>13</pointsize> + <pointsize>17</pointsize> </font> </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> <property name="text"> <string>Moving</string> </property> @@ -4471,9 +4460,6 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>184</blue> </color> </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> <property name="visibility"> <enum>caLabel::IfZero</enum> </property> @@ -4492,9 +4478,12 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> </property> <property name="font"> <font> - <pointsize>13</pointsize> + <pointsize>17</pointsize> </font> </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> <property name="text"> <string>Moving</string> </property> @@ -4518,9 +4507,6 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>184</blue> </color> </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> <property name="visibility"> <enum>caLabel::IfNotZero</enum> </property> @@ -4537,6 +4523,9 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <height>25</height> </rect> </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> <property name="text"> <string>Moving</string> </property> @@ -4560,9 +4549,6 @@ QWidget[Fill="True"] { background: rgba(0,0,0,0); }</string> <blue>255</blue> </color> </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> <property name="visibility"> <enum>caLabel::IfZero</enum> </property>