Added onCmdSimplifyNetwork(). Refs #10084

eclipse-sumo · Feb 28, 2022 · b93f9b1 · b93f9b1
1 parent 5f4b49c
commit b93f9b1
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 2 deletions.
diff --git a/src/netedit/GNEApplicationWindow.cpp b/src/netedit/GNEApplicationWindow.cpp
@@ -256,6 +256,9 @@ FXDEFMAP(GNEApplicationWindow) GNEApplicationWindowMap[] = {
     FXMAPFUNC(SEL_UPDATE,   MID_GNE_TOOLBAREDIT_LOADADDITIONALS,            GNEApplicationWindow::onUpdNeedsNetwork),
     FXMAPFUNC(SEL_COMMAND,  MID_GNE_TOOLBAREDIT_LOADDEMAND,                 GNEApplicationWindow::onCmdLoadDemandInSUMOGUI),
     FXMAPFUNC(SEL_UPDATE,   MID_GNE_TOOLBAREDIT_LOADDEMAND,                 GNEApplicationWindow::onUpdNeedsNetwork),
+    FXMAPFUNC(SEL_COMMAND,  MID_SIMPLIFY_NETWORK,                           GNEApplicationWindow::onCmdSimplifyNetwork),
+    FXMAPFUNC(SEL_UPDATE,   MID_SIMPLIFY_NETWORK,                           GNEApplicationWindow::onUpdNeedsNetworkSelection),
+
     FXMAPFUNC(SEL_COMMAND,  MID_HOTKEY_CTRL_T_OPENSUMONETEDIT,              GNEApplicationWindow::onCmdOpenSUMOGUI),
     FXMAPFUNC(SEL_UPDATE,   MID_HOTKEY_CTRL_T_OPENSUMONETEDIT,              GNEApplicationWindow::onUpdNeedsNetwork),
     /* Prepared for #6042
@@ -1220,6 +1223,10 @@ GNEApplicationWindow::fillMenuBar() {
     myEditMenuCommands.buildFrontElementMenuCommand(myEditMenu);
     // build separator
     new FXMenuSeparator(myEditMenu);
+    // build network reduction menu commands
+    myEditMenuCommands.buildNetworkReductionMenuCommand(myEditMenu);
+    // build separator
+    new FXMenuSeparator(myEditMenu);
     // build open in sumo menu commands
     myEditMenuCommands.buildOpenSUMOMenuCommands(myEditMenu);
     // build lock menu
@@ -2099,7 +2106,7 @@ GNEApplicationWindow::onCmdToggleGrid(FXObject* obj, FXSelector sel, void* ptr)
 
 
 long
-GNEApplicationWindow::onCmdSetFrontElement(FXObject* /*obj*/, FXSelector /*sel*/, void* /*ptr*/) {
+GNEApplicationWindow::onCmdSetFrontElement(FXObject*, FXSelector, void*) {
     if (myViewNet) {
         if (myViewNet->getViewParent()->getInspectorFrame()->shown()) {
             // get inspected AC
@@ -2119,6 +2126,14 @@ GNEApplicationWindow::onCmdSetFrontElement(FXObject* /*obj*/, FXSelector /*sel*/
 }
 
 
+long
+GNEApplicationWindow::onCmdSimplifyNetwork(FXObject*, FXSelector, void*) {
+    if (myViewNet) {
+
+    }
+    return 1;
+}
+
 long
 GNEApplicationWindow::onCmdToggleEditOptions(FXObject* obj, FXSelector sel, void* /* ptr */) {
     // first check that we have a ViewNet
@@ -2500,9 +2515,26 @@ GNEApplicationWindow::onUpdNeedsFrontElement(FXObject* sender, FXSelector, void*
 }
 
 
+long 
+GNEApplicationWindow::onUpdNeedsNetworkSelection(FXObject* sender, FXSelector, void*) {
+    // check if net, viewnet and front attribute exist
+    if (myNet && myViewNet && myViewNet->getEditModes().isCurrentSupermodeNetwork() && 
+        (myViewNet->getEditModes().networkEditMode == NetworkEditMode::NETWORK_SELECT)) {
+        sender->handle(this, FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
+    } else {
+        sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
+    }
+    return 1;
+}
+
+
 long
 GNEApplicationWindow::onUpdReload(FXObject* sender, FXSelector, void*) {
-    sender->handle(this, ((myNet == nullptr) || !OptionsCont::getOptions().isSet("sumo-net-file")) ? FXSEL(SEL_COMMAND, ID_DISABLE) : FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
+    if ((myNet == nullptr) || !OptionsCont::getOptions().isSet("sumo-net-file")) {
+        sender->handle(this, FXSEL(SEL_COMMAND, ID_DISABLE), nullptr);
+    } else {
+        sender->handle(this, FXSEL(SEL_COMMAND, ID_ENABLE), nullptr);
+    }
     return 1;
 }
 

diff --git a/src/netedit/GNEApplicationWindow.h b/src/netedit/GNEApplicationWindow.h
@@ -215,6 +215,9 @@ class GNEApplicationWindow : public GUIMainWindow, public MFXInterThreadEventCli
     /// @brief called when the update/FXCall needs front element is executed
     long onUpdNeedsFrontElement(FXObject*, FXSelector, void*);
 
+    /// @brief called when the update/FXCall needs network selection is executed
+    long onUpdNeedsNetworkSelection(FXObject*, FXSelector, void*);
+
     /// @brief called when the update/FXCall reload is executed
     long onUpdReload(FXObject*, FXSelector, void*);
 
@@ -352,6 +355,9 @@ class GNEApplicationWindow : public GUIMainWindow, public MFXInterThreadEventCli
     /// @brief called if the user call set front element
     long onCmdSetFrontElement(FXObject*, FXSelector, void*);
 
+    /// @brief called if the user call simplify network
+    long onCmdSimplifyNetwork(FXObject*, FXSelector, void*);
+
     /// @brief called if the user press key combination Alt + <0-9>
     long onCmdToggleEditOptions(FXObject*, FXSelector, void*);
 

diff --git a/src/netedit/GNEApplicationWindowHelper.cpp b/src/netedit/GNEApplicationWindowHelper.cpp
@@ -914,6 +914,7 @@ GNEApplicationWindowHelper::EditMenuCommands::EditMenuCommands(GNEApplicationWin
     editViewScheme(nullptr),
     editViewPort(nullptr),
     clearFrontElement(nullptr),
+    networkReduction(nullptr),
     loadAdditionalsInSUMOGUI(nullptr),
     loadDemandInSUMOGUI(nullptr),
     openInSUMOGUI(nullptr),
@@ -957,6 +958,15 @@ GNEApplicationWindowHelper::EditMenuCommands::buildFrontElementMenuCommand(FXMen
 }
 
 
+void
+GNEApplicationWindowHelper::EditMenuCommands::buildNetworkReductionMenuCommand(FXMenuPane* editMenu) {
+    // add clear front element
+    networkReduction = GUIDesigns::buildFXMenuCommand(editMenu,
+                       "Reduce network to selection", GUIIconSubSys::getIcon(GUIIcon::SIMPLIFYNETWORK), 
+                       myGNEApp, MID_SIMPLIFY_NETWORK);
+}
+
+
 void
 GNEApplicationWindowHelper::EditMenuCommands::buildOpenSUMOMenuCommands(FXMenuPane* editMenu) {
     // add open in sumo options

diff --git a/src/netedit/GNEApplicationWindowHelper.h b/src/netedit/GNEApplicationWindowHelper.h
@@ -582,6 +582,9 @@ struct GNEApplicationWindowHelper {
         /// @brief build front element commands
         void buildFrontElementMenuCommand(FXMenuPane* editMenu);
 
+        /// @brief build network reduction commands
+        void buildNetworkReductionMenuCommand(FXMenuPane* editMenu);
+
         /// @brief build open sumo menu commands
         void buildOpenSUMOMenuCommands(FXMenuPane* editMenu);
 
@@ -612,6 +615,9 @@ struct GNEApplicationWindowHelper {
         /// @brief FXMenuCommand for clear Front element
         FXMenuCommand* clearFrontElement;
 
+        /// @brief FXMenuCommand for network reduction
+        FXMenuCommand* networkReduction;
+
         /// @brief menu check for load additionals in SUMO GUI
         FXMenuCheck* loadAdditionalsInSUMOGUI;
 

diff --git a/src/utils/gui/windows/GUIAppEnum.h b/src/utils/gui/windows/GUIAppEnum.h
@@ -314,6 +314,8 @@ enum {
     MID_EDITCHOSEN,
     /// @brief Open in netedit
     MID_NETEDIT,
+    /// @brief simplify network reduction
+    MID_SIMPLIFY_NETWORK,
 
     /// @}