Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions modules/01-operating-room/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ add_library(refArchTypes OBJECT
${SECURITY_CXX_SOURCES}
)
target_link_libraries(refArchTypes
PRIVATE
PUBLIC
RTIConnextDDS::cpp2_api
)

Expand All @@ -114,7 +114,6 @@ add_executable(PatientSensor
)
target_link_libraries(PatientSensor
PRIVATE
RTIConnextDDS::cpp2_api
refArchTypes
)
target_include_directories(PatientSensor
Expand All @@ -138,7 +137,6 @@ if(GTKMM_FOUND)
target_link_libraries(${application}
PRIVATE
${GTKMM_LIBRARIES}
RTIConnextDDS::cpp2_api
refArchTypes
)
if(APPLE)
Expand All @@ -161,4 +159,4 @@ endif()

# Convenience target: build all Module 01 executables
set(APPLICATIONS PatientSensor ${GTK_APPLICATIONS})
add_custom_target(module-01 DEPENDS ${APPLICATIONS})
add_custom_target(module-01 DEPENDS ${APPLICATIONS})
10 changes: 5 additions & 5 deletions modules/01-operating-room/src/Arm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))

Expand All @@ -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;")
Expand Down Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion modules/01-operating-room/src/ArmController.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class SurgicalArmController {
builder->get_widget<Gtk::Box>("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);
Expand All @@ -280,6 +280,7 @@ class SurgicalArmController {
hdr->reorder_child(*logo, 0);
}
} catch (...) {
std::cerr << "Warning: artwork failure " << std::endl;
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/01-operating-room/src/Orchestrator.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ class OrchestratorApp {
builder->get_widget<Gtk::Box>("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);
Expand Down
6 changes: 3 additions & 3 deletions modules/01-operating-room/src/PatientMonitor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down Expand Up @@ -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;")
Expand Down Expand Up @@ -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)

Expand Down
Binary file added resource/images/Arm-Controller.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/images/Arm-Monitor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/images/Orchestrator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/images/Patient-Monitor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.