interactive integration; new user-defined fit functions reloads model list; fixed requirements.txt
This commit is contained in:
@@ -1,10 +1,11 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Form implementation generated from reading ui file 'resources/_ui/basewindow.ui'
|
||||
# Form implementation generated from reading ui file '/autohome/dominik/nmreval/src/resources/_ui/basewindow.ui'
|
||||
#
|
||||
# Created by: PyQt5 UI code generator 5.12.3
|
||||
# Created by: PyQt5 UI code generator 5.15.4
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
|
||||
# run again. Do not edit this file unless you know what you are doing.
|
||||
|
||||
|
||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
@@ -13,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
|
||||
class Ui_BaseWindow(object):
|
||||
def setupUi(self, BaseWindow):
|
||||
BaseWindow.setObjectName("BaseWindow")
|
||||
BaseWindow.resize(1388, 735)
|
||||
BaseWindow.resize(1386, 827)
|
||||
icon = QtGui.QIcon()
|
||||
icon.addPixmap(QtGui.QPixmap(":/logo.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||
BaseWindow.setWindowIcon(icon)
|
||||
@@ -63,12 +64,18 @@ class Ui_BaseWindow(object):
|
||||
icon5 = QtGui.QIcon()
|
||||
icon5.addPixmap(QtGui.QPixmap(":/eval_t1_dock"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||
self.tabWidget.addTab(self.t1tauwidget, icon5, "")
|
||||
self.drawingswidget = DrawingsWidget()
|
||||
self.drawingswidget.setObjectName("drawingswidget")
|
||||
self.tabWidget.addTab(self.drawingswidget, "")
|
||||
self.integralwidget = IntegralWidget()
|
||||
self.integralwidget.setObjectName("integralwidget")
|
||||
self.tabWidget.addTab(self.integralwidget, "")
|
||||
self.area = QtWidgets.QMdiArea(self.splitter)
|
||||
self.area.setObjectName("area")
|
||||
self.horizontalLayout.addWidget(self.splitter)
|
||||
BaseWindow.setCentralWidget(self.centralwidget)
|
||||
self.menubar = QtWidgets.QMenuBar(BaseWindow)
|
||||
self.menubar.setGeometry(QtCore.QRect(0, 0, 1388, 30))
|
||||
self.menubar.setGeometry(QtCore.QRect(0, 0, 1386, 30))
|
||||
self.menubar.setObjectName("menubar")
|
||||
self.menuFile = QtWidgets.QMenu(self.menubar)
|
||||
self.menuFile.setObjectName("menuFile")
|
||||
@@ -359,6 +366,8 @@ class Ui_BaseWindow(object):
|
||||
self.actionUpdate.setObjectName("actionUpdate")
|
||||
self.actionMine = QtWidgets.QAction(BaseWindow)
|
||||
self.actionMine.setObjectName("actionMine")
|
||||
self.action_draw_object = QtWidgets.QAction(BaseWindow)
|
||||
self.action_draw_object.setObjectName("action_draw_object")
|
||||
self.menuSave.addAction(self.actionSave)
|
||||
self.menuSave.addAction(self.actionExportGraphic)
|
||||
self.menuSave.addAction(self.action_save_fit_parameter)
|
||||
@@ -434,6 +443,8 @@ class Ui_BaseWindow(object):
|
||||
self.menuWindow.addAction(self.menuView.menuAction())
|
||||
self.menuWindow.addSeparator()
|
||||
self.menuWindow.addAction(self.actionRefresh)
|
||||
self.menuWindow.addSeparator()
|
||||
self.menuWindow.addAction(self.action_draw_object)
|
||||
self.menuNMR.addAction(self.t1action)
|
||||
self.menuNMR.addAction(self.actionCalculateT1)
|
||||
self.menuNMR.addAction(self.action_coup_calc)
|
||||
@@ -492,6 +503,8 @@ class Ui_BaseWindow(object):
|
||||
self.tabWidget.setTabText(self.tabWidget.indexOf(self.editsignalwidget), _translate("BaseWindow", "Signals"))
|
||||
self.tabWidget.setTabText(self.tabWidget.indexOf(self.ptsselectwidget), _translate("BaseWindow", "Pick points"))
|
||||
self.tabWidget.setTabText(self.tabWidget.indexOf(self.t1tauwidget), _translate("BaseWindow", "SLR"))
|
||||
self.tabWidget.setTabText(self.tabWidget.indexOf(self.drawingswidget), _translate("BaseWindow", "Drawings"))
|
||||
self.tabWidget.setTabText(self.tabWidget.indexOf(self.integralwidget), _translate("BaseWindow", "Integrate"))
|
||||
self.menuFile.setTitle(_translate("BaseWindow", "&File"))
|
||||
self.menuSave.setTitle(_translate("BaseWindow", "&Save..."))
|
||||
self.menuData.setTitle(_translate("BaseWindow", "&Data"))
|
||||
@@ -605,9 +618,12 @@ class Ui_BaseWindow(object):
|
||||
self.actionTetris.setText(_translate("BaseWindow", "Not Tetris"))
|
||||
self.actionUpdate.setText(_translate("BaseWindow", "Look for updates"))
|
||||
self.actionMine.setText(_translate("BaseWindow", "Mine"))
|
||||
self.action_draw_object.setText(_translate("BaseWindow", "Draw objects..."))
|
||||
from ..data.datawidget.datawidget import DataWidget
|
||||
from ..data.integral_widget import IntegralWidget
|
||||
from ..data.point_select import PointSelectWidget
|
||||
from ..data.signaledit.editsignalwidget import EditSignalWidget
|
||||
from ..data.valueeditwidget import ValueEditWidget
|
||||
from ..fit.fitwindow import QFitDialog
|
||||
from ..graphs.drawings import DrawingsWidget
|
||||
from ..nmr.t1widget import QT1Widget
|
||||
|
Reference in New Issue
Block a user