1
0
forked from IPKM/nmreval

interactive integration; new user-defined fit functions reloads model list; fixed requirements.txt

This commit is contained in:
dominik
2022-11-07 20:44:18 +01:00
parent 47f11a073c
commit a746afadff
17 changed files with 626 additions and 358 deletions

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1388</width>
<height>735</height>
<width>1386</width>
<height>827</height>
</rect>
</property>
<property name="windowTitle">
@ -114,6 +114,16 @@
<string>SLR</string>
</attribute>
</widget>
<widget class="DrawingsWidget" name="drawingswidget">
<attribute name="title">
<string>Drawings</string>
</attribute>
</widget>
<widget class="IntegralWidget" name="integralwidget">
<attribute name="title">
<string>Integrate</string>
</attribute>
</widget>
</widget>
<widget class="QMdiArea" name="area"/>
</widget>
@ -125,7 +135,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>1388</width>
<width>1386</width>
<height>30</height>
</rect>
</property>
@ -274,6 +284,8 @@
<addaction name="menuView"/>
<addaction name="separator"/>
<addaction name="actionRefresh"/>
<addaction name="separator"/>
<addaction name="action_draw_object"/>
</widget>
<widget class="QMenu" name="menuNMR">
<property name="title">
@ -999,6 +1011,11 @@
<string>Mine</string>
</property>
</action>
<action name="action_draw_object">
<property name="text">
<string>Draw objects...</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
@ -1037,6 +1054,18 @@
<header>..fit.fitwindow</header>
<container>1</container>
</customwidget>
<customwidget>
<class>DrawingsWidget</class>
<extends>QWidget</extends>
<header>..graphs.drawings</header>
<container>1</container>
</customwidget>
<customwidget>
<class>IntegralWidget</class>
<extends>QWidget</extends>
<header>..data.integral_widget</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections>

View File

@ -6,187 +6,248 @@
<rect>
<x>0</x>
<y>0</y>
<width>431</width>
<height>799</height>
<width>459</width>
<height>830</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<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="2" column="0" colspan="2">
<widget class="QComboBox" name="mode_comboBox">
<item>
<property name="text">
<string>Vertical</string>
</property>
</item>
<item>
<property name="text">
<string>Horizontal</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0" colspan="2">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QComboBox" name="graph_comboBox"/>
</item>
<item row="3" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QListWidget" name="listWidget_2"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QWidget" name="diagonal_widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="vh_widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Position</string>
</property>
<property name="buddy">
<cstring>vh_pos_lineEdit</cstring>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="vh_pos_lineEdit">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="drag_checkBox">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Drag enabled</string>
<string>New object</string>
</property>
<property name="checked">
<bool>true</bool>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_2">
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_3">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="6" column="1">
<widget class="ColorListEditor" name="color_comboBox"/>
</item>
<item row="7" column="0" colspan="2">
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>Create line</string>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Comment</string>
</property>
<property name="buddy">
<cstring>comment_lineEdit</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="comment_lineEdit"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Color</string>
</property>
<property name="buddy">
<cstring>color_comboBox</cstring>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QTableWidget" name="tableWidget">
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="columnCount">
<number>2</number>
</property>
<attribute name="horizontalHeaderVisible">
<bool>true</bool>
</attribute>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<column>
<property name="text">
<string>Pos.</string>
</property>
</column>
<column>
<property name="text">
<string>Comment</string>
</property>
</column>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="1">
<widget class="QComboBox" name="mode_comboBox">
<item>
<property name="text">
<string>Infinite Line</string>
</property>
</item>
<item>
<property name="text">
<string>Multiple points</string>
</property>
</item>
<item>
<property name="text">
<string>Rectangle</string>
</property>
</item>
<item>
<property name="text">
<string>Ellipse</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Type</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Comment</string>
</property>
<property name="buddy">
<cstring>comment_lineEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="comment_lineEdit"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Color</string>
</property>
<property name="buddy">
<cstring>color_comboBox</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="ColorListEditor" name="color_comboBox"/>
</item>
<item row="3" column="0" colspan="2">
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>3</number>
</property>
<widget class="QWidget" name="page">
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Position</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_8"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Angle</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="infiniteline_angle_spinbox">
<property name="wrapping">
<bool>true</bool>
</property>
<property name="suffix">
<string>°</string>
</property>
<property name="maximum">
<number>179</number>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QListWidget" name="listWidget"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3">
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Lower left</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Width</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_2"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Height</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_3"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Angle</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="spinBox"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_4">
<layout class="QFormLayout" name="formLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Centre</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lineEdit_4"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Axis</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_5"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Axis</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_6"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Angle</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_7"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
@ -198,16 +259,9 @@
<header>..lib.delegates</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>graph_comboBox</tabstop>
<tabstop>mode_comboBox</tabstop>
<tabstop>vh_pos_lineEdit</tabstop>
<tabstop>drag_checkBox</tabstop>
<tabstop>comment_lineEdit</tabstop>
<tabstop>color_comboBox</tabstop>
<tabstop>pushButton</tabstop>
<tabstop>tableWidget</tabstop>
</tabstops>
<resources/>
<connections/>
<buttongroups>
<buttongroup name="buttonGroup"/>
</buttongroups>
</ui>

View File

@ -65,7 +65,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Save integrals as dataset</string>
<string>Save area as datasets</string>
</property>
</widget>
</item>