Skip to content

Commit

Permalink
Removed SUMOXMLDefinitions::getExtensions function. Refs #16228
Browse files Browse the repository at this point in the history
  • Loading branch information
@palvarezlopez
palvarezlopez committed Feb 27, 2025
1 parent 760a044 commit 235d508
Show file tree
Hide file tree
Showing 17 changed files with 54 additions and 76 deletions.
14 changes: 7 additions & 7 deletions src/gui/GUIApplicationWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ GUIApplicationWindow::onCmdOpenConfiguration(FXObject*, FXSelector, void*) {
FXFileDialog opendialog(this, TL("Open Simulation Configuration"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN_SUMOCONFIG));
opendialog.setSelectMode(SELECTFILE_EXISTING);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::SumoConfigFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::SumoConfigFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand All @@ -1067,7 +1067,7 @@ GUIApplicationWindow::onCmdOpenNetwork(FXObject*, FXSelector, void*) {
FXFileDialog opendialog(this, TL("Open Network"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN_NET));
opendialog.setSelectMode(SELECTFILE_EXISTING);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::NetFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::NetFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand All @@ -1087,7 +1087,7 @@ GUIApplicationWindow::onCmdOpenShapes(FXObject*, FXSelector, void*) {
FXFileDialog opendialog(this, TL("Open Shapes"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN_SHAPES));
opendialog.setSelectMode(SELECTFILE_EXISTING);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::AdditionalFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::AdditionalFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand Down Expand Up @@ -1118,7 +1118,7 @@ GUIApplicationWindow::onCmdOpenEdgeData(FXObject*, FXSelector, void*) {
FXFileDialog opendialog(this, TL("Open EdgeData"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN_NET));
opendialog.setSelectMode(SELECTFILE_EXISTING);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::EdgeDataFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::EdgeDataFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand Down Expand Up @@ -1188,7 +1188,7 @@ GUIApplicationWindow::onCmdSaveConfig(FXObject*, FXSelector, void*) {
FXFileDialog opendialog(this, TL("Save SUMO Configuration"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::SAVE));
opendialog.setSelectMode(SELECTFILE_ANY);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::SumoConfigFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::SumoConfigFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand Down Expand Up @@ -1303,7 +1303,7 @@ GUIApplicationWindow::onCmdSaveState(FXObject*, FXSelector, void*) {
FXFileDialog opendialog(this, TL("Save Simulation State"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::SAVE));
opendialog.setSelectMode(SELECTFILE_ANY);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::StateFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::StateFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand All @@ -1325,7 +1325,7 @@ GUIApplicationWindow::onCmdLoadState(FXObject*, FXSelector, void*) {
FXFileDialog opendialog(this, TL("Load Simulation State"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN));
opendialog.setSelectMode(SELECTFILE_ANY);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::StateFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::StateFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/GUISUMOViewParent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ GUISUMOViewParent::onCmdMakeSnapshot(FXObject* sender, FXSelector, void*) {
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::CAMERA));
opendialog.setSelectMode(SELECTFILE_ANY);
#ifdef HAVE_FFMPEG
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::ImageVideoFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::ImageVideoFileExtensions.getMultilineString().c_str());
#else
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::ImageFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::ImageFileExtensions.getMultilineString().c_str());
#endif
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
Expand Down
2 changes: 1 addition & 1 deletion src/gui/dialogs/GUIDialog_Breakpoints.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ GUIDialog_Breakpoints::onCmdLoad(FXObject*, FXSelector, void*) {
FXFileDialog opendialog(this, TL("Load Breakpoints"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::EMPTY));
opendialog.setSelectMode(SELECTFILE_ANY);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::TXTFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::TXTFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand Down
66 changes: 29 additions & 37 deletions src/netedit/GNEApplicationWindowHelper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2495,10 +2495,10 @@ std::string
GNEApplicationWindowHelper::openFileDialog(FXWindow* window, bool save, bool multi) {
if (save) {
return openFileDialog(window, TL("Save file as"), GUIIcon::SAVE,
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::XMLFileExtensions.getMultilineString(), save, multi);
} else {
return openFileDialog(window, TL("Open file"), GUIIcon::OPEN_SUMOCONFIG,
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::XMLFileExtensions.getMultilineString(), save, multi);
}
}

Expand All @@ -2507,57 +2507,57 @@ std::string
GNEApplicationWindowHelper::openNetworkFileDialog(FXWindow* window, bool save, bool multi) {
if (save) {
return openFileDialog(window, TL("Save Network file as"), GUIIcon::SAVE_NETWORKELEMENTS,
SUMOXMLDefinitions::NetFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::NetFileExtensions.getMultilineString(), save, multi);
} else {
return openFileDialog(window, TL("Open Network file"), GUIIcon::OPEN_NET,
SUMOXMLDefinitions::NetFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::NetFileExtensions.getMultilineString(), save, multi);
}
}


std::string
GNEApplicationWindowHelper::openNetconvertFileDialog(FXWindow* window) {
return openFileDialog(window, TL("Open NetConvert file"), GUIIcon::OPEN_NET,
SUMOXMLDefinitions::NetconvertConfigFileExtensions.getStrings(), false);
SUMOXMLDefinitions::NetconvertConfigFileExtensions.getMultilineString(), false);
}


std::string
GNEApplicationWindowHelper::savePlainXMLFileDialog(FXWindow* window) {
return openFileDialog(window, TL("Save plain XML as"), GUIIcon::SAVE,
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), true);
SUMOXMLDefinitions::XMLFileExtensions.getMultilineString(), true);
}


std::string
GNEApplicationWindowHelper::saveJoinedJunctionsFileDialog(FXWindow* window) {
return openFileDialog(window, TL("Save joined Junctions as"), GUIIcon::SAVE,
SUMOXMLDefinitions::JunctionFileExtensions.getStrings(), true);
SUMOXMLDefinitions::JunctionFileExtensions.getMultilineString(), true);
}


std::string
GNEApplicationWindowHelper::saveToolLog(FXWindow* window) {
return openFileDialog(window, TL("Save tool log"), GUIIcon::SAVE,
SUMOXMLDefinitions::TXTFileExtensions.getStrings(), true);
SUMOXMLDefinitions::TXTFileExtensions.getMultilineString(), true);
}


std::string
GNEApplicationWindowHelper::openOSMFileDialog(FXWindow* window) {
return openFileDialog(window, TL("Open OSM file"), GUIIcon::OPEN_NET,
SUMOXMLDefinitions::OSMFileExtensions.getStrings(), false);
SUMOXMLDefinitions::OSMFileExtensions.getMultilineString(), false);
}


std::string
GNEApplicationWindowHelper::openNeteditConfigFileDialog(FXWindow* window, bool save) {
if (save) {
return openFileDialog(window, TL("Save netedit Config file as"), GUIIcon::SAVE_NETEDITCONFIG,
SUMOXMLDefinitions::NeteditConfigFileExtensions.getStrings(), save);
SUMOXMLDefinitions::NeteditConfigFileExtensions.getMultilineString(), save);
} else {
return openFileDialog(window, TL("Open netedit Config file"), GUIIcon::OPEN_NETEDITCONFIG,
SUMOXMLDefinitions::NeteditConfigFileExtensions.getStrings(), save);
SUMOXMLDefinitions::NeteditConfigFileExtensions.getMultilineString(), save);
}
}

Expand All @@ -2566,10 +2566,10 @@ std::string
GNEApplicationWindowHelper::openSumoConfigFileDialog(FXWindow* window, bool save, bool multi) {
if (save) {
return openFileDialog(window, TL("Save SUMO Config file as"), GUIIcon::SAVE_SUMOCONFIG,
SUMOXMLDefinitions::SumoConfigFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::SumoConfigFileExtensions.getMultilineString(), save, multi);
} else {
return openFileDialog(window, TL("Open SUMO Config file"), GUIIcon::OPEN_SUMOCONFIG,
SUMOXMLDefinitions::SumoConfigFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::SumoConfigFileExtensions.getMultilineString(), save, multi);
}
}

Expand All @@ -2578,10 +2578,10 @@ std::string
GNEApplicationWindowHelper::openTLSFileDialog(FXWindow* window, bool save) {
if (save) {
return openFileDialog(window, TL("Save TLS file as"), GUIIcon::SAVE_NETWORKELEMENTS,
SUMOXMLDefinitions::TLSFileExtensions.getStrings(), save);
SUMOXMLDefinitions::TLSFileExtensions.getMultilineString(), save);
} else {
return openFileDialog(window, TL("Open TLS file"), GUIIcon::OPEN_TLSPROGRAMS,
SUMOXMLDefinitions::TLSFileExtensions.getStrings(), save);
SUMOXMLDefinitions::TLSFileExtensions.getMultilineString(), save);
}
}

Expand All @@ -2590,10 +2590,10 @@ std::string
GNEApplicationWindowHelper::openEdgeTypeFileDialog(FXWindow* window, bool save) {
if (save) {
return openFileDialog(window, TL("Save EdgeType file as"), GUIIcon::SAVE_NETWORKELEMENTS,
SUMOXMLDefinitions::EdgeTypeFileExtensions.getStrings(), save);
SUMOXMLDefinitions::EdgeTypeFileExtensions.getMultilineString(), save);
} else {
return openFileDialog(window, TL("Open EdgeType file"), GUIIcon::OPEN_NET,
SUMOXMLDefinitions::EdgeTypeFileExtensions.getStrings(), save);
SUMOXMLDefinitions::EdgeTypeFileExtensions.getMultilineString(), save);
}
}

Expand All @@ -2602,10 +2602,10 @@ std::string
GNEApplicationWindowHelper::openAdditionalFileDialog(FXWindow* window, bool save, bool multi) {
if (save) {
return openFileDialog(window, TL("Save Additionals file as"), GUIIcon::SAVE_ADDITIONALELEMENTS,
SUMOXMLDefinitions::AdditionalFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::AdditionalFileExtensions.getMultilineString(), save, multi);
} else {
return openFileDialog(window, TL("Open Additionals file"), GUIIcon::MODEADDITIONAL,
SUMOXMLDefinitions::AdditionalFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::AdditionalFileExtensions.getMultilineString(), save, multi);
}
}

Expand All @@ -2614,10 +2614,10 @@ std::string
GNEApplicationWindowHelper::openRouteFileDialog(FXWindow* window, bool save, bool multi) {
if (save) {
return openFileDialog(window, TL("Save Route file as"), GUIIcon::SAVE_DEMANDELEMENTS,
SUMOXMLDefinitions::RouteFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::RouteFileExtensions.getMultilineString(), save, multi);
} else {
return openFileDialog(window, TL("Open Route file"), GUIIcon::SUPERMODEDEMAND,
SUMOXMLDefinitions::RouteFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::RouteFileExtensions.getMultilineString(), save, multi);
}
}

Expand All @@ -2626,10 +2626,10 @@ std::string
GNEApplicationWindowHelper::openDataFileDialog(FXWindow* window, bool save, bool multi) {
if (save) {
return openFileDialog(window, TL("Save Data file as"), GUIIcon::SAVE_DATAELEMENTS,
SUMOXMLDefinitions::EdgeDataFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::EdgeDataFileExtensions.getMultilineString(), save, multi);
} else {
return openFileDialog(window, TL("Open Data file"), GUIIcon::SUPERMODEDATA,
SUMOXMLDefinitions::EdgeDataFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::EdgeDataFileExtensions.getMultilineString(), save, multi);
}
}

Expand All @@ -2638,10 +2638,10 @@ std::string
GNEApplicationWindowHelper::openMeanDataDialog(FXWindow* window, bool save, bool multi) {
if (save) {
return openFileDialog(window, TL("Save MeanData file as"), GUIIcon::SAVE_MEANDATAELEMENTS,
SUMOXMLDefinitions::MeanDataFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::MeanDataFileExtensions.getMultilineString(), save, multi);
} else {
return openFileDialog(window, TL("Open MeanData file"), GUIIcon::MODEMEANDATA,
SUMOXMLDefinitions::MeanDataFileExtensions.getStrings(), save, multi);
SUMOXMLDefinitions::MeanDataFileExtensions.getMultilineString(), save, multi);
}
}

Expand All @@ -2650,25 +2650,17 @@ std::string
GNEApplicationWindowHelper::openOptionFileDialog(FXWindow* window, bool save) {
if (save) {
return openFileDialog(window, TL("Save options file as"), GUIIcon::SAVE,
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), save);
SUMOXMLDefinitions::XMLFileExtensions.getMultilineString(), save);
} else {
return openFileDialog(window, TL("Open options file"), GUIIcon::OPEN,
SUMOXMLDefinitions::XMLFileExtensions.getStrings(), save);
SUMOXMLDefinitions::XMLFileExtensions.getMultilineString(), save);
}
}


std::string
GNEApplicationWindowHelper::openFileDialog(FXWindow* window, const std::string title,
GUIIcon icon, const std::vector<std::string>& extensions, bool save, bool multi) {
// parse extensions in a format compatible with fx dialogs
std::string patternList;
if (extensions.size() > 0) {
for (const auto& extension : extensions) {
patternList.append(extension + "\n");
}
patternList.pop_back();
}
GUIIcon icon, const std::string& extensions, bool save, bool multi) {
// configure open dialog
FXFileDialog opendialog(window, title.c_str());
// check if allow to create a new file, or select only existent files
Expand All @@ -2683,7 +2675,7 @@ GNEApplicationWindowHelper::openFileDialog(FXWindow* window, const std::string t
}
// set icon and pattern list
opendialog.setIcon(GUIIconSubSys::getIcon(icon));
opendialog.setPatternList(patternList.c_str());
opendialog.setPatternList(extensions.c_str());
// set current folder
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/GNEApplicationWindowHelper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,7 @@ struct GNEApplicationWindowHelper {
private:
/// @brief open filename dialog
static std::string openFileDialog(FXWindow* window, const std::string title, GUIIcon icon,
const std::vector<std::string> &extensions, bool save, bool multi = false);
const std::string& extensions, bool save, bool multi = false);

/// @brief Invalidated copy constructor.
GNEApplicationWindowHelper(const GNEApplicationWindowHelper&) = delete;
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/GNEViewParent.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ GNEViewParent::onCmdMakeSnapshot(FXObject*, FXSelector, void*) {
FXFileDialog opendialog(this, TL("Save Snapshot"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::CAMERA));
opendialog.setSelectMode(SELECTFILE_ANY);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::ImageFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::ImageFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/dialogs/GNEMultipleParametersDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ GNEMultipleParametersDialog::ParametersOperations::onCmdLoadParameters(FXObject*
FXFileDialog opendialog(this, TL("Open Parameter Template"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::GREENVEHICLE));
opendialog.setSelectMode(SELECTFILE_EXISTING);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::XMLFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/dialogs/GNESingleParametersDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ GNESingleParametersDialog::ParametersOperations::onCmdLoadParameters(FXObject*,
FXFileDialog opendialog(this, TL("Open Parameter Template"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::GREENVEHICLE));
opendialog.setSelectMode(SELECTFILE_EXISTING);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::XMLFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ GNEVTypeDistributionsDialog::ParametersOperations::onCmdLoadParameters(FXObject*
FXFileDialog opendialog(this, TL("Open Parameter Template"));
opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::GREENVEHICLE));
opendialog.setSelectMode(SELECTFILE_EXISTING);
opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::XMLFileExtensions).c_str());
opendialog.setPatternList(SUMOXMLDefinitions::XMLFileExtensions.getMultilineString().c_str());
if (gCurrentFolder.length() != 0) {
opendialog.setDirectory(gCurrentFolder);
}
Expand Down
Loading

0 comments on commit 235d508

Please sign in to comment.