Changeset 195:125c56c1efda in glemon-0.x

Timestamp:

03/01/07 09:07:39 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@3206

Message:

Mapstorage does not need to know NoteBookTab? furthermore.

Files:

• mapstorage.cc (modified) (3 diffs)
• mapstorage.h (modified) (5 diffs)
• nbtab.cc (modified) (2 diffs)

mapstorage.cc

@@ -22 +22 @@
 
 #include <mapstorage.h>
-#include <graph_displayer_canvas.h> //kivenni
-#include <nbtab.h> //kivenni
 #include <gui_writer.h>
 #include <gui_reader.h>
@@ -32 +30 @@
 const double p_d=40000;
 
-MapStorage::MapStorage(NoteBookTab& tab) : mytab(tab), modified(false), file_name(""), arrow_pos_read_ok(false), iterations(i_d), attraction(a_d), propulsation(p_d), background_set(false)
+MapStorage::MapStorage() : modified(false), file_name(""), arrow_pos_read_ok(false), iterations(i_d), attraction(a_d), propulsation(p_d), background_set(false)
 {
   nodemap_storage["coordinates_x"] = new Graph::NodeMap<double>(graph);
@@ -571 +569 @@
     background_set = true;
   }
-  mytab.gd_canvas->setBackground();
+  signal_background.emit();
 }
 

mapstorage.h

@@ -23 +23 @@
 #include <xymap.h>
 #include <libgnomecanvasmm.h>
-
-class NoteBookTab;
 
 ///class MapStorage handles NodeMaps and EdgeMaps.
@@ -43 +41 @@
   bool background_set;
   double background_scaling;
-  NoteBookTab& mytab;
 public:
   void setBackground(const std::string& file_name);
@@ -116 +113 @@
   sigc::signal<void, double, double, int> signal_design_win;
 
+  ///Signal emitted when background should be set by \ref NoteBookTab
+  sigc::signal<void> signal_background;
+
   ///Iteration number during graph design
   int iterations;
@@ -130 +130 @@
   ///Its all activity is initializing default values
   ///for different visualization attributes.
-  MapStorage(NoteBookTab& tab);
+  MapStorage();
 
   ///Destructor of MapStorage
@@ -185 +185 @@
   sigc::signal<void, double, double, int> signal_design_win_ch(){return signal_design_win;};
 
+  ///returns \ref signal_background to be able to connect functions to it
+  sigc::signal<void> signal_background_ch(){return signal_background;};
+
+
   ///Adds given map to storage.
 

nbtab.cc

@@ -28 +28 @@
 NoteBookTab::NoteBookTab():mapwinexists(false), designwinexists(false)
 {
-  mapstorage=new MapStorage(*this);
+  mapstorage=new MapStorage();
 
   Gtk::ScrolledWindow *pScrolledWindow = manage(new Gtk::ScrolledWindow);
@@ -39 +39 @@
   mapstorage->signal_node_map_ch().connect(sigc::mem_fun(*this, &NoteBookTab::registerNewNodeMap));
   mapstorage->signal_edge_map_ch().connect(sigc::mem_fun(*this, &NoteBookTab::registerNewEdgeMap));
+  mapstorage->signal_background_ch().connect(sigc::mem_fun(*gd_canvas, &GraphDisplayerCanvas::setBackground));
   show_all_children();
   show();