Skip to content

Commit

Permalink
gui fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvladic
mvladic committed Feb 26, 2020
1 parent 0d824a0 commit e8f06c5
Show file tree
Hide file tree
Showing 9 changed files with 53,543 additions and 53,426 deletions.
53 changes: 49 additions & 4 deletions modular-psu-firmware.eez-project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1275,8 +1275,8 @@
{
"name": "channel_ranges_mode",
"type": "enum",
"enumItems": "[\n\"Best (default)\",\n\"50mA\",\n\"5A\"\n]",
"defaultValue": "Best (default)"
"enumItems": "[\n\"Best\",\n\"50mA\",\n\"5A\"\n]",
"defaultValue": "Best"
},
{
"name": "channel_ranges_auto_ranging",
Expand Down Expand Up @@ -2087,6 +2087,11 @@
"name": "date_time_am_pm",
"type": "string",
"defaultValue": "AM"
},
{
"name": "is_multi_tracking",
"type": "boolean",
"defaultValue": "1"
}
],
"actions": [
Expand Down Expand Up @@ -2778,6 +2783,9 @@
},
{
"name": "edit_no_focus"
},
{
"name": "untrack_all"
}
],
"extensionDefinitions": [
Expand Down Expand Up @@ -27141,7 +27149,7 @@
"data": "channels",
"left": 10,
"top": 86,
"width": 444,
"width": 360,
"height": 35,
"itemWidget": {
"type": "Container",
Expand Down Expand Up @@ -27400,6 +27408,43 @@
},
"listType": "horizontal",
"gap": 0
},
{
"type": "Select",
"style": {
"inheritFrom": "default"
},
"data": "is_multi_tracking",
"left": 370,
"top": 86,
"width": 94,
"height": 36,
"widgets": [
{
"type": "Rectangle",
"style": {
"inheritFrom": "default"
},
"left": 0,
"top": 0,
"width": 94,
"height": 36,
"invertColors": true
},
{
"type": "Text",
"style": {
"inheritFrom": "edit_value_active_M_center"
},
"action": "untrack_all",
"left": 0,
"top": 0,
"width": 94,
"height": 36,
"text": "Untrack",
"focusStyle": {}
}
]
}
]
},
Expand Down Expand Up @@ -458396,7 +458441,7 @@
"#404040",
"#404040",
"#d0d0d0",
"#ffffff",
"#d3d3d3",
"#404040",
"#d6a82f",
"#3cc02a",
Expand Down
7 changes: 6 additions & 1 deletion src/eez/gui/action_impl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,12 @@ void action_toggle_enable_tracking_mode_in_coupling() {
void action_toggle_channel_tracking() {
selectChannel();
auto page = (SysSettingsTrackingPage *)getActivePage();
page->m_trackingEnabled ^= (1 << g_channel->channelIndex);
page->toggleChannelTracking(g_channel->channelIndex);
}

void action_untrack_all() {
auto page = (SysSettingsTrackingPage *)getActivePage();
page->untrackAll();
}

void action_sys_settings_protections_toggle_output_protection_couple() {
Expand Down
59,052 changes: 29,529 additions & 29,523 deletions src/eez/gui/document_simulator.cpp
View file

Large diffs are not rendered by default.

141 changes: 72 additions & 69 deletions src/eez/gui/document_simulator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,8 @@ enum DataEnum {
DATA_ID_DATE_TIME_FORMAT = 366,
DATA_ID_DATE_TIME_FORMAT_IS_DMY = 367,
DATA_ID_DATE_TIME_FORMAT_IS_24H = 368,
DATA_ID_DATE_TIME_AM_PM = 369
DATA_ID_DATE_TIME_AM_PM = 369,
DATA_ID_IS_MULTI_TRACKING = 370
};

void data_none(DataOperationEnum operation, Cursor &cursor, Value &value);
Expand Down Expand Up @@ -741,6 +742,7 @@ void data_date_time_format(DataOperationEnum operation, Cursor &cursor, Value &v
void data_date_time_format_is_dmy(DataOperationEnum operation, Cursor &cursor, Value &value);
void data_date_time_format_is_24h(DataOperationEnum operation, Cursor &cursor, Value &value);
void data_date_time_am_pm(DataOperationEnum operation, Cursor &cursor, Value &value);
void data_is_multi_tracking(DataOperationEnum operation, Cursor &cursor, Value &value);

typedef void (*DataOperationsFunction)(DataOperationEnum operation, Cursor &cursor, Value &value);

Expand Down Expand Up @@ -969,7 +971,8 @@ enum ActionsEnum {
ACTION_ID_EVENT_QUEUE_SELECT_EVENT = 219,
ACTION_ID_DATE_TIME_SELECT_FORMAT = 220,
ACTION_ID_DATE_TIME_TOGGLE_AM_PM = 221,
ACTION_ID_EDIT_NO_FOCUS = 222
ACTION_ID_EDIT_NO_FOCUS = 222,
ACTION_ID_UNTRACK_ALL = 223
};

void action_channel_toggle_output();
Expand Down Expand Up @@ -1194,6 +1197,7 @@ void action_event_queue_select_event();
void action_date_time_select_format();
void action_date_time_toggle_am_pm();
void action_edit_no_focus();
void action_untrack_all();

extern ActionExecFunc g_actionExecFunctions[];

Expand Down Expand Up @@ -1301,71 +1305,70 @@ enum StylesEnum {
STYLE_ID_YES_NO_MESSAGE = 63,
STYLE_ID_TEXT_MESSAGE = 64,
STYLE_ID_ASYNC_OPERATION = 65,
STYLE_ID_ASYNC_OPERATION_ACTION = 66,
STYLE_ID_SCROLLBAR_THUMB = 67,
STYLE_ID_SCROLLBAR_BUTTON = 68,
STYLE_ID_BOTTOM_BUTTON_TEXTUAL_S_LEFT = 69,
STYLE_ID_KEY_SPEC_ICONS = 70,
STYLE_ID_KEY_SPEC_ICONS_DISABLED = 71,
STYLE_ID_KEY_DISABLED = 72,
STYLE_ID_EDIT_VALUE_S_CENTERED = 73,
STYLE_ID_EDIT_VALUE_ACTIVE_S_CENTER = 74,
STYLE_ID_EDIT_VALUE_ACTIVE_M_CENTER = 75,
STYLE_ID_VALUE_M = 76,
STYLE_ID_DEFAULT_DISABLED_M_LEFT = 77,
STYLE_ID_YT_GRAPH = 78,
STYLE_ID_LIST_GRAPH_CURSOR = 79,
STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 80,
STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 81,
STYLE_ID_EDIT_VALUE_FOCUS_S_CENTER = 82,
STYLE_ID_VALUE = 83,
STYLE_ID_DEFAULT_M = 84,
STYLE_ID_NON_INTERACTIVE_BUTTON_M = 85,
STYLE_ID_OPTION_TOGGLE_L_CENTER = 86,
STYLE_ID_DEFAULT_M_LEFT = 87,
STYLE_ID_EVENT_ERROR = 88,
STYLE_ID_DEFAULT_DISABLED_S_LEFT = 89,
STYLE_ID_ICON_AND_TEXT_S = 90,
STYLE_ID_ICON_AND_TEXT_S_DISABLED = 91,
STYLE_ID_DEFAULT_DISABLED = 92,
STYLE_ID_EDIT_VALUE_M_CENTERED = 93,
STYLE_ID_EDIT_S = 94,
STYLE_ID_EDIT_VALUE_ACTIVE_S_LEFT = 95,
STYLE_ID_EVENT_WARNING = 96,
STYLE_ID_DISPLAY_OFF = 97,
STYLE_ID_DISPLAY_OFF_S = 98,
STYLE_ID_DEFAULT_GUI_TMPL = 99,
STYLE_ID_MON_VALUE_48_RIGHT = 100,
STYLE_ID_MON_VALUE_20_LEFT = 101,
STYLE_ID_ENCODER_CURSOR_14_DISABLED = 102,
STYLE_ID_ENCODER_CURSOR_14_ENABLED = 103,
STYLE_ID_ENCODER_CURSOR_14_FOCUSED = 104,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 105,
STYLE_ID_BAR_GRAPH_TEXT = 106,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 107,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 108,
STYLE_ID_TRIGGER_BUTTON_24 = 109,
STYLE_ID_MON_VALUE_14_RIGHT = 110,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_DISABLED = 111,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 112,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_FOCUSED = 113,
STYLE_ID_ENCODER_CURSOR_14_LEFT_DISABLED = 114,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 115,
STYLE_ID_TRIGGER_BUTTON_14 = 116,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 117,
STYLE_ID_INST_SELECTED = 118,
STYLE_ID_MON_VALUE_38_RIGHT = 119,
STYLE_ID_CH_PROT_OFF = 120,
STYLE_ID_CH_PROT_ON = 121,
STYLE_ID_CH_PROT_TRIPPED = 122,
STYLE_ID_BUTTON_BGND = 123,
STYLE_ID_MON_VALUE_24_RIGHT = 124,
STYLE_ID_MON_VALUE_14_CENTER = 125,
STYLE_ID_MON_VALUE_20_RIGHT = 126,
STYLE_ID_MON_VALUE_14_LEFT = 127,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 128,
STYLE_ID_SCROLLBAR_TRACK = 129,
STYLE_ID_NON_INTERACTIVE_BUTTON_S_DISABLED = 130
STYLE_ID_SCROLLBAR_THUMB = 66,
STYLE_ID_SCROLLBAR_BUTTON = 67,
STYLE_ID_BOTTOM_BUTTON_TEXTUAL_S_LEFT = 68,
STYLE_ID_KEY_SPEC_ICONS = 69,
STYLE_ID_KEY_SPEC_ICONS_DISABLED = 70,
STYLE_ID_KEY_DISABLED = 71,
STYLE_ID_EDIT_VALUE_S_CENTERED = 72,
STYLE_ID_EDIT_VALUE_ACTIVE_S_CENTER = 73,
STYLE_ID_EDIT_VALUE_ACTIVE_M_CENTER = 74,
STYLE_ID_VALUE_M = 75,
STYLE_ID_DEFAULT_DISABLED_M_LEFT = 76,
STYLE_ID_YT_GRAPH = 77,
STYLE_ID_LIST_GRAPH_CURSOR = 78,
STYLE_ID_YT_GRAPH_U_DEFAULT_LABEL = 79,
STYLE_ID_YT_GRAPH_I_DEFAULT_LABEL = 80,
STYLE_ID_EDIT_VALUE_FOCUS_S_CENTER = 81,
STYLE_ID_VALUE = 82,
STYLE_ID_DEFAULT_M = 83,
STYLE_ID_NON_INTERACTIVE_BUTTON_M = 84,
STYLE_ID_OPTION_TOGGLE_L_CENTER = 85,
STYLE_ID_DEFAULT_M_LEFT = 86,
STYLE_ID_EVENT_ERROR = 87,
STYLE_ID_DEFAULT_DISABLED_S_LEFT = 88,
STYLE_ID_ICON_AND_TEXT_S = 89,
STYLE_ID_ICON_AND_TEXT_S_DISABLED = 90,
STYLE_ID_DEFAULT_DISABLED = 91,
STYLE_ID_EDIT_VALUE_M_CENTERED = 92,
STYLE_ID_EDIT_S = 93,
STYLE_ID_EDIT_VALUE_ACTIVE_S_LEFT = 94,
STYLE_ID_EVENT_WARNING = 95,
STYLE_ID_DISPLAY_OFF = 96,
STYLE_ID_DISPLAY_OFF_S = 97,
STYLE_ID_DEFAULT_GUI_TMPL = 98,
STYLE_ID_MON_VALUE_48_RIGHT = 99,
STYLE_ID_MON_VALUE_20_LEFT = 100,
STYLE_ID_ENCODER_CURSOR_14_DISABLED = 101,
STYLE_ID_ENCODER_CURSOR_14_ENABLED = 102,
STYLE_ID_ENCODER_CURSOR_14_FOCUSED = 103,
STYLE_ID_BAR_GRAPH_U_DEFAULT = 104,
STYLE_ID_BAR_GRAPH_TEXT = 105,
STYLE_ID_BAR_GRAPH_LIMIT_LINE = 106,
STYLE_ID_BAR_GRAPH_I_DEFAULT = 107,
STYLE_ID_TRIGGER_BUTTON_24 = 108,
STYLE_ID_MON_VALUE_14_RIGHT = 109,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_DISABLED = 110,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_ENABLED = 111,
STYLE_ID_ENCODER_CURSOR_14_RIGHT_FOCUSED = 112,
STYLE_ID_ENCODER_CURSOR_14_LEFT_DISABLED = 113,
STYLE_ID_CHANNEL_OFF_BUTTON_20 = 114,
STYLE_ID_TRIGGER_BUTTON_14 = 115,
STYLE_ID_CHANNEL_OFF_BUTTON_38 = 116,
STYLE_ID_INST_SELECTED = 117,
STYLE_ID_MON_VALUE_38_RIGHT = 118,
STYLE_ID_CH_PROT_OFF = 119,
STYLE_ID_CH_PROT_ON = 120,
STYLE_ID_CH_PROT_TRIPPED = 121,
STYLE_ID_BUTTON_BGND = 122,
STYLE_ID_MON_VALUE_24_RIGHT = 123,
STYLE_ID_MON_VALUE_14_CENTER = 124,
STYLE_ID_MON_VALUE_20_RIGHT = 125,
STYLE_ID_MON_VALUE_14_LEFT = 126,
STYLE_ID_CHANNEL_OFF_BUTTON_14 = 127,
STYLE_ID_SCROLLBAR_TRACK = 128,
STYLE_ID_NON_INTERACTIVE_BUTTON_S_DISABLED = 129
};

enum ThemesEnum {
Expand Down Expand Up @@ -1596,7 +1599,7 @@ enum PagesEnum {
};

#ifdef OPTION_SDRAM
extern const uint8_t assets[394446];
extern const uint8_t assets[394367];
#else
extern const uint8_t assets[3864892];
extern const uint8_t assets[3865036];
#endif
Loading

0 comments on commit e8f06c5

Please sign in to comment.