From 075b2f3fced6228a4b5f0b5419fff35755ea9053 Mon Sep 17 00:00:00 2001 From: Abby Date: Thu, 28 Mar 2024 12:20:10 -0400 Subject: [PATCH] Speed and Authority from CTC through to Train Model --- .gitignore | 2 ++ Main_UI.py | 2 +- Train_Model/app_trainmodel_ui.py | 7 ++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 18401b7a..9601a39a 100644 --- 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 index 512fac1f..184d7e04 100644 --- 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 index 51d519e6..fc4599e7 100644 --- 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):