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

[Lemon SVN]

Author: hegyi
Date: Fri Jan  6 14:58:49 2006
New Revision: 2456

Modified:
   hugo/trunk/gui/kruskalbox.cc
   hugo/trunk/gui/mapstorage.cc
   hugo/trunk/gui/mapstorage.h

Log:
Result of KruskalGUIAlgo is refreshed if displayed, but no more setin a forced way.

Modified: hugo/trunk/gui/kruskalbox.cc
==============================================================================
--- hugo/trunk/gui/kruskalbox.cc	(original)
+++ hugo/trunk/gui/kruskalbox.cc	Fri Jan  6 14:58:49 2006
@@ -32,11 +32,13 @@
   std::ostringstream o;
   o << "Result: " << res;
   resultlabel.set_text(o.str());
+
+  mapstorage->mapChanged(true, (edgemapcbts[OUTPUT])->get_active_text());
+  //   mapstorage->changeActiveMap(true, E_COLOR,
+  // 			      (edgemapcbts[OUTPUT])->get_active_text());
+  //   mapstorage->changeActiveMap(true, E_TEXT,
+  // 			      (edgemapcbts[INPUT])->get_active_text());
   
-  mapstorage->changeActiveMap(true, E_COLOR,
-			      (edgemapcbts[OUTPUT])->get_active_text());
-  mapstorage->changeActiveMap(true, E_TEXT,
-			      (edgemapcbts[INPUT])->get_active_text());
 }
     
 void KruskalBox::build_box()

Modified: hugo/trunk/gui/mapstorage.cc
==============================================================================
--- hugo/trunk/gui/mapstorage.cc	(original)
+++ hugo/trunk/gui/mapstorage.cc	Fri Jan  6 14:58:49 2006
@@ -438,3 +438,27 @@
 {
   arrow_pos_read_ok = true;
 }
+
+void MapStorage::mapChanged(bool itisedge, std::string mapname)
+{
+  if(itisedge)
+    {
+      for(int i=0;i<EDGE_PROPERTY_NUM;i++)
+	{
+	  if(active_edgemaps[i]==mapname)
+	    {
+	      signal_prop.emit(itisedge, i);
+	    }
+	}
+    }
+  else
+    {
+      for(int i=0;i<NODE_PROPERTY_NUM;i++)
+	{
+	  if(active_nodemaps[i]==mapname)
+	    {
+	      signal_prop.emit(itisedge, i);
+	    }
+	}
+    }
+}

Modified: hugo/trunk/gui/mapstorage.h
==============================================================================
--- hugo/trunk/gui/mapstorage.h	(original)
+++ hugo/trunk/gui/mapstorage.h	Fri Jan  6 14:58:49 2006
@@ -133,6 +133,8 @@
   ///To be able to iterate through each maps this function returns an iterator pointing to the last edgemap in the storage.
   std::map< std::string,Graph::EdgeMap<double> * >::iterator endOfEdgeMaps(){return edgemap_storage.end();};
 
+  void mapChanged(bool, std::string);
+
   int readFromFile(const std::string &);
   void writeToFile(const std::string &);