Merge branch 'feat/vision' of https://git.cps.unileoben.ac.at/ClemensFritze/GeislingerProject into feat/vision
This commit is contained in:
commit
88e9535233
Binary file not shown.
@ -1089,7 +1089,8 @@ class RelayControl(QtWidgets.QMainWindow):
|
|||||||
# self.yolo_stream = YOLOv8CameraStream(model_path="models/yolov8m_seg_e300.pt", logging_level="high")
|
# self.yolo_stream = YOLOv8CameraStream(model_path="models/yolov8m_seg_e300.pt", logging_level="high")
|
||||||
# # self.yolo_stream.start() # Start the YOLOv8 stream
|
# # self.yolo_stream.start() # Start the YOLOv8 stream
|
||||||
# self.timer.start(30) # Start the timer to update the frame every 30ms (about 33 FPS)
|
# self.timer.start(30) # Start the timer to update the frame every 30ms (about 33 FPS)
|
||||||
r.turn_on(1)
|
print("Turn on light clicked")
|
||||||
|
self.r.turn_on(1)
|
||||||
|
|
||||||
def spot_off(self):
|
def spot_off(self):
|
||||||
# # Stop the camera stream and processing
|
# # Stop the camera stream and processing
|
||||||
@ -1099,7 +1100,8 @@ class RelayControl(QtWidgets.QMainWindow):
|
|||||||
# self.yolo_stream = None # Reset the YOLOv8 stream object
|
# self.yolo_stream = None # Reset the YOLOv8 stream object
|
||||||
# self.scene.clear() # Clear the displayed frame from the graphicsView
|
# self.scene.clear() # Clear the displayed frame from the graphicsView
|
||||||
# print("Camera stream stopped and resources released.")
|
# print("Camera stream stopped and resources released.")
|
||||||
r.turn_off(1)
|
print("Turn off light clicked")
|
||||||
|
self.r.turn_off(1)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
import sys
|
import sys
|
||||||
@ -1110,6 +1112,8 @@ if __name__ == "__main__":
|
|||||||
|
|
||||||
# Initialize the CameraStreamApp with the UI
|
# Initialize the CameraStreamApp with the UI
|
||||||
camera_app = CameraStreamApp(ui)
|
camera_app = CameraStreamApp(ui)
|
||||||
|
# initialize relay app
|
||||||
|
relay_app = RelayControl(ui)
|
||||||
|
|
||||||
MainWindow.show()
|
MainWindow.show()
|
||||||
sys.exit(app.exec_())
|
sys.exit(app.exec_())
|
Loading…
Reference in New Issue
Block a user