Changeset 1837:8dd6160ff699 in lemon-0.x for gui/new_map_win.cc

Timestamp:

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

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

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

File:

• gui/new_map_win.cc (modified) (9 diffs)

gui/new_map_win.cc

@@ -10 +10 @@
 }
 
-NewMapWin::NewMapWin(const std::string& title, GraphDisplayerCanvas & grdispc, bool itisedge, bool edgenode):Gtk::Dialog(title, true, true),gdc(grdispc),node("Create NodeMap"),edge("Create EdgeMap")
+NewMapWin::NewMapWin(const std::string& title, MainWin & mw, bool itisedge, bool edgenode):Gtk::Dialog(title, true, true),mainwin(mw),node("Create NodeMap"),edge("Create EdgeMap")
 {
   set_default_size(200, 50);
@@ -84 +84 @@
             {
               //create the new map
-              Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (gdc.mapstorage.graph);
+              Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (mainwin.mapstorage.graph);
 
               std::stack<double> polishstack;
   
-              for(EdgeIt k(gdc.mapstorage.graph); k!=INVALID; ++k)
+              for(EdgeIt k(mainwin.mapstorage.graph); k!=INVALID; ++k)
                 {
                   for(int i=0;i<(int)polishform.size();i++)
@@ -107 +107 @@
                         default:
                           //substitute variable
-                          std::map< std::string,Graph::EdgeMap<double> * > ems=gdc.mapstorage.edgemap_storage;
+                          std::map< std::string,Graph::EdgeMap<double> * > ems=mainwin.mapstorage.edgemap_storage;
                           bool itisvar=(ems.find(ch2var[ polishform[i] ])!=ems.end());
                           if(itisvar)
                             {
-                              polishstack.push( (*(gdc.mapstorage.edgemap_storage[ ch2var[ polishform[i] ] ]))[k]);
+                              polishstack.push( (*(mainwin.mapstorage.edgemap_storage[ ch2var[ polishform[i] ] ]))[k]);
                             }
                           else
@@ -154 +154 @@
               //if addition was not successful addEdgeMap returns one.
               //cause can be that there is already a map named like the new one
-              if(gdc.mapstorage.addEdgeMap(mapname, emptr, def_val))
+              if(mainwin.mapstorage.addEdgeMap(mapname, emptr, def_val))
                 {
                   abortion=1;
@@ -160 +160 @@
 
               //add it to the list of the displayable maps
-              gdc.mapwin.registerNewEdgeMap(mapname);
+              mainwin.registerNewEdgeMap(mapname);
 
               //display it
-              gdc.changeEdgeText(mapname);
+              //gdc.changeEdgeText(mapname);
             }
           else //!edge.get_active()
             {
               //create the new map
-              Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (gdc.mapstorage.graph);
+              Graph::NodeMap<double> * emptr=new Graph::NodeMap<double> (mainwin.mapstorage.graph);
 
               std::stack<double> polishstack;
   
-              for(NodeIt k(gdc.mapstorage.graph); k!=INVALID; ++k)
+              for(NodeIt k(mainwin.mapstorage.graph); k!=INVALID; ++k)
                 {
                   for(int i=0;i<(int)polishform.size();i++)
@@ -190 +190 @@
                           break;
                         default:
-                          std::map< std::string,Graph::NodeMap<double> * > nms=gdc.mapstorage.nodemap_storage;
+                          std::map< std::string,Graph::NodeMap<double> * > nms=mainwin.mapstorage.nodemap_storage;
                           bool itisvar=(nms.find(ch2var[ polishform[i] ])!=nms.end());
                           if(itisvar)
                             {
-                              polishstack.push( (*(gdc.mapstorage.nodemap_storage[ ch2var[ polishform[i] ] ]))[k]);
+                              polishstack.push( (*(mainwin.mapstorage.nodemap_storage[ ch2var[ polishform[i] ] ]))[k]);
                             }
                           else
@@ -237 +237 @@
               //if addition was not successful addNodeMap returns one.
               //cause can be that there is already a map named like the new one
-              if(gdc.mapstorage.addNodeMap(mapname,emptr, def_val))
+              if(mainwin.mapstorage.addNodeMap(mapname,emptr, def_val))
                 {
                   abortion=1;
@@ -243 +243 @@
 
               //add it to the list of the displayable maps
-              gdc.mapwin.registerNewNodeMap(mapname);
+              mainwin.registerNewNodeMap(mapname);
 
               //display it
@@ -432 +432 @@
   if(itisedge)
     {
-      cancel=(gdc.mapstorage.edgemap_storage.find(variable)==gdc.mapstorage.edgemap_storage.end());
+      cancel=(mainwin.mapstorage.edgemap_storage.find(variable)==mainwin.mapstorage.edgemap_storage.end());
     }
   else
     {
-      cancel=(gdc.mapstorage.nodemap_storage.find(variable)==gdc.mapstorage.nodemap_storage.end());
+      cancel=(mainwin.mapstorage.nodemap_storage.find(variable)==mainwin.mapstorage.nodemap_storage.end());
     }
   //maybe it is number