Changeset 201:879e47e5b731 in glemon-0.x for algobox.cc

Timestamp:

01/02/08 22:03:09 (16 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

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

Message:

Merge branches/akos to trunk.

File:

• algobox.cc (modified) (3 diffs)

algobox.cc

@@ -83 +83 @@
 {
   mapstorage=ms;
-  std::vector<std::string> nml;
-  std::vector<std::string> eml;
+  std::vector<std::string> n_nml;
+  std::vector<std::string> s_nml;
+  std::vector<std::string> n_eml;
+  std::vector<std::string> s_eml;
   if(mapstorage!=NULL)
     {
       mapstorage->signal_node_map_ch().connect(sigc::mem_fun(*this, &AlgoBox::nodemaplist_changed));
       mapstorage->signal_edge_map_ch().connect(sigc::mem_fun(*this, &AlgoBox::edgemaplist_changed));
-      nml=mapstorage->getNodeMapList();
-      eml=mapstorage->getEdgeMapList();
+      n_nml=mapstorage->getNodeMapList(NUM);
+      s_nml=mapstorage->getNodeMapList(STR);
+      n_eml=mapstorage->getEdgeMapList(NUM);
+      s_eml=mapstorage->getEdgeMapList(STR);
     }
   for(int i=0;i<(int)nodemapcbts.size();i++)
     {
-      (nodemapcbts[i])->update_list(nml);
+      (nodemapcbts[i])->update_list(n_nml, s_nml);
       //update_cbt(nml, *(nodemapcbts[i]));
     }
   for(int i=0;i<(int)edgemapcbts.size();i++)
     {
-      (edgemapcbts[i])->update_list(eml);
+      (edgemapcbts[i])->update_list(n_eml, s_eml);
       //update_cbt(eml, *(edgemapcbts[i]));
     }
@@ -105 +109 @@
 }
 
-void AlgoBox::nodemaplist_changed(std::string newmap)
+void AlgoBox::nodemaplist_changed(std::string newmap, MapValue::Type type)
 {
   for(int i=0;i<(int)nodemapcbts.size();i++)
     {
-      (nodemapcbts[i])->append_text(newmap);
-    }
-}
-
-void AlgoBox::edgemaplist_changed(std::string newmap)
+      (nodemapcbts[i])->append_text(newmap, type);
+    }
+}
+
+void AlgoBox::edgemaplist_changed(std::string newmap, MapValue::Type type)
 {
   for(int i=0;i<(int)edgemapcbts.size();i++)
     {
-      (edgemapcbts[i])->append_text(newmap);
+      (edgemapcbts[i])->append_text(newmap, type);
     }
 }
@@ -161 +165 @@
 }
 
-void AlgoBox::addMapSelector(std::string inputname, bool itisedge)
+void AlgoBox::addMapSelector(std::string inputname, bool itisedge, MapType type)
 {
   std::vector<std::string> empty_vector;
 
-  MapSelector * msp=new MapSelector(empty_vector,"",inputname,itisedge, false);
+  MapSelector * msp=new MapSelector(empty_vector,empty_vector,"",inputname,itisedge, false, type);
 
   if(itisedge)