diff --git a/OptAlgorithm/OptAlgorithm.py b/OptAlgorithm/OptAlgorithm.py
index 43cb9f4..700a32d 100644
--- a/OptAlgorithm/OptAlgorithm.py
+++ b/OptAlgorithm/OptAlgorithm.py
@@ -24,6 +24,9 @@ class OptAlgorithm(AutoConfigClass):
self.x1Contact = self.dist_open_start_1 + self.position_start_1
self.x2Contact = self.dist_open_start_2 + self.position_start_2
+
+ def getMarkOpen(self):
+ return max(self.Ts["topen_2_mark"], self.Ts["topen_1_mark"])
def V1Close(self, t: float):
if t < self.Ts["tclose_1_acc"]:
diff --git a/UML.svg b/UML.svg
index ab0a161..ce20333 100644
--- a/UML.svg
+++ b/UML.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/UML.txt b/UML.txt
index d6a314a..3b74a7d 100644
--- a/UML.txt
+++ b/UML.txt
@@ -71,6 +71,6 @@ ID is compression #yellow
ID is {-}
@91.55623055658612
ID is opening #yellow
-@276.6234655587717
+@220.34565355083035
ID is {-}
@enduml
diff --git a/main.py b/main.py
index f53639a..c00d181 100644
--- a/main.py
+++ b/main.py
@@ -62,7 +62,7 @@ class Application:
self._requestSVG(real, client, ideal, bool)
def updatePlots(self):
- #self._plotRealData()
+ self._plotRealData()
times = np.arange(20000)/10
self._plotIdealData(times)
@@ -155,8 +155,8 @@ class Application:
def _getIdealTimings(self):
data = self.opt.Ts
- self.idealTime = [data['tclose'], data['tgrow'], data['topen']]
-
+ self.idealTime = [data['tclose'], data['tgrow'], self.opt.getMarkOpen()]
+
def _form_idealdatGraph(self, times):
self.idealPhase0 = (self.idealTime[0])*self.scaler #Подъезд
self.idealPhase1 = (self.idealTime[0]+ self.idealTime[1])*self.scaler #Сжатие