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

ui adjustments

Browse Source
This commit is contained in:
Dominik Demuth
2023-06-03 20:27:56 +02:00
parent bec789318d
commit 25f7ff5616
3 changed files with 150 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
self.limits = RegionItem(), RegionItem()
for lim in self.limits:
self.graphicsView.addItem(lim)
self._limitless = True
self.add_sets()
@ -88,9 +89,11 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
self._plots[key] = (data_plot, tg_plot, glass, liquid, tangent, fictive_cp, tnmh_fit)
dist = max_x - min_x
self.limits[0].setRegion((min_x, min_x+0.1*dist))
self.limits[1].setRegion((max_x-0.1*dist, max_x))
if self._limitless:
dist = max_x - min_x
self.limits[0].setRegion((min_x, min_x+0.1*dist))
self.limits[1].setRegion((max_x-0.1*dist, max_x))
self._limitless = False
@QtCore.pyqtSlot(name='on_pushButton_clicked')
def calc_tg(self):
@ -100,9 +103,10 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
for idx in range(self.listWidget.count()):
item = self.listWidget.item(idx)
key = item.data(QtCore.Qt.UserRole)
color = item.foreground()
if item.checkState() == QtCore.Qt.Unchecked:
continue
key = item.data(QtCore.Qt.UserRole)
plot = self._plots[key]
data = self._dsc[key]
@ -118,10 +122,15 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
values = self._tg_value.get(item.data(QtCore.Qt.UserRole))
if values is not None:
self.listWidget_2.clear()
for name, pos in values.items():
tg_item = QtWidgets.QListWidgetItem(f'{name.capitalize()}: {pos[0]:.2f} K')
self.listWidget_2.addItem(tg_item)
label = '\n'.join((f'{name.capitalize()}: {pos[0]:.2f} K' for name, pos in values.items()))
self.label.setText(label)
@QtCore.pyqtSlot(QtWidgets.QListWidgetItem, name='on_listWidget_itemChanged')
def change_visibility(self, item: QtWidgets.QListWidgetItem):
is_checked = bool(item.checkState())
plot = self._plots[item.data(QtCore.Qt.UserRole)]
for val in plot:
val.setVisible(is_checked)
@QtCore.pyqtSlot(name='on_pushButton_2_clicked')
def get_fictive(self):
@ -131,10 +140,13 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
for idx in range(self.listWidget.count()):
item = self.listWidget.item(idx)
key = item.data(QtCore.Qt.UserRole)
if item.checkState() == QtCore.Qt.Unchecked:
continue
key = item.data(QtCore.Qt.UserRole)
plot = self._plots[key]
data = self._dsc[key]
cp, tg = data.get_fictive_cp(*baselines)
plot[5].setData(cp.x, cp.y)
@ -143,7 +155,7 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
plot[1].setData(array(list(self._tg_value[key].values())))
res = data.calculate_tnmh([60, 0.5, 1, 2e5], *baselines, return_fictive=False)
res = cp.calculate_tnmh([60, 0.5, 1, 2e5], *baselines, return_fictive=False)
print(res.pprint())
plot[-1].setData(res.x, res.y)