Changeset 1837:8dd6160ff699 in lemon-0.x for gui/mw-mapselector.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/mw-mapselector.cc (modified) (5 diffs)

gui/mw-mapselector.cc

@@ -1 +1 @@
 #include "map_win.h"
 
-MapWin::MapSelector::MapSelector(GraphDisplayerCanvas & grdispc, MapStorage & mapst, int identifier, bool edge):gdc(grdispc),ms(mapst),id(identifier),itisedge(edge),default_state(true),set_new_map(false),node_to_update(INVALID),edge_to_update(INVALID)
+MapWin::MapSelector::MapSelector(std::vector<std::string> ml, int identifier, bool edge):id(identifier),itisedge(edge),default_state(true),set_new_map(false)
 {
-  update_list();
+  update_list(ml);
 
   cbt.set_active(0);
@@ -51 +51 @@
 {
   set_new_map=true;
-  (new NewMapWin("NewMapWin", gdc, itisedge, false))->run();
+  signal_newmapwin.emit(itisedge);
 }
 
-void MapWin::MapSelector::update_list()
+void MapWin::MapSelector::update_list( std::vector< std::string > ml )
 {
   cbt.clear();
-  if(itisedge)
+  std::vector< std::string >::iterator emsi=ml.begin();
+  for(;emsi!=ml.end();emsi++)
     {
-      std::map< std::string,Graph::EdgeMap<double> * >::iterator emsi=ms.beginOfEdgeMaps();
-      for(;emsi!=ms.endOfEdgeMaps();emsi++)
-        {
-          cbt.append_text(emsi->first);
-        }
-    }
-  else
-    {
-      std::map< std::string,Graph::NodeMap<double> * >::iterator emsi=ms.beginOfNodeMaps();
-      for(;emsi!=ms.endOfNodeMaps();emsi++)
-        {
-          cbt.append_text(emsi->first);
-        }
+      cbt.append_text(*emsi);
     }
   cbt.prepend_text("Default values");
@@ -84 +73 @@
       if(!(mapname.empty())) //We seem to get 2 signals, one when the text is empty.
         {
-          if(itisedge)
-            {
-              if( ( (ms.edgemap_storage).find(mapname) != (ms.edgemap_storage).end() ) )
-                {
-                  Edge edge=edge_to_update;
-                  switch(id)
-                    {
-                    case E_WIDTH:
-                      gdc.changeEdgeWidth(mapname, edge);
-                      break;
-                    case E_COLOR:
-                      gdc.changeEdgeColor(mapname, edge);
-                      break;
-                    case E_TEXT:
-                      gdc.changeEdgeText(mapname, edge);
-                      break;
-                    default:
-                      std::cerr<<"Error\n";
-                    }
-                }
-            }
-          else
-            {
-              if( ( (ms.nodemap_storage).find(mapname) != (ms.nodemap_storage).end() ) )
-                {
-                  Node node=node_to_update;
-                  switch(id)
-                    {
-                    case N_RADIUS:
-                      gdc.changeNodeRadius(mapname, node);
-                      break;
-                    case N_COLOR:
-                      gdc.changeNodeColor(mapname, node);
-                      break;
-                    case N_TEXT:
-                      gdc.changeNodeText(mapname, node);
-                      break;
-                    default:
-                      std::cerr<<"Error\n";
-                    }
-                }
-            }
+          signal_cbt.emit(mapname);
         }
     }
   else if((!default_state)&&(cbt.get_active_row_number()==0))
     {
+      signal_cbt.emit("");
       reset();
     }
@@ -139 +88 @@
   cbt.set_active(0);
 
-  if(itisedge)
-    {
-      Edge edge=edge_to_update;
-      switch(id)
-        {
-        case E_WIDTH:
-          gdc.resetEdgeWidth(edge);
-          break;
-        case E_COLOR:
-          gdc.resetEdgeColor(edge);
-          break;
-        case E_TEXT:
-          gdc.resetEdgeText(edge);
-          break;
-        default:
-          std::cerr<<"Error\n";
-        }
-    }
-  else
-    {
-      Node node=node_to_update; 
-      switch(id)
-        {
-        case N_RADIUS:
-          gdc.resetNodeRadius(node);
-          break;
-        case N_COLOR:
-          gdc.resetNodeColor(node);
-          break;
-        case N_TEXT:
-          gdc.resetNodeText(node);
-          break;
-        default:
-          std::cerr<<"Error\n";
-        }
-    }
+  signal_cbt.emit("");
 }
 
-void MapWin::MapSelector::update(Node node)
-{
-  node_to_update=node;
-  if(default_state)
-    {
-      reset();
-    }
-  else
-    {
-      comboChanged();
-    }
-  node_to_update=INVALID;
-}
-
-void MapWin::MapSelector::update(Edge edge)
-{
-  edge_to_update=edge;
-  if(default_state)
-    {
-      reset();
-    }
-  else
-    {
-      comboChanged();
-    }
-  edge_to_update=INVALID;
-}
 
 Glib::ustring MapWin::MapSelector::get_active_text()
@@ -224 +111 @@
     }
 }
+
+sigc::signal<void, std::string> MapWin::MapSelector::signal_cbt_ch()
+{
+  return signal_cbt;
+}
+
+sigc::signal<void, bool> MapWin::MapSelector::signal_newmapwin_needed()
+{
+  return signal_newmapwin;
+}