Changeset 150:86273bfe0e4d in glemon-0.x for graph_displayer_canvas-event.cc

Timestamp:

09/21/06 12:29:29 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

According to xy->Point changement.

File:

• graph_displayer_canvas-event.cc (modified) (5 diffs)

graph_displayer_canvas-event.cc

@@ -135 +135 @@
 
         // write back the new coordinates to the coords map
-        (mytab.mapstorage).coords.set(active_node, xy<double>(coord_x, coord_y));
+        (mytab.mapstorage).coords.set(active_node, XY(coord_x, coord_y));
 
         clicked_x=new_x;
@@ -235 +235 @@
 
         //old vector from one to the other node - a
-        xy<double> a_v(moved_node_1.x-fix_node.x,moved_node_1.y-fix_node.y);
+        XY a_v(moved_node_1.x-fix_node.x,moved_node_1.y-fix_node.y);
         //new vector from one to the other node - b
-        xy<double> b_v(moved_node_2.x-fix_node.x,moved_node_2.y-fix_node.y);
+        XY b_v(moved_node_2.x-fix_node.x,moved_node_2.y-fix_node.y);
 
         double absa=sqrt(a_v.normSquare());
@@ -249 +249 @@
           {
             //old vector from one node to the breakpoint - c
-            xy<double> c_v(old_arrow_pos.x-fix_node.x,old_arrow_pos.y-fix_node.y);
+            XY c_v(old_arrow_pos.x-fix_node.x,old_arrow_pos.y-fix_node.y);
 
             //unit vector with the same direction to a_v
-            xy<double> a_v_u(a_v.x/absa,a_v.y/absa);
+            XY a_v_u(a_v.x/absa,a_v.y/absa);
 
             //normal vector of unit vector with the same direction to a_v
-            xy<double> a_v_u_n(((-1)*a_v_u.y),a_v_u.x);
+            XY a_v_u_n(((-1)*a_v_u.y),a_v_u.x);
 
             //unit vector with the same direction to b_v
-            xy<double> b_v_u(b_v.x/absb,b_v.y/absb);
+            XY b_v_u(b_v.x/absb,b_v.y/absb);
 
             //normal vector of unit vector with the same direction to b_v
-            xy<double> b_v_u_n(((-1)*b_v_u.y),b_v_u.x);
+            XY b_v_u_n(((-1)*b_v_u.y),b_v_u.x);
 
             //vector c in a_v_u and a_v_u_n co-ordinate system
-            xy<double> c_a(c_v*a_v_u,c_v*a_v_u_n);
+            XY c_a(c_v*a_v_u,c_v*a_v_u_n);
 
             //new vector from one node to the breakpoint - d - we have to calculate this one
-            xy<double> d_v=absb/absa*(c_a.x*b_v_u+c_a.y*b_v_u_n);
+            XY d_v=absb/absa*(c_a.x*b_v_u+c_a.y*b_v_u_n);
 
             return XY(d_v.x+fix_node.x,d_v.y+fix_node.y);
@@ -306 +306 @@
 
       // update coordinates
-      (mytab.mapstorage).coords.set(active_node, xy<double>(clicked_x, clicked_y));
+      (mytab.mapstorage).coords.set(active_node, XY(clicked_x, clicked_y));
 
       // update all other maps
@@ -791 +791 @@
 }
 
-void GraphDisplayerCanvas::textReposition(xy<double> new_place)
-{
-  new_place+=(xy<double>(10,10));
+void GraphDisplayerCanvas::textReposition(XY new_place)
+{
+  new_place+=(XY(10,10));
   edgetextmap[forming_edge]->property_x().set_value(new_place.x);
   edgetextmap[forming_edge]->property_y().set_value(new_place.y);