This commit is contained in:
Dominik Demuth 2023-06-16 20:25:24 +02:00
parent 1703b8d514
commit 5b146433f3
3 changed files with 11 additions and 8 deletions

View File

@ -483,7 +483,6 @@ class ExperimentContainer(QtCore.QObject):
def binning(self, digits: int): def binning(self, digits: int):
new_data = self.copy(full=True) new_data = self.copy(full=True)
new_data.data = self._data.binning(decimals=digits) new_data.data = self._data.binning(decimals=digits)
print(new_data.x)
return new_data return new_data

View File

@ -1,3 +1,4 @@
import pprint
from itertools import cycle from itertools import cycle
from numpy import array, nan, isnan from numpy import array, nan, isnan
@ -259,9 +260,12 @@ class TgCalculator(QtWidgets.QDialog, Ui_Dialog):
graph_id = self.new_graph_tau_combo.currentData() graph_id = self.new_graph_tau_combo.currentData()
print(graph_id) print(graph_id)
print(self._tg_value)
print(self._hodge) ret_dic = {}
for v in self._plots.values():
# (data_plot, tg_plot, glass, liquid, tangent, fictive_cp, tnmh_fit) for key, tg in self._tg_value.items():
print(v.getData()) plts = self._plots[key]
print(self._plots) ret_dic[key] = (tg, plts[1].getData(), plts[2].getData(), plts[3].getData(), plts[4].getData())
pprint.pprint(ret_dic)
pprint.pprint(self._hodge)

View File

@ -773,7 +773,7 @@ class UpperManagement(QtCore.QObject):
key = self.add(self.data[sid].binning(digits=digits)) key = self.add(self.data[sid].binning(digits=digits))
new_data.append(key) new_data.append(key)
self.newData.emit(new_data, '') self.newData.emit(new_data, self.current_graph)
@QtCore.pyqtSlot(int, dict) @QtCore.pyqtSlot(int, dict)
def smooth_data(self, npoints, param_kwargs): def smooth_data(self, npoints, param_kwargs):