diff --git a/modules/01-operating-room/CMakeLists.txt b/modules/01-operating-room/CMakeLists.txt index 79378d3..bf9958c 100644 --- a/modules/01-operating-room/CMakeLists.txt +++ b/modules/01-operating-room/CMakeLists.txt @@ -102,7 +102,7 @@ add_library(refArchTypes OBJECT ${SECURITY_CXX_SOURCES} ) target_link_libraries(refArchTypes - PRIVATE + PUBLIC RTIConnextDDS::cpp2_api ) @@ -114,7 +114,6 @@ add_executable(PatientSensor ) target_link_libraries(PatientSensor PRIVATE - RTIConnextDDS::cpp2_api refArchTypes ) target_include_directories(PatientSensor @@ -138,7 +137,6 @@ if(GTKMM_FOUND) target_link_libraries(${application} PRIVATE ${GTKMM_LIBRARIES} - RTIConnextDDS::cpp2_api refArchTypes ) if(APPLE) @@ -161,4 +159,4 @@ endif() # Convenience target: build all Module 01 executables set(APPLICATIONS PatientSensor ${GTK_APPLICATIONS}) -add_custom_target(module-01 DEPENDS ${APPLICATIONS}) \ No newline at end of file +add_custom_target(module-01 DEPENDS ${APPLICATIONS}) diff --git a/modules/01-operating-room/src/Arm.py b/modules/01-operating-room/src/Arm.py index b55b905..4f26570 100644 --- a/modules/01-operating-room/src/Arm.py +++ b/modules/01-operating-room/src/Arm.py @@ -41,8 +41,8 @@ # Per-joint color palette JOINT_COLORS = { - SurgicalRobot.Motors.BASE: "#004C97", # RTI Blue - SurgicalRobot.Motors.SHOULDER: "#ED8B00", # RTI Orange + SurgicalRobot.Motors.BASE: RTI_BLUE, + SurgicalRobot.Motors.SHOULDER: RTI_ORANGE, SurgicalRobot.Motors.ELBOW: "#00BFFF", # Electric blue SurgicalRobot.Motors.WRIST: "#7CFC00", # Lime green SurgicalRobot.Motors.HAND: "#DA70D6", # Orchid @@ -376,7 +376,7 @@ def __init__(self): self.setWindowTitle("RTI Connext — Surgical Arm Monitor") self.setMinimumSize(640, 650) self.setStyleSheet(f"background-color: {BG_MAIN};") - _icon_px = QPixmap("../../resource/images/rti_logo.png") + _icon_px = QPixmap("../../resource/images/Arm-Monitor.png") if not _icon_px.isNull(): self.setWindowIcon(QIcon(_icon_px)) @@ -399,7 +399,7 @@ def _build_ui(self): h_layout = QHBoxLayout(header) h_layout.setContentsMargins(20, 0, 20, 0) - _logo_px = QPixmap("../../resource/images/rti_logo.png") + _logo_px = QPixmap("../../resource/images/Arm-Monitor.png") if not _logo_px.isNull(): logo_lbl = QLabel() logo_lbl.setStyleSheet("background: transparent;") @@ -580,7 +580,7 @@ def connext_setup(self): def run(self): app = QApplication(sys.argv) app.setStyle("Fusion") - _icon = QIcon(QPixmap("../../resource/images/rti_logo.png")) + _icon = QIcon(QPixmap("../../resource/images/Arm-Monitor.png")) if not _icon.isNull(): app.setWindowIcon(_icon) diff --git a/modules/01-operating-room/src/ArmController.cxx b/modules/01-operating-room/src/ArmController.cxx index 7687278..95c943d 100644 --- a/modules/01-operating-room/src/ArmController.cxx +++ b/modules/01-operating-room/src/ArmController.cxx @@ -265,7 +265,7 @@ class SurgicalArmController { builder->get_widget("header_bar", hdr); try { auto pb = Gdk::Pixbuf::create_from_file( - "../../resource/images/rti_logo.png"); + "../../resource/images/Arm-Controller.png"); window->set_icon(pb); #ifdef __APPLE__ set_macos_dock_icon(pb); @@ -280,6 +280,7 @@ class SurgicalArmController { hdr->reorder_child(*logo, 0); } } catch (...) { + std::cerr << "Warning: artwork failure " << std::endl; } } diff --git a/modules/01-operating-room/src/Orchestrator.cxx b/modules/01-operating-room/src/Orchestrator.cxx index 50e3e9f..b2c5ed4 100644 --- a/modules/01-operating-room/src/Orchestrator.cxx +++ b/modules/01-operating-room/src/Orchestrator.cxx @@ -401,7 +401,7 @@ class OrchestratorApp { builder->get_widget("header_bar", hdr); try { auto pb = Gdk::Pixbuf::create_from_file( - "../../resource/images/rti_logo.png"); + "../../resource/images/Orchestrator.png"); window->set_icon(pb); #ifdef __APPLE__ set_macos_dock_icon(pb); diff --git a/modules/01-operating-room/src/PatientMonitor.py b/modules/01-operating-room/src/PatientMonitor.py index 5dbdac8..eaf9c7b 100644 --- a/modules/01-operating-room/src/PatientMonitor.py +++ b/modules/01-operating-room/src/PatientMonitor.py @@ -317,7 +317,7 @@ def __init__(self): # ── Window icon ───────────────────────────────────────────────── def _set_icon(self): - _px = QPixmap("../../resource/images/rti_logo.png") + _px = QPixmap("../../resource/images/Patient-Monitor.png") if not _px.isNull(): self.setWindowIcon(QIcon(_px)) @@ -347,7 +347,7 @@ def _build_ui(self): h_layout = QHBoxLayout(header) h_layout.setContentsMargins(20, 0, 20, 0) - _logo_px = QPixmap("../../resource/images/rti_logo.png") + _logo_px = QPixmap("../../resource/images/Patient-Monitor.png") if not _logo_px.isNull(): logo_lbl = QLabel() logo_lbl.setStyleSheet("background: transparent;") @@ -543,7 +543,7 @@ def connext_setup(self): def run(self): app = QApplication(sys.argv) app.setStyle("Fusion") - _icon = QIcon(QPixmap("../../resource/images/rti_logo.png")) + _icon = QIcon(QPixmap("../../resource/images/Patient-Monitor.png")) if not _icon.isNull(): app.setWindowIcon(_icon) diff --git a/resource/images/Arm-Controller.png b/resource/images/Arm-Controller.png new file mode 100644 index 0000000..373bccf Binary files /dev/null and b/resource/images/Arm-Controller.png differ diff --git a/resource/images/Arm-Monitor.png b/resource/images/Arm-Monitor.png new file mode 100644 index 0000000..2fd7e8c Binary files /dev/null and b/resource/images/Arm-Monitor.png differ diff --git a/resource/images/Orchestrator.png b/resource/images/Orchestrator.png new file mode 100644 index 0000000..aa7f053 Binary files /dev/null and b/resource/images/Orchestrator.png differ diff --git a/resource/images/Patient-Monitor.png b/resource/images/Patient-Monitor.png new file mode 100644 index 0000000..2d44334 Binary files /dev/null and b/resource/images/Patient-Monitor.png differ