diff --git a/src/gui/__pycache__/plot_window.cpython-310.pyc b/src/gui/__pycache__/plot_window.cpython-310.pyc index 5775610..9dfef7e 100644 Binary files a/src/gui/__pycache__/plot_window.cpython-310.pyc and b/src/gui/__pycache__/plot_window.cpython-310.pyc differ diff --git a/src/gui/plot_window.py b/src/gui/plot_window.py index a4c4e8e..5580735 100644 --- a/src/gui/plot_window.py +++ b/src/gui/plot_window.py @@ -104,37 +104,78 @@ class PlotWindow: delta = 10 #points_per_ms for key, items in self.timings_dict.items(): - if key == 'closure': - ideal_time = self.idealTime[0] - calc = self.opt.calcPhaseClose - color = qts.RGBA[0] - elif key == 'compression': - ideal_time = self.idealTime[1] - calc = self.opt.calcPhaseGrow - color = qts.RGBA[1] - elif key == 'welding': - ideal_time = self.WeldTime - calc = self._returnWeldData - color = qts.RGBA[2] - elif key == 'opening': - calc = self.opt.calcPhaseOpen - ideal_time = self.idealTime[2] - ideal_closure = self.idealTime[3] - color = qts.RGBA[3] - color_closure = qts.RGBA[4] - for item in items: item_data = [] time_data = [] - for i in range(0, int(ideal_time*self.scaler)*delta): - time = i/delta - item_data.append(calc(time/self.scaler)) - time_data.append(time+item[0]*self.scaler) - #print (item_data[-1], time_data[-1]) - self._plotIdealData(np.array(time_data), np.array(item_data).T) - self._addBackgroundSplitter([item[0]*self.scaler,item[0]*self.scaler + time], color) - - if key == 'opening': + + if key == 'closure': + ideal_time = self.idealTime[0] + calc = self.opt.calcPhaseClose + color = qts.RGBA[0] + for i in range(0, int(ideal_time*self.scaler)*delta): + time = i/delta + item_data.append(calc(time/self.scaler)) + time_data.append(time+item[0]*self.scaler) + #print (item_data[-1], time_data[-1]) + self._plotIdealData(np.array(time_data), np.array(item_data).T) + self._addBackgroundSplitter([item[0]*self.scaler,item[0]*self.scaler + time], color) + + elif key == 'compression': + ideal_time = self.idealTime[1] + calc = self.opt.calcPhaseGrow + color = qts.RGBA[1] + + for i in range(int(ideal_time*self.scaler)*delta, 0, -1): + time = i/delta + item_data.append(calc(time/self.scaler)) + time_data.append(item[1]*self.scaler-(ideal_time*self.scaler-time)) + #print (item_data[-1], time_data[-1]) + self._plotIdealData(np.array(time_data), np.array(item_data).T) + self._addBackgroundSplitter([(item[1]-ideal_time)*self.scaler, item[1]*self.scaler], color) + + temp = item_data[0][4] + x = [time_data[0], time_data[-1], time_data[-1]-0.0001] + y = [temp, temp, temp] + a1, b1, c1 = self._calculate_equidistant(x, y, 2.5, 3) + self.p11.addItem(a1) + self.p11.addItem(b1) + self.p11.addItem(c1) + + elif key == 'welding': + ideal_time = self.WeldTime + calc = self._returnWeldData + color = qts.RGBA[2] + + for i in range(0, int(ideal_time*self.scaler)*delta): + time = i/delta + item_data.append(calc(time/self.scaler)) + time_data.append(time+item[0]*self.scaler) + #print (item_data[-1], time_data[-1]) + self._plotIdealData(np.array(time_data), np.array(item_data).T) + self._addBackgroundSplitter([item[0]*self.scaler,item[0]*self.scaler + time], color) + + x = [time_data[0], time_data[-1], time_data[-1]+0.0001] + y = [item_data[0][4], item_data[0][4], item_data[0][4]] + a1, b1, c1 = self._calculate_equidistant(x, y, 0.75, 3) + self.p11.addItem(a1) + self.p11.addItem(b1) + self.p11.addItem(c1) + + elif key == 'opening': + calc = self.opt.calcPhaseOpen + ideal_time = self.idealTime[2] + ideal_closure = self.idealTime[3] + color = qts.RGBA[3] + color_closure = qts.RGBA[4] + + for i in range(0, int(ideal_time*self.scaler)*delta): + time = i/delta + item_data.append(calc(time/self.scaler)) + time_data.append(time+item[0]*self.scaler) + #print (item_data[-1], time_data[-1]) + self._plotIdealData(np.array(time_data), np.array(item_data).T) + self._addBackgroundSplitter([item[0]*self.scaler,item[0]*self.scaler + time], color) + item_data = [] time_data = [] for i in range(0, int(ideal_closure*self.scaler)*delta): @@ -142,24 +183,7 @@ class PlotWindow: item_data.append(self.opt.calcPhaseMovement(time/self.scaler)) time_data.append(time+item[1]*self.scaler) self._plotIdealData(np.array(time_data), np.array(item_data).T) - self._addBackgroundSplitter([item[1]*self.scaler,item[1]*self.scaler + time], color_closure) - - elif key == 'welding': - x = [time_data[0], time_data[-1], time_data[-1]+0.0001] - y = [item_data[0][4], item_data[0][4], item_data[0][4]] - a1, b1, c1 = self._calculate_equidistant(x, y, 0.75, 3) - self.p11.addItem(a1) - self.p11.addItem(b1) - self.p11.addItem(c1) - - elif key == 'compression': - temp = item_data[-1][4] - x = [time_data[0], time_data[-1], time_data[-1]+0.0001] - y = [temp, temp, temp] - a1, b1, c1 = self._calculate_equidistant(x, y, 2.5, 3) - self.p11.addItem(a1) - self.p11.addItem(b1) - self.p11.addItem(c1) + self._addBackgroundSplitter([item[1]*self.scaler,item[1]*self.scaler + time], color_closure) def _returnWeldData(self, _): return self.WeldData diff --git a/src/uml/__pycache__/creator.cpython-310.pyc b/src/uml/__pycache__/creator.cpython-310.pyc index beffd91..bf3b2ef 100644 Binary files a/src/uml/__pycache__/creator.cpython-310.pyc and b/src/uml/__pycache__/creator.cpython-310.pyc differ diff --git a/src/uml/creator.py b/src/uml/creator.py index fba64f7..1fc9cde 100644 --- a/src/uml/creator.py +++ b/src/uml/creator.py @@ -21,11 +21,15 @@ class UMLCreator: real_data.append([item[0]*self.scaler+0.0001, str(key) + '#green']) real_data.append([item[1]*self.scaler, '{-}']) - ideal_data.append([item[0]*self.scaler+0.0001, str(key) + '#yellow']) - ideal_data.append([(item[0]+ideal_time)*self.scaler, '{-}']) - if key == 'opening': - ideal_data.append([item[1]*self.scaler+0.0001, 'coming #yellow']) - ideal_data.append([(item[1]+self._ideal_time[3])*self.scaler, '{-}']) + if key == 'compression': + ideal_data.append([(item[1]-ideal_time)*self.scaler, str(key) + '#yellow']) + ideal_data.append([(item[1]-0.0001)*self.scaler, '{-}']) + else: + ideal_data.append([item[0]*self.scaler+0.0001, str(key) + '#yellow']) + ideal_data.append([(item[0]+ideal_time)*self.scaler, '{-}']) + if key == 'opening': + ideal_data.append([item[1]*self.scaler+0.0001, 'coming #yellow']) + ideal_data.append([(item[1]+self._ideal_time[3])*self.scaler, '{-}']) else: real_data = []