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

gui/map_win.cc

@@ -11 +11 @@
 }
 
-MapWin::MapWin(const std::string& title, MapStorage & mapst, GraphDisplayerCanvas & grdispc):gdc(grdispc),ms(mapst)
+MapWin::MapWin(const std::string& title, std::vector<std::string> eml, std::vector<std::string> nml, MainWin & mw):mainwin(mw)
 {
   set_title(title);
@@ -24 +24 @@
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]=new MapSelector(gdc, ms, i, true);
+    e_combo_array[i]=new MapSelector(eml, i, true);
 
     (*table).attach((*(e_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
+
+    e_combo_array[i]->signal_cbt_ch().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::edgeMapChanged), i));
+    e_combo_array[i]->signal_newmapwin_needed().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::newMapWinNeeded), i));
   }
 
@@ -41 +44 @@
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]=new MapSelector(gdc, ms, i, false);
+    n_combo_array[i]=new MapSelector(nml, i, false);
 
     (*table).attach((*(n_combo_array[i])),0,1,i,i+1,Gtk::SHRINK,Gtk::SHRINK,10,3);
+
+    n_combo_array[i]->signal_cbt_ch().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::nodeMapChanged), i));
+    n_combo_array[i]->signal_newmapwin_needed().connect(sigc::bind(sigc::mem_fun(*this, &MapWin::newMapWinNeeded), i));
   }
 
@@ -56 +62 @@
 }
 
-void MapWin::update()
+void MapWin::nodeMapChanged(std::string mapname, int prop)
+{
+  mainwin.propertyChange(false, prop, mapname);
+}
+
+void MapWin::edgeMapChanged(std::string mapname, int prop)
+{
+  mainwin.propertyChange(true, prop, mapname);
+}
+
+void MapWin::newMapWinNeeded(bool itisedge, int prop)
+{
+  mainwin.popupNewMapWin(itisedge, prop);
+}
+
+void MapWin::update(std::vector<std::string> eml, std::vector<std::string> nml)
 {
   for(int i=0;i<EDGE_PROPERTY_NUM;i++)
   {
-    e_combo_array[i]->update_list();
+    e_combo_array[i]->update_list(eml);
   }
 
   for(int i=0;i<NODE_PROPERTY_NUM;i++)
   {
-    n_combo_array[i]->update_list();
+    n_combo_array[i]->update_list(nml);
   }
-}
-
-
-void MapWin::updateNode(Node node)
-{
-  for(int i=0;i<NODE_PROPERTY_NUM;i++)
-    {
-      n_combo_array[i]->update(node);
-    }
-}
-
-void MapWin::updateEdge(Edge edge)
-{
-  for(int i=0;i<EDGE_PROPERTY_NUM;i++)
-    {
-      e_combo_array[i]->update(edge);
-    }
 }