Skip to content

Commit 14cdfee

Browse files
committed
fixed refresh of channel trigger page when back from ramp&delay page
1 parent b88c346 commit 14cdfee

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/eez/modules/psu/gui/page_ch_settings.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,12 @@ void ChSettingsTriggerPage::pageAlloc() {
510510
outputDelayDuration = outputDelayDurationOrig = g_channel->outputDelayDuration;
511511
}
512512

513+
void ChSettingsTriggerPage::pageWillAppear() {
514+
if (!getDirty()) {
515+
pageAlloc();
516+
}
517+
}
518+
513519
int ChSettingsTriggerPage::getDirty() {
514520
return
515521
triggerMode != triggerModeOrig ||

src/eez/modules/psu/gui/page_ch_settings.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,11 @@ class ChSettingsOtpProtectionPage : public ChSettingsProtectionSetPage {
158158

159159
class ChSettingsTriggerPage : public SetPage {
160160
public:
161-
void pageAlloc();
161+
void pageAlloc() override;
162+
void pageWillAppear() override;
162163

163-
int getDirty();
164-
void set();
164+
int getDirty() override;
165+
void set() override;
165166

166167
TriggerMode triggerMode;
167168

0 commit comments

Comments
 (0)