gainplot added for jungfrau, aspect ratio check in gui added, npixels-1 as endpixel bug fix

This commit is contained in:
Dhanya Maliakal
2017-09-01 12:03:09 +02:00
parent 3fb92aa9dd
commit 277dc2cfd9
5 changed files with 518 additions and 97 deletions

View File

@ -99,7 +99,7 @@
</rect>
</property>
<property name="currentIndex">
<number>3</number>
<number>0</number>
</property>
<widget class="QWidget" name="page_6">
<widget class="QWidget" name="gridLayoutWidget_5">
@ -107,7 +107,7 @@
<rect>
<x>20</x>
<y>5</y>
<width>327</width>
<width>336</width>
<height>26</height>
</rect>
</property>
@ -192,7 +192,7 @@
<rect>
<x>25</x>
<y>5</y>
<width>95</width>
<width>100</width>
<height>26</height>
</rect>
</property>
@ -300,7 +300,7 @@
<rect>
<x>20</x>
<y>5</y>
<width>77</width>
<width>81</width>
<height>26</height>
</rect>
</property>
@ -548,7 +548,7 @@
<rect>
<x>25</x>
<y>5</y>
<width>128</width>
<width>314</width>
<height>26</height>
</rect>
</property>
@ -577,6 +577,43 @@ Displays minimum, maximum and sum of values for each plot.
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_19">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>100</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="chkGainPlot">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;nobr&gt;
Displays minimum, maximum and sum of values for each plot.
&lt;nobr&gt;</string>
</property>
<property name="text">
<string>Gain Plot</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
@ -771,7 +808,7 @@ Displays minimum, maximum and sum of values for each plot.
</rect>
</property>
<property name="currentIndex">
<number>4</number>
<number>5</number>
</property>
<widget class="QWidget" name="page">
<widget class="QWidget" name="gridLayoutWidget_2">
@ -779,7 +816,7 @@ Displays minimum, maximum and sum of values for each plot.
<rect>
<x>25</x>
<y>5</y>
<width>107</width>
<width>108</width>
<height>26</height>
</rect>
</property>
@ -1024,7 +1061,7 @@ Displays minimum, maximum and sum of values for each plot.
<rect>
<x>25</x>
<y>5</y>
<width>95</width>
<width>100</width>
<height>26</height>
</rect>
</property>
@ -1057,7 +1094,7 @@ Displays minimum, maximum and sum of values for each plot.
<rect>
<x>25</x>
<y>5</y>
<width>77</width>
<width>81</width>
<height>26</height>
</rect>
</property>
@ -1315,7 +1352,7 @@ All values between &lt;b&gt;from&lt;/b&gt; and &lt;b&gt;to&lt;/b&gt; will be res
<rect>
<x>25</x>
<y>5</y>
<width>128</width>
<width>132</width>
<height>26</height>
</rect>
</property>
@ -1533,7 +1570,7 @@ Displays minimum, maximum and sum of values for each plot.
<rect>
<x>10</x>
<y>20</y>
<width>227</width>
<width>233</width>
<height>26</height>
</rect>
</property>
@ -1658,7 +1695,7 @@ Displays minimum, maximum and sum of values for each plot.
<rect>
<x>10</x>
<y>20</y>
<width>342</width>
<width>331</width>
<height>26</height>
</rect>
</property>
@ -1828,28 +1865,6 @@ Displays minimum, maximum and sum of values for each plot.
</property>
</widget>
</item>
<item row="0" column="1" colspan="7">
<widget class="QLineEdit" name="dispTitle">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
<property name="readOnly">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="7">
<widget class="QLineEdit" name="dispZMax">
<property name="enabled">
@ -2158,6 +2173,41 @@ Displays minimum, maximum and sum of values for each plot.
</property>
</widget>
</item>
<item row="0" column="1" colspan="4">
<widget class="QLineEdit" name="dispTitle">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
</size>
</property>
<property name="echoMode">
<enum>QLineEdit::Normal</enum>
</property>
<property name="readOnly">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="6" colspan="2">
<widget class="QCheckBox" name="chkAspectRatio">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Keep Aspect Ratio</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
@ -2187,7 +2237,7 @@ Displays minimum, maximum and sum of values for each plot.
<rect>
<x>10</x>
<y>20</y>
<width>358</width>
<width>355</width>
<height>26</height>
</rect>
</property>
@ -2243,11 +2293,11 @@ Displays minimum, maximum and sum of values for each plot.
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>45</width>
<width>40</width>
<height>10</height>
</size>
</property>
@ -2259,11 +2309,11 @@ Displays minimum, maximum and sum of values for each plot.
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>45</width>
<width>40</width>
<height>10</height>
</size>
</property>
@ -2471,9 +2521,9 @@ Interval between plots has 2 modes. A condition to be satisfied, in order to avo
<property name="geometry">
<rect>
<x>10</x>
<y>15</y>
<y>12</y>
<width>331</width>
<height>31</height>
<height>36</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4">
@ -2788,7 +2838,7 @@ Interval between plots has 2 modes. A condition to be satisfied, in order to avo
<rect>
<x>10</x>
<y>20</y>
<width>351</width>
<width>331</width>
<height>26</height>
</rect>
</property>