Merge pull request #158 from asmithie13/Abby_Branch

Speed and Authority from CTC through to Train Model
asmithie13 · Mar 28, 2024 · e597a4d · e597a4d
2 parents 0814692 + 075b2f3
commit e597a4d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,5 @@ Train_Controller_SW/__pycache__/Power.cpython-312.pyc
 Train_Controller_SW/__pycache__/Speed.cpython-312.pyc
 Train_Controller_SW/__pycache__/TrainController.cpython-312.
 Wayside_SW/__pycache__/WaysideSWandTB.cpython-312.pyc
+__pycache__/Main_UI.cpython-312.pyc
+Train_Model/__pycache__/app_trainmodel_ui.cpython-312.pyc
diff --git a/Main_UI.py b/Main_UI.py
@@ -98,7 +98,7 @@ def create_new_train(self, TrainID):
         self.currentTrains[-1].show()
 
         #Eventually let track model know train has started
-
+        self.TrackModelWindow.sendSpeedAuth.connect(self.currentTrains[-1].receiveSpeedAuth_tm)
 
         #Connect Signals to Track Model
         #self.currentTrains[-1].sendSignalToTrack.(self.TrackModelWindow.recieveSignalFromTrain)

diff --git a/Train_Model/app_trainmodel_ui.py b/Train_Model/app_trainmodel_ui.py
@@ -105,9 +105,10 @@ def receiveSpeedAuth_tm(self,speedAuth):
         trainID=speedAuth[0]
         Comm_Speed=speedAuth[1]
         Authority=speedAuth[2]
-        self.sendSpeedAuth.emit(speedAuth)
-        self.send_com_speed_tb.emit(str(Comm_Speed))
-        self.send_authority_tb.emit(str(Authority))
+        print(speedAuth)
+        #self.sendSpeedAuth.emit(speedAuth)
+        #self.send_com_speed_tb.emit(str(Comm_Speed))
+        #self.send_authority_tb.emit(str(Authority))
 
 
     def estop_button_clicked(self):