![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 78053271853acd99d045d64ddc237ba2690299a9..81ea590598397ba993e4163abb4b6e456dcad680 100644 (file)
-/** \file
- * Interface between Inkscape code (SPItem) and graphlayout functions.
+/** @file
+ * @brief Interface between Inkscape code (SPItem) and graphlayout functions.
*/
/*
-* Authors:
-* Tim Dwyer <Tim.Dwyer@infotech.monash.edu.au>
-*
-* Copyright (C) 2005 Authors
-*
-* Released under GNU GPL. Read the file 'COPYING' for more information.
-*/
+ * Authors:
+ * Tim Dwyer <Tim.Dwyer@infotech.monash.edu.au>
+ *
+ * Copyright (C) 2005 Authors
+ *
+ * Released under GNU GPL. Read the file 'COPYING' for more information.
+ */
+
#include <iostream>
#include <config.h>
#include <map>
#include <vector>
#include <algorithm>
+#include <cstring>
+#include <cstdlib>
#include <float.h>
#include "desktop.h"
#include "style.h"
#include "conn-avoid-ref.h"
#include "libavoid/connector.h"
+#include "libavoid/router.h"
#include "libavoid/geomtypes.h"
#include "libcola/cola.h"
#include "libvpsc/generate-constraints.h"
-#include "prefs-utils.h"
+#include "preferences.h"
using namespace std;
using namespace cola;
using namespace vpsc;
-
/**
* Returns true if item is a connector
*/
return path && path->connEndPair.isAutoRoutingConn();
}
+struct CheckProgress : TestConvergence {
+ CheckProgress(double d,unsigned i,list<SPItem *>&
+ selected,vector<Rectangle*>& rs,map<string,unsigned>& nodelookup) :
+ TestConvergence(d,i), selected(selected), rs(rs), nodelookup(nodelookup) {}
+ bool operator()(double new_stress, double* X, double* Y) {
+ /* This is where, if we wanted to animate the layout, we would need to update
+ * the positions of all objects and redraw the canvas and maybe sleep a bit
+ cout << "stress="<<new_stress<<endl;
+ cout << "x[0]="<<rs[0]->getMinX()<<endl;
+ for (list<SPItem *>::iterator it(selected.begin());
+ it != selected.end();
+ ++it)
+ {
+ SPItem *u=*it;
+ if(!isConnector(u)) {
+ Rectangle* r=rs[nodelookup[u->id]];
+ Geom::Rect const item_box(sp_item_bbox_desktop(u));
+ Geom::Point const curr(item_box.midpoint());
+ Geom::Point const dest(r->getCentreX(),r->getCentreY());
+ sp_item_move_rel(u, Geom::Translate(dest - curr));
+ }
+ }
+ */
+ return TestConvergence::operator()(new_stress,X,Y);
+ }
+ list<SPItem *>& selected;
+ vector<Rectangle*>& rs;
+ map<string,unsigned>& nodelookup;
+};
+
/**
* Scans the items list and places those items that are
* not connectors in filtered
++i)
{
SPItem *u=*i;
- NR::Maybe<NR::Rect> const item_box(sp_item_bbox_desktop(u));
- g_assert(item_box);
- NR::Point ll(item_box->min());
- NR::Point ur(item_box->max());
- nodelookup[u->id]=rs.size();
- rs.push_back(new Rectangle(ll[0]-spacing,ur[0]+spacing,
- ll[1]-spacing,ur[1]+spacing));
+ Geom::OptRect const item_box(sp_item_bbox_desktop(u));
+ if(item_box) {
+ Geom::Point ll(item_box->min());
+ Geom::Point ur(item_box->max());
+ nodelookup[u->id]=rs.size();
+ rs.push_back(new Rectangle(ll[0]-spacing,ur[0]+spacing,
+ ll[1]-spacing,ur[1]+spacing));
+ } else {
+ // I'm not actually sure if it's possible for something with a
+ // NULL item-box to be attached to a connector in which case we
+ // should never get to here... but if such a null box can occur it's
+ // probably pretty safe to simply ignore
+ //fprintf(stderr,"NULL item_box found in graphlayout, ignoring!\n");
+ }
}
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
SimpleConstraints scx,scy;
- double ideal_connector_length = prefs_get_double_attribute("tools.connector","length",100);
+ double ideal_connector_length = prefs->getDouble("/tools/connector/length", 100.0);
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;
- }
+
+ bool directed = prefs->getBool("/tools/connector/directedlayout");
+ bool avoid_overlaps = prefs->getBool("/tools/connector/avoidoverlaplayout");
for (list<SPItem *>::iterator i(selected.begin());
i != selected.end();
++i)
{
SPItem *iu=*i;
- 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 *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];
- }
-
+ map<string,unsigned>::iterator i=nodelookup.find(iu->id);
+ if(i==nodelookup.end()) {
+ continue;
+ }
+ unsigned u=i->second;
+ 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 *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];
+ }
+
if (iv == NULL) {
// The connector is not attached to anything at the
// other end so we should just ignore it.
continue;
}
- // 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,
+ // If iv not in nodelookup we again treat the connector
+ // as disconnected and continue
+ 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);
}
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);
+ CheckProgress test(0.0001,100,selected,rs,nodelookup);
+ ConstrainedMajorizationLayout alg(c->rects,c->edges,eweights,ideal_connector_length,test);
alg.setupConstraints(NULL,NULL,avoid_overlaps,
NULL,NULL,&c->scx,&c->scy,NULL,NULL);
alg.run();
{
SPItem *u=*it;
if(!isConnector(u)) {
- Rectangle* r=rs[nodelookup[u->id]];
- NR::Maybe<NR::Rect> item_box(sp_item_bbox_desktop(u));
- g_assert(item_box);
- NR::Point const curr(item_box->midpoint());
- NR::Point const dest(r->getCentreX(),r->getCentreY());
- sp_item_move_rel(u, NR::translate(dest - curr));
+ map<string,unsigned>::iterator i=nodelookup.find(u->id);
+ if(i!=nodelookup.end()) {
+ Rectangle* r=rs[i->second];
+ Geom::OptRect item_box(sp_item_bbox_desktop(u));
+ if(item_box) {
+ Geom::Point const curr(item_box->midpoint());
+ Geom::Point const dest(r->getCentreX(),r->getCentreY());
+ sp_item_move_rel(u, Geom::Translate(dest - curr));
+ }
+ }
}
}
for(unsigned i=0;i<scx.size();i++) {
}
// vim: set cindent
// vim: ts=4 sw=4 et tw=0 wm=0
+
+/*
+ Local Variables:
+ mode:c++
+ c-file-style:"stroustrup"
+ c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+ indent-tabs-mode:nil
+ fill-column:99
+ End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :