fix: Имена переменных

params/system_params.json

@@ -9,13 +9,13 @@
         10.0
     ],
     "v_max_1": [
-        0.3
+        0.25
     ],
     "a_max_2": [
         10.0
     ],
     "v_max_2": [
-        0.3
+        0.25
     ],
     "mass_1": [
         270.0
@@ -56,7 +56,7 @@
     "UML_time_scaler": [
         1000.0
     ],
-    "Range ME, mm": [
+    "gun_range": [
         100.0
     ]
 }

src/OptAlgorithm/OptTimeCalculator.py

@@ -176,7 +176,7 @@ class OptTimeCalculator(AutoConfigClass):
         t5max = (Tfull - v0 / a) / 2 - t1
         v1 = v0 + a * t1
         S1 = v0 * t1 + a * t1 * t1 / 2 + v1 * t31 - a * t31 * t31 / 2
-        S2max = Sfull + S1
+        S2max = -Sfull + S1
         t5 = min(t5max, (vmax) / a, sqrt(S2max / a))
         t3 = abs(v0) / a + t1 + t5
         t32 = t5

src/controller/passportFormer.py

@@ -63,7 +63,7 @@ class PassportFormer(BasePointPassportFormer):
         system_settings = {key: value[0] for key, value in self._params[1].items()}
         tesla_time = sum(self._params[0].get("Tesla summary time", []))
         useful_data = {"tesla_time": tesla_time,
-                        "range_ME": system_settings["Range ME, mm"],
+                        "range": system_settings["gun_range"],
                         "k_hardness": system_settings["k_hardness_1"]
                         }
 
@@ -86,8 +86,10 @@ class PassportFormer(BasePointPassportFormer):
             else:
                 point_timeframe, point_events = None, None
             useful_p_data = {"thickness": operator_settings["object_thickness"],
-                                "L2": operator_settings["object_position"],
-                                "force": operator_settings["force_target"]}
+                             "position": operator_settings["object_position"]-0.5*operator_settings["object_thickness"],
+                             "force": operator_settings["force_target"],
+                             "P1": operator_settings["object_position"] + operator_settings["object_thickness"],
+                             "P2": operator_settings["object_position"]}
 
             points_pocket.append([point_timeframe, ideal_data, point_events, useful_p_data])
         return dataframe, points_pocket, useful_data

src/gui/plotter.py

@@ -200,7 +200,7 @@ class PlotWidget(BasePlotWidget):
 
         dataframe, points_pocket, useful_data = data
         tesla_time = useful_data["tesla_time"]
-        range_ME = useful_data["range_ME"]
+        range_ME = useful_data["range"]
         k_hardness = useful_data["k_hardness"]
         
         dat_is_none = dataframe is None
@@ -265,7 +265,7 @@ class PlotWidget(BasePlotWidget):
                 if settings["workpiece"]:
                     x1 = point_timeframe[0]
                     dx = point_timeframe[1] - x1
-                    y1 = useful_p_data["L2"]*1000
+                    y1 = useful_p_data["position"]*1000
                     dy = useful_p_data["thickness"]*1000
 
                     rect_item = QGraphicsRectItem(x1, y1, dx, dy)

src/gui/settings_window.py

@@ -204,7 +204,7 @@ class SystemSettings(settingsWindow):
             "k_prop": "Proportionality factor",
             "time_capture": "Calculated points per sec",
             "UML_time_scaler": "UML_time_scaler",
-            "Range ME, mm": "Range ME, mm"
+            "gun_range": "Range ME-FE, mm"
             }
         super().__init__(path, name, upd_func, assosiated_names)
         self._num_points.setVisible(False)