From 498400b68059855839983bce650d96583fa0e624 Mon Sep 17 00:00:00 2001 From: ValeryStk Date: Fri, 3 Jan 2025 12:41:03 +0300 Subject: [PATCH] point line switcher --- davis_one/davis.cpp | 3 +++ gui/davis_gui.cpp | 1 + plotly_maker/plotly_maker.cpp | 3 +++ 3 files changed, 7 insertions(+) diff --git a/davis_one/davis.cpp b/davis_one/davis.cpp index de2221e..b001c1e 100644 --- a/davis_one/davis.cpp +++ b/davis_one/davis.cpp @@ -1348,6 +1348,9 @@ void showDateTimeChart(const string& date_time_values, args[ARG_DATE_TIME_VALUES_BLOCK] = data_values_block; args[ARG_DATE_TIME_ASPECT_RATIO_WIDTH] = "1"; args[ARG_DATE_TIME_ASPECT_RATIO_HEIGHT] = "1"; + args[ARG_DATE_TIME_POINT_LINE_SWITCHER_STYLE] = kHtmlComboboxStyleBlock; + args[ARG_DATE_TIME_POINT_LINE_SWITCHER_SELECT] = kHtmlComboboxSelectBlock; + args[ARG_DATE_TIME_POINT_LINE_SWITCHER_UPDATE_FOO] = kHtmlComboboxUpdateFooBlock; /* string paramWH; if(configuration.chart.aspectRatioWidth > configuration.chart.aspectRatioHeight){ diff --git a/gui/davis_gui.cpp b/gui/davis_gui.cpp index 1bde7e4..e92a60d 100644 --- a/gui/davis_gui.cpp +++ b/gui/davis_gui.cpp @@ -753,6 +753,7 @@ bool DavisGUI::checkDateTimeVariant(const QStringList& lines) { } + void DavisGUI::selectAndShowFiles() { QStringList fileNames = QFileDialog::getOpenFileNames(this, diff --git a/plotly_maker/plotly_maker.cpp b/plotly_maker/plotly_maker.cpp index 9686478..f7fb781 100644 --- a/plotly_maker/plotly_maker.cpp +++ b/plotly_maker/plotly_maker.cpp @@ -425,6 +425,9 @@ void showDateTimeChart(const string& date_time_values, args[ARG_DATE_TIME_VALUES_BLOCK] = data_values_block; args[ARG_DATE_TIME_ASPECT_RATIO_WIDTH] = "1"; args[ARG_DATE_TIME_ASPECT_RATIO_HEIGHT] = "1"; + args[ARG_DATE_TIME_POINT_LINE_SWITCHER_STYLE] = kHtmlComboboxStyleBlock; + args[ARG_DATE_TIME_POINT_LINE_SWITCHER_SELECT] = kHtmlComboboxSelectBlock; + args[ARG_DATE_TIME_POINT_LINE_SWITCHER_UPDATE_FOO] = kHtmlComboboxUpdateFooBlock; /* string paramWH; if(configuration.chart.aspectRatioWidth > configuration.chart.aspectRatioHeight){