From 235d5082f3fb26934d928bc935537c4dee276946 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Thu, 27 Feb 2025 10:36:41 +0100 Subject: [PATCH] Removed SUMOXMLDefinitions::getExtensions function. Refs #16228 --- src/gui/GUIApplicationWindow.cpp | 14 ++-- src/gui/GUISUMOViewParent.cpp | 4 +- src/gui/dialogs/GUIDialog_Breakpoints.cpp | 2 +- src/netedit/GNEApplicationWindowHelper.cpp | 66 ++++++++----------- src/netedit/GNEApplicationWindowHelper.h | 2 +- src/netedit/GNEViewParent.cpp | 2 +- .../dialogs/GNEMultipleParametersDialog.cpp | 2 +- .../dialogs/GNESingleParametersDialog.cpp | 2 +- .../dialogs/GNEVTypeDistributionsDialog.cpp | 2 +- src/netedit/dialogs/GNEVehicleTypeDialog.cpp | 4 +- .../frames/common/GNESelectorFrame.cpp | 2 +- .../frames/network/GNETLSEditorFrame.cpp | 2 +- src/utils/foxtools/MFXDecalsTable.cpp | 2 +- .../gui/div/GUIDialog_GLChosenEditor.cpp | 2 +- .../gui/windows/GUIDialog_EditViewport.cpp | 2 +- .../gui/windows/GUIDialog_ViewSettings.cpp | 6 +- src/utils/xml/SUMOXMLDefinitions.h | 14 ---- 17 files changed, 54 insertions(+), 76 deletions(-) diff --git a/src/gui/GUIApplicationWindow.cpp b/src/gui/GUIApplicationWindow.cpp index 9640b0c75c1..cda3e2be54d 100644 --- a/src/gui/GUIApplicationWindow.cpp +++ b/src/gui/GUIApplicationWindow.cpp @@ -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); } @@ -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); } @@ -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); } @@ -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); } @@ -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); } @@ -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); } @@ -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); } diff --git a/src/gui/GUISUMOViewParent.cpp b/src/gui/GUISUMOViewParent.cpp index bd8cde274fe..a2b5e294bc3 100644 --- a/src/gui/GUISUMOViewParent.cpp +++ b/src/gui/GUISUMOViewParent.cpp @@ -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); diff --git a/src/gui/dialogs/GUIDialog_Breakpoints.cpp b/src/gui/dialogs/GUIDialog_Breakpoints.cpp index 9670fb8dbd4..d09cfb5fd79 100644 --- a/src/gui/dialogs/GUIDialog_Breakpoints.cpp +++ b/src/gui/dialogs/GUIDialog_Breakpoints.cpp @@ -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); } diff --git a/src/netedit/GNEApplicationWindowHelper.cpp b/src/netedit/GNEApplicationWindowHelper.cpp index 83115cda24a..9ae935f7723 100644 --- a/src/netedit/GNEApplicationWindowHelper.cpp +++ b/src/netedit/GNEApplicationWindowHelper.cpp @@ -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); } } @@ -2507,10 +2507,10 @@ 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); } } @@ -2518,35 +2518,35 @@ GNEApplicationWindowHelper::openNetworkFileDialog(FXWindow* window, bool save, b 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); } @@ -2554,10 +2554,10 @@ 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); } } @@ -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); } } @@ -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); } } @@ -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); } } @@ -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); } } @@ -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); } } @@ -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); } } @@ -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); } } @@ -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& 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 @@ -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); diff --git a/src/netedit/GNEApplicationWindowHelper.h b/src/netedit/GNEApplicationWindowHelper.h index c93af1ffe58..d9b8ae9362f 100644 --- a/src/netedit/GNEApplicationWindowHelper.h +++ b/src/netedit/GNEApplicationWindowHelper.h @@ -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 &extensions, bool save, bool multi = false); + const std::string& extensions, bool save, bool multi = false); /// @brief Invalidated copy constructor. GNEApplicationWindowHelper(const GNEApplicationWindowHelper&) = delete; diff --git a/src/netedit/GNEViewParent.cpp b/src/netedit/GNEViewParent.cpp index a996690c776..a5cbf9a12b1 100644 --- a/src/netedit/GNEViewParent.cpp +++ b/src/netedit/GNEViewParent.cpp @@ -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); } diff --git a/src/netedit/dialogs/GNEMultipleParametersDialog.cpp b/src/netedit/dialogs/GNEMultipleParametersDialog.cpp index 05efdb73e08..e5ea4f67090 100644 --- a/src/netedit/dialogs/GNEMultipleParametersDialog.cpp +++ b/src/netedit/dialogs/GNEMultipleParametersDialog.cpp @@ -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); } diff --git a/src/netedit/dialogs/GNESingleParametersDialog.cpp b/src/netedit/dialogs/GNESingleParametersDialog.cpp index 823b802f24e..316d7783b9f 100644 --- a/src/netedit/dialogs/GNESingleParametersDialog.cpp +++ b/src/netedit/dialogs/GNESingleParametersDialog.cpp @@ -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); } diff --git a/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp b/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp index 47fc0400ecd..d5053416fbf 100644 --- a/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp +++ b/src/netedit/dialogs/GNEVTypeDistributionsDialog.cpp @@ -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); } diff --git a/src/netedit/dialogs/GNEVehicleTypeDialog.cpp b/src/netedit/dialogs/GNEVehicleTypeDialog.cpp index 9a0e3a4de01..8159d4060c1 100644 --- a/src/netedit/dialogs/GNEVehicleTypeDialog.cpp +++ b/src/netedit/dialogs/GNEVehicleTypeDialog.cpp @@ -695,7 +695,7 @@ GNEVehicleTypeDialog::VTypeAttributes::VTypeAttributeRow::openImageFileDialog() FXFileDialog opendialog(this, TL("Open Image")); opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::VTYPE)); opendialog.setSelectMode(SELECTFILE_EXISTING); - opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::ImageFileExtensions).c_str()); + opendialog.setPatternList(SUMOXMLDefinitions::ImageFileExtensions.getMultilineString().c_str()); if (gCurrentFolder.length() != 0) { opendialog.setDirectory(gCurrentFolder); } @@ -722,7 +722,7 @@ GNEVehicleTypeDialog::VTypeAttributes::VTypeAttributeRow::openOSGFileDialog() { FXFileDialog opendialog(this, TL("Open OSG File")); opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::VTYPE)); opendialog.setSelectMode(SELECTFILE_EXISTING); - opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::OSGFileExtensions).c_str()); + opendialog.setPatternList(SUMOXMLDefinitions::OSGFileExtensions.getMultilineString().c_str()); if (gCurrentFolder.length() != 0) { opendialog.setDirectory(gCurrentFolder); } diff --git a/src/netedit/frames/common/GNESelectorFrame.cpp b/src/netedit/frames/common/GNESelectorFrame.cpp index 5184de6e5d5..36c12467000 100644 --- a/src/netedit/frames/common/GNESelectorFrame.cpp +++ b/src/netedit/frames/common/GNESelectorFrame.cpp @@ -324,7 +324,7 @@ GNESelectorFrame::SelectionOperation::onCmdLoad(FXObject*, FXSelector, void*) { FXFileDialog opendialog(getCollapsableFrame(), TL("Open List of Selected Items")); opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN)); opendialog.setSelectMode(SELECTFILE_EXISTING); - opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::OSGFileExtensions).c_str()); + opendialog.setPatternList(SUMOXMLDefinitions::OSGFileExtensions.getMultilineString().c_str()); if (gCurrentFolder.length() != 0) { opendialog.setDirectory(gCurrentFolder); } diff --git a/src/netedit/frames/network/GNETLSEditorFrame.cpp b/src/netedit/frames/network/GNETLSEditorFrame.cpp index 8258d5201d2..5e2cb1579a2 100644 --- a/src/netedit/frames/network/GNETLSEditorFrame.cpp +++ b/src/netedit/frames/network/GNETLSEditorFrame.cpp @@ -2916,7 +2916,7 @@ GNETLSEditorFrame::TLSFile::onCmdLoadTLSProgram(FXObject*, FXSelector, void*) { FXFileDialog opendialog(getCollapsableFrame(), "Load TLS Program"); opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::MODETLS)); 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); } diff --git a/src/utils/foxtools/MFXDecalsTable.cpp b/src/utils/foxtools/MFXDecalsTable.cpp index 3493c46266e..7850b1ccc5e 100644 --- a/src/utils/foxtools/MFXDecalsTable.cpp +++ b/src/utils/foxtools/MFXDecalsTable.cpp @@ -342,7 +342,7 @@ MFXDecalsTable::onCmdOpenDecal(FXObject* sender, FXSelector, void*) { opendialog.setSelectMode(SELECTFILE_EXISTING); // set icon and pattern list opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN)); - opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::ImageFileExtensions).c_str()); + opendialog.setPatternList(SUMOXMLDefinitions::ImageFileExtensions.getMultilineString().c_str()); // set current folder if (gCurrentFolder.length() != 0) { opendialog.setDirectory(gCurrentFolder); diff --git a/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp b/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp index 390b0b93f41..41963a589f6 100644 --- a/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp +++ b/src/utils/gui/div/GUIDialog_GLChosenEditor.cpp @@ -131,7 +131,7 @@ GUIDialog_GLChosenEditor::onCmdLoad(FXObject*, FXSelector, void*) { FXFileDialog opendialog(this, TL("Open List of Selected Items")); opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN)); opendialog.setSelectMode(SELECTFILE_EXISTING); - opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::OSGFileExtensions).c_str()); + opendialog.setPatternList(SUMOXMLDefinitions::OSGFileExtensions.getMultilineString().c_str()); if (gCurrentFolder.length() != 0) { opendialog.setDirectory(gCurrentFolder); } diff --git a/src/utils/gui/windows/GUIDialog_EditViewport.cpp b/src/utils/gui/windows/GUIDialog_EditViewport.cpp index c89aae28af9..942b7c605f0 100644 --- a/src/utils/gui/windows/GUIDialog_EditViewport.cpp +++ b/src/utils/gui/windows/GUIDialog_EditViewport.cpp @@ -214,7 +214,7 @@ GUIDialog_EditViewport::onCmdLoad(FXObject*, FXSelector, void*) { FXFileDialog opendialog(this, TL("Load Viewport")); opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN)); opendialog.setSelectMode(SELECTFILE_ANY); - opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::ViewSettingsFileExtensions).c_str()); + opendialog.setPatternList(SUMOXMLDefinitions::ViewSettingsFileExtensions.getMultilineString().c_str()); if (gCurrentFolder.length() != 0) { opendialog.setDirectory(gCurrentFolder); } diff --git a/src/utils/gui/windows/GUIDialog_ViewSettings.cpp b/src/utils/gui/windows/GUIDialog_ViewSettings.cpp index 29a83b97632..c5d94f1bd0e 100644 --- a/src/utils/gui/windows/GUIDialog_ViewSettings.cpp +++ b/src/utils/gui/windows/GUIDialog_ViewSettings.cpp @@ -1154,7 +1154,7 @@ GUIDialog_ViewSettings::onCmdImportSetting(FXObject*, FXSelector, void* /*data*/ FXFileDialog opendialog(this, TL("Import view settings")); opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::OPEN)); opendialog.setSelectMode(SELECTFILE_ANY); - opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::ViewSettingsFileExtensions).c_str()); + opendialog.setPatternList(SUMOXMLDefinitions::ViewSettingsFileExtensions.getMultilineString().c_str()); if (gCurrentFolder.length() != 0) { opendialog.setDirectory(gCurrentFolder); } @@ -1171,7 +1171,7 @@ GUIDialog_ViewSettings::onCmdLoadDecal(FXObject*, FXSelector, void* /*data*/) { FXFileDialog opendialog(this, TL("Load Decals")); opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::EMPTY)); opendialog.setSelectMode(SELECTFILE_ANY); - opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::ViewSettingsFileExtensions).c_str()); + opendialog.setPatternList(SUMOXMLDefinitions::ViewSettingsFileExtensions.getMultilineString().c_str()); if (gCurrentFolder.length() != 0) { opendialog.setDirectory(gCurrentFolder); } @@ -1188,7 +1188,7 @@ GUIDialog_ViewSettings::onCmdLoadXMLDecals(FXObject*, FXSelector, void* /*data*/ FXFileDialog opendialog(this, TL("Load Decals")); opendialog.setIcon(GUIIconSubSys::getIcon(GUIIcon::EMPTY)); opendialog.setSelectMode(SELECTFILE_ANY); - opendialog.setPatternList(SUMOXMLDefinitions::getExtensions(SUMOXMLDefinitions::ViewSettingsFileExtensions).c_str()); + opendialog.setPatternList(SUMOXMLDefinitions::ViewSettingsFileExtensions.getMultilineString().c_str()); if (gCurrentFolder.length() != 0) { opendialog.setDirectory(gCurrentFolder); } diff --git a/src/utils/xml/SUMOXMLDefinitions.h b/src/utils/xml/SUMOXMLDefinitions.h index f4246625dc3..b7564bb5b35 100644 --- a/src/utils/xml/SUMOXMLDefinitions.h +++ b/src/utils/xml/SUMOXMLDefinitions.h @@ -2647,20 +2647,6 @@ class SUMOXMLDefinitions { /// @} - /// @brief get extensions in a format compatible with fx dialogs - template - static std::string getExtensions(StringBijection extensions) { - std::string result; - const auto extensionStrings = extensions.getStrings(); - if (extensionStrings.size() > 0) { - for (const auto& extension : extensionStrings) { - result.append(extension + "\n"); - } - result.pop_back(); - } - return result; - } - /// @brief all allowed characters for phase state static const std::string ALLOWED_TLS_LINKSTATES;