![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index ba3ca6e10f1267fcf55c143a5d58c0e75e4b7032..dc9dc3ea96d9c28388ffa8e8cd074fd9ac7c8ac7 100644 (file)
*
* 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>
+#include <map>
+#include <vector>
+#include <algorithm>
+#include <float.h>
-#ifdef HAVE_BOOST_GRAPH_LIB
+#include "util/glib-list-iterators.h"
+#include "graphlayout/graphlayout.h"
#include "sp-path.h"
#include "sp-item.h"
#include "sp-item-transform.h"
#include "sp-conn-end-pair.h"
+#include "style.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/graphviz.hpp>
-#include <map>
-#include <vector>
-#include <algorithm>
-#include <float.h>
-
-using namespace boost;
+#include "libcola/cola.h"
+#include "libvpsc/generate-constraints.h"
+#include "prefs-utils.h"
-// 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<Avoid::Point> PositionVec;
-typedef iterator_property_map<PositionVec::iterator, property_map<Graph, vertex_index_t>::type> PositionMap;
+using namespace std;
+using namespace cola;
+using namespace vpsc;
/**
* Returns true if item is a connector
* Scans the items list and places those items that are
* not connectors in filtered
*/
-void filterConnectors(GSList const *const items, std::list<SPItem *> &filtered) {
+void filterConnectors(GSList const *const items, list<SPItem *> &filtered) {
for(GSList *i=(GSList *)items; i!=NULL; i=i->next) {
SPItem *item=SP_ITEM(i->data);
if(!isConnector(item)) {
}
using Inkscape::Util::GSListConstIterator;
- std::list<SPItem *> selected;
+ list<SPItem *> selected;
filterConnectors(items,selected);
if (selected.empty()) return;
- int n=selected.size();
- std::cout<<"|V|="<<n<<std::endl;
-
- Graph g;
-
- double minX=DBL_MAX, minY=DBL_MAX, maxX=-DBL_MAX, maxY=-DBL_MAX;
+ const unsigned n=selected.size();
+ //Check 2 or more selected objects
+ if (n < 2) return;
- std::map<std::string,Vertex> nodelookup;
- for (std::list<SPItem *>::iterator i(selected.begin());
+ map<string,unsigned> nodelookup;
+ vector<Rectangle*> rs;
+ vector<Edge> es;
+ for (list<SPItem *>::iterator i(selected.begin());
i != selected.end();
++i)
{
SPItem *u=*i;
- std::cout<<"Creating node for id: "<<u->id<<std::endl;
- nodelookup[u->id]=add_vertex(g);
+ NR::Rect const item_box(sp_item_bbox_desktop(u));
+ NR::Point ll(item_box.min());
+ NR::Point ur(item_box.max());
+ nodelookup[u->id]=rs.size();
+ rs.push_back(new Rectangle(ll[0],ur[0],ll[1],ur[1]));
}
- //Check 2 or more selected objects
- if (n < 2) return;
+ SimpleConstraints scx,scy;
+ double ideal_connector_length = prefs_get_double_attribute("tools.connector","length",100);
+ double directed_edge_height_modifier = 1.0;
+ gchar const *directed_str = NULL, *overlaps_str = NULL;
+ directed_str = prefs_get_string_attribute("tools.connector",
+ "directedlayout");
+ overlaps_str = prefs_get_string_attribute("tools.connector",
+ "avoidoverlaplayout");
+ bool avoid_overlaps = false;
+ bool directed = false;
+ if (directed_str && !strcmp(directed_str, "true")) {
+ directed = true;
+ }
+ if (overlaps_str && !strcmp(overlaps_str, "true")) {
+ avoid_overlaps = true;
+ }
- WeightMap weightmap=get(edge_weight, g);
- for (std::list<SPItem *>::iterator i(selected.begin());
+ for (list<SPItem *>::iterator i(selected.begin());
i != selected.end();
++i)
{
- using NR::X; using NR::Y;
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);
- std::list<SPItem *> neighbours;
- neighbours.insert<GSListConstIterator<SPItem *> >(neighbours.end(),nlist,NULL);
- for (std::list<SPItem *>::iterator j(neighbours.begin());
- j != neighbours.end();
+ unsigned u=nodelookup[iu->id];
+ GSList *nlist=iu->avoidRef->getAttachedConnectors(Avoid::runningFrom);
+ list<SPItem *> connectors;
+
+ connectors.insert<GSListConstIterator<SPItem *> >(connectors.end(),nlist,NULL);
+ for (list<SPItem *>::iterator j(connectors.begin());
+ j != connectors.end();
++j) {
-
- SPItem *iv=*j;
- Vertex v=nodelookup[iv->id];
- Graph::edge_descriptor e; bool inserted;
- tie(e, inserted)=add_edge(u,v,g);
- weightmap[e]=1.0;
+ SPItem *conn=*j;
+ SPItem *iv;
+ SPItem *items[2];
+ assert(isConnector(conn));
+ SP_PATH(conn)->connEndPair.getAttachedItems(items);
+ if(items[0]==iu) {
+ iv=items[1];
+ } else {
+ iv=items[0];
+ }
+
+ // What do we do if iv not in nodelookup?!?!
+ map<string,unsigned>::iterator v_pair=nodelookup.find(iv->id);
+ if(v_pair!=nodelookup.end()) {
+ unsigned v=v_pair->second;
+ //cout << "Edge: (" << u <<","<<v<<")"<<endl;
+ es.push_back(make_pair(u,v));
+ if(conn->style->marker[SP_MARKER_LOC_END].set) {
+ if(directed && strcmp(conn->style->marker[SP_MARKER_LOC_END].value,"none")) {
+ scy.push_back(new SimpleConstraint(v, u,
+ (ideal_connector_length * directed_edge_height_modifier)));
+ }
+ }
+ }
}
if(nlist) {
g_slist_free(nlist);
}
- NR::Rect const item_box(sp_item_bbox_desktop(*i));
-
- NR::Point ll(item_box.min());
- minX=std::min(ll[0],minX);
- minY=std::min(ll[1],minY);
- NR::Point ur(item_box.max());
- maxX=std::max(ur[0],maxX);
- maxY=std::max(ur[1],maxY);
}
- double width=maxX-minX;
- double height=maxY-minY;
- 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);
- circle_graph_layout(g, position, width/2.0);
- kamada_kawai_spring_layout(g, position, weightmap, side_length(width));
-
- graph_traits<Graph>::vertex_iterator vi, vi_end;
- for (std::list<SPItem *>::iterator it(selected.begin());
+ const unsigned E = es.size();
+ double eweights[E];
+ fill(eweights,eweights+E,1);
+ vector<Component*> cs;
+ connectedComponents(rs,es,scx,scy,cs);
+ for(unsigned i=0;i<cs.size();i++) {
+ Component* c=cs[i];
+ if(c->edges.size()<2) continue;
+ ConstrainedMajorizationLayout alg(c->rects,c->edges,eweights,ideal_connector_length);
+ alg.setupConstraints(NULL,NULL,avoid_overlaps,
+ NULL,NULL,&c->scx,&c->scy,NULL,NULL);
+ alg.run();
+ }
+ separateComponents(cs);
+
+ for (list<SPItem *>::iterator it(selected.begin());
it != selected.end();
++it)
{
SPItem *u=*it;
if(!isConnector(u)) {
+ Rectangle* r=rs[nodelookup[u->id]];
NR::Rect const item_box(sp_item_bbox_desktop(u));
NR::Point const curr(item_box.midpoint());
- NR::Point const dest(minX+width/2.0+position[nodelookup[u->id]].x,
- minY+height/2.0+position[nodelookup[u->id]].y);
+ NR::Point const dest(r->getCentreX(),r->getCentreY());
sp_item_move_rel(u, NR::translate(dest - curr));
}
}
+ for(unsigned i=0;i<scx.size();i++) {
+ delete scx[i];
+ }
+ for(unsigned i=0;i<scy.size();i++) {
+ delete scy[i];
+ }
+ for(unsigned i=0;i<rs.size();i++) {
+ delete rs[i];
+ }
}
-#else
-void graphlayout(GSList const *const items) {
- std::cout<<"Connector network layout not available! Install boost graph library and recompile to enable."<<std::endl;
-}
-#endif // HAVE_BOOST_GRAPH_LIB
+// vim: set cindent
+// vim: ts=4 sw=4 et tw=0 wm=0