detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

small changes from the meeting

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui@9 af1100a4-978c-4157-bff7-07162d2ba061
This commit is contained in:
l_maliakal_d
2012-06-08 10:21:30 +00:00
parent ef41286bf0
commit 2b02f94fe3
11 changed files with 442 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
slsDetectorGui/forms/form_detectormain.ui
View File

@ -10,7 +10,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>800</height> <height>848</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -137,134 +137,6 @@
<addaction name="menuModes"/> <addaction name="menuModes"/>
<addaction name="menuHelp"/> <addaction name="menuHelp"/>
</widget> </widget>
<widget class="QDockWidget" name="dockWidgetTerminal">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>38</width>
<height>200</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>524287</width>
<height>390</height>
</size>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>119</red>
<green>119</green>
<blue>119</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="toolTip">
<string>Undock, move and enlarge the window to use it</string>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="features">
<set>QDockWidget::DockWidgetVerticalTitleBar</set>
</property>
<property name="allowedAreas">
<set>Qt::BottomDockWidgetArea|Qt::RightDockWidgetArea</set>
</property>
<property name="windowTitle">
<string>SLS Detector Terminal</string>
</property>
<attribute name="dockWidgetArea">
<number>2</number>
</attribute>
<widget class="QWidget" name="dockWidgetContentsTerminal">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>119</red>
<green>119</green>
<blue>119</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
</widget>
</widget>
<widget class="QDockWidget" name="dockWidgetPlot"> <widget class="QDockWidget" name="dockWidgetPlot">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>

117
slsDetectorGui/forms/form_tab_dataoutput.ui
View File

@ -74,62 +74,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" colspan="4"> <item row="0" column="3" colspan="5">
<widget class="QLineEdit" name="lineEdit_2"/> <widget class="QLineEdit" name="lineEdit_2"/>
</item> </item>
<item row="0" column="7">
<widget class="QPushButton" name="pushButton_3">
<property name="text">
<string>Acquire Flat Field Data</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QRadioButton" name="radioButton_3">
<property name="text">
<string>Auto</string>
</property>
</widget>
</item>
<item row="1" column="7">
<widget class="QSpinBox" name="spinBox"/>
</item>
<item row="0" column="6">
<widget class="QPushButton" name="pushButton_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
<item row="1" column="5" colspan="2">
<widget class="QRadioButton" name="radioButton">
<property name="text">
<string>Custom dead time(ns):</string>
</property>
</widget>
</item>
<item row="1" column="3">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QCheckBox" name="checkBox_5"> <widget class="QCheckBox" name="checkBox_5">
<property name="text"> <property name="text">
@ -157,6 +104,68 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="8">
<widget class="QPushButton" name="pushButton_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QRadioButton" name="radioButton_3">
<property name="text">
<string>Auto</string>
</property>
</widget>
</item>
<item row="1" column="4">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="5">
<widget class="QRadioButton" name="radioButton">
<property name="text">
<string>Custom dead time(ns):</string>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QSpinBox" name="spinBox"/>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

84
slsDetectorGui/forms/form_tab_measurement.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>718</width> <width>775</width>
<height>339</height> <height>345</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -25,7 +25,7 @@
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>1000</width> <width>1000</width>
<height>339</height> <height>345</height>
</size> </size>
</property> </property>
<property name="palette"> <property name="palette">
@ -152,7 +152,7 @@
<widget class="QGroupBox" name="boxProgress"> <widget class="QGroupBox" name="boxProgress">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>30</x>
<y>179</y> <y>179</y>
<width>319</width> <width>319</width>
<height>90</height> <height>90</height>
@ -213,7 +213,7 @@
<widget class="QPushButton" name="btnStartStop"> <widget class="QPushButton" name="btnStartStop">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>30</x>
<y>289</y> <y>289</y>
<width>319</width> <width>319</width>
<height>31</height> <height>31</height>
@ -238,7 +238,7 @@
<widget class="QFrame" name="frameTimeResolved"> <widget class="QFrame" name="frameTimeResolved">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>352</x> <x>390</x>
<y>8</y> <y>8</y>
<width>362</width> <width>362</width>
<height>342</height> <height>342</height>
@ -330,6 +330,9 @@
<string>Frame period between exposures. <string>Frame period between exposures.
#period#</string> #period#</string>
</property> </property>
<property name="decimals">
<number>9</number>
</property>
<property name="maximum"> <property name="maximum">
<double>2000000000.000000000000000</double> <double>2000000000.000000000000000</double>
</property> </property>
@ -595,7 +598,7 @@
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="lblExpTime"> <widget class="QLabel" name="lblExpTime">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>Exposure Time:</string> <string>Exposure Time:</string>
@ -605,7 +608,7 @@
<item row="2" column="2"> <item row="2" column="2">
<widget class="QDoubleSpinBox" name="spinExpTime"> <widget class="QDoubleSpinBox" name="spinExpTime">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -617,18 +620,24 @@
<string>Exposure time of each frame. <string>Exposure time of each frame.
#exptime#</string> #exptime#</string>
</property> </property>
<property name="decimals">
<number>9</number>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum"> <property name="maximum">
<double>2000000000.000000000000000</double> <double>2000000000.000000000000000</double>
</property> </property>
<property name="value"> <property name="value">
<double>0.000000000000000</double> <double>1.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3"> <item row="2" column="3">
<widget class="QComboBox" name="comboExpUnit"> <widget class="QComboBox" name="comboExpUnit">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -696,6 +705,9 @@
<string>Frame period between exposures. <string>Frame period between exposures.
#period#</string> #period#</string>
</property> </property>
<property name="decimals">
<number>9</number>
</property>
<property name="maximum"> <property name="maximum">
<double>2000000000.000000000000000</double> <double>2000000000.000000000000000</double>
</property> </property>
@ -772,7 +784,7 @@
<widget class="QFrame" name="frameNotTimeResolved"> <widget class="QFrame" name="frameNotTimeResolved">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>20</x>
<y>5</y> <y>5</y>
<width>336</width> <width>336</width>
<height>159</height> <height>159</height>
@ -902,6 +914,56 @@
</layout> </layout>
</widget> </widget>
</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> </widget>
<resources/> <resources/>
<connections/> <connections/>

210
slsDetectorGui/forms/form_tab_plot.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>734</width> <width>775</width>
<height>345</height> <height>345</height>
</rect> </rect>
</property> </property>
@ -35,9 +35,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>130</y> <y>135</y>
<width>711</width> <width>751</width>
<height>146</height> <height>141</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
@ -53,8 +53,8 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>20</y> <y>15</y>
<width>691</width> <width>731</width>
<height>121</height> <height>121</height>
</rect> </rect>
</property> </property>
@ -288,9 +288,9 @@
<widget class="QGroupBox" name="box2D"> <widget class="QGroupBox" name="box2D">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>11</x> <x>150</x>
<y>70</y> <y>70</y>
<width>571</width> <width>466</width>
<height>46</height> <height>46</height>
</rect> </rect>
</property> </property>
@ -306,15 +306,21 @@
<widget class="QWidget" name="gridLayoutWidget_5"> <widget class="QWidget" name="gridLayoutWidget_5">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>8</x> <x>10</x>
<y>20</y> <y>20</y>
<width>551</width> <width>451</width>
<height>22</height> <height>22</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="chkInterpolate"> <widget class="QCheckBox" name="chkInterpolate">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Interpolate</string> <string>Interpolate</string>
</property> </property>
@ -322,6 +328,12 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QCheckBox" name="chkContour"> <widget class="QCheckBox" name="chkContour">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Contour</string> <string>Contour</string>
</property> </property>
@ -329,6 +341,12 @@
</item> </item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QCheckBox" name="chkLogz"> <widget class="QCheckBox" name="chkLogz">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Log Scale (Z)</string> <string>Log Scale (Z)</string>
</property> </property>
@ -339,9 +357,12 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>210</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
@ -353,9 +374,9 @@
<widget class="QGroupBox" name="box1D"> <widget class="QGroupBox" name="box1D">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>150</x>
<y>10</y> <y>10</y>
<width>571</width> <width>466</width>
<height>46</height> <height>46</height>
</rect> </rect>
</property> </property>
@ -491,7 +512,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>20</y> <y>20</y>
<width>641</width> <width>371</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>
@ -503,10 +524,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="5">
<widget class="QPushButton" name="btnClear"> <widget class="QPushButton" name="btnClear">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -519,7 +540,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="0" column="6">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -529,7 +550,71 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>400</width> <width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="3">
<widget class="QSpinBox" name="spinBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Persistency:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>5</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="4">
<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>10</height> <height>10</height>
</size> </size>
</property> </property>
@ -537,20 +622,18 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<zorder>gridLayoutWidget_3</zorder>
<zorder>groupBox_2</zorder>
</widget> </widget>
<widget class="QGroupBox" name="boxSave"> <widget class="QGroupBox" name="boxSave">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>290</y> <y>290</y>
<width>711</width> <width>751</width>
<height>51</height> <height>51</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
<string>Save</string> <string>Save Image</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -563,7 +646,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>15</y> <y>15</y>
<width>698</width> <width>741</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
@ -676,14 +759,14 @@
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>599</x> <x>655</x>
<y>10</y> <y>10</y>
<width>121</width> <width>106</width>
<height>81</height> <height>101</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
<string>Clone</string> <string>Snapshot</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -695,25 +778,28 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>5</x> <x>5</x>
<y>10</y> <y>19</y>
<width>111</width> <width>101</width>
<height>76</height> <height>76</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="topMargin"> <property name="horizontalSpacing">
<number>9</number> <number>28</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>-1</number> <number>8</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QPushButton" name="btnClone"> <widget class="QPushButton" name="btnClone">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -722,14 +808,14 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="text"> <property name="text">
<string>Clone Plot</string> <string>Create</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QPushButton" name="btnCloseClones"> <widget class="QPushButton" name="btnCloseClones">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -745,6 +831,54 @@
</layout> </layout>
</widget> </widget>
</widget> </widget>
<widget class="QGroupBox" name="groupBox_3">
<property name="enabled">
<bool>true</bool>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>106</width>
<height>101</height>
</rect>
</property>
<property name="title">
<string>Plot Arguments</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="flat">
<bool>false</bool>
</property>
<widget class="QWidget" name="gridLayoutWidget_4">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>91</width>
<height>44</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QCheckBox" name="chktest1D_2">
<property name="text">
<string>None</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="chktest1D_3">
<property name="text">
<string>Data Graph</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>

41
slsDetectorGui/forms/form_tab_settings.ui
View File

@ -36,8 +36,8 @@
<rect> <rect>
<x>13</x> <x>13</x>
<y>16</y> <y>16</y>
<width>227</width> <width>311</width>
<height>47</height> <height>151</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
@ -107,6 +107,43 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Threshold:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="spinBox">
<property name="minimum">
<number>-1</number>
</property>
<property name="value">
<number>-1</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Number of Modules:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Dynamic Range:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="comboBox"/>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="spinBox_2"/>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

19
slsDetectorGui/include/qDefs.h
View File

@ -8,6 +8,9 @@
#ifndef QDEFS_H #ifndef QDEFS_H
#define QDEFS_H #define QDEFS_H
#include <iostream>
using namespace std;
class qDefs class qDefs
{ {
public: public:
@ -32,18 +35,18 @@ public:
* @param value time * @param value time
* returns time value in ns * returns time value in ns
*/ */
static int64_t get64bTime(timeUnit unit, double value){ static float getNSTime(timeUnit unit, float value){
int64_t value64=value; float valueNS=value;
switch(unit){ switch(unit){
case HOURS: value64*=60; case HOURS: valueNS*=60;
case MINUTES: value64*=60; case MINUTES: valueNS*=60;
case SECONDS: value64*=1000; case SECONDS: valueNS*=1000;
case MILLISECONDS: value64*=1000; case MILLISECONDS: valueNS*=1000;
case MICROSECONDS: value64*=1000; case MICROSECONDS: valueNS*=1000;
case NANOSECONDS: case NANOSECONDS:
default:; default:;
} }
return value64; return valueNS;
}; };

24
slsDetectorGui/include/qDetectorMain.h
View File

@ -27,19 +27,12 @@ class slsDetectorUtils;
#include <QGridLayout> #include <QGridLayout>
#include <QResizeEvent> #include <QResizeEvent>
class MyTabWidget:public QTabWidget /** To Over-ride the QTabWidget class to get the tabBar */
{ class MyTabWidget:public QTabWidget{
public: public:
MyTabWidget(QWidget* parent = 0) MyTabWidget(QWidget* parent = 0) {setParent(parent);}
{
setParent(parent);
}
//Overridden method from QTabWidget //Overridden method from QTabWidget
QTabBar* tabBar() QTabBar* tabBar(){return QTabWidget::tabBar();}
{
return QTabWidget::tabBar();
}
}; };
@ -81,7 +74,9 @@ private:
/** default height of central widgetwhen plot Window when docked */ /** default height of central widgetwhen plot Window when docked */
int heightCentralWidget; int heightCentralWidget;
/** enumeration of the tabs */ /** enumeration of the tabs */
enum {Measurement, DataOutput, Plot, Actions, Settings, Advanced, Debugging, Developer, NumberOfTabs }; enum {Measurement, Settings, DataOutput, Plot, Actions, Advanced, Debugging, Developer, NumberOfTabs };
QColor defaultTabColor;
/* Scroll Area for the tabs**/ /* Scroll Area for the tabs**/
QScrollArea *scroll[NumberOfTabs]; QScrollArea *scroll[NumberOfTabs];
@ -178,11 +173,6 @@ void About();
*/ */
void ResizeMainWindow(bool b); void ResizeMainWindow(bool b);
/** Sets the Size of the undocked/docked terminal window
* @param b bool TRUE if undocked(outside main window), FALSE docked
*/
void SetTerminalWindowSize(bool b);
/** Enables/disables tabs depending on if acquisition is currently in progress /** Enables/disables tabs depending on if acquisition is currently in progress
*/ */
void EnableTabs(); void EnableTabs();

1
slsDetectorGui/include/qTabMeasurement.h
View File

@ -47,6 +47,7 @@ private:
enum{None, Auto, Gated, Trigger_Exp_Series, Trigger_Frame, Trigger_Readout, Gated_Start, Trigger_Window, NumTimingModes}; enum{None, Auto, Gated, Trigger_Exp_Series, Trigger_Frame, Trigger_Readout, Gated_Start, Trigger_Window, NumTimingModes};
/** methods */ /** methods */
/** Sets up the widget /** Sets up the widget
*/ */

2
slsDetectorGui/src/qCloneWidget.cpp
View File

@ -71,7 +71,7 @@ void qCloneWidget::SetupWidgetWindow(QString title,int numDim,SlsQt1DPlot*& plot
} }
/** Save group box */ /** Save group box */
boxSave = new QGroupBox("Save",this); boxSave = new QGroupBox("Save Image",this);
boxSave->setFixedHeight(45); boxSave->setFixedHeight(45);
boxSave->setContentsMargins(0,8,0,0); boxSave->setContentsMargins(0,8,0,0);
layoutSave = new QHBoxLayout; layoutSave = new QHBoxLayout;

38
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -164,7 +164,6 @@ void qDetectorMain::SetUpDetector(){
void qDetectorMain::Initialization(){ void qDetectorMain::Initialization(){
/** Dockable Plot*/ /** Dockable Plot*/
connect(dockWidgetPlot,SIGNAL(topLevelChanged(bool)),this,SLOT(ResizeMainWindow(bool))); connect(dockWidgetPlot,SIGNAL(topLevelChanged(bool)),this,SLOT(ResizeMainWindow(bool)));
connect(dockWidgetTerminal,SIGNAL(topLevelChanged(bool)),this,SLOT(SetTerminalWindowSize(bool)));
/** tabs */ /** tabs */
connect(tabs,SIGNAL(currentChanged(int)),this, SLOT(refresh(int)));//( QWidget*))); connect(tabs,SIGNAL(currentChanged(int)),this, SLOT(refresh(int)));//( QWidget*)));
@ -201,6 +200,8 @@ void qDetectorMain::Initialization(){
heightPlotWindow = dockWidgetPlot->size().height(); heightPlotWindow = dockWidgetPlot->size().height();
heightCentralWidget = centralwidget->size().height(); heightCentralWidget = centralwidget->size().height();
defaultTabColor = tabs->tabBar()->tabTextColor(DataOutput);
} }
@ -241,12 +242,8 @@ void qDetectorMain::refresh(int index){
else{ else{
; ;
} }
for(int i=0;i<NumberOfTabs;i++){ for(int i=0;i<NumberOfTabs;i++)
if(tabs->isTabEnabled(i)) tabs->tabBar()->setTabTextColor(i,defaultTabColor);
tabs->tabBar()->setTabTextColor(i,Qt::black);
else
tabs->tabBar()->setTabTextColor(i,Qt::gray);
}
tabs->tabBar()->setTabTextColor(index,QColor(0,0,200,255)); tabs->tabBar()->setTabTextColor(index,QColor(0,0,200,255));
} }
@ -255,15 +252,12 @@ void qDetectorMain::SetDockableMode(bool b){
#ifdef VERBOSE #ifdef VERBOSE
cout<<"Setting Dockable Mode to "<<b<<endl; cout<<"Setting Dockable Mode to "<<b<<endl;
#endif #endif
if(b){ if(b)
dockWidgetPlot->setFeatures(QDockWidget::DockWidgetFloatable); dockWidgetPlot->setFeatures(QDockWidget::DockWidgetFloatable);
dockWidgetTerminal->setFeatures(QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetVerticalTitleBar); else{
dockWidgetPlot->setFloating(false);
}else{
dockWidgetPlot->setFeatures(QDockWidget::NoDockWidgetFeatures); dockWidgetPlot->setFeatures(QDockWidget::NoDockWidgetFeatures);
dockWidgetTerminal->setFeatures(QDockWidget::DockWidgetVerticalTitleBar);
} }
} }
@ -368,24 +362,6 @@ void qDetectorMain::resizeEvent(QResizeEvent* event){
//prolly not needed
void qDetectorMain::SetTerminalWindowSize(bool b){
#ifdef VERBOSE
cout<<"Resizing Terminal Window"<<endl;
#endif
/*//depends on gridlayout in qdrawterminal widget class
if(b){
dockWidgetTerminal->setMinimumWidth(width()/2);
}
else{
dockWidgetTerminal->setMinimumWidth(38);
QSizePolicy sizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred);
dockWidgetTerminal->setSizePolicy(sizePolicy);
}*/
}
void qDetectorMain::EnableTabs(){ void qDetectorMain::EnableTabs(){
bool enable; bool enable;

81
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -48,6 +48,13 @@ qTabMeasurement::~qTabMeasurement(){
void qTabMeasurement::SetupWidgetWindow(){ void qTabMeasurement::SetupWidgetWindow(){
/** Exp Time **/
float time = (float)(myDet->setTimer(slsDetectorDefs::ACQUISITION_TIME,-1)*(1E-9));
spinExpTime->setValue(time);
comboExpUnit->setCurrentIndex(qDefs::SECONDS);
lblNote->hide();
/** File Name **/ /** File Name **/
dispFileName->setText(QString(myDet->getFileName().c_str())); dispFileName->setText(QString(myDet->getFileName().c_str()));
/** File Index **/ /** File Index **/
@ -241,30 +248,58 @@ void qTabMeasurement::setNumFrames(int val){
void qTabMeasurement::setExposureTime(){ void qTabMeasurement::setExposureTime(){
int64_t exptime64; int64_t exptimeNS;
/** Get the 64 bit value of timer**/ /** Get the 64 bit value of timer**/
exptime64 = qDefs::get64bTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value()); exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value());
#ifdef VERBOSE #ifdef VERBOSE
cout<<"Setting acquisition time to " << exptime64 << " clocks" << endl; cout<<"Setting acquisition time to " << exptimeNS << " clocks" << endl;
#endif #endif
myDet->setTimer(slsDetectorDefs::ACQUISITION_TIME,exptime64); myDet->setTimer(slsDetectorDefs::ACQUISITION_TIME,exptimeNS);
//float t=exptime64; if(lblPeriod->isEnabled()){
int64_t acqtimeNS;
acqtimeNS = qDefs::getNSTime((qDefs::timeUnit)comboPeriodUnit->currentIndex(),spinPeriod->value());
if(exptimeNS>acqtimeNS) {
lblNote->show();
lblPeriod->setPalette(lblNote->palette());
lblPeriod->setText("* Acquisition Period");
}
else {
lblNote->hide();
lblPeriod->setPalette(lblNumFrames->palette());
lblPeriod->setText("Acquisition Period");
}
}
//float t=exptimeNS;
//emit acquisitionTimeChanged(t/(100E+6)); ?????????????????????? //emit acquisitionTimeChanged(t/(100E+6)); ??????????????????????
} }
void qTabMeasurement::setAcquisitionPeriod(){ void qTabMeasurement::setAcquisitionPeriod(){
int64_t exptime64; int64_t acqtimeNS;
/** Get the 64 bit value of timer**/ /** Get the 64 bit value of timer**/
exptime64 = qDefs::get64bTime((qDefs::timeUnit)comboPeriodUnit->currentIndex(),spinPeriod->value()); acqtimeNS = qDefs::getNSTime((qDefs::timeUnit)comboPeriodUnit->currentIndex(),spinPeriod->value());
#ifdef VERBOSE #ifdef VERBOSE
cout<<"Setting frame period between exposures to " << exptime64 << " clocks" << endl; cout<<"Setting frame period between exposures to " << acqtimeNS << " clocks" << endl;
#endif #endif
myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,exptime64); myDet->setTimer(slsDetectorDefs::FRAME_PERIOD,acqtimeNS);
//float t=exptime64; int64_t exptimeNS;
exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value());
if(exptimeNS>acqtimeNS){
lblNote->show();
lblPeriod->setPalette(lblNote->palette());
lblPeriod->setText("* Acquisition Period");
}
else {
lblNote->hide();
lblPeriod->setPalette(lblNumFrames->palette());
lblPeriod->setText("Acquisition Period");
}
//float t=exptimeNS;
//emit acquisitionTimeChanged(t/(100E+6)); ?????????????????????? //emit acquisitionTimeChanged(t/(100E+6)); ??????????????????????
} }
@ -283,13 +318,13 @@ void qTabMeasurement::setNumTriggers(int val){
void qTabMeasurement::setDelay(){ void qTabMeasurement::setDelay(){
int64_t exptime64; int64_t exptimeNS;
/** Get the 64 bit value of timer**/ /** Get the 64 bit value of timer**/
exptime64 = qDefs::get64bTime((qDefs::timeUnit)comboDelayUnit->currentIndex(),spinDelay->value()); exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboDelayUnit->currentIndex(),spinDelay->value());
#ifdef VERBOSE #ifdef VERBOSE
cout<<"Setting delay after trigger to " << exptime64 << " clocks" << endl; cout<<"Setting delay after trigger to " << exptimeNS << " clocks" << endl;
#endif #endif
myDet->setTimer(slsDetectorDefs::DELAY_AFTER_TRIGGER,exptime64); myDet->setTimer(slsDetectorDefs::DELAY_AFTER_TRIGGER,exptimeNS);
} }
@ -415,6 +450,24 @@ void qTabMeasurement::setTimingMode(int mode){
#endif #endif
spinPeriod->setValue(time); spinPeriod->setValue(time);
comboPeriodUnit->setCurrentIndex(qDefs::SECONDS); comboPeriodUnit->setCurrentIndex(qDefs::SECONDS);
int64_t exptimeNS,acqtimeNS;
exptimeNS = qDefs::getNSTime((qDefs::timeUnit)comboExpUnit->currentIndex(),spinExpTime->value());
acqtimeNS = qDefs::getNSTime((qDefs::timeUnit)comboPeriodUnit->currentIndex(),spinPeriod->value());
if(exptimeNS>acqtimeNS) {
lblNote->show();
lblPeriod->setPalette(lblNote->palette());
lblPeriod->setText("* Acquisition Period");
}
else {
lblNote->hide();
lblPeriod->setPalette(lblNumFrames->palette());
lblPeriod->setText("Acquisition Period");
}
}else {
lblNote->hide();
lblPeriod->setPalette(lblNumFrames->palette());
lblPeriod->setText("Acquisition Period");
} }
/**Number of Triggers */ /**Number of Triggers */