IPKM/nmreval
14
2
Fork 1
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX: integration limits are not possible

Browse Source
This commit is contained in:
Dominik Demuth 2022-11-04 15:53:40 +01:00
parent 917f1c3910
commit ccb44fc038
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui_qt/math/integrate_derive.py
View File

@ -48,6 +48,11 @@ class QDeriveIntegrate(QtWidgets.QDialog, Ui_Dialog):
def enable_graph(self, state: int): def enable_graph(self, state: int):
self.graph_combobox.setEnabled(state != QtCore.Qt.Checked) self.graph_combobox.setEnabled(state != QtCore.Qt.Checked)
@QtCore.pyqtSlot(int, name='on_range_checkbox_stateChanged')
def enable_limits(self, full_range: int):
self.start_lineedit.setEnabled(full_range != QtCore.Qt.Checked)
self.stop_lineedit.setEnabled(full_range != QtCore.Qt.Checked)
def get_options(self): def get_options(self):
opts = {'graph': '' if self.newgraph_checkbox.isChecked() else self.graph_combobox.currentData(), opts = {'graph': '' if self.newgraph_checkbox.isChecked() else self.graph_combobox.currentData(),
'mode': self.mode, 'sets': []} 'mode': self.mode, 'sets': []}

2
src/nmreval/data/points.py
View File

@ -393,7 +393,7 @@ class Points:
def integrate(self, log: bool = False, limits: tuple[float, float] = None) -> PointLike: def integrate(self, log: bool = False, limits: tuple[float, float] = None) -> PointLike:
new_data = self.copy() new_data = self.copy()
if limits is not None: if limits != (None, None):
new_data.cut(*limits) new_data.cut(*limits)
if log: if log: