fixed refresh of channel trigger page when back from ramp&delay page

eez-open · Feb 15, 2021 · 14cdfee · 14cdfee
1 parent b88c346
commit 14cdfee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/eez/modules/psu/gui/page_ch_settings.cpp b/src/eez/modules/psu/gui/page_ch_settings.cpp
@@ -510,6 +510,12 @@ void ChSettingsTriggerPage::pageAlloc() {
     outputDelayDuration = outputDelayDurationOrig = g_channel->outputDelayDuration;
 }
 
+void ChSettingsTriggerPage::pageWillAppear() {
+	if (!getDirty()) {
+		pageAlloc();
+	}
+}
+
 int ChSettingsTriggerPage::getDirty() {
     return 
         triggerMode != triggerModeOrig ||

diff --git a/src/eez/modules/psu/gui/page_ch_settings.h b/src/eez/modules/psu/gui/page_ch_settings.h
@@ -158,10 +158,11 @@ class ChSettingsOtpProtectionPage : public ChSettingsProtectionSetPage {
 
 class ChSettingsTriggerPage : public SetPage {
 public:
-    void pageAlloc();
+    void pageAlloc() override;
+    void pageWillAppear() override;
 
-    int getDirty();
-    void set();
+    int getDirty() override;
+    void set() override;
 
     TriggerMode triggerMode;