Skip to content

davis logo #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 13, 2025
Merged

davis logo #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0e602e
davis logo
AntonMrt Jan 12, 2025
2343ec4
style to kHtmlDavisLogoHyperlinkBlock
AntonMrt Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions array_core/multi_plot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,20 @@ void holdOff(const Config& configuration) {
} else {
paramWHsecond = paramWH;
}
vector<string> args = {dvs::kPlotlyJsName, allChartBlocks_str, allTracesNames_str,
configuration.chart.title, configuration.chart.xLabel, configuration.chart.yLabel,
vector<string> args = {dvs::kPlotlyJsName,
allChartBlocks_str,
allTracesNames_str,
configuration.chart.title,
configuration.chart.xLabel,
configuration.chart.yLabel,
dvs::toStringDotSeparator(configuration.chart.aspectRatioWidth),
dvs::toStringDotSeparator(configuration.chart.aspectRatioHeight),
paramWH, paramWHsecond,
paramWH,
paramWHsecond,
dvs::kHtmlComboboxStyleBlock,
dvs::kHtmlComboboxSelectBlock,
dvs::kHtmlComboboxUpdateFooBlock
dvs::kHtmlComboboxUpdateFooBlock,
dvs::kHtmlDavisLogoHyperlinkBlock
};
string multichartPage = dvs::kHtmlMultiChartModel;
string filled_multichartPage = "";
Expand Down
199 changes: 147 additions & 52 deletions davis_one/davis.cpp
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion davis_one/davis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ enum ARGS_INDEX {
ARG_POINT_LINE_SWITCHER_STYLE, //%13
ARG_POINT_LINE_SWITCHER_SELECT, //%14
ARG_POINT_LINE_SWITCHER_UPDATE_FOO, //%15
ARG_DAVIS_LOGO, //%16
// ADD NEW ENUM BEFORE THIS COMMENT
ARGS_SIZE
};
Expand Down Expand Up @@ -166,6 +167,7 @@ enum ARGS_DATE_TIME_PAGE_INDEX {
ARG_DATE_TIME_POINT_LINE_SWITCHER_STYLE, //%7
ARG_DATE_TIME_POINT_LINE_SWITCHER_SELECT, //%8
ARG_DATE_TIME_POINT_LINE_SWITCHER_UPDATE_FOO, //%9
ARG_DATE_TIME_DAVIS_LOGO, //%10
// ADD NEW ENUM BEFORE THIS COMMENT
ARGS_DATE_TIME_PAGE_SIZE
};
Expand All @@ -185,6 +187,7 @@ enum ARGS_MULTI_CHARTS_PAGE {
ARG_MC_POINT_LINE_SWITCHER_STYLE, //%11
ARG_MC_TIME_POINT_LINE_SWITCHER_SELECT, //%12
ARG_MC_TIME_POINT_LINE_SWITCHER_UPDATE_FOO, //%13
ARG_MC_TIME_DAVIS_LOGO, //%14
// ADD NEW ENUM BEFORE THIS COMMENT
ARGS_MULTI_CHARTS_PAGE_SIZE
};
Expand All @@ -198,7 +201,7 @@ enum ARGS_CLOUD_OF_POINTS_PAGE {
ARG_CLOUD_OF_POINTS_ASPECT_RATIO_HEIGHT, //%6
ARG_CLOUD_OF_POINTS_ASPECT_WIDTH_OR_HEIGHT, //7 "width" if ARG_ASPECT_RATIO_WIDTH > ARG_ASPECT_RATIO_HEIGHT and "height" if not
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.

ARG_CLOUD_OF_POINTS_DAVIS_LOGO, //%9
// ADD NEW ENUM BEFORE THIS COMMENT
ARGS_CLOUD_OF_POINTS_PAGE_SIZE
};
Expand Down Expand Up @@ -245,6 +248,7 @@ extern const char kHtmlComboboxUpdateFooBlock[];
extern const char kHtmlComboboxSelectSurfaceMatrixBlock[];
extern const char kHtmlComboboxUpdateSurfaceMatrixFooBlock[];

extern const char kHtmlDavisLogoHyperlinkBlock[];

} // namespace dvs end

Expand Down
3 changes: 2 additions & 1 deletion gui/davis_gui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,7 +962,8 @@ void DavisGUI::visualizeFiles(const QStringList& file_list) {
.arg(paramWHsecond)
.arg(dvs::kHtmlComboboxStyleBlock)
.arg(dvs::kHtmlComboboxSelectBlock)
.arg(dvs::kHtmlComboboxUpdateFooBlock);
.arg(dvs::kHtmlComboboxUpdateFooBlock)
.arg(dvs::kHtmlDavisLogoHyperlinkBlock);

dvs::saveStringToFile(dvs::makeUniqueDavisHtmlName(), multichartPage.toStdString());
dvs::openFileBySystem(dvs::makeUniqueDavisHtmlName());
Expand Down
Loading
Loading