version to 0.44pre4

[inkscape.git] / src / graphlayout / graphlayout.cpp

diff --git a/src/graphlayout/graphlayout.cpp b/src/graphlayout/graphlayout.cpp
index 48d05823e8b9c38b298bf8809e81806f4020bff5..00829dac889cdafce1590b08dc3bcdd28f28b7bc 100644 (file)
--- a/src/graphlayout/graphlayout.cpp
+++ b/src/graphlayout/graphlayout.cpp
@@ -9,12 +9,12 @@
 *
 * Released under GNU GPL.  Read the file 'COPYING' for more information.
 */
+#include "util/glib-list-iterators.h"
 #include "graphlayout/graphlayout.h"
 #include <iostream>
 #include <config.h>
 
 #ifdef HAVE_BOOST_GRAPH_LIB
-#include "util/glib-list-iterators.h"
 #include "sp-path.h"
 #include "sp-item.h"
 #include "sp-item-transform.h"
@@ -108,7 +108,7 @@ void graphlayout(GSList const *const items) {
                SPItem *iu=*i;
                std::cout<<"Getting neighbours for id: "<<iu->id<<std::endl;
                Vertex u=nodelookup[iu->id];
-               GSList *nlist=iu->avoidRef->getAttachedShapes(Avoid::ConnRef::runningFrom);
+               GSList *nlist=iu->avoidRef->getAttachedShapes(Avoid::runningFrom);
                std::list<SPItem *> neighbours;
                neighbours.insert<GSListConstIterator<SPItem *> >(neighbours.end(),nlist,NULL);
                for (std::list<SPItem *>::iterator j(neighbours.begin());
@@ -138,7 +138,7 @@ void graphlayout(GSList const *const items) {
        std::cout<<"Graph has |V|="<<num_vertices(g)<<" Width="<<width<<" Height="<<height<<std::endl;
        PositionVec position_vec(num_vertices(g));
        PositionMap position(position_vec.begin(), get(vertex_index, g));
-       //write_graphviz(std::cout, g, make_label_writer<std::vector<std::string>>(labels));
+       write_graphviz(std::cout, g);
        circle_graph_layout(g, position, width/2.0);
        kamada_kawai_spring_layout(g, position, weightmap, side_length(width));