Skip to content

Commit 40a71fe

Browse files
authored
davis logo (#153)
* davis logo * style to kHtmlDavisLogoHyperlinkBlock
1 parent 5ccb4ed commit 40a71fe

File tree

7 files changed

+306
-107
lines changed

7 files changed

+306
-107
lines changed

array_core/multi_plot.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,20 @@ void holdOff(const Config& configuration) {
5555
} else {
5656
paramWHsecond = paramWH;
5757
}
58-
vector<string> args = {dvs::kPlotlyJsName, allChartBlocks_str, allTracesNames_str,
59-
configuration.chart.title, configuration.chart.xLabel, configuration.chart.yLabel,
58+
vector<string> args = {dvs::kPlotlyJsName,
59+
allChartBlocks_str,
60+
allTracesNames_str,
61+
configuration.chart.title,
62+
configuration.chart.xLabel,
63+
configuration.chart.yLabel,
6064
dvs::toStringDotSeparator(configuration.chart.aspectRatioWidth),
6165
dvs::toStringDotSeparator(configuration.chart.aspectRatioHeight),
62-
paramWH, paramWHsecond,
66+
paramWH,
67+
paramWHsecond,
6368
dvs::kHtmlComboboxStyleBlock,
6469
dvs::kHtmlComboboxSelectBlock,
65-
dvs::kHtmlComboboxUpdateFooBlock
70+
dvs::kHtmlComboboxUpdateFooBlock,
71+
dvs::kHtmlDavisLogoHyperlinkBlock
6672
};
6773
string multichartPage = dvs::kHtmlMultiChartModel;
6874
string filled_multichartPage = "";

davis_one/davis.cpp

Lines changed: 147 additions & 52 deletions
Large diffs are not rendered by default.

davis_one/davis.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ enum ARGS_INDEX {
136136
ARG_POINT_LINE_SWITCHER_STYLE, //%13
137137
ARG_POINT_LINE_SWITCHER_SELECT, //%14
138138
ARG_POINT_LINE_SWITCHER_UPDATE_FOO, //%15
139+
ARG_DAVIS_LOGO, //%16
139140
// ADD NEW ENUM BEFORE THIS COMMENT
140141
ARGS_SIZE
141142
};
@@ -166,6 +167,7 @@ enum ARGS_DATE_TIME_PAGE_INDEX {
166167
ARG_DATE_TIME_POINT_LINE_SWITCHER_STYLE, //%7
167168
ARG_DATE_TIME_POINT_LINE_SWITCHER_SELECT, //%8
168169
ARG_DATE_TIME_POINT_LINE_SWITCHER_UPDATE_FOO, //%9
170+
ARG_DATE_TIME_DAVIS_LOGO, //%10
169171
// ADD NEW ENUM BEFORE THIS COMMENT
170172
ARGS_DATE_TIME_PAGE_SIZE
171173
};
@@ -185,6 +187,7 @@ enum ARGS_MULTI_CHARTS_PAGE {
185187
ARG_MC_POINT_LINE_SWITCHER_STYLE, //%11
186188
ARG_MC_TIME_POINT_LINE_SWITCHER_SELECT, //%12
187189
ARG_MC_TIME_POINT_LINE_SWITCHER_UPDATE_FOO, //%13
190+
ARG_MC_TIME_DAVIS_LOGO, //%14
188191
// ADD NEW ENUM BEFORE THIS COMMENT
189192
ARGS_MULTI_CHARTS_PAGE_SIZE
190193
};
@@ -198,7 +201,7 @@ enum ARGS_CLOUD_OF_POINTS_PAGE {
198201
ARG_CLOUD_OF_POINTS_ASPECT_RATIO_HEIGHT, //%6
199202
ARG_CLOUD_OF_POINTS_ASPECT_WIDTH_OR_HEIGHT, //7 "width" if ARG_ASPECT_RATIO_WIDTH > ARG_ASPECT_RATIO_HEIGHT and "height" if not
200203
ARG_CLOUD_OF_POINTS_ASPECT_WIDTH_OR_HEIGHT_FOR_AUTOSCALE, //%8 if value of it is equal to ARG_ASPECT_WIDTH_OR_HEIGHT it's mean no autoscale.
201-
204+
ARG_CLOUD_OF_POINTS_DAVIS_LOGO, //%9
202205
// ADD NEW ENUM BEFORE THIS COMMENT
203206
ARGS_CLOUD_OF_POINTS_PAGE_SIZE
204207
};
@@ -245,6 +248,7 @@ extern const char kHtmlComboboxUpdateFooBlock[];
245248
extern const char kHtmlComboboxSelectSurfaceMatrixBlock[];
246249
extern const char kHtmlComboboxUpdateSurfaceMatrixFooBlock[];
247250

251+
extern const char kHtmlDavisLogoHyperlinkBlock[];
248252

249253
} // namespace dvs end
250254

gui/davis_gui.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,8 @@ void DavisGUI::visualizeFiles(const QStringList& file_list) {
962962
.arg(paramWHsecond)
963963
.arg(dvs::kHtmlComboboxStyleBlock)
964964
.arg(dvs::kHtmlComboboxSelectBlock)
965-
.arg(dvs::kHtmlComboboxUpdateFooBlock);
965+
.arg(dvs::kHtmlComboboxUpdateFooBlock)
966+
.arg(dvs::kHtmlDavisLogoHyperlinkBlock);
966967

967968
dvs::saveStringToFile(dvs::makeUniqueDavisHtmlName(), multichartPage.toStdString());
968969
dvs::openFileBySystem(dvs::makeUniqueDavisHtmlName());

0 commit comments

Comments
 (0)