summaryrefslogtreecommitdiffstats
path: root/src/graphlayout/graphlayout.cpp
diff options
context:
space:
mode:
authorTim Dwyer <tgdwyer@gmail.com>2006-02-13 05:32:36 +0000
committertgdwyer <tgdwyer@users.sourceforge.net>2006-02-13 05:32:36 +0000
commitcad88fadaff2049b896ba08c5289e68dfbe419b2 (patch)
tree21bd373d2204d2cc69067ca32ea7a39f14091c6f /src/graphlayout/graphlayout.cpp
parentMake our own simple_point (diff)
downloadinkscape-cad88fadaff2049b896ba08c5289e68dfbe419b2.tar.gz
inkscape-cad88fadaff2049b896ba08c5289e68dfbe419b2.zip
using libavoid/geomtypes.h
(bzr r129)
Diffstat (limited to 'src/graphlayout/graphlayout.cpp')
-rw-r--r--src/graphlayout/graphlayout.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/graphlayout/graphlayout.cpp b/src/graphlayout/graphlayout.cpp
index e6b0173f8..77452aff2 100644
--- a/src/graphlayout/graphlayout.cpp
+++ b/src/graphlayout/graphlayout.cpp
@@ -20,10 +20,10 @@
#include "sp-conn-end-pair.h"
#include "conn-avoid-ref.h"
#include "libavoid/connector.h"
+#include "libavoid/geomtypes.h"
#include <boost/graph/kamada_kawai_spring_layout.hpp>
#include <boost/graph/circle_layout.hpp>
#include <boost/graph/adjacency_list.hpp>
-//#include <boost/graph/simple_point.hpp>
#include <boost/graph/graphviz.hpp>
#include <map>
#include <vector>
@@ -32,16 +32,12 @@
using namespace boost;
-struct simple_point {
- double x;
- double y;
-};
// create a typedef for the Graph type
typedef adjacency_list<vecS, vecS, undirectedS, no_property,
property<edge_weight_t, double> > Graph;
typedef property_map<Graph, edge_weight_t>::type WeightMap;
typedef graph_traits<Graph>::vertex_descriptor Vertex;
-typedef std::vector<simple_point> PositionVec;
+typedef std::vector<Avoid::Point> PositionVec;
typedef iterator_property_map<PositionVec::iterator, property_map<Graph, vertex_index_t>::type> PositionMap;
bool isConnector(SPItem *i) {