Changeset 150:86273bfe0e4d in glemon-0.x

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.

Files:

• all_include.h (modified) (2 diffs)
• graph_displayer_canvas-event.cc (modified) (5 diffs)
• graph_displayer_canvas.cc (modified) (1 diff)
• graph_displayer_canvas.h (modified) (2 diffs)
• gui_reader.cc (modified) (2 diffs)
• gui_writer.cc (modified) (2 diffs)
• xml.h (modified) (4 diffs)
• xymap.h (modified) (2 diffs)

all_include.h

@@ -15 +15 @@
 #include <lemon/maps.h>
 #include <lemon/error.h>
-#include <lemon/xy.h>
+#include <lemon/dim2.h>
 
 enum {E_WIDTH, E_COLOR, E_TEXT, EDGE_PROPERTY_NUM}; // edge properties;
@@ -38 +38 @@
 using namespace lemon;
 
-typedef xy<double> XY;
+typedef lemon::dim2::Point<double> XY;
 typedef ListGraph Graph;
 typedef Graph::Node Node;

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);

graph_displayer_canvas.cc

@@ -200 +200 @@
     //initializing edge-text as well, to empty string
 
-    xy<double> text_pos(
+    XY text_pos(
         ((mytab.mapstorage).coords[i].x+node_property_defaults[N_RADIUS]+5),
         ((mytab.mapstorage).coords[i].y+node_property_defaults[N_RADIUS]+5));

graph_displayer_canvas.h

@@ -10 +10 @@
 #include <libgnomecanvasmm.h>
 #include <libgnomecanvasmm/polygon.h>
-#include <lemon/xy.h>
+#include <lemon/dim2.h>
 
 ///This class is the canvas, on which the graph can be drawn.
@@ -269 +269 @@
 public:
   ///Moves the text to new place
-  void textReposition(xy<double>);
+  void textReposition(XY);
 
   ///Activates an edge belonging to an EdgeBase

gui_reader.cc

@@ -2 +2 @@
 #include "xml.h"
 #include "mapstorage.h"
-#include <lemon/xy.h>
+#include <lemon/dim2.h>
 #include <vector>
 
@@ -16 +16 @@
 {
   XmlIo x(is);
-  std::map<int, xy<double> > m;
+  std::map<int, XY > m;
   x("arrow_pos", m);
 

gui_writer.cc

@@ -2 +2 @@
 #include "xml.h"
 #include "mapstorage.h"
-#include <lemon/xy.h>
+#include <lemon/dim2.h>
 #include <vector>
 
@@ -13 +13 @@
 {
   XmlIo x(os);
-  std::map<int, xy<double> > m;
+  std::map<int, XY > m;
   for (EdgeIt e(mapstorage->graph); e != INVALID; ++e)
   {

xml.h

@@ -21 +21 @@
 #include <map>
 #include <lemon/error.h>
-#include <lemon/xy.h>
+#include <lemon/dim2.h>
 
 namespace lemon {
@@ -410 +410 @@
   ///
   template<class T>
-  void xml(XmlIo &x,lemon::xy<T> &v)
+  void xml(XmlIo &x,lemon::dim2::Point<T> &v)
   {
     { XmlIo::LineTag t(x,"x"); x(v.x); }
@@ -421 +421 @@
   ///
   template<class T>
-  void xml(XmlIo &x,lemon::BoundingBox<T> &v)
+  void xml(XmlIo &x,lemon::dim2::BoundingBox<T> &v)
   {
     if(x.write()) {
@@ -432 +432 @@
       v.clear();
       while(x.nextTag()=="point") {
-        lemon::xy<T> co;
+        lemon::dim2::Point<T> co;
         x("point",co);
         v.add(co);

xymap.h

@@ -3 +3 @@
 
 #include <lemon/list_graph.h>
-#include <lemon/xy.h>
+#include <lemon/dim2.h>
 
 template<class M>
@@ -13 +13 @@
   public:
     typedef typename M::Key Key;
-    typedef lemon::xy<typename M::Value> Value;
+    typedef lemon::dim2::Point<typename M::Value> Value;
     XYMap() {}
     XYMap(M &_xmap, M &_ymap) : xmap(&_xmap), ymap(&_ymap) {}