[Lemon-commits] [lemon_svn] hegyi: r2093 - hugo/trunk/gui

[Lemon SVN]

Author: hegyi
Date: Tue Jul 26 20:14:23 2005
New Revision: 2093

Modified:
   hugo/trunk/gui/graph_displayer_canvas-edge.cc
   hugo/trunk/gui/graph_displayer_canvas-event.cc
   hugo/trunk/gui/graph_displayer_canvas.h
   hugo/trunk/gui/map_win.cc

Log:
creates one new edgemap

Modified: hugo/trunk/gui/graph_displayer_canvas-edge.cc
==============================================================================
--- hugo/trunk/gui/graph_displayer_canvas-edge.cc	(original)
+++ hugo/trunk/gui/graph_displayer_canvas-edge.cc	Tue Jul 26 20:14:23 2005
@@ -106,9 +106,8 @@
 
 int GraphDisplayerCanvas::changeEdgeText (std::string mapname, Graph::Edge edge)
 {
-
   //the number in the map will be written on the edge
-  //EXCEPT when the name of the map is Text, because
+  //EXCEPT when the name of the map is Default, because
   //in that case empty string will be written, because
   //that is the deleter map
 

Modified: hugo/trunk/gui/graph_displayer_canvas-event.cc
==============================================================================
--- hugo/trunk/gui/graph_displayer_canvas-event.cc	(original)
+++ hugo/trunk/gui/graph_displayer_canvas-event.cc	Tue Jul 26 20:14:23 2005
@@ -805,10 +805,10 @@
 
 void GraphDisplayerCanvas::addNewEdgeMap()
 {
-  Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (g);
+  Graph::EdgeMap<double> * emptr=new Graph::EdgeMap<double> (g,20);
   mapstorage.addEdgeMap("NewEdgeMap",emptr);
   mapwin->registerNewEdgeMap("NewEdgeMap");
-  std::cout << "Add New EdgeMap is not yet implemented." << std::endl;
+  changeEdgeText("NewEdgeMap");
 }
 
 void GraphDisplayerCanvas::addNewNodeMap()

Modified: hugo/trunk/gui/graph_displayer_canvas.h
==============================================================================
--- hugo/trunk/gui/graph_displayer_canvas.h	(original)
+++ hugo/trunk/gui/graph_displayer_canvas.h	Tue Jul 26 20:14:23 2005
@@ -149,7 +149,7 @@
   Gnome::Canvas::Widget * canvasentrywidget;
 
   ///Here we store the maps that can be displayed through properties.
-  MapStorage mapstorage;
+  MapStorage & mapstorage;
 
   ///Indicates whether the button of mouse is pressed or not
   int isbutton;

Modified: hugo/trunk/gui/map_win.cc
==============================================================================
--- hugo/trunk/gui/map_win.cc	(original)
+++ hugo/trunk/gui/map_win.cc	Tue Jul 26 20:14:23 2005
@@ -122,6 +122,7 @@
 
 void MapWin::eComboChanged(int prop)
 {
+
   Gtk::Entry* entry = e_combo_array[prop].get_entry();
 
   if(entry)
@@ -249,12 +250,26 @@
     }
 }
 
-void MapWin::registerNewEdgeMap(std::string)
+void MapWin::registerNewEdgeMap(std::string newmapname)
 {
-  std::cout << "void MapWin::registerNewEdgeMap(std::string) is not yet implemented" << std::endl;
+  for(int i=0;i<EDGE_PROPERTY_NUM;i++)
+  {
+    //filling in combo box with choices
+    std::list<Glib::ustring> listStrings=e_combo_array[i].get_popdown_strings();
+    listStrings.push_back(newmapname);
+    e_combo_array[i].set_popdown_strings(listStrings);
+  }
+  Gtk::Entry* entry = e_combo_array[E_TEXT].get_entry();
+  entry->set_text((Glib::ustring)newmapname);
 }
 
-void MapWin::registerNewNodeMap(std::string)
+void MapWin::registerNewNodeMap(std::string newmapname)
 {
-  std::cout << "void MapWin::registerNewNodeMap(std::string) is not yet implemented" << std::endl;
+  for(int i=0;i<EDGE_PROPERTY_NUM;i++)
+  {
+    //filling in combo box with choices
+    std::list<Glib::ustring> listStrings=n_combo_array[i].get_popdown_strings();
+    listStrings.push_back(newmapname);
+    n_combo_array[i].set_popdown_strings(listStrings);
+  }
 }