Changeset 194:6b2b718420eb in glemon-0.x for new_map_win.cc

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

File:

• new_map_win.cc (modified) (10 diffs)

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