Skip to content

Commit

Permalink
trigger gui fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Apr 5, 2020
1 parent cefba5b commit c2d73ff
Show file tree
Hide file tree
Showing 27 changed files with 46,223 additions and 45,393 deletions.
3,730 changes: 2,297 additions & 1,433 deletions modular-psu-firmware.eez-project

Large diffs are not rendered by default.

27 changes: 7 additions & 20 deletions src/eez/gui/action_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -754,14 +754,6 @@ void action_ch_settings_trigger_edit_trigger_mode() {
((ChSettingsTriggerPage *)getActivePage())->editTriggerMode();
}

void action_ch_settings_trigger_edit_voltage_trigger_value() {
((ChSettingsTriggerPage *)getActivePage())->editVoltageTriggerValue();
}

void action_ch_settings_trigger_edit_current_trigger_value() {
((ChSettingsTriggerPage *)getActivePage())->editCurrentTriggerValue();
}

void action_ch_settings_lists_edit_list_count() {
((ChSettingsListsPage *)getActivePage())->editListCount();
}
Expand Down Expand Up @@ -834,18 +826,6 @@ void action_channel_lists_file_export() {
((ChSettingsListsPage *)getActivePage())->fileExport();
}

void action_channel_initiate_trigger() {
channelInitiateTrigger();
}

void action_channel_set_to_fixed() {
channelSetToFixed();
}

void action_channel_enable_output() {
channelEnableOutput();
}

void action_trigger_select_source() {
((SysSettingsTriggerPage *)getActivePage())->selectSource();
}
Expand Down Expand Up @@ -1320,6 +1300,13 @@ void action_show_sys_settings_ramp_and_delay() {
pushPage(PAGE_ID_SYS_SETTINGS_RAMP_AND_DELAY);
}

void action_channel_toggle_ramp_state() {
auto page = (SysSettingsRampAndDelayPage *)getPage(PAGE_ID_SYS_SETTINGS_RAMP_AND_DELAY);
if (page) {
page->toggleRampState(getFoundWidgetAtDown().cursor);
}
}

} // namespace gui
} // namespace eez

Expand Down
48,493 changes: 24,292 additions & 24,201 deletions src/eez/gui/document_simulator.cpp

Large diffs are not rendered by default.

Loading

0 comments on commit c2d73ff

Please sign in to comment.