1.1 --- a/graph_displayer_canvas.cc	Mon Oct 30 13:08:04 2006 +0000
     1.2 +++ b/graph_displayer_canvas.cc	Mon Oct 30 14:57:48 2006 +0000
     1.3 @@ -25,7 +25,7 @@
     1.4    nodetextmap(mainw.mapstorage.graph), displayed_graph(*(root()), 0, 0),
     1.5    isbutton(0), active_item(NULL), target_item(NULL), nodemap_to_edit(""),
     1.6    edgemap_to_edit(""), autoscale(true), zoomtrack(false), radius_size(20), edge_width(10),
     1.7 -  iterations(20), attraction(0.05), propulsation(40000), was_redesigned(false), is_drawn(false), mytab(mainw)
     1.8 +  was_redesigned(false), is_drawn(false), mytab(mainw)
     1.9  {
    1.10    //base event handler is move tool
    1.11    actual_handler=signal_event().connect(sigc::mem_fun(*this, &GraphDisplayerCanvas::moveEventHandler), false);
    1.12 @@ -304,7 +304,12 @@
    1.13        moveNode(init.x, init.y, nodesmap[i], i);
    1.14        was_redesigned=true;
    1.15      }
    1.16 -  
    1.17 +
    1.18 +  double attraction;
    1.19 +  double propulsation;
    1.20 +  int iterations;
    1.21 +
    1.22 +  (mytab.mapstorage).get_design_data(attraction, propulsation, iterations);
    1.23  
    1.24    //iteration counter
    1.25    for(int l=0;l<iterations;l++)
    1.26 @@ -393,25 +398,3 @@
    1.27      }
    1.28  }
    1.29  
    1.30 -void GraphDisplayerCanvas::get_design_data(double & attraction_p, double & propulsation_p, int & iterations_p)
    1.31 -{
    1.32 -  attraction_p=attraction;
    1.33 -  propulsation_p=propulsation;
    1.34 -  iterations_p=iterations;
    1.35 -}
    1.36 -
    1.37 -void GraphDisplayerCanvas::set_attraction(double attraction_p)
    1.38 -{
    1.39 -  attraction=attraction_p;
    1.40 -}
    1.41 -
    1.42 -void GraphDisplayerCanvas::set_propulsation(double propulsation_p)
    1.43 -{
    1.44 -  propulsation=propulsation_p;
    1.45 -}
    1.46 -
    1.47 -void GraphDisplayerCanvas::set_iteration(int iterations_p)
    1.48 -{
    1.49 -  iterations=iterations_p;
    1.50 -}
    1.51 -