Skip to content

Commit bcda5e6

Browse files
ValeryStkValeryStk
committed
delete unused enum and renaming
1 parent 999880f commit bcda5e6

File tree

6 files changed

+15
-63
lines changed

6 files changed

+15
-63
lines changed

‎davis_one/davis.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,9 +1755,9 @@ void showCloudOfPointsChartStr(const std::string& xValues,
17551755
openFileBySystem(unique_file_name);
17561756
}
17571757

1758-
void showDateTimeMultichart(const std::string& date_time_values,
1759-
const vector<vector<double>>& yValues,
1760-
bool isFitPlotToWindow) {
1758+
void showMultiChart(const std::string& date_time_values,
1759+
const vector<vector<double>>& yValues,
1760+
bool isFitPlotToWindow) {
17611761
string out;
17621762
vector<string>args {ARGS_DATE_TIME_PAGE_SIZE, ""};
17631763
args[ARG_JS_NAME] = kPlotlyJsName;

‎davis_one/davis.h

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -178,30 +178,6 @@ enum ARGS_DATE_TIME_PAGE_INDEX {
178178
ARGS_DATE_TIME_PAGE_SIZE
179179
};
180180

181-
// currently don't used
182-
enum ARGS_MULTI_CHARTS_PAGE {
183-
ARG_JS_MC_NAME,
184-
ARG_TRACES_BLOCKS,
185-
ARG_DATA_OF_TRACES,
186-
something1,
187-
something2,
188-
something3,
189-
ARG_MC_ASPECT_RATIO_WIDTH, //%7
190-
ARG_MC_ASPECT_RATIO_HEIGHT, //%8
191-
ARG_MC_ASPECT_WIDTH_OR_HEIGHT, //%9 "width" if ARG_ASPECT_RATIO_WIDTH > ARG_ASPECT_RATIO_HEIGHT and "height" if not
192-
ARG_MC_ASPECT_WIDTH_OR_HEIGHT_FOR_AUTOSCALE, //%10 if value of it is equal to ARG_ASPECT_WIDTH_OR_HEIGHT it's mean no autoscale.
193-
ARG_MC_POINT_LINE_SWITCHER_STYLE, //%11
194-
ARG_MC_POINT_LINE_SWITCHER_SELECT, //%12
195-
ARG_MC_POINT_LINE_SWITCHER_UPDATE_FOO, //%13
196-
ARG_MC_DAVIS_LOGO, //%14
197-
ARG_MC_AVERAGE_BUTTON_STYLE,//%15
198-
ARG_MC_AVERAGE_BUTTON_DIV,//%16
199-
ARG_MC_AVERAGE_BUTTON_JS,//%17
200-
ARG_MC_AVERAGE_VALUES_BLOCK,//%18
201-
// ADD NEW ENUM BEFORE THIS COMMENT
202-
ARGS_MULTI_CHARTS_PAGE_SIZE
203-
};
204-
205181
enum ARGS_CLOUD_OF_POINTS_PAGE {
206182
ARG_JS_COF_NAME,
207183
ARG_X_CLOUD_OF_POINTS,
@@ -488,9 +464,9 @@ void showCloudOfPointsChartStr(const string& xValues,
488464
const vector<double>& colorValues,
489465
bool isFitPlotToWindow);
490466

491-
void showDateTimeMultichart(const string& date_time_values,
492-
const vector<vector<double>>& yValues,
493-
bool isFitPlotToWindow);
467+
void showMultiChart(const string& date_time_values,
468+
const vector<vector<double>>& yValues,
469+
bool isFitPlotToWindow);
494470

495471

496472
} // namespace dvs end

‎gui/davis_gui.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ bool DavisGUI::checkDateTimeVariant(const QStringList& lines) {
753753

754754
if (multicharts.empty() == false) {
755755
dvs::transponeMatrix(multicharts);
756-
dvs::showDateTimeMultichart(dates.toStdString(), multicharts, action_fitPlotToAllWindow->isChecked());
756+
dvs::showMultiChart(dates.toStdString(), multicharts, action_fitPlotToAllWindow->isChecked());
757757
return true;
758758
}
759759

@@ -921,7 +921,7 @@ void DavisGUI::visualizeFiles(const QStringList& file_list) {
921921
}
922922
}
923923
if (dates_list.isEmpty() == false) {
924-
dvs::showDateTimeMultichart(dates_list[0].toStdString(), all_values, action_fitPlotToAllWindow->isChecked());
924+
dvs::showMultiChart(dates_list[0].toStdString(), all_values, action_fitPlotToAllWindow->isChecked());
925925
return;
926926
}
927927

@@ -936,7 +936,7 @@ void DavisGUI::visualizeFiles(const QStringList& file_list) {
936936
data.push_back(outY);
937937
};
938938
}
939-
dvs::showDateTimeMultichart(dvs::vectorToString(x_values), data, action_fitPlotToAllWindow->isChecked());
939+
dvs::showMultiChart(dvs::vectorToString(x_values), data, action_fitPlotToAllWindow->isChecked());
940940
return;
941941
}
942942
QString filePath = file_list.first();

‎plotly_maker/html_parts.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,30 +59,6 @@ enum ARGS_DATE_TIME_PAGE_INDEX {
5959
ARGS_DATE_TIME_PAGE_SIZE
6060
};
6161

62-
// currently don't used
63-
enum ARGS_MULTI_CHARTS_PAGE {
64-
ARG_JS_MC_NAME,
65-
ARG_TRACES_BLOCKS,
66-
ARG_DATA_OF_TRACES,
67-
something1,
68-
something2,
69-
something3,
70-
ARG_MC_ASPECT_RATIO_WIDTH, //%7
71-
ARG_MC_ASPECT_RATIO_HEIGHT, //%8
72-
ARG_MC_ASPECT_WIDTH_OR_HEIGHT, //%9 "width" if ARG_ASPECT_RATIO_WIDTH > ARG_ASPECT_RATIO_HEIGHT and "height" if not
73-
ARG_MC_ASPECT_WIDTH_OR_HEIGHT_FOR_AUTOSCALE, //%10 if value of it is equal to ARG_ASPECT_WIDTH_OR_HEIGHT it's mean no autoscale.
74-
ARG_MC_POINT_LINE_SWITCHER_STYLE, //%11
75-
ARG_MC_POINT_LINE_SWITCHER_SELECT, //%12
76-
ARG_MC_POINT_LINE_SWITCHER_UPDATE_FOO, //%13
77-
ARG_MC_DAVIS_LOGO, //%14
78-
ARG_MC_AVERAGE_BUTTON_STYLE,//%15
79-
ARG_MC_AVERAGE_BUTTON_DIV,//%16
80-
ARG_MC_AVERAGE_BUTTON_JS,//%17
81-
ARG_MC_AVERAGE_VALUES_BLOCK,//%18
82-
// ADD NEW ENUM BEFORE THIS COMMENT
83-
ARGS_MULTI_CHARTS_PAGE_SIZE
84-
};
85-
8662
enum ARGS_CLOUD_OF_POINTS_PAGE {
8763
ARG_JS_COF_NAME,
8864
ARG_X_CLOUD_OF_POINTS,

‎plotly_maker/plotly_maker.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,9 +537,9 @@ void showCloudOfPointsChartStr(const std::string& xValues,
537537
openFileBySystem(unique_file_name);
538538
}
539539

540-
void showDateTimeMultichart(const std::string& date_time_values,
541-
const vector<vector<double>>& yValues,
542-
bool isFitPlotToWindow) {
540+
void showMultiChart(const std::string& date_time_values,
541+
const vector<vector<double>>& yValues,
542+
bool isFitPlotToWindow) {
543543
string out;
544544
vector<string>args {ARGS_DATE_TIME_PAGE_SIZE, ""};
545545
args[ARG_JS_NAME] = kPlotlyJsName;

‎plotly_maker/plotly_maker.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ void showCloudOfPointsChartStr(const string& xValues,
6565
const vector<double>& colorValues,
6666
bool isFitPlotToWindow);
6767

68-
void showDateTimeMultichart(const string& date_time_values,
69-
const vector<vector<double>>& yValues,
70-
bool isFitPlotToWindow);
68+
void showMultiChart(const string& date_time_values,
69+
const vector<vector<double>>& yValues,
70+
bool isFitPlotToWindow);
7171

7272
//#STOP_GRAB_TO_DVS_NAMESPACE
7373
}; // namespace dvs

0 commit comments

Comments
 (0)