diff --git a/src/gui/__pycache__/plotter.cpython-310.pyc b/src/gui/__pycache__/plotter.cpython-310.pyc index d6427a3..523d4ef 100644 Binary files a/src/gui/__pycache__/plotter.cpython-310.pyc and b/src/gui/__pycache__/plotter.cpython-310.pyc differ diff --git a/src/gui/plotter.py b/src/gui/plotter.py index 6abeaf2..23d5a5e 100644 --- a/src/gui/plotter.py +++ b/src/gui/plotter.py @@ -222,6 +222,21 @@ class PlotWidget(BasePlotWidget): rect_item.setPen(pg.mkPen('black', width=3)) plot_widget.addItem(rect_item) + if settings["force accuracy"]: + modifier = 0.05 + + x1 = point_events["Welding"][0] + dx = point_events["Welding"][1] - x1 + force = useful_p_data["force"] + y1 = force*(1-modifier) + dy = force*(2*modifier) + + rect_item = QGraphicsRectItem(x1, y1, dx, dy) + rect_item.setZValue(-5) + rect_item.setBrush(pg.mkBrush((0,255,0, 50))) + rect_item.setPen(pg.mkPen('black', width=0)) + plot_widget.addItem(rect_item) + # Добавляем идеальные стадии и идеальные сигналы if settings["ideals"]: self._add_ideal_stage_regions(plot_widget, ideal_data, point_events, reg_items, 100) diff --git a/src/utils/base/__pycache__/base.cpython-310.pyc b/src/utils/base/__pycache__/base.cpython-310.pyc index ae58136..a931dec 100644 Binary files a/src/utils/base/__pycache__/base.cpython-310.pyc and b/src/utils/base/__pycache__/base.cpython-310.pyc differ diff --git a/src/utils/base/base.py b/src/utils/base/base.py index cf016df..7b9a6a7 100644 --- a/src/utils/base/base.py +++ b/src/utils/base/base.py @@ -125,7 +125,8 @@ class BasePlotWidget: "ideals": False, "mirror ME": False, "workpiece": False, - "force compensation FE": False + "force compensation FE": False, + "force accuracy":True }, "Real_signals": [ { @@ -156,7 +157,8 @@ class BasePlotWidget: "ideals": False, "mirror ME": True, "workpiece": True, - "force compensation FE": True + "force compensation FE": True, + "force accuracy":False }, "Real_signals": [ { @@ -187,7 +189,8 @@ class BasePlotWidget: "ideals": True, "mirror ME": False, "workpiece": False, - "force compensation FE": False + "force compensation FE": False, + "force accuracy":False }, "Real_signals": [ {