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

minor cleanup

Browse Source
This commit is contained in:
Dominik Demuth
2023-06-13 20:28:37 +02:00
parent 92c29bec2a
commit 988d2ccbda
4 changed files with 280 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gui_qt/dsc/glass_dialog.py
View File

@ -29,33 +29,42 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
'mid': PlotItem(x=[], y=[], pen=None, symbol='s', symbolBrush=Tab10.TabOrange.rgb(), name='Midpoint'),
'end': PlotItem(x=[], y=[], pen=None, symbol='t', symbolBrush=Tab10.TabGreen.rgb(), name='End'),
'inflection': PlotItem(x=[], y=[], pen=None, symbol='d', symbolBrush=Tab10.TabRed.rgb(), name='Inflection'),
'fictive': PlotItem(x=[], y=[], pen=None, symbol='t1', symbolBrush=Tab10.TabPurple.rgb(), name='Fictive'),
# 'fictive': PlotItem(x=[], y=[], pen=None, symbol='t1', symbolBrush=Tab10.TabPurple.rgb(), name='Fictive'),
# 'TNMH': PlotItem(x=[], y=[], pen=None, symbol='star', symbolBrush=Tab10.TabPurple.rgb(), name='TNMH'),
}
self.tau_plot.getPlotItem().addLegend()
for plt in self._hodge_plots.values():
self.graphicsView_3.addItem(plt)
self.tau_plot.addItem(plt)
self.tau_plot.setLogMode(y=True)
self.limits = RegionItem(), RegionItem()
for lim in self.limits:
self.graphicsView.addItem(lim)
self.dsc_plot.addItem(lim)
self._limitless = True
self.add_sets()
self.listWidget.itemClicked.connect(self.show_tg_values)
for x in 'abc':
self.comboBox_2.addItem(x)
# for x in self._hodge_plots:
# self.hodge_selection.addItem(x)
def __call__(self):
print('call')
self.clear()
self._colors = cycle(Tab10)
self.add_sets()
for g in self._management.graphs.list():
print(g)
return self
def clear(self):
self.listWidget.clear()
for plots in self._plots.values():
for val in plots:
self.graphicsView.removeItem(val)
self.dsc_plot.removeItem(val)
self.graphicsView_2.removeItem(val)
for plt in self._hodge_plots.values():
@ -65,6 +74,7 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
self._plots = {}
self._tg_value = {}
self._fit = {}
self.gra
def add_sets(self):
min_x = 10_000_000
@ -86,22 +96,22 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
self._dsc[key] = (data, None)
data_plot = PlotItem(x=data.x, y=data.y, pen=mkPen(c.rgb()))
self.graphicsView.addItem(data_plot)
self.dsc_plot.addItem(data_plot)
glass = PlotItem()
glass.set_line(style=2, color=c)
self.graphicsView.addItem(glass)
self.dsc_plot.addItem(glass)
liquid = PlotItem()
liquid.set_line(style=2, color=c)
self.graphicsView.addItem(liquid)
self.dsc_plot.addItem(liquid)
tangent = PlotItem()
tangent.set_line(style=2, color=c)
self.graphicsView.addItem(tangent)
self.dsc_plot.addItem(tangent)
tg_plot = PlotItem(pen=None, symbolBrush=c.rgb(), symbol='o')
self.graphicsView.addItem(tg_plot)
self.dsc_plot.addItem(tg_plot)
fictive_cp = PlotItem(pen=mkPen(c.rgb()))
self.graphicsView_2.addItem(fictive_cp)
@ -111,7 +121,7 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
self.graphicsView_2.addItem(tnmh_fit)
self._plots[key] = (data_plot, tg_plot, glass, liquid, tangent, fictive_cp, tnmh_fit)
self._tg_value[key] = {'onset': (nan, nan), 'mid': (nan, nan), 'end': (nan, nan), 'inflection': (nan, nan), 'fictive': (nan, nan)}
self._tg_value[key] = {'onset': (nan, nan), 'mid': (nan, nan), 'end': (nan, nan), 'inflection': (nan, nan)} # , 'fictive': (nan, nan)}
if self._limitless:
dist = max_x - min_x
@ -119,7 +129,7 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
self.limits[1].setRegion((max_x-min(5, 0.1*dist), max_x))
self._limitless = False
@QtCore.pyqtSlot(name='on_pushButton_clicked')
@QtCore.pyqtSlot(name='on_calctg_button_clicked')
def calc_tg(self):
baselines = tuple(lim.getRegion() for lim in self.limits)
if baselines[0][0] > baselines[1][0]:
@ -148,7 +158,7 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
if values is not None:
label = '\n'.join((f'{name.capitalize()}: {pos[0]:.2f} K' for name, pos in values.items()))
self.label_3.setText(label)
self.tg_value_label.setText(label)
fit = self._fit.get(item.data(QtCore.Qt.UserRole))
if fit is not None:
@ -241,4 +251,3 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
def close(self) -> bool:
self.clear()
return super().close()