Changeset 194:6b2b718420eb in glemon-0.x

Timestamp:

02/28/07 19:20:28 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Header reorganising

Files:

• algobox.cc (modified) (1 diff)
• algobox.h (modified) (1 diff)
• algowin.cc (modified) (1 diff)
• algowin.h (modified) (1 diff)
• background_chooser_dialog.cc (modified) (1 diff)
• design_win.cc (modified) (1 diff)
• design_win.h (modified) (1 diff)
• dijkstrabox.cc (modified) (1 diff)
• dijkstrabox.h (modified) (1 diff)
• eps_win.cc (modified) (1 diff)
• eps_win.h (modified) (1 diff)
• gdc-broken_edge.cc (modified) (6 diffs)
• graph-displayer.cc (modified) (1 diff)
• graph_displayer_canvas-edge.cc (modified) (9 diffs)
• graph_displayer_canvas-event.cc (modified) (33 diffs)
• graph_displayer_canvas-node.cc (modified) (8 diffs)
• graph_displayer_canvas-zoom.cc (modified) (1 diff)
• graph_displayer_canvas.cc (modified) (20 diffs)
• graph_displayer_canvas.h (modified) (1 diff)
• gui_reader.cc (modified) (1 diff)
• gui_reader.h (modified) (1 diff)
• gui_writer.cc (modified) (1 diff)
• gui_writer.h (modified) (1 diff)
• kruskalbox.cc (modified) (1 diff)
• kruskalbox.h (modified) (1 diff)
• main_win.cc (modified) (4 diffs)
• main_win.h (modified) (1 diff)
• map_win.cc (modified) (1 diff)
• map_win.h (modified) (1 diff)
• mapselector.cc (modified) (1 diff)
• mapselector.h (modified) (1 diff)
• mapstorage.cc (modified) (1 diff)
• mapstorage.h (modified) (1 diff)
• nbtab.cc (modified) (17 diffs)
• nbtab.h (modified) (2 diffs)
• new_map_win.cc (modified) (10 diffs)
• new_map_win.h (modified) (1 diff)

algobox.cc

@@ -18 +18 @@
 
 #include <algobox.h>
+#include <mapstorage.h>
+#include <mapselector.h>
 
 enum {N_DEMO1, N_DEMO2, NODE_INPUT_NUM}; // input IDs for nodes;

algobox.h

@@ -20 +20 @@
 #define ALGOBOX_H
 
-class AlgoBox;
+class MapStorage;
+class MapSelector;
 
 #include <all_include.h>
-#include <mapstorage.h>
-#include <mapselector.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>

algowin.cc

@@ -18 +18 @@
 
 #include <algowin.h>
+#include <algobox.h>
 #include <kruskalbox.h>
 #include <dijkstrabox.h>

algowin.h

@@ -20 +20 @@
 #define ALGOWIN_H
 
-class AlgoWin;
-
 #include <all_include.h>
-//#include <mapstorage.h>
-#include <algobox.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 
+class AlgoBox;
 class MapStorage;
 

background_chooser_dialog.cc

@@ -1 @@
-#include "background_chooser_dialog.h"
+#include <background_chooser_dialog.h>
 #include <gtkmm/stock.h>
-#include "mapstorage.h"
+#include <mapstorage.h>
 
 BackgroundChooserDialog::BackgroundChooserDialog(MapStorage* ms) :

design_win.cc

@@ -17 +17 @@
  */
 
+#include <nbtab.h>
 #include <design_win.h>
 

design_win.h

@@ -20 +20 @@
 #define DESWIN_H
 
-class DesignWin;
+class NoteBookTab;
 
 #include <all_include.h>
-#include <nbtab.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>

dijkstrabox.cc

@@ -17 +17 @@
  */
 
+#include <mapstorage.h>
+#include <mapselector.h>
+#include <algobox.h>
 #include <dijkstrabox.h>
+
 #include <lemon/dijkstra.h>
 #include <lemon/suurballe.h>

dijkstrabox.h

@@ -20 +20 @@
 #define DIJKSTRABOX_H
 
-class DijkstraBox;
+class AlgoBox;
 
 #include <all_include.h>
-#include <algobox.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>

eps_win.cc

@@ -17 +17 @@
  */
 
-#include "eps_win.h"
+#include <nbtab.h>
+#include <eps_win.h>
 #include <set>
 

eps_win.h

@@ -20 +20 @@
 #define EPS_WIN_H
 
-class EpsWin;
+class NoteBookTab;
 
 #include <all_include.h>
-#include <nbtab.h>
-#include <mapselector.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>

gdc-broken_edge.cc

@@ -17 +17 @@
  */
 
-#include "graph_displayer_canvas.h"
+#include <graph_displayer_canvas.h>
+#include <mapstorage.h>
+#include <nbtab.h>
 #include <cmath>
 
@@ -34 +36 @@
 void GraphDisplayerCanvas::EdgeBase::drawArrow(XY unit_vector_in_dir)
 {
-  MapStorage& ms = canvas.mytab.mapstorage;
+  MapStorage& ms = *canvas.mytab.mapstorage;
   XY center(ms.arrow_pos[edge]);
   XY unit_norm_vector(0-unit_vector_in_dir.y, unit_vector_in_dir.x);
@@ -85 +87 @@
 void GraphDisplayerCanvas::BrokenEdge::draw()
 {
-  MapStorage& ms = canvas.mytab.mapstorage;
+  MapStorage& ms = *canvas.mytab.mapstorage;
 
   //calculating coordinates of the direction indicator arrow
@@ -151 +153 @@
         Gnome::Canvas::Points points_new;
 
-        canvas.mytab.mapstorage.arrow_pos.set(edge, canvas.mytab.mapstorage.arrow_pos[edge] + XY(dx, dy));
+        canvas.mytab.mapstorage->arrow_pos.set(edge, canvas.mytab.mapstorage->arrow_pos[edge] + XY(dx, dy));
 
         draw();
-        canvas.textReposition(canvas.mytab.mapstorage.arrow_pos[edge]);
+        canvas.textReposition(canvas.mytab.mapstorage->arrow_pos[edge]);
 
         clicked_x=e->motion.x;
@@ -195 +197 @@
 void GraphDisplayerCanvas::LoopEdge::draw()
 {
-  MapStorage& ms = canvas.mytab.mapstorage;
+  MapStorage& ms = *canvas.mytab.mapstorage;
 
   Node node = ms.graph.source(edge);
@@ -248 +250 @@
       if(isbutton)
       {
-        canvas.mytab.mapstorage.arrow_pos.set(edge, XY(e->motion.x, e->motion.y));
+        canvas.mytab.mapstorage->arrow_pos.set(edge, XY(e->motion.x, e->motion.y));
 
         draw();
-        canvas.textReposition(canvas.mytab.mapstorage.arrow_pos[edge]);
+        canvas.textReposition(canvas.mytab.mapstorage->arrow_pos[edge]);
       }
     default: break;

graph-displayer.cc

@@ -22 +22 @@
 
 #include "all_include.h"
-#include "mapstorage.h"
 #include "main_win.h"
 #include <libgnomecanvasmm.h>

graph_displayer_canvas-edge.cc

@@ -17 +17 @@
  */
 
-#include "graph_displayer_canvas.h"
+#include <graph_displayer_canvas.h>
+#include <mapstorage.h>
+#include <nbtab.h>
 #include <cmath>
 
@@ -28 +30 @@
   min=edge_property_defaults[E_WIDTH];
   max=edge_property_defaults[E_WIDTH];
-  Graph::EdgeMap<double> actual_map((mytab.mapstorage).graph,edge_property_defaults[E_WIDTH]);
+  Graph::EdgeMap<double> actual_map((mytab.mapstorage)->graph,edge_property_defaults[E_WIDTH]);
   
   if(edge==INVALID)
     {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double v=fabs(actual_map[i]);
@@ -69 +71 @@
   double min, max;
 
-  min=(mytab.mapstorage).minOfEdgeMap(mapname);
-  max=(mytab.mapstorage).maxOfEdgeMap(mapname);
-  actual_map=((mytab.mapstorage).edgemap_storage)[mapname];
-
-  if(edge==INVALID)
-    {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  min=(mytab.mapstorage)->minOfEdgeMap(mapname);
+  max=(mytab.mapstorage)->maxOfEdgeMap(mapname);
+  actual_map=((mytab.mapstorage)->edgemap_storage)[mapname];
+
+  if(edge==INVALID)
+    {
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double v=(*actual_map)[i];
@@ -132 +134 @@
   //green in RGB
   Graph::EdgeMap<double> * actual_map;
-  actual_map=((mytab.mapstorage).edgemap_storage)[mapname];
+  actual_map=((mytab.mapstorage)->edgemap_storage)[mapname];
 
   double max, min;
 
-  max=(mytab.mapstorage).maxOfEdgeMap(mapname);
-  min=(mytab.mapstorage).minOfEdgeMap(mapname);
-
-  if(edge==INVALID)
-    {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  max=(mytab.mapstorage)->maxOfEdgeMap(mapname);
+  min=(mytab.mapstorage)->minOfEdgeMap(mapname);
+
+  if(edge==INVALID)
+    {
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double w=(*actual_map)[i];
@@ -183 +185 @@
   //the minimum of the nodemap to the range of
   //green in RGB
-  Graph::EdgeMap<double> actual_map((mytab.mapstorage).graph,edge_property_defaults[E_COLOR]);
+  Graph::EdgeMap<double> actual_map((mytab.mapstorage)->graph,edge_property_defaults[E_COLOR]);
 
   double max, min;
@@ -192 +194 @@
   if(edge==INVALID)
     {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double w=actual_map[i];
@@ -237 +239 @@
   if(edge==INVALID)
     {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           edgemap_to_edit=mapname;
-          double number=(*((mytab.mapstorage).edgemap_storage)[mapname])[i];
+          double number=(*((mytab.mapstorage)->edgemap_storage)[mapname])[i];
           
           std::ostringstream ostr;
@@ -251 +253 @@
   else
     {
-          double number=(*((mytab.mapstorage).edgemap_storage)[mapname])[edge];
+          double number=(*((mytab.mapstorage)->edgemap_storage)[mapname])[edge];
 
           std::ostringstream ostr;
@@ -272 +274 @@
   if(edge==INVALID)
     {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           edgemap_to_edit="";

graph_displayer_canvas-event.cc

@@ -17 +17 @@
  */
 
-#include "graph_displayer_canvas.h"
+#include <graph_displayer_canvas.h>
+#include <mapstorage.h>
+#include <nbtab.h>
 #include <cmath>
 
@@ -146 +148 @@
       active_item=(get_item_at(clicked_x, clicked_y));
       active_node=INVALID;
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           if(nodesmap[i]==active_item)
@@ -169 +171 @@
       if(active_node!=INVALID)
         {
-          (mytab.mapstorage).modified = true;
+          (mytab.mapstorage)->modified = true;
           
           //new coordinates will be the old values,
@@ -191 +193 @@
           std::ostringstream ostr;
           ostr << "(" <<
-            (mytab.mapstorage).coords[active_node].x << ", " <<
-            (mytab.mapstorage).coords[active_node].y << ")";
+            (mytab.mapstorage)->coords[active_node].x << ", " <<
+            (mytab.mapstorage)->coords[active_node].y << ")";
           double radius =
             (nodesmap[active_node]->property_x2().get_value() -
@@ -199 +201 @@
             {
               coord_text->property_text().set_value(ostr.str());
-              coord_text->property_x().set_value((mytab.mapstorage).coords[active_node].x +
+              coord_text->property_x().set_value((mytab.mapstorage)->coords[active_node].x +
                                                  radius);
-              coord_text->property_y().set_value((mytab.mapstorage).coords[active_node].y -
+              coord_text->property_y().set_value((mytab.mapstorage)->coords[active_node].y -
                                                  radius);
             }
@@ -208 +210 @@
               coord_text = new Gnome::Canvas::Text(
                                                    displayed_graph,
-                                                   (mytab.mapstorage).coords[active_node].x + radius,
-                                                   (mytab.mapstorage).coords[active_node].y - radius,
+                                                   (mytab.mapstorage)->coords[active_node].x + radius,
+                                                   (mytab.mapstorage)->coords[active_node].y - radius,
                                                    ostr.str());
               coord_text->property_fill_color().set_value("black");
@@ -300 +302 @@
 
     case GDK_BUTTON_RELEASE:
-      (mytab.mapstorage).modified = true;
+      (mytab.mapstorage)->modified = true;
 
       is_drawn=true;
@@ -306 +308 @@
       isbutton=1;
 
-      active_node=(mytab.mapstorage).graph.addNode();
+      active_node=(mytab.mapstorage)->graph.addNode();
 
       //initiating values corresponding to new node in maps
@@ -313 +315 @@
 
       // update coordinates
-      (mytab.mapstorage).coords.set(active_node, XY(clicked_x, clicked_y));
+      (mytab.mapstorage)->coords.set(active_node, XY(clicked_x, clicked_y));
 
       // update all other maps
       for (std::map<std::string, Graph::NodeMap<double>*>::const_iterator it =
-          (mytab.mapstorage).nodemap_storage.begin(); it !=
-          (mytab.mapstorage).nodemap_storage.end(); ++it)
+          (mytab.mapstorage)->nodemap_storage.begin(); it !=
+          (mytab.mapstorage)->nodemap_storage.end(); ++it)
       {
         if ((it->first != "coordinates_x") &&
@@ -324 +326 @@
         {
           (*(it->second))[active_node] =
-            (mytab.mapstorage).nodemap_default[it->first];
+            (mytab.mapstorage)->nodemap_default[it->first];
         }
       }
       // increment the id map's default value
-      (mytab.mapstorage).nodemap_default["label"] += 1.0;
+      (mytab.mapstorage)->nodemap_default["label"] += 1.0;
 
       nodesmap[active_node]=new Gnome::Canvas::Ellipse(displayed_graph,
@@ -378 +380 @@
           active_item=(get_item_at(clicked_x, clicked_y));
           active_node=INVALID;
-          for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+          for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
           {
             if(nodesmap[i]==active_item)
@@ -407 +409 @@
           target_item=(get_item_at(clicked_x, clicked_y));
           Node target_node=INVALID;
-          for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+          for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
           {
             if(nodesmap[i]==target_item)
@@ -417 +419 @@
           if(target_node!=INVALID)
           {
-            (mytab.mapstorage).modified = true;
+            (mytab.mapstorage)->modified = true;
 
             *(nodesmap[target_node]) <<
@@ -423 +425 @@
 
             //creating new edge
-            active_edge=(mytab.mapstorage).graph.addEdge(active_node,
+            active_edge=(mytab.mapstorage)->graph.addEdge(active_node,
                 target_node);
 
@@ -429 +431 @@
             for (std::map<std::string,
                 Graph::EdgeMap<double>*>::const_iterator it =
-                (mytab.mapstorage).edgemap_storage.begin(); it !=
-                (mytab.mapstorage).edgemap_storage.end(); ++it)
+                (mytab.mapstorage)->edgemap_storage.begin(); it !=
+                (mytab.mapstorage)->edgemap_storage.end(); ++it)
             {
               (*(it->second))[active_edge] =
-                (mytab.mapstorage).edgemap_default[it->first];
+                (mytab.mapstorage)->edgemap_default[it->first];
             }
             // increment the id map's default value
-            (mytab.mapstorage).edgemap_default["label"] += 1.0;
+            (mytab.mapstorage)->edgemap_default["label"] += 1.0;
 
             if(target_node!=active_node)                
             {
               // set the coordinates of the arrow on the new edge
-              MapStorage& ms = mytab.mapstorage;
+              MapStorage& ms = *mytab.mapstorage;
               ms.arrow_pos.set(active_edge,
                   (ms.coords[ms.graph.source(active_edge)] +
@@ -453 +455 @@
             {
               // set the coordinates of the arrow on the new edge
-              MapStorage& ms = mytab.mapstorage;
+              MapStorage& ms = *mytab.mapstorage;
               ms.arrow_pos.set(active_edge,
                   (ms.coords[ms.graph.source(active_edge)] +
@@ -464 +466 @@
 
             //initializing edge-text as well, to empty string
-            XY text_pos=mytab.mapstorage.arrow_pos[active_edge];
+            XY text_pos=mytab.mapstorage->arrow_pos[active_edge];
             text_pos+=(XY(10,10));
 
@@ -498 +500 @@
         if(target_item)
         {
-          propertyUpdate((mytab.mapstorage).graph.target(active_edge),N_COLOR);
+          propertyUpdate((mytab.mapstorage)->graph.target(active_edge),N_COLOR);
           target_item=NULL;
         }
@@ -522 +524 @@
       active_edge=INVALID;
       //was it a node?
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           if(nodesmap[i]==active_item)
@@ -532 +534 @@
       if(active_node==INVALID)
         {
-          for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+          for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
             {
               if(edgesmap[i]->getLine()==active_item)
@@ -561 +563 @@
               if(active_node!=INVALID)
                 {
-                  (mytab.mapstorage).modified = true;
+                  (mytab.mapstorage)->modified = true;
 
                   std::set<Graph::Edge> edges_to_delete;
 
-                  for(OutEdgeIt e((mytab.mapstorage).graph,active_node);e!=INVALID;++e)
+                  for(OutEdgeIt e((mytab.mapstorage)->graph,active_node);e!=INVALID;++e)
                     {
                       edges_to_delete.insert(e);
                     }
                   
-                  for(InEdgeIt e((mytab.mapstorage).graph,active_node);e!=INVALID;++e)
+                  for(InEdgeIt e((mytab.mapstorage)->graph,active_node);e!=INVALID;++e)
                     {
                       edges_to_delete.insert(e);
@@ -636 +638 @@
 
             //find the activated item between text of nodes
-            for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+            for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
               {
                 //at the same time only one can be active
@@ -648 +650 @@
             if(clicked_node==INVALID)
               {
-                for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+                for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
                   {
                     //at the same time only one can be active
@@ -661 +663 @@
               {
                 //find the activated item between texts
-                for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+                for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
                   {
                     //at the same time only one can be active
@@ -673 +675 @@
                 if(clicked_edge==INVALID)
                   {
-                    for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+                    for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
                       {
                         //at the same time only one can be active
@@ -715 +717 @@
                       case Gtk::RESPONSE_ACCEPT:
                         double new_value = spin.get_value();
-                        (*(mytab.mapstorage).nodemap_storage[nodemap_to_edit])[active_node] =
+                        (*(mytab.mapstorage)->nodemap_storage[nodemap_to_edit])[active_node] =
                           new_value;
                         std::ostringstream ostr;
@@ -758 +760 @@
                         case Gtk::RESPONSE_ACCEPT:
                           double new_value = spin.get_value();
-                          (*(mytab.mapstorage).edgemap_storage[edgemap_to_edit])[active_edge] =
+                          (*(mytab.mapstorage)->edgemap_storage[edgemap_to_edit])[active_edge] =
                             new_value;
                           std::ostringstream ostr;
@@ -783 +785 @@
   delete(nodetextmap[node_to_delete]);
   delete(nodesmap[node_to_delete]);
-  (mytab.mapstorage).graph.erase(node_to_delete);
+  (mytab.mapstorage)->graph.erase(node_to_delete);
 }
 
@@ -790 +792 @@
   delete(edgetextmap[edge_to_delete]);
   delete(edgesmap[edge_to_delete]);
-  (mytab.mapstorage).graph.erase(edge_to_delete);
+  (mytab.mapstorage)->graph.erase(edge_to_delete);
 }
 
@@ -810 +812 @@
     else
     {
-      for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
       {
         if(edgesmap[i]==active_bre)
@@ -852 +854 @@
 
   // the new coordinates of the centre of the node 
-  double coord_x = dx + (mytab.mapstorage).coords[moved_node].x;
-  double coord_y = dy + (mytab.mapstorage).coords[moved_node].y;
+  double coord_x = dx + (mytab.mapstorage)->coords[moved_node].x;
+  double coord_y = dy + (mytab.mapstorage)->coords[moved_node].y;
 
   // write back the new coordinates to the coords map
-  (mytab.mapstorage).coords.set(moved_node, XY(coord_x, coord_y));
+  (mytab.mapstorage)->coords.set(moved_node, XY(coord_x, coord_y));
 
   //all the edges connected to the moved point has to be redrawn
-  for(OutEdgeIt ei((mytab.mapstorage).graph,moved_node);ei!=INVALID;++ei)
+  for(OutEdgeIt ei((mytab.mapstorage)->graph,moved_node);ei!=INVALID;++ei)
     {
       XY arrow_pos;
 
-      if (mytab.mapstorage.graph.source(ei) == mytab.mapstorage.graph.target(ei))
-        {
-          arrow_pos = mytab.mapstorage.arrow_pos[ei] + XY(dx, dy);
+      if (mytab.mapstorage->graph.source(ei) == mytab.mapstorage->graph.target(ei))
+        {
+          arrow_pos = mytab.mapstorage->arrow_pos[ei] + XY(dx, dy);
         }
       else
@@ -871 +873 @@
           XY moved_node_1(coord_x - dx, coord_y - dy);
           XY moved_node_2(coord_x, coord_y);
-          Node target = mytab.mapstorage.graph.target(ei);
-          XY fix_node(mytab.mapstorage.coords[target].x,
-                      mytab.mapstorage.coords[target].y);
-          XY old_arrow_pos(mytab.mapstorage.arrow_pos[ei]);
+          Node target = mytab.mapstorage->graph.target(ei);
+          XY fix_node(mytab.mapstorage->coords[target].x,
+                      mytab.mapstorage->coords[target].y);
+          XY old_arrow_pos(mytab.mapstorage->arrow_pos[ei]);
 
           arrow_pos = calcArrowPos(moved_node_1, moved_node_2, fix_node, old_arrow_pos, isbutton);
         }
 
-      mytab.mapstorage.arrow_pos.set(ei, arrow_pos);
+      mytab.mapstorage->arrow_pos.set(ei, arrow_pos);
       edgesmap[ei]->draw();
 
       //reposition of edgetext
-      XY text_pos=mytab.mapstorage.arrow_pos[ei];
+      XY text_pos=mytab.mapstorage->arrow_pos[ei];
       text_pos+=(XY(10,10));
       edgetextmap[ei]->property_x().set_value(text_pos.x);
@@ -889 +891 @@
     }
 
-  for(InEdgeIt ei((mytab.mapstorage).graph,moved_node);ei!=INVALID;++ei)
-    {
-      if (mytab.mapstorage.graph.source(ei) != mytab.mapstorage.graph.target(ei))
+  for(InEdgeIt ei((mytab.mapstorage)->graph,moved_node);ei!=INVALID;++ei)
+    {
+      if (mytab.mapstorage->graph.source(ei) != mytab.mapstorage->graph.target(ei))
         {
           XY moved_node_1(coord_x - dx, coord_y - dy);
           XY moved_node_2(coord_x, coord_y);
-          Node source = mytab.mapstorage.graph.source(ei);
-          XY fix_node(mytab.mapstorage.coords[source].x,
-                      mytab.mapstorage.coords[source].y);
-          XY old_arrow_pos(mytab.mapstorage.arrow_pos[ei]);
+          Node source = mytab.mapstorage->graph.source(ei);
+          XY fix_node(mytab.mapstorage->coords[source].x,
+                      mytab.mapstorage->coords[source].y);
+          XY old_arrow_pos(mytab.mapstorage->arrow_pos[ei]);
 
           XY arrow_pos;
           arrow_pos = calcArrowPos(moved_node_1, moved_node_2, fix_node, old_arrow_pos, isbutton);
 
-          mytab.mapstorage.arrow_pos.set(ei, arrow_pos);
+          mytab.mapstorage->arrow_pos.set(ei, arrow_pos);
           edgesmap[ei]->draw();
 
           //reposition of edgetext
-          XY text_pos=mytab.mapstorage.arrow_pos[ei];
+          XY text_pos=mytab.mapstorage->arrow_pos[ei];
           text_pos+=(XY(10,10));
           edgetextmap[ei]->property_x().set_value(text_pos.x);

graph_displayer_canvas-node.cc

@@ -17 +17 @@
  */
 
-#include "graph_displayer_canvas.h"
+#include <graph_displayer_canvas.h>
+#include <mapstorage.h>
+#include <nbtab.h>
 #include <cmath>
 
@@ -26 +28 @@
   Graph::NodeMap<double> * actual_map;
   double min, max;
-  min=(mytab.mapstorage).minOfNodeMap(mapname);
-  max=(mytab.mapstorage).maxOfNodeMap(mapname);
-  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
-
-  if(node==INVALID)
-    {
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  min=(mytab.mapstorage)->minOfNodeMap(mapname);
+  max=(mytab.mapstorage)->maxOfNodeMap(mapname);
+  actual_map=((mytab.mapstorage)->nodemap_storage)[mapname];
+
+  if(node==INVALID)
+    {
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double v=fabs((*actual_map)[i]);
@@ -104 +106 @@
   min=node_property_defaults[N_RADIUS];
   max=node_property_defaults[N_RADIUS];
-  Graph::NodeMap<double> actual_map((mytab.mapstorage).graph,node_property_defaults[N_RADIUS]);
+  Graph::NodeMap<double> actual_map((mytab.mapstorage)->graph,node_property_defaults[N_RADIUS]);
   
   if(node==INVALID)
     {
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           double v=fabs(actual_map[i]);
@@ -168 +170 @@
 
   Graph::NodeMap<double> * actual_map;
-  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
+  actual_map=((mytab.mapstorage)->nodemap_storage)[mapname];
 
   double max, min;
 
-  max=(mytab.mapstorage).maxOfNodeMap(mapname);
-  min=(mytab.mapstorage).minOfNodeMap(mapname);
-
-  if(node==INVALID)
-    {
-
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  max=(mytab.mapstorage)->maxOfNodeMap(mapname);
+  min=(mytab.mapstorage)->minOfNodeMap(mapname);
+
+  if(node==INVALID)
+    {
+
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           Gdk::Color color;
@@ -223 +225 @@
   //green in RGB
 
-  Graph::NodeMap<double> actual_map((mytab.mapstorage).graph,node_property_defaults[N_COLOR]);
+  Graph::NodeMap<double> actual_map((mytab.mapstorage)->graph,node_property_defaults[N_COLOR]);
 
   double max, min;
@@ -233 +235 @@
     {
 
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           Gdk::Color color;
@@ -280 +282 @@
 
   Graph::NodeMap<double> * actual_map=NULL;
-  actual_map=((mytab.mapstorage).nodemap_storage)[mapname];
-
-  if(node==INVALID)
-    {
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  actual_map=((mytab.mapstorage)->nodemap_storage)[mapname];
+
+  if(node==INVALID)
+    {
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           nodemap_to_edit=mapname;
@@ -317 +319 @@
   if(node==INVALID)
     {
-      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+      for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
         {
           nodemap_to_edit="";

graph_displayer_canvas-zoom.cc

@@ -17 +17 @@
  */
 
-#include "graph_displayer_canvas.h"
+#include <graph_displayer_canvas.h>
 #include <cmath>
 

graph_displayer_canvas.cc

@@ -17 +17 @@
  */
 
-#include "graph_displayer_canvas.h"
+#include <mapstorage.h>
+#include <nbtab.h>
+#include <graph_displayer_canvas.h>
 #include <lemon/random.h>
 #include <cmath>
 
 GraphDisplayerCanvas::GraphDisplayerCanvas(NoteBookTab & mainw) :
-  nodesmap(mainw.mapstorage.graph), edgesmap(mainw.mapstorage.graph), edgetextmap(mainw.mapstorage.graph),
-  nodetextmap(mainw.mapstorage.graph), displayed_graph(*(root()), 0, 0),
+  nodesmap(mainw.mapstorage->graph), edgesmap(mainw.mapstorage->graph), edgetextmap(mainw.mapstorage->graph),
+  nodetextmap(mainw.mapstorage->graph), displayed_graph(*(root()), 0, 0),
   isbutton(0), active_item(NULL), target_item(NULL), nodemap_to_edit(""),
   edgemap_to_edit(""), autoscale(true), zoomtrack(false), radius_size(20), edge_width(10),
@@ -50 +52 @@
     delete background;
   }
-  if (mytab.mapstorage.isBackgroundSet())
+  if (mytab.mapstorage->isBackgroundSet())
   {
     background_set = true;
     refBackground = Gdk::Pixbuf::create_from_file(
-      mytab.mapstorage.getBackgroundFilename());
+      mytab.mapstorage->getBackgroundFilename());
     background = new Gnome::Canvas::Pixbuf(
         *(root()),
@@ -70 +72 @@
 GraphDisplayerCanvas::~GraphDisplayerCanvas()
 {
-  for (NodeIt n((mytab.mapstorage).graph); n != INVALID; ++n)
+  for (NodeIt n((mytab.mapstorage)->graph); n != INVALID; ++n)
     {
       delete nodesmap[n];
@@ -76 +78 @@
     }
   
-  for (EdgeIt e((mytab.mapstorage).graph); e != INVALID; ++e)
+  for (EdgeIt e((mytab.mapstorage)->graph); e != INVALID; ++e)
     {
       delete edgesmap[e];
@@ -119 +121 @@
       if(mapname!="")
         {
-          if( ( ((mytab.mapstorage).nodemap_storage).find(mapname) != ((mytab.mapstorage).nodemap_storage).end() ) )
+          if( ( ((mytab.mapstorage)->nodemap_storage).find(mapname) != ((mytab.mapstorage)->nodemap_storage).end() ) )
             {
               switch(prop)
@@ -166 +168 @@
       if(mapname!="")
         {
-          if( ( ((mytab.mapstorage).edgemap_storage).find(mapname) != ((mytab.mapstorage).edgemap_storage).end() ) )
+          if( ( ((mytab.mapstorage)->edgemap_storage).find(mapname) != ((mytab.mapstorage)->edgemap_storage).end() ) )
             {
               switch(prop)
@@ -208 +210 @@
   //first edges are drawn, to hide joining with nodes later
 
-  for (EdgeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
-  {
-    if (mytab.mapstorage.graph.source(i) == mytab.mapstorage.graph.target(i))
+  for (EdgeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
+  {
+    if (mytab.mapstorage->graph.source(i) == mytab.mapstorage->graph.target(i))
     {
       edgesmap[i]=new LoopEdge(displayed_graph, i, *this);
@@ -220 +222 @@
     //initializing edge-text as well, to empty string
 
-    XY text_pos=mytab.mapstorage.arrow_pos[i];
+    XY text_pos=mytab.mapstorage->arrow_pos[i];
     text_pos+=(XY(10,10));
 
@@ -231 +233 @@
   //afterwards nodes come to be drawn
 
-  for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+  for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
   {
     //drawing bule nodes, with black line around them
@@ -237 +239 @@
     nodesmap[i]=new Gnome::Canvas::Ellipse(
         displayed_graph,
-        (mytab.mapstorage).coords[i].x-20,
-        (mytab.mapstorage).coords[i].y-20,
-        (mytab.mapstorage).coords[i].x+20,
-        (mytab.mapstorage).coords[i].y+20);
+        (mytab.mapstorage)->coords[i].x-20,
+        (mytab.mapstorage)->coords[i].y-20,
+        (mytab.mapstorage)->coords[i].x+20,
+        (mytab.mapstorage)->coords[i].y+20);
     *(nodesmap[i]) << Gnome::Canvas::Properties::fill_color("blue");
     *(nodesmap[i]) << Gnome::Canvas::Properties::outline_color("black");
@@ -248 +250 @@
 
     XY text_pos(
-        ((mytab.mapstorage).coords[i].x+node_property_defaults[N_RADIUS]+5),
-        ((mytab.mapstorage).coords[i].y+node_property_defaults[N_RADIUS]+5));
+        ((mytab.mapstorage)->coords[i].x+node_property_defaults[N_RADIUS]+5),
+        ((mytab.mapstorage)->coords[i].y+node_property_defaults[N_RADIUS]+5));
 
     nodetextmap[i]=new Gnome::Canvas::Text(displayed_graph,
@@ -282 +284 @@
   forming_edge=INVALID;
 
-  for (NodeIt n((mytab.mapstorage).graph); n != INVALID; ++n)
+  for (NodeIt n((mytab.mapstorage)->graph); n != INVALID; ++n)
   {
     delete nodesmap[n];
@@ -288 +290 @@
   }
 
-  for (EdgeIt e((mytab.mapstorage).graph); e != INVALID; ++e)
+  for (EdgeIt e((mytab.mapstorage)->graph); e != INVALID; ++e)
   {
     delete edgesmap[e];
@@ -324 +326 @@
 void GraphDisplayerCanvas::reDesignGraph()
 {
-  NodeIt firstnode((mytab.mapstorage).graph);
+  NodeIt firstnode((mytab.mapstorage)->graph);
   //is it not an empty graph?
   if(firstnode!=INVALID)
@@ -334 +336 @@
       if(!was_redesigned)
         {
-          NodeIt i((mytab.mapstorage).graph);
+          NodeIt i((mytab.mapstorage)->graph);
 
           dim2::Point<double> init(init_vector_length*rnd(),
@@ -346 +348 @@
       int iterations;
 
-      (mytab.mapstorage).get_design_data(attraction, propulsation, iterations);
+      (mytab.mapstorage)->get_design_data(attraction, propulsation, iterations);
 
       //iteration counter
       for(int l=0;l<iterations;l++)
         {
-          Graph::NodeMap<double> x(mytab.mapstorage.graph);
-          Graph::NodeMap<double> y(mytab.mapstorage.graph);
+          Graph::NodeMap<double> x(mytab.mapstorage->graph);
+          Graph::NodeMap<double> y(mytab.mapstorage->graph);
           XYMap<Graph::NodeMap<double> > actual_forces;
           actual_forces.setXMap(x);
@@ -358 +360 @@
 
           //count actual force for each nodes
-          for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+          for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
             {
               //propulsation of nodes
-              for (NodeIt j((mytab.mapstorage).graph); j!=INVALID; ++j)
+              for (NodeIt j((mytab.mapstorage)->graph); j!=INVALID; ++j)
                 {
                   if(i!=j)
                     {
                       lemon::dim2::Point<double> delta =
-                        ((mytab.mapstorage).coords[i]-
-                         (mytab.mapstorage).coords[j]);
+                        ((mytab.mapstorage)->coords[i]-
+                         (mytab.mapstorage)->coords[j]);
 
                       const double length_sqr=std::max(delta.normSquare(),min_dist);
@@ -382 +384 @@
                 }
               //attraction of nodes, to which actual node is bound
-              for(OutEdgeIt ei((mytab.mapstorage).graph,i);ei!=INVALID;++ei)
+              for(OutEdgeIt ei((mytab.mapstorage)->graph,i);ei!=INVALID;++ei)
                 {
                   lemon::dim2::Point<double> delta =
-                    ((mytab.mapstorage).coords[i]-
-                     (mytab.mapstorage).coords[mytab.mapstorage.
+                    ((mytab.mapstorage)->coords[i]-
+                     (mytab.mapstorage)->coords[mytab.mapstorage->
                                                graph.target(ei)]);
                 
@@ -395 +397 @@
                   actual_forces.set(i,actual_forces[i]-delta);
                 }
-              for(InEdgeIt ei((mytab.mapstorage).graph,i);ei!=INVALID;++ei)
+              for(InEdgeIt ei((mytab.mapstorage)->graph,i);ei!=INVALID;++ei)
                 {
                   lemon::dim2::Point<double> delta =
-                    ((mytab.mapstorage).coords[i]-
-                     (mytab.mapstorage).coords[mytab.mapstorage.
+                    ((mytab.mapstorage)->coords[i]-
+                     (mytab.mapstorage)->coords[mytab.mapstorage->
                                                graph.source(ei)]);
                 
@@ -409 +411 @@
                 }
             }
-          for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
-            {
-              if(((mytab.mapstorage).coords[i].x)+actual_forces[i].x>max_coord)
-                {
-                  actual_forces[i].x=max_coord-((mytab.mapstorage).coords[i].x);
-                  std::cout << "Correction! " << (((mytab.mapstorage).coords[i].x)+actual_forces[i].x) << std::endl;
-                }
-              else if(((mytab.mapstorage).coords[i].x)+actual_forces[i].x<(0-max_coord))
-                {
-                  actual_forces[i].x=0-max_coord-((mytab.mapstorage).coords[i].x);
-                  std::cout << "Correction! " << (((mytab.mapstorage).coords[i].x)+actual_forces[i].x) << std::endl;
-                }
-              if(((mytab.mapstorage).coords[i].y)+actual_forces[i].y>max_coord)
-                {
-                  actual_forces[i].y=max_coord-((mytab.mapstorage).coords[i].y);
-                  std::cout << "Correction! " << (((mytab.mapstorage).coords[i].y)+actual_forces[i].y) << std::endl;
-                }
-              else if(((mytab.mapstorage).coords[i].y)+actual_forces[i].y<(0-max_coord))
-                {
-                  actual_forces[i].y=0-max_coord-((mytab.mapstorage).coords[i].y);
-                  std::cout << "Correction! " << (((mytab.mapstorage).coords[i].y)+actual_forces[i].y) << std::endl;
+          for (NodeIt i((mytab.mapstorage)->graph); i!=INVALID; ++i)
+            {
+              if(((mytab.mapstorage)->coords[i].x)+actual_forces[i].x>max_coord)
+                {
+                  actual_forces[i].x=max_coord-((mytab.mapstorage)->coords[i].x);
+                  std::cout << "Correction! " << (((mytab.mapstorage)->coords[i].x)+actual_forces[i].x) << std::endl;
+                }
+              else if(((mytab.mapstorage)->coords[i].x)+actual_forces[i].x<(0-max_coord))
+                {
+                  actual_forces[i].x=0-max_coord-((mytab.mapstorage)->coords[i].x);
+                  std::cout << "Correction! " << (((mytab.mapstorage)->coords[i].x)+actual_forces[i].x) << std::endl;
+                }
+              if(((mytab.mapstorage)->coords[i].y)+actual_forces[i].y>max_coord)
+                {
+                  actual_forces[i].y=max_coord-((mytab.mapstorage)->coords[i].y);
+                  std::cout << "Correction! " << (((mytab.mapstorage)->coords[i].y)+actual_forces[i].y) << std::endl;
+                }
+              else if(((mytab.mapstorage)->coords[i].y)+actual_forces[i].y<(0-max_coord))
+                {
+                  actual_forces[i].y=0-max_coord-((mytab.mapstorage)->coords[i].y);
+                  std::cout << "Correction! " << (((mytab.mapstorage)->coords[i].y)+actual_forces[i].y) << std::endl;
                 }
               moveNode(actual_forces[i].x, actual_forces[i].y, nodesmap[i], i);

graph_displayer_canvas.h

@@ -20 +20 @@
 #define GRAPH_DISPLAYER_CANVAS_H
 
-class GraphDisplayerCanvas;
+class NoteBookTab;
 
 #include "all_include.h"
-#include "nbtab.h"
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
-#include <lemon/dim2.h>
 
 ///This class is the canvas, on which the graph can be drawn.

gui_reader.cc

@@ -17 +17 @@
  */
 
-#include "gui_reader.h"
-#include "xml.h"
-#include "mapstorage.h"
+#include <gui_reader.h>
+#include <mapstorage.h>
+
+#include <xml.h>
 #include <lemon/dim2.h>
 #include <vector>

gui_reader.h

@@ -19 +19 @@
 #ifndef GUI_READER_H
 #define GUI_READER_H
+#include <lemon/lemon_reader.h>
 
-#include "mapstorage.h"
-#include <lemon/lemon_reader.h>
+class MapStorage;
 
 using lemon::LemonReader;

gui_writer.cc

@@ -17 +17 @@
  */
 
-#include "gui_writer.h"
-#include "xml.h"
-#include "mapstorage.h"
+#include <xml.h>
 #include <lemon/dim2.h>
 #include <vector>
+
+#include <gui_writer.h>
+#include <mapstorage.h>
 
 std::string GuiWriter::header()

gui_writer.h

@@ -20 +20 @@
 #define GUI_WRITER_H
 
-#include "mapstorage.h"
 #include <lemon/lemon_writer.h>
+
+class MapStorage;
 
 using lemon::LemonWriter;

kruskalbox.cc

@@ -17 +17 @@
  */
 
+#include <lemon/kruskal.h>
+
+#include <mapstorage.h>
+#include <mapselector.h>
+#include <algobox.h>
 #include <kruskalbox.h>
 

kruskalbox.h

@@ -20 +20 @@
 #define KRUSKALBOX_H
 
-class KruskalBox;
+class AlgoBox;
 
 #include <all_include.h>
-#include <algobox.h>
-#include <lemon/kruskal.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>

main_win.cc

@@ -21 +21 @@
 #endif
 
-#include "main_win.h"
-#include "guipixbufs.h"
-#include "background_chooser_dialog.h"
+#include <main_win.h>
+#include <guipixbufs.h>
+#include <background_chooser_dialog.h>
+
+#include <mapstorage.h>
+#include <graph_displayer_canvas.h>
+#include <algowin.h>
+#include <new_map_win.h>
+#include <nbtab.h>
 
 #include "i18n.h"
@@ -365 +371 @@
   if(active_tab!=-1)
     {
-      if (tabs[active_tab]->mapstorage.modified)
+      if (tabs[active_tab]->mapstorage->modified)
         {
           Gtk::MessageDialog mdialog(_("<b>Save changes before closing?</b>"), true, 
@@ -554 +560 @@
     {
     }
-  awp->update_maplist(&(tabs[i]->mapstorage));
+  awp->update_maplist(tabs[i]->mapstorage);
 }
 
@@ -633 +639 @@
 void MainWin::createBackgroundChooser()
 {
-  BackgroundChooserDialog dialog(&(tabs[active_tab]->mapstorage));
+  BackgroundChooserDialog dialog(tabs[active_tab]->mapstorage);
   dialog.run();
 }

main_win.h

@@ -21 +21 @@
 
 #include "all_include.h"
-#include "algowin.h"
-#include "map_win.h"
-#include "new_map_win.h"
-#include "nbtab.h"
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 
+class AlgoWin;
+class NoteBookTab;
 
 ///This class is the main window of GUI.

map_win.cc

@@ -17 +17 @@
  */
 
-#include "map_win.h"
+#include <map_win.h>
+#include <nbtab.h>
+#include <mapselector.h>
 #include <set>
 

map_win.h

@@ -20 +20 @@
 #define MAP_WIN_H
 
-class MapWin;
+class NoteBookTab;
+class MapSelector;
 
 #include <all_include.h>
-#include <nbtab.h>
-#include <mapselector.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>

mapselector.cc

@@ -17 +17 @@
  */
 
-#include "mapselector.h"
+#include <mapselector.h>
 
 MapSelector::MapSelector(std::vector<std::string> ml, std::string act, std::string labeltext, bool edge, bool d):def(d),itisedge(edge),set_new_map(false)

mapselector.h

@@ -20 +20 @@
 #define MAPSELECTOR_H
 
-class MapSelector;
-
 #include <all_include.h>
-#include <map_win.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>

mapstorage.cc

@@ -17 +17 @@
  */
 
-#include "mapstorage.h"
-#include "nbtab.h"
-#include "gui_writer.h"
-#include "gui_reader.h"
 #include <limits>
 #include <cmath>
 #include <gtkmm.h>
-#include<lemon/graph_to_eps.h>
+
+#include <mapstorage.h>
+#include <graph_displayer_canvas.h> //kivenni
+#include <nbtab.h> //kivenni
+#include <gui_writer.h>
+#include <gui_reader.h>
+#include <lemon/graph_to_eps.h>
 
 const int i_d=20;

mapstorage.h

@@ -20 +20 @@
 #define MAPSTORAGE_H
 
-class Mapstorage;
-
-#include "all_include.h"
-#include "xymap.h"
+#include <all_include.h>
+#include <xymap.h>
 #include <libgnomecanvasmm.h>
 

nbtab.cc

@@ -18 +18 @@
 
 #include <nbtab.h>
+#include <mapstorage.h>
 #include <eps_win.h>
-
-NoteBookTab::NoteBookTab():mapwinexists(false), designwinexists(false), mapstorage(*this)
-{
+#include <map_win.h>
+#include <design_win.h>
+#include <graph_displayer_canvas.h>
+
+
+
+NoteBookTab::NoteBookTab():mapwinexists(false), designwinexists(false)
+{
+  mapstorage=new MapStorage(*this);
+
   Gtk::ScrolledWindow *pScrolledWindow = manage(new Gtk::ScrolledWindow);
   gd_canvas=new GraphDisplayerCanvas(*this);
@@ -28 +36 @@
 
   //connecting signals - controller character
-  mapstorage.signal_prop_ch().connect(sigc::mem_fun(*gd_canvas, &GraphDisplayerCanvas::propertyChange));
-  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_prop_ch().connect(sigc::mem_fun(*gd_canvas, &GraphDisplayerCanvas::propertyChange));
+  mapstorage->signal_node_map_ch().connect(sigc::mem_fun(*this, &NoteBookTab::registerNewNodeMap));
+  mapstorage->signal_edge_map_ch().connect(sigc::mem_fun(*this, &NoteBookTab::registerNewEdgeMap));
   show_all_children();
   show();
@@ -37 +45 @@
 void NoteBookTab::readFile(const std::string &file)
 {
-  mapstorage.readFromFile(file);
-  mapstorage.file_name = file;
-  mapstorage.modified = false;
+  mapstorage->readFromFile(file);
+  mapstorage->file_name = file;
+  mapstorage->modified = false;
   gd_canvas->drawGraph();
   if(mapwinexists)
     {
-      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+      mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
     }
   signal_title.emit(Glib::filename_display_basename(file));
@@ -50 +58 @@
 void NoteBookTab::newFile()
 {
-  if (mapstorage.modified)
+  if (mapstorage->modified)
   {
     Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true,
@@ -69 +77 @@
   }
   gd_canvas->clear();
-  mapstorage.clear();
-  if(mapwinexists)
-    {
-      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+  mapstorage->clear();
+  if(mapwinexists)
+    {
+      mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
     }
   signal_title.emit("unsaved file");
@@ -79 +87 @@
 void NoteBookTab::openFile()
 {
-  if (mapstorage.modified)
+  if (mapstorage->modified)
   {
     Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true, 
@@ -103 +111 @@
   {
     gd_canvas->clear();
-    mapstorage.clear();
+    mapstorage->clear();
     Glib::ustring filename = fcdialog.get_filename();
-    if (!mapstorage.readFromFile(filename))
-    {
-      mapstorage.file_name = filename;
-      mapstorage.modified = false;
+    if (!mapstorage->readFromFile(filename))
+    {
+      mapstorage->file_name = filename;
+      mapstorage->modified = false;
       gd_canvas->drawGraph();
       if(mapwinexists)
         {
-          mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+          mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
         }
       signal_title.emit(Glib::filename_display_basename(filename));
@@ -121 +129 @@
 void NoteBookTab::saveFile()
 {
-  if (mapstorage.file_name == "") {
+  if (mapstorage->file_name == "") {
     saveFileAs();
   }
   else
   {
-    mapstorage.writeToFile(mapstorage.file_name);
-    mapstorage.modified = false;
-    signal_title.emit(Glib::filename_display_basename(mapstorage.file_name));
+    mapstorage->writeToFile(mapstorage->file_name);
+    mapstorage->modified = false;
+    signal_title.emit(Glib::filename_display_basename(mapstorage->file_name));
   }
 }
@@ -140 +148 @@
   {
     Glib::ustring filename = fcdialog.get_filename();
-    mapstorage.file_name = filename;
-    mapstorage.writeToFile(filename);
-    mapstorage.modified = false;
+    mapstorage->file_name = filename;
+    mapstorage->writeToFile(filename);
+    mapstorage->modified = false;
     signal_title.emit(Glib::filename_display_basename(filename));
   }
@@ -149 +157 @@
 void NoteBookTab::close()
 {
-  if (mapstorage.modified)
+  if (mapstorage->modified)
   {
     Gtk::MessageDialog mdialog("<b>Save changes before closing?</b>", true,
@@ -168 +176 @@
   }
   gd_canvas->clear();
-  mapstorage.clear();
-  if(mapwinexists)
-    {
-      mapwin->update(mapstorage.getEdgeMapList(), mapstorage.getNodeMapList());
+  mapstorage->clear();
+  if(mapwinexists)
+    {
+      mapwin->update(mapstorage->getEdgeMapList(), mapstorage->getNodeMapList());
     }
   signal_title.emit("unsaved file");
@@ -178 +186 @@
 void NoteBookTab::propertyChange(bool itisedge, int prop, std::string mapname)
 {
-  mapstorage.changeActiveMap(itisedge, prop, mapname);
+  mapstorage->changeActiveMap(itisedge, prop, mapname);
 }
 
@@ -193 +201 @@
 std::string NoteBookTab::getActiveEdgeMap(int prop)
 {
-  return mapstorage.getActiveEdgeMap(prop);
+  return mapstorage->getActiveEdgeMap(prop);
 }
 
 std::string NoteBookTab::getActiveNodeMap(int prop)
 {
-  return mapstorage.getActiveNodeMap(prop);
+  return mapstorage->getActiveNodeMap(prop);
 }
 
@@ -221 +229 @@
   if(!mapwinexists)
     {
-      mapwin=new MapWin("Map Setup - "+name, mapstorage.getEdgeMapList(), mapstorage.getNodeMapList(), *this);
-      mapst2mapwin=mapstorage.signal_map_win_ch().connect(sigc::mem_fun(*mapwin, &MapWin::changeEntry));
+      mapwin=new MapWin("Map Setup - "+name, mapstorage->getEdgeMapList(), mapstorage->getNodeMapList(), *this);
+      mapst2mapwin=mapstorage->signal_map_win_ch().connect(sigc::mem_fun(*mapwin, &MapWin::changeEntry));
       mapwin->show();
       mapwinexists=true;
@@ -245 +253 @@
       double attraction, propulsation;
       int iterations;
-      mapstorage.get_design_data(attraction, propulsation, iterations);
+      mapstorage->get_design_data(attraction, propulsation, iterations);
       designwin=new DesignWin("Design Setup - "+name, attraction, propulsation, iterations, *this);
 
@@ -255 +263 @@
       designwin->signal_delete_event().connect(sigc::mem_fun(*this, &NoteBookTab::closeDesignWin));
 
-      mapst2designwin=mapstorage.signal_design_win_ch().connect(sigc::mem_fun(*designwin, &DesignWin::set_data));
+      mapst2designwin=mapstorage->signal_design_win_ch().connect(sigc::mem_fun(*designwin, &DesignWin::set_data));
 
       designwin->show();
@@ -307 +315 @@
 void NoteBookTab::active_maps_needed()
 {
-  mapstorage.broadcastActiveMaps();
+  mapstorage->broadcastActiveMaps();
 }
 
 void NoteBookTab::exportGraphToEPS(std::vector<bool> options, std::string filename)
 {
-  mapstorage.exportGraphToEPS(options, filename);
-}
+  mapstorage->exportGraphToEPS(options, filename);
+}

nbtab.h

@@ -20 +20 @@
 #define NBTAB_H
 
-class NoteBookTab;
-
-#include "mapstorage.h"
-#include "map_win.h"
-//#include "eps_win.h"
+class MapStorage;
 class EpsWin;
-#include "design_win.h"
-#include "graph_displayer_canvas.h"
+class MapWin;
+class DesignWin;
+class GraphDisplayerCanvas;
+
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
@@ -60 +58 @@
   
   ///Maps assigned to the graph displayed in this \ref NoteBookTab of notebook.
-  MapStorage mapstorage;
+  MapStorage * mapstorage;
     
   ///Title changement indicator.

new_map_win.cc

@@ -18 +18 @@
 
 #include <new_map_win.h>
+#include <nbtab.h>
+#include <mapstorage.h>
 
 bool NewMapWin::closeIfEscapeIsPressed(GdkEventKey* e)
@@ -120 +122 @@
             {
               //create the new map
-              Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (mytab.mapstorage.graph, def_val);
+              Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (mytab.mapstorage->graph, def_val);
               
               if(!only_nums)
@@ -126 +128 @@
                   std::stack<double> polishstack;
                   
-                  for(EdgeIt k(mytab.mapstorage.graph); k!=INVALID; ++k)
+                  for(EdgeIt k(mytab.mapstorage->graph); k!=INVALID; ++k)
                     {
                       for(int i=0;i<(int)polishform.size();i++)
@@ -145 +147 @@
                             default:
                               //substitute variable
-                              std::map< std::string,Graph::EdgeMap<double> * > ems=mytab.mapstorage.edgemap_storage;
+                              std::map< std::string,Graph::EdgeMap<double> * > ems=mytab.mapstorage->edgemap_storage;
                               bool itisvar=(ems.find(ch2var[ polishform[i] ])!=ems.end());
                               if(itisvar)
                                 {
-                                  polishstack.push( (*(mytab.mapstorage.edgemap_storage[ ch2var[ polishform[i] ] ]))[k]);
+                                  polishstack.push( (*(mytab.mapstorage->edgemap_storage[ ch2var[ polishform[i] ] ]))[k]);
                                 }
                               else
@@ -188 +190 @@
               //if addition was not successful addEdgeMap returns one.
               //cause can be that there is already a map named like the new one
-              if(mytab.mapstorage.addEdgeMap(mapname, emptr, def_val))
+              if(mytab.mapstorage->addEdgeMap(mapname, emptr, def_val))
                 {
                   abortion=1;
@@ -203 +205 @@
             {
               //create the new map
-              Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (mytab.mapstorage.graph, def_val);
+              Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (mytab.mapstorage->graph, def_val);
 
               if(!only_nums)
@@ -209 +211 @@
                   std::stack<double> polishstack;
   
-                  for(NodeIt k(mytab.mapstorage.graph); k!=INVALID; ++k)
+                  for(NodeIt k(mytab.mapstorage->graph); k!=INVALID; ++k)
                     {
                       for(int i=0;i<(int)polishform.size();i++)
@@ -227 +229 @@
                               break;
                             default:
-                              std::map< std::string,Graph::NodeMap<double> * > nms=mytab.mapstorage.nodemap_storage;
+                              std::map< std::string,Graph::NodeMap<double> * > nms=mytab.mapstorage->nodemap_storage;
                               bool itisvar=(nms.find(ch2var[ polishform[i] ])!=nms.end());
                               if(itisvar)
                                 {
-                                  polishstack.push( (*(mytab.mapstorage.nodemap_storage[ ch2var[ polishform[i] ] ]))[k]);
+                                  polishstack.push( (*(mytab.mapstorage->nodemap_storage[ ch2var[ polishform[i] ] ]))[k]);
                                 }
                               else
@@ -269 +271 @@
               //if addition was not successful addNodeMap returns one.
               //cause can be that there is already a map named like the new one
-              if(mytab.mapstorage.addNodeMap(mapname,emptr, def_val))
+              if(mytab.mapstorage->addNodeMap(mapname,emptr, def_val))
                 {
                   abortion=1;
@@ -480 +482 @@
   if(itisedge)
     {
-      cancel=(mytab.mapstorage.edgemap_storage.find(variable)==mytab.mapstorage.edgemap_storage.end());
+      cancel=(mytab.mapstorage->edgemap_storage.find(variable)==mytab.mapstorage->edgemap_storage.end());
     }
   else
     {
-      cancel=(mytab.mapstorage.nodemap_storage.find(variable)==mytab.mapstorage.nodemap_storage.end());
+      cancel=(mytab.mapstorage->nodemap_storage.find(variable)==mytab.mapstorage->nodemap_storage.end());
     }
   //maybe it is number

new_map_win.h

@@ -20 +20 @@
 #define NEWMAPWIN_H
 
-class NewMapWin;
-
 #include <all_include.h>
-#include <nbtab.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
 #include <stack>
+
+class NoteBookTab;
 
 ///Graphical interface for node/edge map creation.