diff -r 7ea73c90a7f0 -r 14a76109b561 graph_displayer_canvas.cc
--- a/graph_displayer_canvas.cc	Mon Oct 09 08:06:31 2006 +0000
+++ b/graph_displayer_canvas.cc	Thu Oct 12 11:39:29 2006 +0000
@@ -5,7 +5,8 @@
   nodesmap(mainw.mapstorage.graph), edgesmap(mainw.mapstorage.graph), edgetextmap(mainw.mapstorage.graph),
   nodetextmap(mainw.mapstorage.graph), displayed_graph(*(root()), 0, 0),
   isbutton(0), active_item(NULL), target_item(NULL), nodemap_to_edit(""),
-  edgemap_to_edit(""), autoscale(true), zoomtrack(false), radius_size(20), edge_width(10), mytab(mainw)
+  edgemap_to_edit(""), autoscale(true), zoomtrack(false), radius_size(20), edge_width(10),
+  iterations(20), attraction(0.05), propulsation(40000), mytab(mainw)
 {
   //base event handler is move tool
   actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::moveEventHandler), false);
@@ -251,3 +252,117 @@
   width_p=edge_width;
   radius_p=radius_size;
 }
+
+void GraphDisplayerCanvas::reDesignGraph()
+{
+  double min_dist=40;
+
+  //iteration counter
+  for(int l=0;l<iterations;l++)
+    {
+      Graph::NodeMap<double> x(mytab.mapstorage.graph);
+      Graph::NodeMap<double> y(mytab.mapstorage.graph);
+      XYMap<Graph::NodeMap<double> > actual_forces;
+      actual_forces.setXMap(x);
+      actual_forces.setYMap(y);
+
+      lemon::dim2::Point<double> delta;
+
+      //count actual force for each nodes
+      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+	{
+	  //propulsation of nodes
+	  for (NodeIt j((mytab.mapstorage).graph); j!=INVALID; ++j)
+	    {
+	      if(i!=j)
+		{
+		  delta=((mytab.mapstorage).coords[i]-(mytab.mapstorage).coords[j]);
+
+		  double length_sqr=delta.normSquare();
+		  double length=sqrt(length_sqr);
+		  if(length_sqr<min_dist)
+		    {
+		      length_sqr=min_dist;
+		    }
+
+		  //normalize vector
+		  delta/=length;
+
+		  //calculating propulsation strength
+		  //greater distance menas smaller propulsation strength
+		  delta*=propulsation/length_sqr;
+		    
+		  actual_forces.set(i,(actual_forces[i]+delta));
+		}
+	    }
+	  //attraction of nodes, to which actual node is bound
+	  for(OutEdgeIt ei((mytab.mapstorage).graph,i);ei!=INVALID;++ei)
+	    {
+	      delta=((mytab.mapstorage).coords[i]-(mytab.mapstorage).coords[mytab.mapstorage.graph.target(ei)]);
+
+	      double length_sqr=delta.normSquare();
+	      double length=sqrt(length_sqr);
+	      if(length_sqr<min_dist)
+		{
+		  length_sqr=min_dist;
+		}
+
+	      //normalize vector
+	      delta/=length;
+
+	      //calculating attraction strength
+	      //greater distance means greater strength
+	      delta*=attraction*length;
+
+	      actual_forces.set(i,actual_forces[i]-delta);
+	    }
+	  for(InEdgeIt ei((mytab.mapstorage).graph,i);ei!=INVALID;++ei)
+	    {
+	      delta=((mytab.mapstorage).coords[i]-(mytab.mapstorage).coords[mytab.mapstorage.graph.source(ei)]);
+
+	      double length_sqr=delta.normSquare();
+	      double length=sqrt(length_sqr);
+	      if(length_sqr<min_dist)
+		{
+		  length_sqr=min_dist;
+		}
+
+	      //normalize vector
+	      delta/=length;
+
+	      //calculating attraction strength
+	      //greater distance means greater strength
+	      delta*=attraction*length;
+
+	      actual_forces.set(i,actual_forces[i]-delta);
+	    }
+	}
+      for (NodeIt i((mytab.mapstorage).graph); i!=INVALID; ++i)
+	{
+	  moveNode(actual_forces[i].x, actual_forces[i].y, nodesmap[i], i);
+	}
+    }
+}
+
+void GraphDisplayerCanvas::get_design_data(double & attraction_p, double & propulsation_p, int & iterations_p)
+{
+  attraction_p=attraction;
+  propulsation_p=propulsation;
+  iterations_p=iterations;
+}
+
+void GraphDisplayerCanvas::set_attraction(double attraction_p)
+{
+  attraction=attraction_p;
+}
+
+void GraphDisplayerCanvas::set_propulsation(double propulsation_p)
+{
+  propulsation=propulsation_p;
+}
+
+void GraphDisplayerCanvas::set_iteration(int iterations_p)
+{
+  iterations=iterations_p;
+}
+