src/gui_qt/_py/ptstab.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file './nmreval/src/resources/_ui/ptstab.ui'
+# Form implementation generated from reading ui file 'nmreval/src/resources/_ui/ptstab.ui'
 #
 # Created by: PyQt5 UI code generator 5.15.10
 #
@@ -14,29 +14,90 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName("Form")
-        Form.resize(316, 747)
+        Form.resize(498, 746)
-        self.verticalLayout = QtWidgets.QVBoxLayout(Form)
+        self.gridLayout_2 = QtWidgets.QGridLayout(Form)
-        self.verticalLayout.setContentsMargins(3, 3, 3, 3)
+        self.gridLayout_2.setVerticalSpacing(9)
-        self.verticalLayout.setObjectName("verticalLayout")
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.lineEdit_2 = QtWidgets.QLineEdit(Form)
+        self.lineEdit_2.setObjectName("lineEdit_2")
+        self.horizontalLayout_2.addWidget(self.lineEdit_2)
+        self.lineEdit = QtWidgets.QLineEdit(Form)
+        self.lineEdit.setObjectName("lineEdit")
+        self.horizontalLayout_2.addWidget(self.lineEdit)
+        self.comboBox_2 = QtWidgets.QComboBox(Form)
+        self.comboBox_2.setObjectName("comboBox_2")
+        self.comboBox_2.addItem("")
+        self.comboBox_2.addItem("")
+        self.horizontalLayout_2.addWidget(self.comboBox_2)
+        self.gridLayout_2.addLayout(self.horizontalLayout_2, 4, 1, 1, 1)
+        self.comboBox = QtWidgets.QComboBox(Form)
+        self.comboBox.setObjectName("comboBox")
+        self.comboBox.addItem("")
+        self.comboBox.addItem("")
+        self.gridLayout_2.addWidget(self.comboBox, 7, 1, 1, 1)
+        self.special_comboBox = QtWidgets.QComboBox(Form)
+        self.special_comboBox.setEnabled(False)
+        self.special_comboBox.setObjectName("special_comboBox")
+        self.special_comboBox.addItem("")
+        self.special_comboBox.addItem("")
+        self.special_comboBox.addItem("")
+        self.special_comboBox.addItem("")
+        self.gridLayout_2.addWidget(self.special_comboBox, 3, 1, 1, 1)
+        self.graph_checkbox = QtWidgets.QCheckBox(Form)
+        self.graph_checkbox.setChecked(True)
+        self.graph_checkbox.setObjectName("graph_checkbox")
+        self.gridLayout_2.addWidget(self.graph_checkbox, 8, 0, 1, 1)
+        self.label = QtWidgets.QLabel(Form)
+        self.label.setObjectName("label")
+        self.gridLayout_2.addWidget(self.label, 7, 0, 1, 1)
+        self.graph_combobox = QtWidgets.QComboBox(Form)
+        self.graph_combobox.setEnabled(False)
+        self.graph_combobox.setObjectName("graph_combobox")
+        self.gridLayout_2.addWidget(self.graph_combobox, 8, 1, 1, 1)
+        self.deleteButton = QtWidgets.QPushButton(Form)
+        icon = QtGui.QIcon.fromTheme("dialog-cancel")
+        self.deleteButton.setIcon(icon)
+        self.deleteButton.setObjectName("deleteButton")
+        self.gridLayout_2.addWidget(self.deleteButton, 2, 0, 1, 2)
         self.peaktable = QtWidgets.QListWidget(Form)
         self.peaktable.setEditTriggers(QtWidgets.QAbstractItemView.DoubleClicked|QtWidgets.QAbstractItemView.EditKeyPressed)
         self.peaktable.setObjectName("peaktable")
-        self.verticalLayout.addWidget(self.peaktable)
+        self.gridLayout_2.addWidget(self.peaktable, 1, 0, 1, 2)
-        self.groupBox = QtWidgets.QGroupBox(Form)
+        self.checkBox = QtWidgets.QCheckBox(Form)
-        self.groupBox.setObjectName("groupBox")
+        self.checkBox.setObjectName("checkBox")
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.groupBox)
+        self.gridLayout_2.addWidget(self.checkBox, 3, 0, 1, 1)
-        self.horizontalLayout.setContentsMargins(3, 3, 3, 3)
+        self.okButton = QtWidgets.QPushButton(Form)
-        self.horizontalLayout.setSpacing(3)
+        icon = QtGui.QIcon.fromTheme("dialog-ok")
+        self.okButton.setIcon(icon)
+        self.okButton.setObjectName("okButton")
+        self.gridLayout_2.addWidget(self.okButton, 9, 0, 1, 2)
+        self.label_5 = QtWidgets.QLabel(Form)
+        self.label_5.setObjectName("label_5")
+        self.gridLayout_2.addWidget(self.label_5, 5, 0, 1, 1)
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
-        self.left_pt = QtWidgets.QSpinBox(self.groupBox)
+        self.xbutton = QtWidgets.QCheckBox(Form)
-        self.left_pt.setMaximum(999)
+        self.xbutton.setObjectName("xbutton")
-        self.left_pt.setObjectName("left_pt")
+        self.horizontalLayout.addWidget(self.xbutton)
-        self.horizontalLayout.addWidget(self.left_pt)
+        self.ybutton = QtWidgets.QCheckBox(Form)
-        self.right_pt = QtWidgets.QSpinBox(self.groupBox)
+        self.ybutton.setChecked(True)
-        self.right_pt.setMaximum(999)
+        self.ybutton.setObjectName("ybutton")
-        self.right_pt.setObjectName("right_pt")
+        self.horizontalLayout.addWidget(self.ybutton)
-        self.horizontalLayout.addWidget(self.right_pt)
+        self.gridLayout_2.addLayout(self.horizontalLayout, 6, 1, 1, 1)
-        self.average_combobox = QtWidgets.QComboBox(self.groupBox)
+        spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.gridLayout_2.addItem(spacerItem, 10, 0, 1, 1)
+        self.label_3 = QtWidgets.QLabel(Form)
+        self.label_3.setObjectName("label_3")
+        self.gridLayout_2.addWidget(self.label_3, 4, 0, 1, 1)
+        self.label_4 = QtWidgets.QLabel(Form)
+        self.label_4.setObjectName("label_4")
+        self.gridLayout_2.addWidget(self.label_4, 6, 0, 1, 1)
+        self.label_2 = QtWidgets.QLabel(Form)
+        self.label_2.setObjectName("label_2")
+        self.gridLayout_2.addWidget(self.label_2, 0, 0, 1, 2)
+        self.average_combobox = QtWidgets.QComboBox(Form)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -47,90 +108,52 @@ class Ui_Form(object):
         self.average_combobox.addItem("")
         self.average_combobox.addItem("")
         self.average_combobox.addItem("")
-        self.horizontalLayout.addWidget(self.average_combobox)
+        self.gridLayout_2.addWidget(self.average_combobox, 5, 1, 1, 1)
-        self.verticalLayout.addWidget(self.groupBox)
+        self.label.setBuddy(self.comboBox)
-        self.groupBox_2 = QtWidgets.QGroupBox(Form)
+        self.label_5.setBuddy(self.average_combobox)
-        self.groupBox_2.setCheckable(True)
+        self.label_4.setBuddy(self.xbutton)
-        self.groupBox_2.setChecked(False)
+        self.label_2.setBuddy(self.peaktable)
-        self.groupBox_2.setObjectName("groupBox_2")
-        self.horizontalLayout_5 = QtWidgets.QHBoxLayout(self.groupBox_2)
-        self.horizontalLayout_5.setContentsMargins(3, 3, 3, 3)
-        self.horizontalLayout_5.setSpacing(2)
-        self.horizontalLayout_5.setObjectName("horizontalLayout_5")
-        self.special_comboBox = QtWidgets.QComboBox(self.groupBox_2)
-        self.special_comboBox.setObjectName("special_comboBox")
-        self.special_comboBox.addItem("")
-        self.special_comboBox.addItem("")
-        self.special_comboBox.addItem("")
-        self.special_comboBox.addItem("")
-        self.horizontalLayout_5.addWidget(self.special_comboBox)
-        self.verticalLayout.addWidget(self.groupBox_2)
-        self.groupBox_3 = QtWidgets.QGroupBox(Form)
-        self.groupBox_3.setObjectName("groupBox_3")
-        self.gridLayout = QtWidgets.QGridLayout(self.groupBox_3)
-        self.gridLayout.setContentsMargins(3, 3, 3, 3)
-        self.gridLayout.setSpacing(3)
-        self.gridLayout.setObjectName("gridLayout")
-        self.xbutton = QtWidgets.QCheckBox(self.groupBox_3)
-        self.xbutton.setObjectName("xbutton")
-        self.gridLayout.addWidget(self.xbutton, 0, 0, 1, 1)
-        self.ybutton = QtWidgets.QCheckBox(self.groupBox_3)
-        self.ybutton.setChecked(True)
-        self.ybutton.setObjectName("ybutton")
-        self.gridLayout.addWidget(self.ybutton, 0, 1, 1, 1)
-        self.graph_checkbox = QtWidgets.QCheckBox(self.groupBox_3)
-        self.graph_checkbox.setChecked(True)
-        self.graph_checkbox.setObjectName("graph_checkbox")
-        self.gridLayout.addWidget(self.graph_checkbox, 1, 0, 1, 1)
-        self.graph_combobox = QtWidgets.QComboBox(self.groupBox_3)
-        self.graph_combobox.setEnabled(False)
-        self.graph_combobox.setObjectName("graph_combobox")
-        self.gridLayout.addWidget(self.graph_combobox, 1, 1, 1, 1)
-        self.verticalLayout.addWidget(self.groupBox_3)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setContentsMargins(-1, 0, -1, -1)
-        self.horizontalLayout_2.setSpacing(2)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.okButton = QtWidgets.QPushButton(Form)
-        icon = QtGui.QIcon.fromTheme("dialog-ok")
-        self.okButton.setIcon(icon)
-        self.okButton.setObjectName("okButton")
-        self.horizontalLayout_2.addWidget(self.okButton)
-        self.deleteButton = QtWidgets.QPushButton(Form)
-        icon = QtGui.QIcon.fromTheme("dialog-cancel")
-        self.deleteButton.setIcon(icon)
-        self.deleteButton.setObjectName("deleteButton")
-        self.horizontalLayout_2.addWidget(self.deleteButton)
-        self.verticalLayout.addLayout(self.horizontalLayout_2)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)
+        Form.setTabOrder(self.peaktable, self.checkBox)
+        Form.setTabOrder(self.checkBox, self.special_comboBox)
+        Form.setTabOrder(self.special_comboBox, self.comboBox_2)
+        Form.setTabOrder(self.comboBox_2, self.average_combobox)
+        Form.setTabOrder(self.average_combobox, self.xbutton)
+        Form.setTabOrder(self.xbutton, self.ybutton)
+        Form.setTabOrder(self.ybutton, self.comboBox)
+        Form.setTabOrder(self.comboBox, self.graph_checkbox)
+        Form.setTabOrder(self.graph_checkbox, self.graph_combobox)
 
     def retranslateUi(self, Form):
         _translate = QtCore.QCoreApplication.translate
         Form.setWindowTitle(_translate("Form", "Form"))
-        self.peaktable.setToolTip(_translate("Form", "Edit by entering new value: \n"
+        self.comboBox_2.setItemText(0, _translate("Form", "points"))
-"Single number for points (e.g. 1e-6); \n"
+        self.comboBox_2.setItemText(1, _translate("Form", "range"))
-"two numbers separated by space for regions (e.g. 1e-6 5e-6). \n"
+        self.comboBox.setItemText(0, _translate("Form", "\"Group\" value"))
-"Changing between regions and points is NOT possible"))
+        self.comboBox.setItemText(1, _translate("Form", "x value"))
-        self.groupBox.setTitle(_translate("Form", "Average (drop-down used for pts and regions)"))
-        self.left_pt.setSuffix(_translate("Form", " pts"))
-        self.left_pt.setPrefix(_translate("Form", "- "))
-        self.right_pt.setSuffix(_translate("Form", " pts"))
-        self.right_pt.setPrefix(_translate("Form", "+ "))
-        self.average_combobox.setItemText(0, _translate("Form", "Mean"))
-        self.average_combobox.setItemText(1, _translate("Form", "Sum"))
-        self.average_combobox.setItemText(2, _translate("Form", "Integral"))
-        self.average_combobox.setItemText(3, _translate("Form", "Std. deviation"))
-        self.groupBox_2.setTitle(_translate("Form", "Special value"))
         self.special_comboBox.setToolTip(_translate("Form", "Automatic selection of respective points"))
         self.special_comboBox.setItemText(0, _translate("Form", "max(y)"))
         self.special_comboBox.setItemText(1, _translate("Form", "max(abs(y))"))
         self.special_comboBox.setItemText(2, _translate("Form", "min(y)"))
         self.special_comboBox.setItemText(3, _translate("Form", "min(abs(y))"))
-        self.groupBox_3.setTitle(_translate("Form", "Result"))
+        self.graph_checkbox.setText(_translate("Form", "New graph?"))
+        self.label.setText(_translate("Form", "Group by"))
+        self.deleteButton.setText(_translate("Form", "Delete selection"))
+        self.peaktable.setToolTip(_translate("Form", "Edit by entering new value: \n"
+"Single number for points (e.g. 1e-6); \n"
+"two numbers separated by space for regions (e.g. 1e-6 5e-6). \n"
+"Changing between regions and points is NOT possible"))
+        self.checkBox.setText(_translate("Form", "Use special value"))
+        self.okButton.setText(_translate("Form", "Apply"))
+        self.label_5.setText(_translate("Form", "Aggregation"))
         self.xbutton.setText(_translate("Form", "x"))
         self.ybutton.setText(_translate("Form", "y"))
-        self.graph_checkbox.setText(_translate("Form", "New graph?"))
+        self.label_3.setText(_translate("Form", "Region around points"))
-        self.okButton.setText(_translate("Form", "Apply"))
+        self.label_4.setText(_translate("Form", "New set based on"))
-        self.deleteButton.setText(_translate("Form", "Delete selected"))
+        self.label_2.setText(_translate("Form", "Selected points and regions"))
+        self.average_combobox.setItemText(0, _translate("Form", "Mean"))
+        self.average_combobox.setItemText(1, _translate("Form", "Sum"))
+        self.average_combobox.setItemText(2, _translate("Form", "Integral"))
+        self.average_combobox.setItemText(3, _translate("Form", "Std. deviation"))

src/gui_qt/data/point_select.py

@@ -1,6 +1,6 @@
 import re
 
-from ..Qt import QtCore, QtWidgets
+from ..Qt import QtCore, QtWidgets, QtGui
 from .._py.ptstab import Ui_Form
 from ..lib.pg_objects import LogInfiniteLine, RegionItem
 
@@ -29,9 +29,13 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
 
         self.okButton.clicked.connect(self.apply)
         self.deleteButton.clicked.connect(self.remove_points)
+
         self.peaktable.itemChanged.connect(self.editing_finished)
         self.peaktable.itemDoubleClicked.connect(self.editing_started)
 
+        self.lineEdit.setValidator(QtGui.QDoubleValidator())
+        self.lineEdit_2.setValidator(QtGui.QDoubleValidator())
+
     def keyPressEvent(self, e):
         if e.key() == QtCore.Qt.Key.Key_Delete:
             self.remove_points()
@@ -208,3 +212,10 @@ class PointSelectWidget(QtWidgets.QWidget, Ui_Form):
     @QtCore.pyqtSlot(int, name='on_graph_checkbox_stateChanged')
     def changed_state(self, checked):
         self.graph_combobox.setEnabled(checked != QtCore.Qt.CheckState.Checked)
+
+    @QtCore.pyqtSlot(int, name='on_comboBox_2_currentIndexChanged')
+    def change_limits(self, idx: int) -> None:
+        self.left_pt.setVisible(idx == 0)
+        self.right_pt.setVisible(idx == 0)
+        self.doubleSpinBox.setVisible(idx == 1)
+        self.doubleSpinBox_2.setVisible(idx == 1)

src/resources/_ui/ptstab.ui

@@ -6,27 +6,124 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>316</width>
+    <width>498</width>
-    <height>747</height>
+    <height>746</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QGridLayout" name="gridLayout_2">
-   <property name="leftMargin">
+   <property name="verticalSpacing">
-    <number>3</number>
+    <number>9</number>
    </property>
-   <property name="topMargin">
+   <item row="4" column="1">
-    <number>3</number>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
-   </property>
+     <item>
-   <property name="rightMargin">
+      <widget class="QLineEdit" name="lineEdit_2"/>
-    <number>3</number>
+     </item>
-   </property>
+     <item>
-   <property name="bottomMargin">
+      <widget class="QLineEdit" name="lineEdit"/>
-    <number>3</number>
+     </item>
-   </property>
+     <item>
-   <item>
+      <widget class="QComboBox" name="comboBox_2">
+       <item>
+        <property name="text">
+         <string>points</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>range</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="7" column="1">
+    <widget class="QComboBox" name="comboBox">
+     <item>
+      <property name="text">
+       <string>&quot;Group&quot; value</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>x value</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QComboBox" name="special_comboBox">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="toolTip">
+      <string>Automatic selection of respective points</string>
+     </property>
+     <item>
+      <property name="text">
+       <string>max(y)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>max(abs(y))</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>min(y)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>min(abs(y))</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="8" column="0">
+    <widget class="QCheckBox" name="graph_checkbox">
+     <property name="text">
+      <string>New graph?</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Group by</string>
+     </property>
+     <property name="buddy">
+      <cstring>comboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1">
+    <widget class="QComboBox" name="graph_combobox">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QPushButton" name="deleteButton">
+     <property name="text">
+      <string>Delete selection</string>
+     </property>
+     <property name="icon">
+      <iconset theme="dialog-cancel">
+       <normaloff>.</normaloff>.</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
     <widget class="QListWidget" name="peaktable">
      <property name="toolTip">
       <string>Edit by entering new value: 
@@ -39,235 +136,142 @@ Changing between regions and points is NOT possible</string>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QCheckBox" name="checkBox">
-     <property name="title">
+     <property name="text">
-      <string>Average (drop-down used for pts and regions)</string>
+      <string>Use special value</string>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>3</number>
-      </property>
-      <property name="leftMargin">
-       <number>3</number>
-      </property>
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="rightMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
-       <number>3</number>
-      </property>
-      <item>
-       <widget class="QSpinBox" name="left_pt">
-        <property name="suffix">
-         <string> pts</string>
-        </property>
-        <property name="prefix">
-         <string>- </string>
-        </property>
-        <property name="maximum">
-         <number>999</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QSpinBox" name="right_pt">
-        <property name="suffix">
-         <string> pts</string>
-        </property>
-        <property name="prefix">
-         <string>+ </string>
-        </property>
-        <property name="maximum">
-         <number>999</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="average_combobox">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <item>
-         <property name="text">
-          <string>Mean</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Sum</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Integral</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Std. deviation</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
+   <item row="9" column="0" colspan="2">
-    <widget class="QGroupBox" name="groupBox_2">
+    <widget class="QPushButton" name="okButton">
-     <property name="title">
+     <property name="text">
-      <string>Special value</string>
+      <string>Apply</string>
      </property>
-     <property name="checkable">
+     <property name="icon">
-      <bool>true</bool>
+      <iconset theme="dialog-ok">
+       <normaloff>.</normaloff>.</iconset>
      </property>
-     <property name="checked">
-      <bool>false</bool>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_5">
-      <property name="spacing">
-       <number>2</number>
-      </property>
-      <property name="leftMargin">
-       <number>3</number>
-      </property>
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="rightMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
-       <number>3</number>
-      </property>
-      <item>
-       <widget class="QComboBox" name="special_comboBox">
-        <property name="toolTip">
-         <string>Automatic selection of respective points</string>
-        </property>
-        <item>
-         <property name="text">
-          <string>max(y)</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>max(abs(y))</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>min(y)</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>min(abs(y))</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
+   <item row="5" column="0">
-    <widget class="QGroupBox" name="groupBox_3">
+    <widget class="QLabel" name="label_5">
-     <property name="title">
+     <property name="text">
-      <string>Result</string>
+      <string>Aggregation</string>
+     </property>
+     <property name="buddy">
+      <cstring>average_combobox</cstring>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <property name="leftMargin">
-       <number>3</number>
-      </property>
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="rightMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
-       <number>3</number>
-      </property>
-      <property name="spacing">
-       <number>3</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="xbutton">
-        <property name="text">
-         <string>x</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QCheckBox" name="ybutton">
-        <property name="text">
-         <string>y</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="graph_checkbox">
-        <property name="text">
-         <string>New graph?</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="graph_combobox">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
+   <item row="6" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>2</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
      <item>
-      <widget class="QPushButton" name="okButton">
+      <widget class="QCheckBox" name="xbutton">
        <property name="text">
-        <string>Apply</string>
+        <string>x</string>
-       </property>
-       <property name="icon">
-        <iconset theme="dialog-ok">
-         <normaloff>.</normaloff>.</iconset>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="deleteButton">
+      <widget class="QCheckBox" name="ybutton">
        <property name="text">
-        <string>Delete selected</string>
+        <string>y</string>
        </property>
-       <property name="icon">
+       <property name="checked">
-        <iconset theme="dialog-cancel">
+        <bool>true</bool>
-         <normaloff>.</normaloff>.</iconset>
        </property>
       </widget>
      </item>
     </layout>
    </item>
+   <item row="10" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Region around points</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>New set based on</string>
+     </property>
+     <property name="buddy">
+      <cstring>xbutton</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Selected points and regions</string>
+     </property>
+     <property name="buddy">
+      <cstring>peaktable</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QComboBox" name="average_combobox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <item>
+      <property name="text">
+       <string>Mean</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Sum</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Integral</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Std. deviation</string>
+      </property>
+     </item>
+    </widget>
+   </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>peaktable</tabstop>
+  <tabstop>checkBox</tabstop>
+  <tabstop>special_comboBox</tabstop>
+  <tabstop>comboBox_2</tabstop>
+  <tabstop>average_combobox</tabstop>
+  <tabstop>xbutton</tabstop>
+  <tabstop>ybutton</tabstop>
+  <tabstop>comboBox</tabstop>
+  <tabstop>graph_checkbox</tabstop>
+  <tabstop>graph_combobox</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>