Skip to content

Commit 43e0c6a

Browse files
palvarezlopezpalvarezlopez
committed
Renamed static calls to open dialogs. Refs #16898 
1 parent 2639c4d commit 43e0c6a

8 files changed

Lines changed: 205 additions & 305 deletions

‎src/netedit/GNEApplicationWindow.cpp‎

Lines changed: 138 additions & 81 deletions
Large diffs are not rendered by default.

‎src/netedit/GNEApplicationWindowHelper.cpp‎

Lines changed: 0 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -2477,158 +2477,4 @@ GNEApplicationWindowHelper::stringEndsWith(const std::string& str, const std::st
24772477
}
24782478
}
24792479

2480-
2481-
GNEFileDialog
2482-
GNEApplicationWindowHelper::openXMLFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2483-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2484-
return GNEFileDialog(applicationWindow, TL("XML"),
2485-
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), openMode,
2486-
GNEFileDialog::ConfigType::NETEDIT);
2487-
} else {
2488-
return GNEFileDialog(applicationWindow, TL("XML"),
2489-
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), openMode,
2490-
GNEFileDialog::ConfigType::NETEDIT);
2491-
}
2492-
}
2493-
2494-
2495-
GNEFileDialog
2496-
GNEApplicationWindowHelper::openNetworkFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2497-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2498-
return GNEFileDialog(applicationWindow, TL("network"),
2499-
SUMOXMLDefinitions::NetFileExtensions.getStrings(), openMode,
2500-
GNEFileDialog::ConfigType::NETEDIT);
2501-
} else {
2502-
return GNEFileDialog(applicationWindow, TL("network"),
2503-
SUMOXMLDefinitions::NetFileExtensions.getStrings(), openMode,
2504-
GNEFileDialog::ConfigType::NETEDIT);
2505-
}
2506-
}
2507-
2508-
2509-
GNEFileDialog
2510-
GNEApplicationWindowHelper::openNeteditConfigFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2511-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2512-
return GNEFileDialog(applicationWindow, TL("netedit config"),
2513-
SUMOXMLDefinitions::NeteditConfigFileExtensions.getStrings(), openMode,
2514-
GNEFileDialog::ConfigType::NETEDIT);
2515-
} else {
2516-
return GNEFileDialog(applicationWindow, TL("netedit config"),
2517-
SUMOXMLDefinitions::NeteditConfigFileExtensions.getStrings(), openMode,
2518-
GNEFileDialog::ConfigType::NETEDIT);
2519-
}
2520-
}
2521-
2522-
2523-
GNEFileDialog
2524-
GNEApplicationWindowHelper::openSumoConfigFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2525-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2526-
return GNEFileDialog(applicationWindow, TL("sumo config"),
2527-
SUMOXMLDefinitions::SumoConfigFileExtensions.getStrings(), openMode,
2528-
GNEFileDialog::ConfigType::NETEDIT);
2529-
} else {
2530-
return GNEFileDialog(applicationWindow, TL("sumo config"),
2531-
SUMOXMLDefinitions::SumoConfigFileExtensions.getStrings(), openMode,
2532-
GNEFileDialog::ConfigType::NETEDIT);
2533-
}
2534-
}
2535-
2536-
2537-
GNEFileDialog
2538-
GNEApplicationWindowHelper::openTLSFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2539-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2540-
return GNEFileDialog(applicationWindow, TL("Traffic Light definitions"),
2541-
SUMOXMLDefinitions::TLSFileExtensions.getStrings(), openMode,
2542-
GNEFileDialog::ConfigType::NETEDIT);
2543-
} else {
2544-
return GNEFileDialog(applicationWindow, TL("Traffic Light definitions"),
2545-
SUMOXMLDefinitions::TLSFileExtensions.getStrings(), openMode,
2546-
GNEFileDialog::ConfigType::NETEDIT);
2547-
}
2548-
}
2549-
2550-
2551-
GNEFileDialog
2552-
GNEApplicationWindowHelper::openEdgeTypeFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2553-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2554-
return GNEFileDialog(applicationWindow, TL("EdgeTypes"),
2555-
SUMOXMLDefinitions::EdgeTypeFileExtensions.getStrings(), openMode,
2556-
GNEFileDialog::ConfigType::NETEDIT);
2557-
} else {
2558-
return GNEFileDialog(applicationWindow, TL("EdgeTypes"),
2559-
SUMOXMLDefinitions::EdgeTypeFileExtensions.getStrings(), openMode,
2560-
GNEFileDialog::ConfigType::NETEDIT);
2561-
}
2562-
}
2563-
2564-
2565-
GNEFileDialog
2566-
GNEApplicationWindowHelper::openAdditionalFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2567-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2568-
return GNEFileDialog(applicationWindow, TL("Additional elements"),
2569-
SUMOXMLDefinitions::AdditionalFileExtensions.getStrings(), openMode,
2570-
GNEFileDialog::ConfigType::NETEDIT);
2571-
} else {
2572-
return GNEFileDialog(applicationWindow, TL("Additional elements"),
2573-
SUMOXMLDefinitions::AdditionalFileExtensions.getStrings(), openMode,
2574-
GNEFileDialog::ConfigType::NETEDIT);
2575-
}
2576-
}
2577-
2578-
2579-
GNEFileDialog
2580-
GNEApplicationWindowHelper::openRouteFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2581-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2582-
return GNEFileDialog(applicationWindow, TL("Route elements"),
2583-
SUMOXMLDefinitions::RouteFileExtensions.getStrings(), openMode,
2584-
GNEFileDialog::ConfigType::NETEDIT);
2585-
} else {
2586-
return GNEFileDialog(applicationWindow, TL("Route elements"),
2587-
SUMOXMLDefinitions::RouteFileExtensions.getStrings(), openMode,
2588-
GNEFileDialog::ConfigType::NETEDIT);
2589-
}
2590-
}
2591-
2592-
2593-
GNEFileDialog
2594-
GNEApplicationWindowHelper::openDataFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2595-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2596-
return GNEFileDialog(applicationWindow, TL("Data elements"),
2597-
SUMOXMLDefinitions::EdgeDataFileExtensions.getStrings(), openMode,
2598-
GNEFileDialog::ConfigType::NETEDIT);
2599-
} else {
2600-
return GNEFileDialog(applicationWindow, TL("Data elements"),
2601-
SUMOXMLDefinitions::EdgeDataFileExtensions.getStrings(), openMode,
2602-
GNEFileDialog::ConfigType::NETEDIT);
2603-
}
2604-
}
2605-
2606-
2607-
GNEFileDialog
2608-
GNEApplicationWindowHelper::openMeanDataDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2609-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2610-
return GNEFileDialog(applicationWindow, TL("MeanData elements"),
2611-
SUMOXMLDefinitions::MeanDataFileExtensions.getStrings(), openMode,
2612-
GNEFileDialog::ConfigType::NETEDIT);
2613-
} else {
2614-
return GNEFileDialog(applicationWindow, TL("MeanData elements"),
2615-
SUMOXMLDefinitions::MeanDataFileExtensions.getStrings(), openMode,
2616-
GNEFileDialog::ConfigType::NETEDIT);
2617-
}
2618-
}
2619-
2620-
2621-
GNEFileDialog
2622-
GNEApplicationWindowHelper::openOptionFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode) {
2623-
if (openMode == GNEFileDialog::OpenMode::SAVE) {
2624-
return GNEFileDialog(applicationWindow, TL("options"),
2625-
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), openMode,
2626-
GNEFileDialog::ConfigType::NETEDIT);
2627-
} else {
2628-
return GNEFileDialog(applicationWindow, TL("options"),
2629-
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), openMode,
2630-
GNEFileDialog::ConfigType::NETEDIT);
2631-
}
2632-
}
2633-
26342480
/****************************************************************************/

‎src/netedit/GNEApplicationWindowHelper.h‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,39 +1163,6 @@ struct GNEApplicationWindowHelper {
11631163
/// @brief check if a string ends with another string
11641164
static bool stringEndsWith(const std::string& str, const std::string& suffix);
11651165

1166-
/// @brief open xml file dialog
1167-
static GNEFileDialog openXMLFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1168-
1169-
/// @brief open netconvert file dialog
1170-
static GNEFileDialog openNetworkFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1171-
1172-
/// @brief open netedit config file dialog
1173-
static GNEFileDialog openNeteditConfigFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1174-
1175-
/// @brief open SUMO config file dialog
1176-
static GNEFileDialog openSumoConfigFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1177-
1178-
/// @brief open TLS file dialog
1179-
static GNEFileDialog openTLSFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1180-
1181-
/// @brief open edgeType file dialog
1182-
static GNEFileDialog openEdgeTypeFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1183-
1184-
/// @brief open additional dialog
1185-
static GNEFileDialog openAdditionalFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1186-
1187-
/// @brief open route file dialog
1188-
static GNEFileDialog openRouteFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1189-
1190-
/// @brief open data file dialog
1191-
static GNEFileDialog openDataFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1192-
1193-
/// @brief open meandata filename dialog
1194-
static GNEFileDialog openMeanDataDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1195-
1196-
/// @brief open option dialog
1197-
static GNEFileDialog openOptionFileDialog(GNEApplicationWindow* applicationWindow, GNEFileDialog::OpenMode openMode);
1198-
11991166
private:
12001167
/// @brief Invalidated copy constructor.
12011168
GNEApplicationWindowHelper(const GNEApplicationWindowHelper&) = delete;

‎src/netedit/dialogs/options/GNEOptionsEditor.cpp‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,15 @@ GNEOptionsEditor::onCmdShowToolTipsMenu(FXObject*, FXSelector, void*) {
222222

223223
long
224224
GNEOptionsEditor::onCmdSaveOptions(FXObject*, FXSelector, void*) {
225-
// open save dialog
226-
const auto fileDialog = GNEApplicationWindowHelper::openOptionFileDialog(myDialog->getApplicationWindow(), GNEFileDialog::OpenMode::SAVE);
225+
// open file dialog
226+
const auto optionsFileDialog = GNEFileDialog(myDialog->getApplicationWindow(), TL("options"),
227+
SUMOXMLDefinitions::XMLFileExtensions.getStrings(),
228+
GNEFileDialog::OpenMode::SAVE,
229+
GNEFileDialog::ConfigType::NETEDIT);
227230
// check file
228-
if (fileDialog.getResult() == GNEDialog::Result::ACCEPT) {
229-
std::ofstream out(StringUtils::transcodeToLocal(fileDialog.getFilename()));
230-
myOptionsContainer.writeConfiguration(out, true, false, false, fileDialog.getFilename(), true);
231+
if (optionsFileDialog.getResult() == GNEDialog::Result::ACCEPT) {
232+
std::ofstream out(StringUtils::transcodeToLocal(optionsFileDialog.getFilename()));
233+
myOptionsContainer.writeConfiguration(out, true, false, false, optionsFileDialog.getFilename(), true);
231234
out.close();
232235
}
233236
return 1;
@@ -237,9 +240,12 @@ GNEOptionsEditor::onCmdSaveOptions(FXObject*, FXSelector, void*) {
237240
long
238241
GNEOptionsEditor::onCmdLoadOptions(FXObject*, FXSelector, void*) {
239242
// open file dialog
240-
const auto fileDialog = GNEApplicationWindowHelper::openOptionFileDialog(myDialog->getApplicationWindow(), GNEFileDialog::OpenMode::LOAD_SINGLE);
243+
const auto optionsFileDialog = GNEFileDialog(myDialog->getApplicationWindow(), TL("options"),
244+
SUMOXMLDefinitions::XMLFileExtensions.getStrings(),
245+
GNEFileDialog::OpenMode::LOAD_SINGLE,
246+
GNEFileDialog::ConfigType::NETEDIT);
241247
// check file
242-
if ((fileDialog.getResult() == GNEDialog::Result::ACCEPT) && loadConfiguration(fileDialog.getFilename())) {
248+
if ((optionsFileDialog.getResult() == GNEDialog::Result::ACCEPT) && loadConfiguration(optionsFileDialog.getFilename())) {
243249
// update entries
244250
for (const auto& entry : myOptionRowEntries) {
245251
entry->updateOption();

‎src/netedit/dialogs/options/GNEOptionsEditorRow.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -568,12 +568,15 @@ GNEOptionsEditorRow::OptionFilename::restoreOption() {
568568

569569
long
570570
GNEOptionsEditorRow::OptionFilename::onCmdOpenDialog(FXObject*, FXSelector, void*) {
571-
// get file
571+
// get open mode
572572
GNEFileDialog::OpenMode openMode = (myName.find("output") != std::string::npos) ? GNEFileDialog::OpenMode::SAVE : GNEFileDialog::OpenMode::LOAD_SINGLE;
573-
const auto fileDialog = GNEApplicationWindowHelper::openXMLFileDialog(myOptionsEditor->myDialog->getApplicationWindow(), openMode);
573+
// open dialog
574+
const auto XMLFileDialog = GNEFileDialog(myOptionsEditor->myDialog->getApplicationWindow(), TL("XML"),
575+
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), openMode,
576+
GNEFileDialog::ConfigType::NETEDIT);
574577
// check that file is valid
575-
if (fileDialog.getResult() == GNEDialog::Result::ACCEPT) {
576-
myFilenameTextField->setText(fileDialog.getFilename().c_str(), TRUE);
578+
if (XMLFileDialog.getResult() == GNEDialog::Result::ACCEPT) {
579+
myFilenameTextField->setText(XMLFileDialog.getFilename().c_str(), TRUE);
577580
}
578581
updateResetButton();
579582
return 1;

‎src/netedit/dialogs/tools/GNENetgenerateDialog.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,13 @@ GNENetgenerateDialog::runInternalTest(const InternalTestStep::DialogArgument* /*
118118
long
119119
GNENetgenerateDialog::onCmdOpenOutputFile(FXObject*, FXSelector, void*) {
120120
// get output file
121-
const auto fileDialog = GNEApplicationWindowHelper::openNetworkFileDialog(myApplicationWindow, GNEFileDialog::OpenMode::SAVE);
121+
const auto networkFileDialog = GNEFileDialog(myApplicationWindow, TL("network"),
122+
SUMOXMLDefinitions::NetFileExtensions.getStrings(),
123+
GNEFileDialog::OpenMode::SAVE,
124+
GNEFileDialog::ConfigType::NETEDIT);
122125
// check file
123-
if (fileDialog.getResult() == GNEDialog::Result::ACCEPT) {
124-
myOutputTextField->setText(fileDialog.getFilename().c_str(), TRUE);
126+
if (networkFileDialog.getResult() == GNEDialog::Result::ACCEPT) {
127+
myOutputTextField->setText(networkFileDialog.getFilename().c_str(), TRUE);
125128
}
126129
return 1;
127130
}

‎src/netedit/dialogs/tools/GNEPythonToolDialog.cpp‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,13 @@ GNEPythonToolDialog::onCmdShowToolTipsMenu(FXObject*, FXSelector, void*) {
139139
long
140140
GNEPythonToolDialog::onCmdSave(FXObject*, FXSelector, void*) {
141141
// open save dialog
142-
const auto fileDialog = GNEApplicationWindowHelper::openOptionFileDialog(myApplicationWindow, GNEFileDialog::OpenMode::SAVE);
142+
const auto optionsFileDialog = GNEFileDialog(myApplicationWindow, TL("options"),
143+
SUMOXMLDefinitions::XMLFileExtensions.getStrings(),
144+
GNEFileDialog::OpenMode::SAVE,
145+
GNEFileDialog::ConfigType::NETEDIT);
143146
// check file
144-
if (fileDialog.getResult() == GNEDialog::Result::ACCEPT) {
145-
myPythonTool->saveConfiguration(fileDialog.getFilename());
147+
if (optionsFileDialog.getResult() == GNEDialog::Result::ACCEPT) {
148+
myPythonTool->saveConfiguration(optionsFileDialog.getFilename());
146149
}
147150
return 1;
148151
}
@@ -151,9 +154,12 @@ GNEPythonToolDialog::onCmdSave(FXObject*, FXSelector, void*) {
151154
long
152155
GNEPythonToolDialog::onCmdLoad(FXObject*, FXSelector, void*) {
153156
// open file dialog
154-
const auto fileDialog = GNEApplicationWindowHelper::openOptionFileDialog(myApplicationWindow, GNEFileDialog::OpenMode::LOAD_SINGLE);
157+
const auto optionsFileDialog = GNEFileDialog(myApplicationWindow, TL("options"),
158+
SUMOXMLDefinitions::XMLFileExtensions.getStrings(),
159+
GNEFileDialog::OpenMode::LOAD_SINGLE,
160+
GNEFileDialog::ConfigType::NETEDIT);
155161
// check file
156-
if ((fileDialog.getResult() == GNEDialog::Result::ACCEPT) && myPythonTool->loadConfiguration(fileDialog.getFilename())) {
162+
if ((optionsFileDialog.getResult() == GNEDialog::Result::ACCEPT) && myPythonTool->loadConfiguration(optionsFileDialog.getFilename())) {
157163
// rebuild arguments
158164
buildArguments((mySortedCheckButton->getCheck() == TRUE), (myGroupedCheckButton->getCheck() == TRUE));
159165
}

0 commit comments

Comments
 (0)