Changeset 94:adfdc2f70548 in glemon-0.x for map_win.h

Timestamp:

11/29/05 20:31:58 (18 years ago)

Author:

Hegyi Péter

Branch:

gui

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk/gui@2389

Message:

Structure of GUI is now more clear-cut than before.

File:

• map_win.h (modified) (7 diffs)

map_win.h

@@ -6 +6 @@
 class MapWin;
 
-#include "all_include.h"
-#include "graph_displayer_canvas.h"
-#include "mapstorage.h"
-#include "new_map_win.h"
+#include <all_include.h>
+#include <main_win.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
@@ -22 +20 @@
   {
   protected:
-    GraphDisplayerCanvas & gdc;
-    ///The \ref MapStorage in which the visualizable maps are stored
-    MapStorage & ms;
+    sigc::signal<void, std::string> signal_cbt;
+    sigc::signal<void, bool> signal_newmapwin;
 
     int id;
@@ -42 +39 @@
     Gtk::Label * label;
 
-    Node node_to_update;
-    Edge edge_to_update;
-
-
   public:
 
-    MapSelector(GraphDisplayerCanvas &, MapStorage &, int, bool);
+    MapSelector(std::vector<std::string>, int, bool);
 
-    void update_list();
+    sigc::signal<void, std::string> signal_cbt_ch();
+    sigc::signal<void, bool> signal_newmapwin_needed();
+
+    void update_list( std::vector<std::string> );
 
     ///If a radiobutton is clicked, this function determines
@@ -62 +58 @@
     virtual void reset();
 
-    virtual void update(Node node);
-    virtual void update(Edge edge);
-
     Glib::ustring get_active_text();
     void set_active_text(Glib::ustring);
@@ -73 +66 @@
 
 protected:
-  ///The \ref GraphDisplayerCanvas on which the graph will be drawn.
-  ///It has to be known for this class, because
-  ///when a map assigned to a certain attribute
-  ///a function of the \ref GraphDisplayerCanvas will be called.
-  GraphDisplayerCanvas & gdc;
-
-  ///The \ref MapStorage in which the visualizable maps are stored
-  MapStorage & ms;
+  MainWin & mainwin;
 
   Gtk::Table * table;
@@ -92 +78 @@
 public:
   ///Constructor of MapWin creates the widgets shown in MapWin.
-  MapWin(const std::string& title, MapStorage &, GraphDisplayerCanvas &);
+  MapWin(const std::string& title, std::vector<std::string>, std::vector<std::string>, MainWin & mw);
 
-  ///This function is created to set the appropriate maps on the newly created node
-  void updateNode(Graph::Node);
+  void nodeMapChanged(std::string, int);
 
-  ///This function is created to set the appropriate maps on the newly created edge
-  void updateEdge(Graph::Edge);
+  void edgeMapChanged(std::string, int);
+
+  void newMapWinNeeded(bool, int);
 
   ///This function inserts name of the new edgemap in the list in the combo box
@@ -108 +94 @@
   virtual bool closeIfEscapeIsPressed(GdkEventKey*);
 
-  void update();
+  void update(std::vector<std::string>, std::vector<std::string>);
 };