Changeset 166:302d75b08b27 in glemon-0.x

Timestamp:

10/16/06 15:05:25 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/glemon/trunk@2992

Message:

Graph redesign starts with an initial kick of the first node.

Files:

• graph_displayer_canvas.cc (modified) (2 diffs)
• graph_displayer_canvas.h (modified) (1 diff)

graph_displayer_canvas.cc

@@ -7 +7 @@
   isbutton(0), active_item(NULL), target_item(NULL), nodemap_to_edit(""),
   edgemap_to_edit(""), autoscale(true), zoomtrack(false), radius_size(20), edge_width(10),
-  iterations(20), attraction(0.05), propulsation(40000), mytab(mainw)
+  iterations(20), attraction(0.05), propulsation(40000), was_redesigned(false), mytab(mainw)
 {
   //base event handler is move tool
@@ -256 +256 @@
 void GraphDisplayerCanvas::reDesignGraph()
 {
-  double min_dist=40;
+  double min_dist=20;
+  double init_vector_length=25;
+
+  if(!was_redesigned)
+    {
+      NodeIt i((mytab.mapstorage).graph);
+      double r=random();
+      dim2::Point<double> init(init_vector_length*sin(r),init_vector_length*cos(r));
+      moveNode(init.x, init.y, nodesmap[i], i);
+      was_redesigned=true;
+    }
+  
 
   //iteration counter

graph_displayer_canvas.h

@@ -418 +418 @@
   ///Propulsation factor during graph design
   double propulsation;
+
+  ///Was redesign run on this graph already?
+  ///
+  ///If not, the layout will be modified randomly
+  ///to avoid frozen layout because of wrong
+  ///initial state
+  bool was_redesigned;
   
 private: