1.1 --- a/algobox.cc	Wed May 02 20:33:58 2007 +0000
     1.2 +++ b/algobox.cc	Wed Jan 02 21:03:09 2008 +0000
     1.3 @@ -82,41 +82,45 @@
     1.4  void AlgoBox::update_maplist(MapStorage * ms)
     1.5  {
     1.6    mapstorage=ms;
     1.7 -  std::vector<std::string> nml;
     1.8 -  std::vector<std::string> eml;
     1.9 +  std::vector<std::string> n_nml;
    1.10 +  std::vector<std::string> s_nml;
    1.11 +  std::vector<std::string> n_eml;
    1.12 +  std::vector<std::string> s_eml;
    1.13    if(mapstorage!=NULL)
    1.14      {
    1.15        mapstorage->signal_node_map_ch().connect(sigc::mem_fun(*this, &AlgoBox::nodemaplist_changed));
    1.16        mapstorage->signal_edge_map_ch().connect(sigc::mem_fun(*this, &AlgoBox::edgemaplist_changed));
    1.17 -      nml=mapstorage->getNodeMapList();
    1.18 -      eml=mapstorage->getEdgeMapList();
    1.19 +      n_nml=mapstorage->getNodeMapList(NUM);
    1.20 +      s_nml=mapstorage->getNodeMapList(STR);
    1.21 +      n_eml=mapstorage->getEdgeMapList(NUM);
    1.22 +      s_eml=mapstorage->getEdgeMapList(STR);
    1.23      }
    1.24    for(int i=0;i<(int)nodemapcbts.size();i++)
    1.25      {
    1.26 -      (nodemapcbts[i])->update_list(nml);
    1.27 +      (nodemapcbts[i])->update_list(n_nml, s_nml);
    1.28        //update_cbt(nml, *(nodemapcbts[i]));
    1.29      }
    1.30    for(int i=0;i<(int)edgemapcbts.size();i++)
    1.31      {
    1.32 -      (edgemapcbts[i])->update_list(eml);
    1.33 +      (edgemapcbts[i])->update_list(n_eml, s_eml);
    1.34        //update_cbt(eml, *(edgemapcbts[i]));
    1.35      }
    1.36    signal_maplist_updated.emit();
    1.37  }
    1.38  
    1.39 -void AlgoBox::nodemaplist_changed(std::string newmap)
    1.40 +void AlgoBox::nodemaplist_changed(std::string newmap, MapValue::Type type)
    1.41  {
    1.42    for(int i=0;i<(int)nodemapcbts.size();i++)
    1.43      {
    1.44 -      (nodemapcbts[i])->append_text(newmap);
    1.45 +      (nodemapcbts[i])->append_text(newmap, type);
    1.46      }
    1.47  }
    1.48  
    1.49 -void AlgoBox::edgemaplist_changed(std::string newmap)
    1.50 +void AlgoBox::edgemaplist_changed(std::string newmap, MapValue::Type type)
    1.51  {
    1.52    for(int i=0;i<(int)edgemapcbts.size();i++)
    1.53      {
    1.54 -      (edgemapcbts[i])->append_text(newmap);
    1.55 +      (edgemapcbts[i])->append_text(newmap, type);
    1.56      }
    1.57  }
    1.58  
    1.59 @@ -160,11 +164,11 @@
    1.60    pack_start(*(new Gtk::HSeparator()));
    1.61  }
    1.62  
    1.63 -void AlgoBox::addMapSelector(std::string inputname, bool itisedge)
    1.64 +void AlgoBox::addMapSelector(std::string inputname, bool itisedge, MapType type)
    1.65  {
    1.66    std::vector<std::string> empty_vector;
    1.67  
    1.68 -  MapSelector * msp=new MapSelector(empty_vector,"",inputname,itisedge, false);
    1.69 +  MapSelector * msp=new MapSelector(empty_vector,empty_vector,"",inputname,itisedge, false, type);
    1.70  
    1.71    if(itisedge)
    1.72      {