Changeset 201:879e47e5b731 in glemon-0.x for gdc-broken_edge.cc

Timestamp:

01/02/08 22:03:09 (16 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

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

Message:

Merge branches/akos to trunk.

File:

• gdc-broken_edge.cc (modified) (7 diffs)

gdc-broken_edge.cc

@@ -37 +37 @@
 {
   MapStorage& ms = *canvas.mytab.mapstorage;
-  XY center(ms.arrow_pos[edge]);
+  XY center(ms.getArrowCoords(edge));
   XY unit_norm_vector(0-unit_vector_in_dir.y, unit_vector_in_dir.x);
 
@@ -90 +90 @@
 
   //calculating coordinates of the direction indicator arrow
-  XY head(ms.coords[ms.graph.target(edge)]);
-  XY center(ms.arrow_pos[edge]);
+  XY head(ms.getNodeCoords(ms.graph.target(edge)));
+  XY center(ms.getArrowCoords(edge));
 
   XY unit_vector_in_dir(head-center);
@@ -108 +108 @@
   Node source = ms.graph.source(edge);
   Node target = ms.graph.target(edge);
-  points.push_back(Gnome::Art::Point(ms.coords[source].x,
-        ms.coords[source].y));
-  points.push_back(Gnome::Art::Point(ms.arrow_pos[edge].x,
-        ms.arrow_pos[edge].y));
-  points.push_back(Gnome::Art::Point(ms.coords[target].x,
-        ms.coords[target].y));
+  points.push_back(Gnome::Art::Point(ms.getNodeCoords(source).x,
+        ms.getNodeCoords(source).y));
+  points.push_back(Gnome::Art::Point(ms.getArrowCoords(edge).x,
+        ms.getArrowCoords(edge).y));
+  points.push_back(Gnome::Art::Point(ms.getNodeCoords(target).x,
+        ms.getNodeCoords(target).y));
   line.property_points().set_value(points);
 }
@@ -153 +153 @@
         Gnome::Canvas::Points points_new;
 
-        canvas.mytab.mapstorage->arrow_pos.set(edge, canvas.mytab.mapstorage->arrow_pos[edge] + XY(dx, dy));
+        canvas.mytab.mapstorage->setArrowCoords(edge, canvas.mytab.mapstorage->getArrowCoords(edge) + XY(dx, dy));
 
         draw();
-        canvas.textReposition(canvas.mytab.mapstorage->arrow_pos[edge]);
+        canvas.textReposition(canvas.mytab.mapstorage->getArrowCoords(edge));
 
         clicked_x=e->motion.x;
@@ -200 +200 @@
 
   Node node = ms.graph.source(edge);
-  XY center = (ms.coords[node] + ms.arrow_pos[edge]) / 2.0;
-
-  XY unit_vector_in_dir(rot90(center - ms.arrow_pos[edge]));
+  XY center = (ms.getNodeCoords(node) + ms.getArrowCoords(edge)) / 2.0;
+
+  XY unit_vector_in_dir(rot90(center - ms.getArrowCoords(edge)));
   double length = sqrt(unit_vector_in_dir.normSquare());
   unit_vector_in_dir /= length;
@@ -209 +209 @@
 
   double radius =
-    sqrt((ms.arrow_pos[edge] - ms.coords[node]).normSquare()) / 2.0;
+    sqrt((ms.getArrowCoords(edge) - ms.getNodeCoords(node)).normSquare()) / 2.0;
 
   XY p1 = center + XY(-radius,  radius);
@@ -250 +250 @@
       if(isbutton)
       {
-        canvas.mytab.mapstorage->arrow_pos.set(edge, XY(e->motion.x, e->motion.y));
+        canvas.mytab.mapstorage->setArrowCoords(edge, XY(e->motion.x, e->motion.y));
 
         draw();
-        canvas.textReposition(canvas.mytab.mapstorage->arrow_pos[edge]);
+        canvas.textReposition(canvas.mytab.mapstorage->getArrowCoords(edge));
       }
     default: break;