1.1 --- a/map_win.h	Wed Nov 23 16:24:59 2005 +0000
     1.2 +++ b/map_win.h	Tue Nov 29 19:31:58 2005 +0000
     1.3 @@ -5,10 +5,8 @@
     1.4  
     1.5  class MapWin;
     1.6  
     1.7 -#include "all_include.h"
     1.8 -#include "graph_displayer_canvas.h"
     1.9 -#include "mapstorage.h"
    1.10 -#include "new_map_win.h"
    1.11 +#include <all_include.h>
    1.12 +#include <main_win.h>
    1.13  #include <libgnomecanvasmm.h>
    1.14  #include <libgnomecanvasmm/polygon.h>
    1.15  
    1.16 @@ -21,9 +19,8 @@
    1.17    class MapSelector : public Gtk::HBox
    1.18    {
    1.19    protected:
    1.20 -    GraphDisplayerCanvas & gdc;
    1.21 -    ///The \ref MapStorage in which the visualizable maps are stored
    1.22 -    MapStorage & ms;
    1.23 +    sigc::signal<void, std::string> signal_cbt;
    1.24 +    sigc::signal<void, bool> signal_newmapwin;
    1.25  
    1.26      int id;
    1.27  
    1.28 @@ -41,15 +38,14 @@
    1.29  
    1.30      Gtk::Label * label;
    1.31  
    1.32 -    Node node_to_update;
    1.33 -    Edge edge_to_update;
    1.34 -
    1.35 -
    1.36    public:
    1.37  
    1.38 -    MapSelector(GraphDisplayerCanvas &, MapStorage &, int, bool);
    1.39 +    MapSelector(std::vector<std::string>, int, bool);
    1.40  
    1.41 -    void update_list();
    1.42 +    sigc::signal<void, std::string> signal_cbt_ch();
    1.43 +    sigc::signal<void, bool> signal_newmapwin_needed();
    1.44 +
    1.45 +    void update_list( std::vector<std::string> );
    1.46  
    1.47      ///If a radiobutton is clicked, this function determines
    1.48      ///which button was that and after that calls the
    1.49 @@ -61,9 +57,6 @@
    1.50  
    1.51      virtual void reset();
    1.52  
    1.53 -    virtual void update(Node node);
    1.54 -    virtual void update(Edge edge);
    1.55 -
    1.56      Glib::ustring get_active_text();
    1.57      void set_active_text(Glib::ustring);
    1.58      void append_text(Glib::ustring);
    1.59 @@ -72,14 +65,7 @@
    1.60  
    1.61  
    1.62  protected:
    1.63 -  ///The \ref GraphDisplayerCanvas on which the graph will be drawn.
    1.64 -  ///It has to be known for this class, because
    1.65 -  ///when a map assigned to a certain attribute
    1.66 -  ///a function of the \ref GraphDisplayerCanvas will be called.
    1.67 -  GraphDisplayerCanvas & gdc;
    1.68 -
    1.69 -  ///The \ref MapStorage in which the visualizable maps are stored
    1.70 -  MapStorage & ms;
    1.71 +  MainWin & mainwin;
    1.72  
    1.73    Gtk::Table * table;
    1.74    
    1.75 @@ -91,13 +77,13 @@
    1.76  
    1.77  public:
    1.78    ///Constructor of MapWin creates the widgets shown in MapWin.
    1.79 -  MapWin(const std::string& title, MapStorage &, GraphDisplayerCanvas &);
    1.80 +  MapWin(const std::string& title, std::vector<std::string>, std::vector<std::string>, MainWin & mw);
    1.81  
    1.82 -  ///This function is created to set the appropriate maps on the newly created node
    1.83 -  void updateNode(Graph::Node);
    1.84 +  void nodeMapChanged(std::string, int);
    1.85  
    1.86 -  ///This function is created to set the appropriate maps on the newly created edge
    1.87 -  void updateEdge(Graph::Edge);
    1.88 +  void edgeMapChanged(std::string, int);
    1.89 +
    1.90 +  void newMapWinNeeded(bool, int);
    1.91  
    1.92    ///This function inserts name of the new edgemap in the list in the combo box
    1.93    void registerNewEdgeMap(std::string);
    1.94 @@ -107,7 +93,7 @@
    1.95  
    1.96    virtual bool closeIfEscapeIsPressed(GdkEventKey*);
    1.97  
    1.98 -  void update();
    1.99 +  void update(std::vector<std::string>, std::vector<std::string>);
   1.100  };
   1.101  
   1.102  #endif //MAP_WIN_H