fixed bugs to do with stacked trace and fixed file input range for scan

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@22 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-08-03 16:52:21 +00:00
parent 63f9d04981
commit 2dbdf8ff17
19 changed files with 885 additions and 326 deletions

View File

@ -62,19 +62,47 @@
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<property name="horizontalSpacing">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>5</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QRadioButton" name="radioConstant">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QRadioButton" name="radioRange">
<property name="toolTip">
<string/>
</property>
<property name="text">
<string>Constant Step Size</string>
</property>
@ -84,7 +112,11 @@
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioSpecific">
<widget class="QRadioButton" name="radioCustom">
<property name="toolTip">
<string>&lt;nobr&gt;Measures only at specific values listed by the user.&lt;/nobr&gt;&lt;br&gt;
&lt;nobr&gt;Number of entries is restricted to &lt;b&gt;Number of Steps&lt;/b&gt; field.&lt;/nobr&gt;</string>
</property>
<property name="text">
<string>Specific Values</string>
</property>
@ -94,13 +126,17 @@
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioValue">
<widget class="QRadioButton" name="radioFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;Measures only at the specific values listed in a file.&lt;/nobr&gt;&lt;br&gt;
&lt;nobr&gt;Select the file, where these values are listed.&lt;/nobr&gt;</string>
</property>
<property name="text">
<string>Values from File</string>
</property>
@ -109,6 +145,22 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0">
@ -283,13 +335,13 @@
</sizepolicy>
</property>
<property name="minimum">
<number>1</number>
<number>0</number>
</property>
<property name="maximum">
<number>1000000</number>
</property>
<property name="value">
<number>2</number>
<number>0</number>
</property>
</widget>
</item>

View File

@ -55,6 +55,10 @@
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QCheckBox" name="chkFlatField">
<property name="toolTip">
<string>Flat field corrections.
#flatfield# filename</string>
</property>
<property name="text">
<string>Flat Field File:</string>
</property>
@ -81,6 +85,10 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Flat field corrections.
#flatfield# filename</string>
</property>
</widget>
</item>
<item row="1" column="0">
@ -219,6 +227,10 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Flat field corrections.
#flatfield# filename</string>
</property>
<property name="text">
<string>Browse</string>
</property>
@ -236,6 +248,9 @@
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="chkAngular">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Angular Conversion</string>
</property>
@ -299,56 +314,6 @@
</layout>
</widget>
</widget>
<widget class="QLabel" name="lblNote">
<property name="geometry">
<rect>
<x>245</x>
<y>327</y>
<width>256</width>
<height>16</height>
</rect>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>193</red>
<green>193</green>
<blue>193</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="text">
<string>* Note: Enter valid file to enable Flat Field.</string>
</property>
</widget>
</widget>
<resources/>
<connections/>

View File

@ -427,13 +427,6 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Timing Mode:</string>
</property>
</widget>
</item>
<item row="0" column="2" colspan="2">
<widget class="QComboBox" name="comboTimingMode">
<property name="sizePolicy">
@ -632,6 +625,10 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Frame period between exposures.
#period#</string>
</property>
<property name="text">
<string>Acquisition Period:</string>
</property>
@ -731,6 +728,13 @@
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lblTimingMode">
<property name="text">
<string>Timing Mode:</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
@ -873,56 +877,6 @@
</layout>
</widget>
</widget>
<widget class="QLabel" name="lblNote">
<property name="geometry">
<rect>
<x>130</x>
<y>330</y>
<width>521</width>
<height>16</height>
</rect>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>193</red>
<green>193</green>
<blue>193</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="text">
<string>* Note: The Acquisition Period should be greater than or equal to the Exposure Time.</string>
</property>
</widget>
</widget>
<resources/>
<connections/>

View File

@ -196,7 +196,7 @@
<rect>
<x>10</x>
<y>20</y>
<width>358</width>
<width>356</width>
<height>26</height>
</rect>
</property>
@ -220,7 +220,7 @@
<item row="0" column="3">
<widget class="QCheckBox" name="checkBox">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -236,7 +236,7 @@
<item row="0" column="4">
<widget class="QCheckBox" name="checkBox_2">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -380,7 +380,7 @@
<item>
<widget class="QCheckBox" name="chkAutoFName">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -412,7 +412,7 @@
<item>
<widget class="QCheckBox" name="chkSaveAll">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -1458,7 +1458,7 @@
<item row="0" column="4">
<widget class="QPushButton" name="btnCloseClones_2">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">