Added GUIDialog_ChooserAbstract. Refs eclipse-sumo#6916

abcsyald · Oct 16, 2020 · 0916840 · 0916840
1 parent c666b53
commit 0916840
Show file tree

Hide file tree

Showing 8 changed files with 529 additions and 407 deletions.
diff --git a/src/gui/GUISUMOViewParent.cpp b/src/gui/GUISUMOViewParent.cpp
@@ -228,9 +228,8 @@ GUISUMOViewParent::onCmdLocate(FXObject*, FXSelector sel, void*) {
                 myGLObjChooser.ACChooserJunction->restore();
                 myGLObjChooser.ACChooserJunction->setFocus();
             } else {
-                myGLObjChooser.ACChooserJunction = new GUIDialog_GLObjChooser(this, nullptr,
-                    GUIIconSubSys::getIcon(GUIIcon::LOCATEJUNCTION), 
-                    "Junction Chooser", 
+                myGLObjChooser.ACChooserJunction = new GUIDialog_GLObjChooser(this,
+                    GUIIconSubSys::getIcon(GUIIcon::LOCATEJUNCTION), "Junction Chooser", 
                     static_cast<GUINet*>(GUINet::getInstance())->getJunctionIDs(myParent->listInternal()), 
                     GUIGlObjectStorage::gIDStorage);
             }

diff --git a/src/netedit/dialogs/GNEDialogACChooser.cpp b/src/netedit/dialogs/GNEDialogACChooser.cpp
@@ -31,7 +31,7 @@
 // ===========================================================================
 
 GNEDialogACChooser::GNEDialogACChooser(GNEViewParent* viewParent, FXIcon* icon, const std::string& title, const std::vector<GNEAttributeCarrier*>& ACs):
-    GUIDialog_GLObjChooser(nullptr, viewParent, icon, title.c_str(), std::vector<GUIGlID>(), GUIGlObjectStorage::gIDStorage),
+    GUIDialog_ChooserAbstract(nullptr, viewParent, icon, title.c_str(), std::vector<GUIGlID>(), GUIGlObjectStorage::gIDStorage),
     myACs(ACs),
     myFilteredACs(ACs),
     myViewParent(viewParent),
@@ -105,7 +105,7 @@ GNEDialogACChooser::getObjectName(GUIGlObject* o) const {
             return tlDef->getID() + " (" + o->getMicrosimID() + ")";
         }
     } else {
-        return GUIDialog_GLObjChooser::getObjectName(o);
+        return GUIDialog_ChooserAbstract::getObjectName(o);
     }
 }
 

diff --git a/src/netedit/dialogs/GNEDialogACChooser.h b/src/netedit/dialogs/GNEDialogACChooser.h
@@ -21,10 +21,7 @@
 #pragma once
 #include <config.h>
 
-#include <string>
-#include <vector>
-#include <set>
-#include <utils/gui/windows/GUIDialog_GLObjChooser.h>
+#include <utils/gui/windows/GUIDialog_ChooserAbstract.h>
 
 
 // ===========================================================================
@@ -43,7 +40,7 @@ class GNEViewParent;
  * from a given artifact like vehicles, edges or junctions and allow
  * one of their items
  */
-class GNEDialogACChooser : public GUIDialog_GLObjChooser {
+class GNEDialogACChooser : public GUIDialog_ChooserAbstract {
 
 public:
     /** @brief Constructor

diff --git a/src/utils/gui/windows/CMakeLists.txt b/src/utils/gui/windows/CMakeLists.txt
@@ -16,6 +16,8 @@ set(utils_gui_windows_STAT_SRCS
    GUIPerspectiveChanger.h
    GUISUMOAbstractView.cpp
    GUISUMOAbstractView.h
+   GUIDialog_ChooserAbstract.cpp
+   GUIDialog_ChooserAbstract.h
    GUIDialog_GLObjChooser.cpp
    GUIDialog_GLObjChooser.h
 )