[Lemon-commits] [lemon_svn] hegyi: r2986 - glemon/trunk

[Lemon SVN]

Author: hegyi
Date: Fri Oct 13 15:53:10 2006
New Revision: 2986

Modified:
   glemon/trunk/Makefile.am
   glemon/trunk/algobox.cc
   glemon/trunk/algobox.h
   glemon/trunk/algowin.cc
   glemon/trunk/main_win.cc

Log:
Dijkstra in GUI.

Modified: glemon/trunk/Makefile.am
==============================================================================
--- glemon/trunk/Makefile.am	(original)
+++ glemon/trunk/Makefile.am	Fri Oct 13 15:53:10 2006
@@ -44,7 +44,9 @@
 	i18n.h \
 	gettext.h \
 	design_win.h \
-	design_win.cc
+	design_win.cc \
+	dijkstrabox.h \
+	dijkstrabox.cc
 
 glemon_CXXFLAGS = $(GTK_CFLAGS) $(LEMON_CFLAGS)
 glemon_LDFLAGS = $(GTK_LIBS) $(LEMON_LIBS)

Modified: glemon/trunk/algobox.cc
==============================================================================
--- glemon/trunk/algobox.cc	(original)
+++ glemon/trunk/algobox.cc	Fri Oct 13 15:53:10 2006
@@ -81,6 +81,7 @@
       (edgemapcbts[i])->update_list(eml);
       //update_cbt(eml, *(edgemapcbts[i]));
     }
+  signal_maplist_updated.emit();
 }
 
 void AlgoBox::nodemaplist_changed(std::string newmap)

Modified: glemon/trunk/algobox.h
==============================================================================
--- glemon/trunk/algobox.h	(original)
+++ glemon/trunk/algobox.h	Fri Oct 13 15:53:10 2006
@@ -45,6 +45,10 @@
   ///In that case will be this signal emitted.
   sigc::signal<void, std::string, bool> signal_newmapwin_need;
 
+  ///Signal emitted when maplists are updated after tab change
+  sigc::signal<void> signal_maplist_updated;
+
+
 protected:
   ///Holder of tabnames.
   Gtk::ComboBoxText tabcbt;
@@ -97,6 +101,8 @@
   ///Emitted if user wants to create a new map for inpuit or output.
   sigc::signal<void, std::string, bool> signal_newmapwin_needed(){return signal_newmapwin_need;};
 
+  sigc::signal<void> signal_upon_maplist_updated(){return signal_maplist_updated;};
+
   ///Emits signal that requires list of maps for the recently selected \ref NoteBookTab.
   void emit_tab_change();
 

Modified: glemon/trunk/algowin.cc
==============================================================================
--- glemon/trunk/algowin.cc	(original)
+++ glemon/trunk/algowin.cc	Fri Oct 13 15:53:10 2006
@@ -1,5 +1,6 @@
 #include <algowin.h>
 #include <kruskalbox.h>
+#include <dijkstrabox.h>
 
 sigc::signal<void, AlgoWin *> AlgoWin::signal_closing()
 {
@@ -39,6 +40,10 @@
       ab=new KruskalBox(tabnames);
       set_title("Kruskal Algorithm");
       break;
+    case 2:
+      ab=new DijkstraBox(tabnames);
+      set_title("Dijkstra Algorithm");
+      break;
     default:
       break;
     }

Modified: glemon/trunk/main_win.cc
==============================================================================
--- glemon/trunk/main_win.cc	(original)
+++ glemon/trunk/main_win.cc	Fri Oct 13 15:53:10 2006
@@ -107,6 +107,8 @@
 	   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) );
+  ag->add( Gtk::Action::create("AlgoDijkstra", _("_Dijkstra")),
+	   sigc::bind( sigc::mem_fun ( *this, &MainWin::createAlgoWin ), 2) );
 
   Gtk::RadioAction::Group tool_group;
   ag->add( Gtk::RadioAction::create(tool_group, "MoveItem", Gtk::StockID("gd-move"), _("Move")),
@@ -159,6 +161,7 @@
       "    <menu action='AlgoMenu'>"
       "      <menuitem action='AlgoGeneral'/>"
       "      <menuitem action='AlgoKruskal'/>"
+      "      <menuitem action='AlgoDijkstra'/>"
       "    </menu>"
       "  </menubar>"
       "  <toolbar name='ToolBar'>"