showLabels

eez-open · Jan 3, 2020 · 98fbbf5 · 98fbbf5
1 parent 28f5648
commit 98fbbf5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/src/eez/gui/action_impl.cpp b/src/eez/gui/action_impl.cpp
@@ -1152,10 +1152,7 @@ void action_dlog_toggle() {
 
 void action_show_dlog_view() {
     dlog_view::g_showLatest = true;
-    if (dlog_record::isExecuting()) {
-        dlog_view::g_showLabels = false;
-    } else {
-        dlog_view::g_showLabels = true;
+    if (!dlog_record::isExecuting()) {
         dlog_view::openFile(dlog_record::getLatestFilePath());
     }
     showPage(PAGE_ID_DLOG_VIEW);

diff --git a/src/eez/modules/psu/dlog_view.cpp b/src/eez/modules/psu/dlog_view.cpp
@@ -733,8 +733,6 @@ void openFile(const char *filePath) {
                     g_recording.getValue = getValue;
                     g_isLoading = false;
 
-                    g_showLabels = true;
-
                     if (yAxisHasDifferentUnits(g_recording)) {
                         autoScale(g_recording);
                     }

diff --git a/src/eez/modules/psu/scpi/display.cpp b/src/eez/modules/psu/scpi/display.cpp
@@ -213,7 +213,6 @@ scpi_result_t scpi_cmd_displayDataQ(scpi_t *context) {
 scpi_result_t scpi_cmd_displayWindowDlog(scpi_t *context) {
 #if OPTION_DISPLAY && OPTION_SD_CARD
     dlog_view::g_showLatest = true;
-    dlog_view::g_showLabels = false;
     psu::gui::g_psuAppContext.pushPageOnNextIter(PAGE_ID_DLOG_VIEW);
     return SCPI_RES_OK;
 #else