Changeset 1876:5ad84ad1b68f in lemon-0.x

Timestamp:

01/04/06 19:05:55 (17 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Communication with algorithm window is developed.

Location:

gui

Files:

• Makefile.am (modified) (2 diffs)
• algobox.cc (added)
• algobox.h (modified) (1 diff)
• algowin.cc (added)
• algowin.h (modified) (1 diff)
• kruskalbox.cc (added)
• kruskalbox.h (added)
• main_win.cc (modified) (7 diffs)
• main_win.h (modified) (1 diff)

gui/Makefile.am

@@ -8 +8 @@
 glemon_SOURCES = \
         all_include.h \
+        algobox.cc \
+        algobox.h \
+        algowin.cc \
+        algowin.h \
         gdc-broken_edge.cc \
         graph_displayer_canvas.cc \
@@ -16 +20 @@
         graph_displayer_canvas-zoom.cc \
         graph-displayer.cc \
+        kruskalbox.cc \
+        kruskalbox.h \
         main_win.cc \
         main_win.h \

gui/algobox.h

@@ -12 +12 @@
 class AlgoBox : public Gtk::VBox
 {
+  sigc::signal<void, std::string> signal_maplist_need;  
   
+  Gtk::ComboBoxText tabcbt;
+
+protected:
   Gtk::Label * label;
-  Gtk::ComboBoxText cbt;
+  std::vector<Gtk::ComboBoxText *> nodemapcbts;
+  std::vector<Gtk::ComboBoxText *> edgemapcbts;
   
- public:
-  AlgoBox(std::vector<std::string> tabnames)
-    {
-      update_tablist(tabnames);
+public:
+  AlgoBox(){};
+  AlgoBox(std::vector<std::string>, std::vector<std::string>, std::vector<std::string>);
 
-      label=new Gtk::Label("Haliho");
-      
-      pack_start(*label);
-      pack_start(cbt);
+  virtual void init(std::vector<std::string>, std::vector<std::string>, std::vector<std::string>);
 
-      show_all_children();
-    };
+  sigc::signal<void, std::string> signal_maplist_needed();  
+  void emit_tab_change();
 
-  void update_tablist( std::vector< std::string > tl )
-    {
-      std::string actname=cbt.get_active_text();
-      int prev_act=-1;
+  void update_tablist( std::vector< std::string > tl );
+  void update_maplist( std::vector< std::string >, std::vector< std::string >);
 
-      cbt.clear();
-      int actptr=0;
-
-      std::vector< std::string >::iterator emsi=tl.begin();
-      for(;emsi!=tl.end();emsi++)
-        {
-          if(actname==*emsi)
-            {
-              prev_act=actptr;
-            }
-
-          cbt.append_text(*emsi);
-          actptr++;
-        }
-
-      if(prev_act!=-1)
-        {
-          cbt.set_active(prev_act);
-        }
-      else if(actptr>0) //so there is item in the list
-        {
-          cbt.set_active(0);
-        }
-    }
-
+  void update_cbt( std::vector< std::string > tl, Gtk::ComboBoxText &);
+  
+  virtual void run();
+  
+  virtual void build_box();
 };
 #endif //ALGOBOX_H

gui/algowin.h

@@ -11 +11 @@
 #include <libgnomecanvasmm/polygon.h>
 
-enum {GENERAL, ALGO_NUM}; // algorithm IDs;
+enum {GENERAL, KRUSKAL, ALGO_NUM}; // algorithm IDs;
 
-class AlgoWin : public Gtk::Dialog
+class AlgoWin : public Gtk::Window
 {
 private:
   AlgoBox * ab;
+  Gtk::Button * runbutton;
+  Gtk::Button * closebutton;
 
 protected:
   sigc::signal<void, AlgoWin *> signal_closed;  
+  sigc::signal<void, AlgoWin *, std::string> signal_maplist_need;  
 
 public:
-  sigc::signal<void, AlgoWin *> signal_closing()
-  {
-    return signal_closed;
-  }
+  bool closeIfEscapeIsPressed(GdkEventKey* e);
 
-  AlgoWin(int algoid, std::vector<std::string> tabnames)
-    {
-      Gtk::VBox * vbox=get_vbox();
-      
-      ab=new AlgoBox(tabnames);
-      
-      vbox->pack_start(*ab);
-      
-      add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
-      
-      show_all_children();
-    };
+  sigc::signal<void, AlgoWin *> signal_closing();
+  sigc::signal<void, AlgoWin *, std::string> signal_maplist_needed();
 
-  void update_tablist(std::vector<std::string> tabnames)
-  {
-    ab->update_tablist(tabnames);
-  }
+  void emit_tab_change(std::string);
 
-  void on_hide()
-  {
-    signal_closed.emit(this);
-    Gtk::Dialog::on_hide();
-  }
+  AlgoWin(int, std::vector<std::string>, std::vector<std::string>, std::vector<std::string>);
+
+  void update_tablist(std::vector<std::string> tabnames);
+  void update_maplist(std::vector<std::string>, std::vector<std::string>);
+
+  void on_hide();
 };
 #endif //ALGOWIN_H

gui/main_win.cc

@@ -105 +105 @@
   ag->add( Gtk::Action::create("AlgoGeneral", "_General"),
            sigc::bind( sigc::mem_fun ( *this, &MainWin::createAlgoWin ), 0) );
+  ag->add( Gtk::Action::create("AlgoKruskal", "_Kruskal"),
+           sigc::bind( sigc::mem_fun ( *this, &MainWin::createAlgoWin ), 1) );
 
   Gtk::RadioAction::Group tool_group;
@@ -154 +156 @@
       "    <menu action='AlgoMenu'>"
       "      <menuitem action='AlgoGeneral'/>"
+      "      <menuitem action='AlgoKruskal'/>"
       "    </menu>"
       "  </menubar>"
@@ -225 +228 @@
   set_title(tabnames[active_tab] + " - " + prog_name);
   notebook.set_tab_label_text((Widget&)*(tabs[active_tab]), tabnames[active_tab]);
-  updateAlgoWins();
+  updateAlgoWinTabs();
 }
 
@@ -247 +250 @@
   notebook.set_current_page(size);
   set_tabtitle("unsaved file");
-  updateAlgoWins();
+  updateAlgoWinTabs();
 }
 
@@ -307 +310 @@
         }
 
-      updateAlgoWins();
+      updateAlgoWinTabs();
     }
 }
@@ -405 +408 @@
 void MainWin::createAlgoWin(int algoid)
 {
-  AlgoWin * aw=new AlgoWin(algoid, tabnames);
+  AlgoWin * aw=new AlgoWin(algoid, tabnames, tabs[0]->mapstorage.getNodeMapList(),tabs[0]->mapstorage.getEdgeMapList());
   aw->signal_closing().connect(sigc::mem_fun(*this, &MainWin::deRegisterAlgoWin));
+  aw->signal_maplist_needed().connect(sigc::mem_fun(*this, &MainWin::updateAlgoWinMaps));
   aws.insert(aw);
   aw->show();
 }
 
+void MainWin::updateAlgoWinMaps(AlgoWin * awp, std::string tabname)
+{
+  int i=0;
+  for(;(i<(int)tabnames.size())&&(tabnames[i]!=tabname);i++)
+    {
+    }
+  awp->update_maplist(tabs[i]->mapstorage.getNodeMapList(),tabs[i]->mapstorage.getEdgeMapList());
+}
+
 void MainWin::deRegisterAlgoWin(AlgoWin * awp)
 {
@@ -416 +429 @@
 }
 
-void MainWin::updateAlgoWins()
+void MainWin::updateAlgoWinTabs()
 {
   std::set< AlgoWin* >::iterator awsi=aws.begin();

gui/main_win.h

@@ -74 +74 @@
   virtual void createAlgoWin(int);
   virtual void deRegisterAlgoWin(AlgoWin *);
-  virtual void updateAlgoWins();
+  virtual void updateAlgoWinTabs();
+  virtual void updateAlgoWinMaps(AlgoWin *, std::string);
 
   virtual void changeEditorialTool(int);