Changeset 1878:409a31271efd in lemon-0.x

Timestamp:

01/05/06 13:30:09 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2453

Message:

Several changes. \n If new map is added to mapstorage it emits signal with the name of the new map. This was important, because from now on not only tha mapwin should be updated. \n Furthermore algobox gets a pointer to mapstorage instead of only the mapnames from it. This is important because without it it would be complicated to pass all of the required maps to algobox.

Location:

gui

Files:

• algobox.cc (modified) (6 diffs)
• algobox.h (modified) (3 diffs)
• algowin.cc (modified) (3 diffs)
• algowin.h (modified) (1 diff)
• kruskalbox.cc (modified) (1 diff)
• kruskalbox.h (modified) (1 diff)
• main_win.cc (modified) (4 diffs)
• mapstorage.cc (modified) (2 diffs)
• mapstorage.h (modified) (2 diffs)
• nbtab.cc (modified) (1 diff)
• new_map_win.cc (modified) (2 diffs)

gui/algobox.cc

@@ -4 +4 @@
 enum {E_DEMO1, EDGE_INPUT_NUM}; // input IDs for edges;
 
-AlgoBox::AlgoBox(std::vector<std::string> tabnames, std::vector<std::string> nodemapnames, std::vector<std::string> edgemapnames)
+AlgoBox::AlgoBox(std::vector<std::string> tabnames)
 {
-  init(tabnames, nodemapnames, edgemapnames);
+  init(tabnames);
 }
 
-void AlgoBox::init(std::vector<std::string> tabnames, std::vector<std::string> nodemapnames, std::vector<std::string> edgemapnames)
+void AlgoBox::init(std::vector<std::string> tabnames)
 {
   set_spacing(5);
@@ -19 +19 @@
 
   pack_start(tabcbt);
-
   build_box();
-
-  update_maplist(nodemapnames, edgemapnames);
 
   show_all_children();
@@ -53 +50 @@
   else if(actptr>0) //so there is item in the list
     {
-      cbt.set_active(0);
+      //cbt.set_active(0);
     }
 }
@@ -63 +60 @@
 }
 
-void AlgoBox::update_maplist( std::vector< std::string > nml, std::vector< std::string > eml )
+void AlgoBox::update_maplist( void * ms)
 {
+  mapstorage=(MapStorage *)ms;
+  std::vector<std::string> nml;
+  std::vector<std::string> 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->getNodeMapList();
+    }
   for(int i=0;i<(int)nodemapcbts.size();i++)
     {
@@ -72 +79 @@
     {
       update_cbt(eml, *(edgemapcbts[i]));
+    }
+}
+
+void AlgoBox::nodemaplist_changed(std::string newmap)
+{
+  for(int i=0;i<(int)nodemapcbts.size();i++)
+    {
+      (nodemapcbts[i])->append_text(newmap);
+    }
+}
+
+void AlgoBox::edgemaplist_changed(std::string newmap)
+{
+  for(int i=0;i<(int)edgemapcbts.size();i++)
+    {
+      (edgemapcbts[i])->append_text(newmap);
     }
 }
@@ -137 +160 @@
 void AlgoBox::emit_tab_change()
 {
-  signal_maplist_need.emit(tabcbt.get_active_text());
+  std::string active_tab=tabcbt.get_active_text();
+  if(active_tab!="")
+    {
+      signal_maplist_need.emit(active_tab);
+    }
+  else
+    {
+      std::vector<std::string> empty_vector;
+      update_maplist(NULL);
+    }
 }

gui/algobox.h

@@ -7 +7 @@
 
 #include <all_include.h>
+#include <mapstorage.h>
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
@@ -20 +21 @@
   std::vector<Gtk::ComboBoxText *> nodemapcbts;
   std::vector<Gtk::ComboBoxText *> edgemapcbts;
-  
+
+  MapStorage * mapstorage;
+
 public:
   AlgoBox(){};
-  AlgoBox(std::vector<std::string>, std::vector<std::string>, std::vector<std::string>);
+  AlgoBox(std::vector<std::string>);
 
-  virtual void init(std::vector<std::string>, std::vector<std::string>, std::vector<std::string>);
+  virtual void init(std::vector<std::string>);
 
   sigc::signal<void, std::string> signal_maplist_needed();  
@@ -31 +34 @@
 
   void update_tablist( std::vector< std::string > tl );
-  void update_maplist( std::vector< std::string >, std::vector< std::string >);
+  void update_maplist( void * );
+
+  void nodemaplist_changed(std::string);
+  void edgemaplist_changed(std::string);
 
   void update_cbt( std::vector< std::string > tl, Gtk::ComboBoxText &);

gui/algowin.cc

@@ -21 +21 @@
 }
 
-AlgoWin::AlgoWin(int algoid, std::vector<std::string> tabnames, std::vector<std::string> nodemapnames,std::vector<std::string> edgemapnames)
+AlgoWin::AlgoWin(int algoid, std::vector<std::string> tabnames)
 {
   signal_key_press_event().connect(sigc::mem_fun(*this, &AlgoWin::closeIfEscapeIsPressed));
@@ -33 +33 @@
     {
     case 0:
-      ab=new AlgoBox(tabnames, nodemapnames, edgemapnames);
+      ab=new AlgoBox(tabnames);
       set_title("Algo Win Demo");
       break;
     case 1:
-      ab=new KruskalBox(tabnames, nodemapnames, edgemapnames);
+      ab=new KruskalBox(tabnames);
       set_title("Kruskal Algorithm");
       break;
@@ -72 +72 @@
 }
 
-void AlgoWin::update_maplist(std::vector<std::string> nodemapnames, std::vector<std::string> edgemapnames)
+void AlgoWin::update_maplist(void * mapstorage)
 {
-  ab->update_maplist(nodemapnames, edgemapnames);
+  ab->update_maplist(mapstorage);
 }
 

gui/algowin.h

@@ -32 +32 @@
   void emit_tab_change(std::string);
 
-  AlgoWin(int, std::vector<std::string>, std::vector<std::string>, std::vector<std::string>);
+  AlgoWin(int, std::vector<std::string>);
 
   void update_tablist(std::vector<std::string> tabnames);
-  void update_maplist(std::vector<std::string>, std::vector<std::string>);
+  void update_maplist( void *);
 
   void on_hide();

gui/kruskalbox.cc

@@ -1 +1 @@
 #include <kruskalbox.h>
 
-KruskalBox::KruskalBox(std::vector<std::string> t, std::vector<std::string> nm, std::vector<std::string> em):AlgoBox()
+KruskalBox::KruskalBox(std::vector<std::string> t):AlgoBox()
 {
-  init(t, nm, em);
+  init(t);
 }
     
 void KruskalBox::run()
 {
+  
   std::cout << "Kruskal inditasa, de meg nincsen keszen." << std::endl;
 }

gui/kruskalbox.h

@@ -15 +15 @@
 {
 public:
-  KruskalBox(std::vector<std::string> t, std::vector<std::string> nm, std::vector<std::string> em);
+  KruskalBox(std::vector<std::string> t);
     
   void run();

gui/main_win.cc

@@ -410 +410 @@
 void MainWin::createAlgoWin(int algoid)
 {
-  AlgoWin * aw=new AlgoWin(algoid, tabnames, tabs[0]->mapstorage.getNodeMapList(),tabs[0]->mapstorage.getEdgeMapList());
+  AlgoWin * aw=new AlgoWin(algoid, tabnames);
   aw->signal_closing().connect(sigc::mem_fun(*this, &MainWin::deRegisterAlgoWin));
   aw->signal_maplist_needed().connect(sigc::mem_fun(*this, &MainWin::updateAlgoWinMaps));
@@ -417 +417 @@
 }
 
+void MainWin::updateAlgoWinTabs()
+{
+  std::set< AlgoWin* >::iterator awsi=aws.begin();
+  for(;awsi!=aws.end();awsi++)
+    {
+      (*awsi)->update_tablist(tabnames);
+    }
+}
+
 void MainWin::updateAlgoWinMaps(AlgoWin * awp, std::string tabname)
 {
@@ -423 +432 @@
     {
     }
-  awp->update_maplist(tabs[i]->mapstorage.getNodeMapList(),tabs[i]->mapstorage.getEdgeMapList());
+  //awp->update_maplist(tabs[i]->mapstorage.getNodeMapList(),tabs[i]->mapstorage.getEdgeMapList());
+  awp->update_maplist(&(tabs[i]->mapstorage));
 }
 
@@ -429 +439 @@
 {
   aws.erase(awp);
-}
-
-void MainWin::updateAlgoWinTabs()
-{
-  std::set< AlgoWin* >::iterator awsi=aws.begin();
-  for(;awsi!=aws.end();awsi++)
-    {
-      (*awsi)->update_tablist(tabnames);
-    }
 }
 

gui/mapstorage.cc

@@ -59 +59 @@
       // set the maps default value
       nodemap_default[name] = default_value;
+
+      //announce changement in maps
+      signal_node_map.emit(name);
       return 0;
     }
@@ -127 +130 @@
       // set the maps default value
       edgemap_default[name] = default_value;
+
+      //announce changement in maps
+      signal_edge_map.emit(name);
       return 0;
     }

gui/mapstorage.h

@@ -61 +61 @@
   typedef sigc::signal<void, bool, int> Signal_Prop;
   Signal_Prop signal_prop;
+  sigc::signal<void, std::string> signal_node_map;
+  sigc::signal<void, std::string> signal_edge_map;
 
 public:
@@ -82 +84 @@
 
   Signal_Prop signal_prop_ch();
+
+  sigc::signal<void, std::string> signal_node_map_ch(){return signal_node_map;};
+  sigc::signal<void, std::string> signal_edge_map_ch(){return signal_edge_map;};
 
   ///Adds given map to storage. A name and the map itself has to be provided.

gui/nbtab.cc

@@ -8 +8 @@
   //connecting signals - controller character
   mapstorage.signal_prop_ch().connect(sigc::mem_fun(*gd_canvas, &GraphDisplayerCanvas::propertyChange));
+  mapstorage.signal_node_map_ch().connect(sigc::mem_fun(*this, &NoteBookTab::registerNewNodeMap));
+  mapstorage.signal_edge_map_ch().connect(sigc::mem_fun(*this, &NoteBookTab::registerNewEdgeMap));
   show_all_children();
   show();

gui/new_map_win.cc

@@ -160 +160 @@
 
               //add it to the list of the displayable maps
-              mytab.registerNewEdgeMap(mapname);
+              //furthermore it is done by signals
+              //mytab.registerNewEdgeMap(mapname);
 
               //display it
@@ -243 +244 @@
 
               //add it to the list of the displayable maps
-              mytab.registerNewNodeMap(mapname);
+              //furthermore it is done by signals
+              //mytab.registerNewNodeMap(mapname);
 
               //display it