This commit is contained in:
2019-07-04 16:40:25 +02:00
parent 6a60f7d222
commit c582ba15d5
16 changed files with 421 additions and 250 deletions

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>775</width>
<height>345</height>
<width>819</width>
<height>377</height>
</rect>
</property>
<property name="sizePolicy">
@ -48,7 +48,7 @@
<enum>QTabWidget::North</enum>
</property>
<property name="currentIndex">
<number>0</number>
<number>4</number>
</property>
<property name="elideMode">
<enum>Qt::ElideLeft</enum>
@ -80,7 +80,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>450</width>
<width>550</width>
<height>20</height>
</size>
</property>
@ -95,6 +95,12 @@
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="spinSetAllTrimbits">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="minimum">
<number>-1</number>
</property>
@ -109,12 +115,12 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>190</height>
<height>250</height>
</size>
</property>
</spacer>
@ -273,8 +279,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>735</width>
<height>235</height>
<width>779</width>
<height>267</height>
</rect>
</property>
<layout class="QGridLayout" name="gridRoi">
@ -306,7 +312,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -342,7 +348,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="maximumSize">
@ -392,7 +398,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -400,7 +406,7 @@
#rx_udpip#</string>
</property>
<property name="text">
<string>none</string>
<string>0</string>
</property>
</widget>
</item>
@ -415,7 +421,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -423,7 +429,7 @@
#rx_udpmac#</string>
</property>
<property name="text">
<string>none</string>
<string>0</string>
</property>
</widget>
</item>
@ -457,7 +463,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -465,7 +471,7 @@
#detectormac#</string>
</property>
<property name="text">
<string/>
<string>0</string>
</property>
</widget>
</item>
@ -480,7 +486,7 @@
<property name="minimumSize">
<size>
<width>127</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -524,7 +530,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -532,7 +538,7 @@
#online#</string>
</property>
<property name="text">
<string/>
<string>Offline</string>
</property>
<property name="readOnly">
<bool>true</bool>
@ -550,7 +556,7 @@
<property name="minimumSize">
<size>
<width>127</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -620,7 +626,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -628,7 +634,7 @@
#detectorip#</string>
</property>
<property name="text">
<string/>
<string>0</string>
</property>
</widget>
</item>
@ -643,7 +649,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -713,7 +719,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -770,7 +776,7 @@
<property name="minimumSize">
<size>
<width>127</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -814,7 +820,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -822,7 +828,7 @@
#rx_udpip#</string>
</property>
<property name="text">
<string/>
<string>0</string>
</property>
</widget>
</item>
@ -844,9 +850,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<width>60</width>
<height>20</height>
</size>
</property>
@ -863,7 +872,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -871,7 +880,7 @@
#r_online#</string>
</property>
<property name="text">
<string/>
<string>Offline</string>
</property>
<property name="readOnly">
<bool>true</bool>
@ -902,7 +911,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
</widget>
@ -1002,7 +1011,7 @@
<property name="minimumSize">
<size>
<width>180</width>
<height>0</height>
<height>25</height>
</size>
</property>
<property name="toolTip">
@ -1010,7 +1019,7 @@
#detectorip#</string>
</property>
<property name="text">
<string/>
<string>0</string>
</property>
</widget>
</item>
@ -1069,7 +1078,7 @@
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1090,6 +1099,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of additional storage cells. For Jungfrau only. &lt;/p&gt;&lt;p&gt;Default: 0. &lt;/p&gt;&lt;p&gt;Number of Images received: #frames * #cycles * (#storagecells+1) &lt;/p&gt;&lt;p&gt; #storagecells#&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
@ -1130,6 +1145,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Exposure Time of a sub frame. Only for Eiger in 32 bit mode
@ -1187,6 +1208,12 @@ Default value is 0. A value less than the required minimum is ignored.
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Period between sub frames. Only for Eiger in 32 bit mode.
@ -1244,6 +1271,12 @@ Exposure Time of a sub frame. Only for Eiger in 32 bit mode
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Period between sub frames. Only for Eiger in 32 bit mode.
@ -1302,6 +1335,12 @@ Default value is 0. A value less than the required minimum is ignored.
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Exposure Time of a sub frame. Only for Eiger in 32 bit mode
@ -1369,6 +1408,36 @@ Exposure Time of a sub frame. Only for Eiger in 32 bit mode
</item>
</layout>
</widget>
<tabstops>
<tabstop>tabAdvancedSettings</tabstop>
<tabstop>spinSetAllTrimbits</tabstop>
<tabstop>btnAddRoi</tabstop>
<tabstop>btnSetRoi</tabstop>
<tabstop>btnGetRoi</tabstop>
<tabstop>btnClearRoi</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>comboDetector</tabstop>
<tabstop>dispOnline</tabstop>
<tabstop>spinControlPort</tabstop>
<tabstop>spinStopPort</tabstop>
<tabstop>dispDetectorUDPIP</tabstop>
<tabstop>dispDetectorUDPMAC</tabstop>
<tabstop>spinZMQPort</tabstop>
<tabstop>dispZMQIP</tabstop>
<tabstop>dispRxrHostname</tabstop>
<tabstop>dispRxrOnline</tabstop>
<tabstop>spinRxrTCPPort</tabstop>
<tabstop>spinRxrUDPPort</tabstop>
<tabstop>dispRxrUDPIP</tabstop>
<tabstop>dispRxrUDPMAC</tabstop>
<tabstop>spinRxrZMQPort</tabstop>
<tabstop>dispRxrZMQIP</tabstop>
<tabstop>spinNumStoragecells</tabstop>
<tabstop>spinSubExpTime</tabstop>
<tabstop>comboSubExpTimeUnit</tabstop>
<tabstop>spinSubDeadTime</tabstop>
<tabstop>comboSubDeadTimeUnit</tabstop>
</tabstops>
<resources>
<include location="../include/icons.qrc"/>
</resources>

View File

@ -718,6 +718,21 @@ Compression using Root. Available only for Gotthard in Expert Mode.
</item>
</layout>
</widget>
<tabstops>
<tabstop>comboDetector</tabstop>
<tabstop>dispOutputDir</tabstop>
<tabstop>btnOutputBrowse</tabstop>
<tabstop>comboFileFormat</tabstop>
<tabstop>chkOverwriteEnable</tabstop>
<tabstop>chkTenGiga</tabstop>
<tabstop>chkRate</tabstop>
<tabstop>radioDefaultDeadtime</tabstop>
<tabstop>radioCustomDeadtime</tabstop>
<tabstop>spinCustomDeadTime</tabstop>
<tabstop>comboEigerClkDivider</tabstop>
<tabstop>comboEigerFlags1</tabstop>
<tabstop>comboEigerFlags2</tabstop>
</tabstops>
<resources>
<include location="../include/icons.qrc"/>
</resources>

View File

@ -176,20 +176,40 @@
<number>18</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Current Frame: </string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Current Measurement:</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Current Frame: </string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="lblCurrentFrame">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="lblCurrentMeasurement">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@ -211,26 +231,6 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="lblCurrentFrame">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="value">
<number>24</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@ -1047,6 +1047,22 @@ Frame period between exposures.
</item>
</layout>
</widget>
<tabstops>
<tabstop>chkFile</tabstop>
<tabstop>dispFileName</tabstop>
<tabstop>spinIndex</tabstop>
<tabstop>comboTimingMode</tabstop>
<tabstop>spinNumMeasurements</tabstop>
<tabstop>spinNumFrames</tabstop>
<tabstop>spinExpTime</tabstop>
<tabstop>comboExpUnit</tabstop>
<tabstop>spinPeriod</tabstop>
<tabstop>comboPeriodUnit</tabstop>
<tabstop>spinNumTriggers</tabstop>
<tabstop>spinDelay</tabstop>
<tabstop>comboDelayUnit</tabstop>
<tabstop>spinNumSamples</tabstop>
</tabstops>
<resources>
<include location="../include/icons.qrc"/>
</resources>

View File

@ -2550,6 +2550,57 @@ Streaming Interval between 2 plots. Default is time interval with 200 ms.
<zorder>boxPlotAxis</zorder>
<zorder>boxSnapshot</zorder>
</widget>
<tabstops>
<tabstop>radioNoPlot</tabstop>
<tabstop>radioDataGraph</tabstop>
<tabstop>comboFrequency</tabstop>
<tabstop>spinTimeGap</tabstop>
<tabstop>comboTimeGapUnit</tabstop>
<tabstop>chkPedestal</tabstop>
<tabstop>chkInterpolate</tabstop>
<tabstop>chkContour</tabstop>
<tabstop>chkLogz</tabstop>
<tabstop>chkTitle</tabstop>
<tabstop>dispTitle</tabstop>
<tabstop>chkAspectRatio</tabstop>
<tabstop>chkXAxis</tabstop>
<tabstop>dispXAxis</tabstop>
<tabstop>chkXMin</tabstop>
<tabstop>dispXMin</tabstop>
<tabstop>chkXMax</tabstop>
<tabstop>dispXMax</tabstop>
<tabstop>chkYAxis</tabstop>
<tabstop>dispYAxis</tabstop>
<tabstop>chkYMin</tabstop>
<tabstop>dispYMin</tabstop>
<tabstop>chkYMax</tabstop>
<tabstop>dispYMax</tabstop>
<tabstop>chkZAxis</tabstop>
<tabstop>dispZAxis</tabstop>
<tabstop>chkZMin</tabstop>
<tabstop>dispZMin</tabstop>
<tabstop>chkZMax</tabstop>
<tabstop>dispZMax</tabstop>
<tabstop>spinTo_2</tabstop>
<tabstop>chkStatistics_2</tabstop>
<tabstop>chkGainPlot</tabstop>
<tabstop>chkGapPixels</tabstop>
<tabstop>chkSuperimpose</tabstop>
<tabstop>spinPersistency</tabstop>
<tabstop>chk1DLog</tabstop>
<tabstop>chkPoints</tabstop>
<tabstop>chkLines</tabstop>
<tabstop>chkAccumulate</tabstop>
<tabstop>spinFrom_2</tabstop>
<tabstop>chkBinary</tabstop>
<tabstop>spinFrom</tabstop>
<tabstop>spinTo</tabstop>
<tabstop>chkStatistics</tabstop>
<tabstop>chkAccumulate_2</tabstop>
<tabstop>spinNthFrame</tabstop>
<tabstop>chkPedestal_2</tabstop>
<tabstop>chkBinary_2</tabstop>
</tabstops>
<resources>
<include location="../include/icons.qrc"/>
</resources>

View File

@ -274,6 +274,11 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>comboSettings</tabstop>
<tabstop>spinThreshold</tabstop>
<tabstop>comboDynamicRange</tabstop>
</tabstops>
<resources>
<include location="../include/icons.qrc"/>
</resources>