diff --git a/Tests/ArrayCoreTest.cpp b/Tests/ArrayCoreTest.cpp index 2f1f968..2af84ce 100644 --- a/Tests/ArrayCoreTest.cpp +++ b/Tests/ArrayCoreTest.cpp @@ -126,6 +126,7 @@ TEST(ArrayCore, configurator) { auto config = dv::Config(); config.heatmap.xLabel = "Столбцы"; config.heatmap.yLabel = "Строки"; + config.heatmap.zLabel = "Z"; config.heatmap.title = "Тестовая матрица"; config.heatmap.colorSc = dv::COLORSCALE_YlGnBu; bool result1 = dv::show(values, "HeatMap", config); diff --git a/array_core/configurator.h b/array_core/configurator.h index ba6f215..8c301b4 100644 --- a/array_core/configurator.h +++ b/array_core/configurator.h @@ -36,6 +36,7 @@ struct commonSettings { std::string title; std::string xLabel; std::string yLabel; + std::string zLabel; double aspectRatioWidth; // use it for user scale if isFitPlotToWindow = false double aspectRatioHeight;// use it for user scale if isFitPlotToWindow = false bool isFitPlotToWindow; //true - plot fits to browser window, false - square plot diff --git a/davis_one/davis.cpp b/davis_one/davis.cpp index c84aa72..56a6740 100644 --- a/davis_one/davis.cpp +++ b/davis_one/davis.cpp @@ -1335,6 +1335,7 @@ bool createHtmlPageHeatmap(const std::vector>& values, args[ARG_TITLE] = configuration.heatmap.title; args[ARG_TITLE_X] = configuration.heatmap.xLabel; args[ARG_TITLE_Y] = configuration.heatmap.yLabel; + args[ARG_TITLE_Z] = configuration.heatmap.zLabel; args[ARG_ASPECT_RATIO_WIDTH] = dvs::toStringDotSeparator(configuration.heatmap.aspectRatioWidth); args[ARG_ASPECT_RATIO_HEIGHT] = dvs::toStringDotSeparator(configuration.heatmap.aspectRatioHeight); string paramWH; diff --git a/davis_one/davis.h b/davis_one/davis.h index 37b7024..e0f21c9 100644 --- a/davis_one/davis.h +++ b/davis_one/davis.h @@ -67,6 +67,7 @@ struct commonSettings { std::string title; std::string xLabel; std::string yLabel; + std::string zLabel; double aspectRatioWidth; // use it for user scale if isFitPlotToWindow = false double aspectRatioHeight;// use it for user scale if isFitPlotToWindow = false bool isFitPlotToWindow; //true - plot fits to browser window, false - square plot diff --git a/plotly_maker/plotly_maker.cpp b/plotly_maker/plotly_maker.cpp index fed865c..c154ae6 100644 --- a/plotly_maker/plotly_maker.cpp +++ b/plotly_maker/plotly_maker.cpp @@ -119,6 +119,7 @@ bool createHtmlPageHeatmap(const std::vector>& values, args[ARG_TITLE] = configuration.heatmap.title; args[ARG_TITLE_X] = configuration.heatmap.xLabel; args[ARG_TITLE_Y] = configuration.heatmap.yLabel; + args[ARG_TITLE_Z] = configuration.heatmap.zLabel; args[ARG_ASPECT_RATIO_WIDTH] = dvs::toStringDotSeparator(configuration.heatmap.aspectRatioWidth); args[ARG_ASPECT_RATIO_HEIGHT] = dvs::toStringDotSeparator(configuration.heatmap.aspectRatioHeight); string paramWH;