main_win.cc
branchgui
changeset 108 bf355fd6563e
parent 107 b1be10a9a2b6
child 114 0ace7edbb06f
     1.1 --- a/main_win.cc	Thu Jan 05 01:54:24 2006 +0000
     1.2 +++ b/main_win.cc	Thu Jan 05 12:30:09 2006 +0000
     1.3 @@ -409,27 +409,13 @@
     1.4  
     1.5  void MainWin::createAlgoWin(int algoid)
     1.6  {
     1.7 -  AlgoWin * aw=new AlgoWin(algoid, tabnames, tabs[0]->mapstorage.getNodeMapList(),tabs[0]->mapstorage.getEdgeMapList());
     1.8 +  AlgoWin * aw=new AlgoWin(algoid, tabnames);
     1.9    aw->signal_closing().connect(sigc::mem_fun(*this, &MainWin::deRegisterAlgoWin));
    1.10    aw->signal_maplist_needed().connect(sigc::mem_fun(*this, &MainWin::updateAlgoWinMaps));
    1.11    aws.insert(aw);
    1.12    aw->show();
    1.13  }
    1.14  
    1.15 -void MainWin::updateAlgoWinMaps(AlgoWin * awp, std::string tabname)
    1.16 -{
    1.17 -  int i=0;
    1.18 -  for(;(i<(int)tabnames.size())&&(tabnames[i]!=tabname);i++)
    1.19 -    {
    1.20 -    }
    1.21 -  awp->update_maplist(tabs[i]->mapstorage.getNodeMapList(),tabs[i]->mapstorage.getEdgeMapList());
    1.22 -}
    1.23 -
    1.24 -void MainWin::deRegisterAlgoWin(AlgoWin * awp)
    1.25 -{
    1.26 -  aws.erase(awp);
    1.27 -}
    1.28 -
    1.29  void MainWin::updateAlgoWinTabs()
    1.30  {
    1.31    std::set< AlgoWin* >::iterator awsi=aws.begin();
    1.32 @@ -439,6 +425,21 @@
    1.33      }
    1.34  }
    1.35  
    1.36 +void MainWin::updateAlgoWinMaps(AlgoWin * awp, std::string tabname)
    1.37 +{
    1.38 +  int i=0;
    1.39 +  for(;(i<(int)tabnames.size())&&(tabnames[i]!=tabname);i++)
    1.40 +    {
    1.41 +    }
    1.42 +  //awp->update_maplist(tabs[i]->mapstorage.getNodeMapList(),tabs[i]->mapstorage.getEdgeMapList());
    1.43 +  awp->update_maplist(&(tabs[i]->mapstorage));
    1.44 +}
    1.45 +
    1.46 +void MainWin::deRegisterAlgoWin(AlgoWin * awp)
    1.47 +{
    1.48 +  aws.erase(awp);
    1.49 +}
    1.50 +
    1.51  void MainWin::changeEditorialTool(int tool)
    1.52  {
    1.53    active_tool=tool;