diff -r c7ae8642a8d8 -r 879e47e5b731 algobox.cc --- a/algobox.cc Wed May 02 20:33:58 2007 +0000 +++ b/algobox.cc Wed Jan 02 21:03:09 2008 +0000 @@ -82,41 +82,45 @@ void AlgoBox::update_maplist(MapStorage * ms) { mapstorage=ms; - std::vector nml; - std::vector eml; + std::vector n_nml; + std::vector s_nml; + std::vector n_eml; + std::vector 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])); } signal_maplist_updated.emit(); } -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); + (nodemapcbts[i])->append_text(newmap, type); } } -void AlgoBox::edgemaplist_changed(std::string newmap) +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); } } @@ -160,11 +164,11 @@ pack_start(*(new Gtk::HSeparator())); } -void AlgoBox::addMapSelector(std::string inputname, bool itisedge) +void AlgoBox::addMapSelector(std::string inputname, bool itisedge, MapType type) { std::vector 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) {