Fixed warnings and renamed "askformerge to "mergeautomatically". Refs #…

…12
eclipse-sumo · Jan 16, 2025 · 927af3e · 927af3e
1 parent 325edac
commit 927af3e
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 45 deletions.
diff --git a/src/netedit/GNEApplicationWindow.cpp b/src/netedit/GNEApplicationWindow.cpp
@@ -240,8 +240,8 @@ FXDEFMAP(GNEApplicationWindow) GNEApplicationWindowMap[] = {
     FXMAPFUNC(SEL_UPDATE,  MID_GNE_NETWORKVIEWOPTIONS_EXTENDSELECTION,          GNEApplicationWindow::onUpdToggleViewOption),
     FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_CHANGEALLPHASES,          GNEApplicationWindow::onCmdToggleViewOption),
     FXMAPFUNC(SEL_UPDATE,  MID_GNE_NETWORKVIEWOPTIONS_CHANGEALLPHASES,          GNEApplicationWindow::onUpdToggleViewOption),
-    FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_ASKFORMERGE,              GNEApplicationWindow::onCmdToggleViewOption),
-    FXMAPFUNC(SEL_UPDATE,  MID_GNE_NETWORKVIEWOPTIONS_ASKFORMERGE,              GNEApplicationWindow::onUpdToggleViewOption),
+    FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_MERGEAUTOMATICALLY,       GNEApplicationWindow::onCmdToggleViewOption),
+    FXMAPFUNC(SEL_UPDATE,  MID_GNE_NETWORKVIEWOPTIONS_MERGEAUTOMATICALLY,       GNEApplicationWindow::onUpdToggleViewOption),
     FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_SHOWBUBBLES,              GNEApplicationWindow::onCmdToggleViewOption),
     FXMAPFUNC(SEL_UPDATE,  MID_GNE_NETWORKVIEWOPTIONS_SHOWBUBBLES,              GNEApplicationWindow::onUpdToggleViewOption),
     FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_MOVEELEVATION,            GNEApplicationWindow::onCmdToggleViewOption),
@@ -2830,8 +2830,8 @@ GNEApplicationWindow::onCmdToggleViewOption(FXObject* sender, FXSelector sel, vo
                 return myViewNet->onCmdToggleExtendSelection(sender, sel, ptr);
             case MID_GNE_NETWORKVIEWOPTIONS_CHANGEALLPHASES:
                 return myViewNet->onCmdToggleChangeAllPhases(sender, sel, ptr);
-            case MID_GNE_NETWORKVIEWOPTIONS_ASKFORMERGE:
-                return myViewNet->onCmdToggleWarnAboutMerge(sender, sel, ptr);
+            case MID_GNE_NETWORKVIEWOPTIONS_MERGEAUTOMATICALLY:
+                return myViewNet->onCmdToggleMergeAutomatically(sender, sel, ptr);
             case MID_GNE_NETWORKVIEWOPTIONS_SHOWBUBBLES:
                 return myViewNet->onCmdToggleShowJunctionBubbles(sender, sel, ptr);
             case MID_GNE_NETWORKVIEWOPTIONS_MOVEELEVATION:
@@ -2975,8 +2975,8 @@ GNEApplicationWindow::onUpdToggleViewOption(FXObject* sender, FXSelector sel, vo
                     menuCheck->setCheck(FALSE);
                 }
                 break;
-            case MID_GNE_NETWORKVIEWOPTIONS_ASKFORMERGE:
-                if (myViewNet->getNetworkViewOptions().menuCheckWarnAboutMerge->amChecked()) {
+            case MID_GNE_NETWORKVIEWOPTIONS_MERGEAUTOMATICALLY:
+                if (myViewNet->getNetworkViewOptions().menuCheckMergeAutomatically->amChecked()) {
                     menuCheck->setCheck(TRUE);
                 } else {
                     menuCheck->setCheck(FALSE);

diff --git a/src/netedit/GNEApplicationWindowHelper.cpp b/src/netedit/GNEApplicationWindowHelper.cpp
@@ -903,10 +903,10 @@ GNEApplicationWindowHelper::EditMenuCommands::NetworkViewOptions::buildNetworkVi
                                GUIIconSubSys::getIcon(GUIIcon::NETWORKMODE_CHECKBOX_APPLYTOALLPHASES),
                                myGNEApp, MID_GNE_NETWORKVIEWOPTIONS_CHANGEALLPHASES);
 
-    menuCheckWarnAboutMerge = GUIDesigns::buildFXMenuCheckboxIcon(editMenu,
-                              TL("Ask for confirmation before merging junction"), "Alt+5", "",
-                              GUIIconSubSys::getIcon(GUIIcon::NETWORKMODE_CHECKBOX_ASKFORMERGE),
-                              myGNEApp, MID_GNE_NETWORKVIEWOPTIONS_ASKFORMERGE);
+    menuCheckMergeAutomatically = GUIDesigns::buildFXMenuCheckboxIcon(editMenu,
+                              TL("Don't ask for confirmation before merging junction"), "Alt+5", "",
+                              GUIIconSubSys::getIcon(GUIIcon::NETWORKMODE_CHECKBOX_MERGEAUTOMATICALLY),
+                              myGNEApp, MID_GNE_NETWORKVIEWOPTIONS_MERGEAUTOMATICALLY);
 
     menuCheckShowJunctionBubble = GUIDesigns::buildFXMenuCheckboxIcon(editMenu,
                                   TL("Show bubbles over junctions shapes"), "Alt+6", "",
@@ -946,7 +946,7 @@ GNEApplicationWindowHelper::EditMenuCommands::NetworkViewOptions::hideNetworkVie
     menuCheckShowTAZElements->hide();
     menuCheckExtendSelection->hide();
     menuCheckChangeAllPhases->hide();
-    menuCheckWarnAboutMerge->hide();
+    menuCheckMergeAutomatically->hide();
     menuCheckShowJunctionBubble->hide();
     menuCheckMoveElevation->hide();
     menuCheckChainEdges->hide();
@@ -999,8 +999,8 @@ GNEApplicationWindowHelper::EditMenuCommands::NetworkViewOptions::updateShortcut
         menuCheckChangeAllPhases->setAccelText(("Alt+" + toString(index)).c_str());
         index++;
     }
-    if (menuCheckWarnAboutMerge->shown()) {
-        menuCheckWarnAboutMerge->setAccelText(("Alt+" + toString(index)).c_str());
+    if (menuCheckMergeAutomatically->shown()) {
+        menuCheckMergeAutomatically->setAccelText(("Alt+" + toString(index)).c_str());
         index++;
     }
     if (menuCheckShowJunctionBubble->shown()) {
@@ -2465,17 +2465,17 @@ GNEApplicationWindowHelper::toggleEditOptionsNetwork(GNEViewNet* viewNet, const
         }
         // Call manually onCmdToggleChangeAllPhases
         viewNet->onCmdToggleChangeAllPhases(obj, sel, nullptr);
-    } else if (menuCheck == viewNet->getNetworkViewOptions().menuCheckWarnAboutMerge) {
+    } else if (menuCheck == viewNet->getNetworkViewOptions().menuCheckMergeAutomatically) {
         // Toggle menuCheckWarnAboutMerge
-        if (viewNet->getNetworkViewOptions().menuCheckWarnAboutMerge->amChecked() == TRUE) {
+        if (viewNet->getNetworkViewOptions().menuCheckMergeAutomatically->amChecked() == TRUE) {
             // show extra information for tests
             WRITE_DEBUG("Disabled warn about merge through alt + " + toString(numericalKeyPressed + 1));
         } else {
             // show extra information for tests
             WRITE_DEBUG("Enabled warn about merge through alt + " + toString(numericalKeyPressed + 1));
         }
-        // Call manually onCmdToggleWarnAboutMerge
-        viewNet->onCmdToggleWarnAboutMerge(obj, sel, nullptr);
+        // Call manually onCmdToggleMergeAutomatically
+        viewNet->onCmdToggleMergeAutomatically(obj, sel, nullptr);
     } else if (menuCheck == viewNet->getNetworkViewOptions().menuCheckShowJunctionBubble) {
         // Toggle menuCheckShowJunctionBubble
         if (viewNet->getNetworkViewOptions().menuCheckShowJunctionBubble->amChecked() == TRUE) {

diff --git a/src/netedit/GNEApplicationWindowHelper.h b/src/netedit/GNEApplicationWindowHelper.h
@@ -516,7 +516,7 @@ struct GNEApplicationWindowHelper {
             MFXMenuCheckIcon* menuCheckChangeAllPhases = nullptr;
 
             /// @brief menu check to we should warn about merging junctions
-            MFXMenuCheckIcon* menuCheckWarnAboutMerge = nullptr;
+            MFXMenuCheckIcon* menuCheckMergeAutomatically = nullptr;
 
             /// @brief menu check to show connection as bubble in "Move" mode.
             MFXMenuCheckIcon* menuCheckShowJunctionBubble = nullptr;

diff --git a/src/netedit/GNEViewNet.cpp b/src/netedit/GNEViewNet.cpp
@@ -119,7 +119,7 @@ FXDEFMAP(GNEViewNet) GNEViewNetMap[] = {
     FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_SHOWTAZELEMENTS,          GNEViewNet::onCmdToggleShowTAZElements),
     FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_EXTENDSELECTION,          GNEViewNet::onCmdToggleExtendSelection),
     FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_CHANGEALLPHASES,          GNEViewNet::onCmdToggleChangeAllPhases),
-    FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_ASKFORMERGE,              GNEViewNet::onCmdToggleWarnAboutMerge),
+    FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_MERGEAUTOMATICALLY,       GNEViewNet::onCmdToggleMergeAutomatically),
     FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_SHOWBUBBLES,              GNEViewNet::onCmdToggleShowJunctionBubbles),
     FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_MOVEELEVATION,            GNEViewNet::onCmdToggleMoveElevation),
     FXMAPFUNC(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_CHAINEDGES,               GNEViewNet::onCmdToggleChainEdges),
@@ -896,7 +896,9 @@ bool
 GNEViewNet::askMergeJunctions(const GNEJunction* movedJunction, const GNEJunction* targetJunction, bool &alreadyAsked) {
     if (alreadyAsked) {
         return false;
-    } else if (!myNetworkViewOptions.menuCheckWarnAboutMerge->amChecked()) {
+    } else if (myNetworkViewOptions.menuCheckMergeAutomatically->amChecked()) {
+        return true;
+    } else {
         WRITE_DEBUG("Opening FXMessageBox 'merge junctions'");
         // open question box
         const std::string header = TL("Confirm Junction Merger");
@@ -4078,19 +4080,19 @@ GNEViewNet::onCmdToggleDrawSpreadVehicles(FXObject*, FXSelector sel, void*) {
 
 
 long
-GNEViewNet::onCmdToggleWarnAboutMerge(FXObject*, FXSelector sel, void*) {
+GNEViewNet::onCmdToggleMergeAutomatically(FXObject*, FXSelector sel, void*) {
     // Toggle menuCheckWarnAboutMerge
-    if (myNetworkViewOptions.menuCheckWarnAboutMerge->amChecked() == TRUE) {
-        myNetworkViewOptions.menuCheckWarnAboutMerge->setChecked(FALSE);
+    if (myNetworkViewOptions.menuCheckMergeAutomatically->amChecked() == TRUE) {
+        myNetworkViewOptions.menuCheckMergeAutomatically->setChecked(FALSE);
     } else {
-        myNetworkViewOptions.menuCheckWarnAboutMerge->setChecked(TRUE);
+        myNetworkViewOptions.menuCheckMergeAutomatically->setChecked(TRUE);
     }
-    myNetworkViewOptions.menuCheckWarnAboutMerge->update();
+    myNetworkViewOptions.menuCheckMergeAutomatically->update();
     // Only update view
     updateViewNet();
     // set focus in menu check again, if this function was called clicking over menu check instead using alt+<key number>
-    if (sel == FXSEL(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_ASKFORMERGE)) {
-        myNetworkViewOptions.menuCheckWarnAboutMerge->setFocus();
+    if (sel == FXSEL(SEL_COMMAND, MID_GNE_NETWORKVIEWOPTIONS_MERGEAUTOMATICALLY)) {
+        myNetworkViewOptions.menuCheckMergeAutomatically->setFocus();
     }
     return 1;
 }
@@ -4763,11 +4765,11 @@ GNEViewNet::updateNetworkModeSpecificControls() {
             myCurrentFrame = myViewParent->getMoveFrame();
             myNetworkCheckableButtons.moveNetworkElementsButton->setChecked(true);
             // show view options
-            myNetworkViewOptions.menuCheckWarnAboutMerge->show();
+            myNetworkViewOptions.menuCheckMergeAutomatically->show();
             myNetworkViewOptions.menuCheckShowJunctionBubble->show();
             myNetworkViewOptions.menuCheckMoveElevation->show();
             // show menu checks
-            menuChecks.menuCheckWarnAboutMerge->show();
+            menuChecks.menuCheckMergeAutomatically->show();
             menuChecks.menuCheckShowJunctionBubble->show();
             menuChecks.menuCheckMoveElevation->show();
             break;

diff --git a/src/netedit/GNEViewNet.h b/src/netedit/GNEViewNet.h
@@ -416,7 +416,7 @@ class GNEViewNet : public GUISUMOAbstractView {
     long onCmdToggleDrawSpreadVehicles(FXObject*, FXSelector, void*);
 
     /// @brief toggle warn for merge
-    long onCmdToggleWarnAboutMerge(FXObject*, FXSelector, void*);
+    long onCmdToggleMergeAutomatically(FXObject*, FXSelector, void*);
 
     /// @brief toggle show junction bubbles
     long onCmdToggleShowJunctionBubbles(FXObject*, FXSelector, void*);

diff --git a/src/netedit/GNEViewNetHelper.cpp b/src/netedit/GNEViewNetHelper.cpp
@@ -2750,11 +2750,11 @@ GNEViewNetHelper::NetworkViewOptions::buildNetworkViewOptionsMenuChecks() {
     menuCheckChangeAllPhases->setChecked(false);
     menuCheckChangeAllPhases->create();
 
-    menuCheckWarnAboutMerge = new MFXCheckableButton(false, gripModes, toolTipMenu,
+    menuCheckMergeAutomatically = new MFXCheckableButton(false, gripModes, toolTipMenu,
             (std::string("\t") + TL("Automatic merging junction") + std::string("\t") + TL("Toggle ask for confirmation before merging junction.")),
-            GUIIconSubSys::getIcon(GUIIcon::NETWORKMODE_CHECKBOX_ASKFORMERGE),
-            myViewNet, MID_GNE_NETWORKVIEWOPTIONS_ASKFORMERGE, GUIDesignMFXCheckableButtonSquare);
-    menuCheckWarnAboutMerge->create();
+            GUIIconSubSys::getIcon(GUIIcon::NETWORKMODE_CHECKBOX_MERGEAUTOMATICALLY),
+            myViewNet, MID_GNE_NETWORKVIEWOPTIONS_MERGEAUTOMATICALLY, GUIDesignMFXCheckableButtonSquare);
+    menuCheckMergeAutomatically->create();
 
     menuCheckShowJunctionBubble = new MFXCheckableButton(false, gripModes, toolTipMenu,
             (std::string("\t") + TL("Show bubbles") + std::string("\t") + TL("Toggle show bubbles over junctions shapes.")),
@@ -2802,7 +2802,7 @@ GNEViewNetHelper::NetworkViewOptions::hideNetworkViewOptionsMenuChecks() {
     menuCheckShowTAZElements->hide();
     menuCheckExtendSelection->hide();
     menuCheckChangeAllPhases->hide();
-    menuCheckWarnAboutMerge->hide();
+    menuCheckMergeAutomatically->hide();
     menuCheckShowJunctionBubble->hide();
     menuCheckMoveElevation->hide();
     menuCheckChainEdges->hide();
@@ -2846,8 +2846,8 @@ GNEViewNetHelper::NetworkViewOptions::getVisibleNetworkMenuCommands(std::vector<
     if (menuCheckChangeAllPhases->shown()) {
         commands.push_back(menuCheckChangeAllPhases);
     }
-    if (menuCheckWarnAboutMerge->shown()) {
-        commands.push_back(menuCheckWarnAboutMerge);
+    if (menuCheckMergeAutomatically->shown()) {
+        commands.push_back(menuCheckMergeAutomatically);
     }
     if (menuCheckShowJunctionBubble->shown()) {
         commands.push_back(menuCheckShowJunctionBubble);

diff --git a/src/netedit/GNEViewNetHelper.h b/src/netedit/GNEViewNetHelper.h
@@ -859,8 +859,8 @@ struct GNEViewNetHelper {
         /// @brief checkable button to set change all phases
         MFXCheckableButton* menuCheckChangeAllPhases = nullptr;
 
-        /// @brief checkable button to we should warn about merging junctions
-        MFXCheckableButton* menuCheckWarnAboutMerge = nullptr;
+        /// @brief checkable button to we should't warn about merging junctions
+        MFXCheckableButton* menuCheckMergeAutomatically = nullptr;
 
         /// @brief checkable button to show connection as bubble in "Move" mode.
         MFXCheckableButton* menuCheckShowJunctionBubble = nullptr;

diff --git a/src/utils/gui/images/GUIIconSubSys.cpp b/src/utils/gui/images/GUIIconSubSys.cpp
@@ -184,7 +184,7 @@
 #include "icons/computepathmanager.xpm"
 
 #include "icons/checkboxes/checkbox_applytoallphases.xpm"
-#include "icons/checkboxes/checkbox_askformerge.xpm"
+#include "icons/checkboxes/checkbox_mergeautomatically.xpm"
 #include "icons/checkboxes/checkbox_autoselectjunctions.xpm"
 #include "icons/checkboxes/checkbox_bubbles.xpm"
 #include "icons/checkboxes/checkbox_chain.xpm"
@@ -740,7 +740,7 @@ GUIIconSubSys::GUIIconSubSys(FXApp* a) {
     myIcons[GUIIcon::NETWORKMODE_CHECKBOX_SELECTEDGES] = new FXXPMIcon(a, checkbox_selectededges_xpm);
     myIcons[GUIIcon::NETWORKMODE_CHECKBOX_SHOWCONNECTIONS] = new FXXPMIcon(a, checkbox_showconnections_xpm);
     myIcons[GUIIcon::NETWORKMODE_CHECKBOX_AUTOSELECTJUNCTIONS] = new FXXPMIcon(a, checkbox_autoselectjunctions_xpm);
-    myIcons[GUIIcon::NETWORKMODE_CHECKBOX_ASKFORMERGE] = new FXXPMIcon(a, checkbox_askformerge_xpm);
+    myIcons[GUIIcon::NETWORKMODE_CHECKBOX_MERGEAUTOMATICALLY] = new FXXPMIcon(a, checkbox_mergeautomatically_xpm);
     myIcons[GUIIcon::NETWORKMODE_CHECKBOX_BUBBLES] = new FXXPMIcon(a, checkbox_bubbles_xpm);
     myIcons[GUIIcon::NETWORKMODE_CHECKBOX_ELEVATION] = new FXXPMIcon(a, checkbox_elevation_xpm);
     myIcons[GUIIcon::NETWORKMODE_CHECKBOX_CHAIN] = new FXXPMIcon(a, checkbox_chain_xpm);

diff --git a/src/utils/gui/images/GUIIcons.h b/src/utils/gui/images/GUIIcons.h
@@ -298,7 +298,7 @@ enum class GUIIcon {
     NETWORKMODE_CHECKBOX_SELECTEDGES,
     NETWORKMODE_CHECKBOX_SHOWCONNECTIONS,
     NETWORKMODE_CHECKBOX_AUTOSELECTJUNCTIONS,
-    NETWORKMODE_CHECKBOX_ASKFORMERGE,
+    NETWORKMODE_CHECKBOX_MERGEAUTOMATICALLY,
     NETWORKMODE_CHECKBOX_BUBBLES,
     NETWORKMODE_CHECKBOX_ELEVATION,
     NETWORKMODE_CHECKBOX_CHAIN,

diff --git a/...icons/checkboxes/checkbox_askformerge.xpm → ...heckboxes/checkbox_mergeautomatically.xpm b/...icons/checkboxes/checkbox_askformerge.xpm → ...heckboxes/checkbox_mergeautomatically.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char *checkbox_askformerge_xpm[] = {
+static const char *checkbox_mergeautomatically_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "16 16 3 1",
 "H c #CC0000",

diff --git a/src/utils/gui/windows/GUIAppEnum.h b/src/utils/gui/windows/GUIAppEnum.h
@@ -835,8 +835,8 @@ enum {
     MID_GNE_NETWORKVIEWOPTIONS_EXTENDSELECTION,
     /// @brief change all phases
     MID_GNE_NETWORKVIEWOPTIONS_CHANGEALLPHASES,
-    /// @brief ask before merging junctions
-    MID_GNE_NETWORKVIEWOPTIONS_ASKFORMERGE,
+    /// @brief don't ask before merging junctions
+    MID_GNE_NETWORKVIEWOPTIONS_MERGEAUTOMATICALLY,
     /// @brief show junctions as bubbles
     MID_GNE_NETWORKVIEWOPTIONS_SHOWBUBBLES,
     /// @brief move elevation instead of x,y