Merge pull request #305 from tinymovr/studio/gui_improvements

GUI improvements
tinymovr · Oct 10, 2023 · 3302c39 · 3302c39
2 parents b30b800 + f05c66f
commit 3302c39
Show file tree

Hide file tree

Showing 7 changed files with 1,033 additions and 132 deletions.
diff --git a/firmware/src/can/can_endpoints.c b/firmware/src/can/can_endpoints.c
@@ -19,7 +19,7 @@
 
 
 uint8_t (*avlos_endpoints[79])(uint8_t * buffer, uint8_t * buffer_len, Avlos_Command cmd) = {&avlos_protocol_hash, &avlos_uid, &avlos_fw_version, &avlos_hw_revision, &avlos_Vbus, &avlos_Ibus, &avlos_power, &avlos_temp, &avlos_calibrated, &avlos_errors, &avlos_save_config, &avlos_erase_config, &avlos_reset, &avlos_enter_dfu, &avlos_scheduler_errors, &avlos_controller_state, &avlos_controller_mode, &avlos_controller_warnings, &avlos_controller_errors, &avlos_controller_position_setpoint, &avlos_controller_position_p_gain, &avlos_controller_velocity_setpoint, &avlos_controller_velocity_limit, &avlos_controller_velocity_p_gain, &avlos_controller_velocity_i_gain, &avlos_controller_velocity_deadband, &avlos_controller_velocity_increment, &avlos_controller_current_Iq_setpoint, &avlos_controller_current_Id_setpoint, &avlos_controller_current_Iq_limit, &avlos_controller_current_Iq_estimate, &avlos_controller_current_bandwidth, &avlos_controller_current_Iq_p_gain, &avlos_controller_current_max_Ibus_regen, &avlos_controller_current_max_Ibrake, &avlos_controller_voltage_Vq_setpoint, &avlos_controller_calibrate, &avlos_controller_idle, &avlos_controller_position_mode, &avlos_controller_velocity_mode, &avlos_controller_current_mode, &avlos_controller_set_pos_vel_setpoints, &avlos_comms_can_rate, &avlos_comms_can_id, &avlos_motor_R, &avlos_motor_L, &avlos_motor_pole_pairs, &avlos_motor_type, &avlos_motor_offset, &avlos_motor_direction, &avlos_motor_calibrated, &avlos_motor_I_cal, &avlos_motor_errors, &avlos_encoder_position_estimate, &avlos_encoder_velocity_estimate, &avlos_encoder_type, &avlos_encoder_bandwidth, &avlos_encoder_calibrated, &avlos_encoder_errors, &avlos_traj_planner_max_accel, &avlos_traj_planner_max_decel, &avlos_traj_planner_max_vel, &avlos_traj_planner_t_accel, &avlos_traj_planner_t_decel, &avlos_traj_planner_t_total, &avlos_traj_planner_move_to, &avlos_traj_planner_move_to_tlimit, &avlos_traj_planner_errors, &avlos_homing_velocity, &avlos_homing_max_homing_t, &avlos_homing_retract_dist, &avlos_homing_warnings, &avlos_homing_stall_detect_velocity, &avlos_homing_stall_detect_delta_pos, &avlos_homing_stall_detect_t, &avlos_homing_home, &avlos_watchdog_enabled, &avlos_watchdog_triggered, &avlos_watchdog_timeout };
-uint32_t avlos_proto_hash = 4118115615;
+uint32_t avlos_proto_hash = 3526126264;
 
 uint32_t _avlos_get_proto_hash(void)
 {

diff --git a/studio/Python/tinymovr/gui/__init__.py b/studio/Python/tinymovr/gui/__init__.py
@@ -7,14 +7,17 @@
     display_file_open_dialog,
     display_file_save_dialog,
     magnitude_of,
-    hold_sema,
     TimedGetter,
     check_selected_items,
     get_dynamic_attrs,
     is_dark_mode
 )
 from tinymovr.gui.widgets import (
-    OurQTreeWidget,
+    NodeTreeWidgetItem,
+    AttrTreeWidgetItem,
+    FuncTreeWidgetItem,
+    OptionsTreeWidgetItem,
+    PlaceholderQTreeWidget,
     IconComboBoxWidget,
     ArgumentInputDialog
 )

diff --git a/studio/Python/tinymovr/gui/helpers.py b/studio/Python/tinymovr/gui/helpers.py
@@ -33,7 +33,7 @@
     QPushButton {
         background-color: #ededef;
         border-radius: 4px; 
-        margin: 0 0 1px 0;
+        margin: 3px 10px 3px 0;
     }
     QPushButton:pressed {
         background-color: #cdcdcf;
@@ -44,6 +44,22 @@
     background-color: #eaeaec;
     } 
 
+/* --------------------------------------- QComboBox -----------------------------------*/
+
+    QComboBox {
+        margin: 0 10px 0 5px;
+    }
+
+    QComboBox {
+        margin: 0 10px 0 0;
+    }
+
+    QComboBox::drop-down {
+        border: none;
+        background-color: #ededef;
+        border-radius: 4px; 
+    }
+
 /* --------------------------------------- QScrollBar -----------------------------------*/
 
     QScrollBar:horizontal
@@ -57,7 +73,7 @@
 
     QScrollBar::handle:horizontal
     {
-        background-color: #dfdfe1;      /* #605F5F; */
+        background-color: #dfdfe1; 
         min-width: 5px;
         border-radius: 4px;
     }
@@ -175,6 +191,11 @@
     {
         background: none;
     }
+
+    QAbstractScrollArea::corner {
+        background: #dfdfe1;
+        border: none;
+    }
 """
 
 
@@ -185,7 +206,7 @@
     QPushButton {
         background-color: #363638;
         border-radius: 4px; 
-        margin: 0 0 1px 0;
+        margin: 3px 10px 3px 0;
     }
     QPushButton:pressed {
         background-color: #767678;
@@ -196,6 +217,37 @@
     background-color: #464648;
     }
 
+/* --------------------------------------- QComboBox -----------------------------------*/
+
+    QComboBox {
+        margin: 0 10px 0 5px;
+    }
+    
+    QComboBox::drop-down {
+        border: none;
+        background-color: #363638;
+        border-radius: 4px; 
+    }
+
+    QComboBox::down-arrow
+    {   
+        border: 0px;
+        background-repeat: no-repeat;
+        background-position: center center;
+        border-image: url(:/qss_icons/rc/down_arrow.png);
+        height:20px;
+        width:20px;
+    }
+
+/* ----------------------------------- Headers (dark only) -------------------------------*/
+
+    QHeaderView::section {
+        border-right-color: #262628;
+        border-right-width: 1px;
+        border-style: solid;
+        margin: 0 4px;
+    }
+
 /* --------------------------------------- QScrollBar -----------------------------------*/
 
     QScrollBar:horizontal
@@ -204,12 +256,12 @@
         margin: 3px 15px 3px 15px;
         border: 1px transparent white;
         border-radius: 4px;
-        background-color: white;
+        background-color: #363638;
     }
 
     QScrollBar::handle:horizontal
     {
-        background-color: #dfdfe1;      /* #605F5F; */
+        background-color: #605F5F; 
         min-width: 5px;
         border-radius: 4px;
     }
@@ -266,7 +318,7 @@
 
     QScrollBar:vertical
     {
-        background-color: white;
+        background-color: #363638;
         width: 15px;
         margin: 15px 3px 15px 3px;
         border: 1px transparent white;
@@ -275,7 +327,7 @@
 
     QScrollBar::handle:vertical
     {
-        background-color: #dfdfe1;
+        background-color: #605F5F;
         min-height: 5px;
         border-radius: 4px;
     }
@@ -327,6 +379,11 @@
     {
         background: none;
     }
+
+    QAbstractScrollArea::corner {
+        background: #363638;
+        border: none;
+    }
 """
 
 
@@ -407,14 +464,6 @@ def magnitude_of(val):
     return val
 
 
-def hold_sema(sema):
-    sema.acquire()
-    try:
-        yield
-    finally:
-        sema.release()
-
-
 class TimedGetter:
     """
     An interface class that maintains timing