X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fgraphlayout%2Fgraphlayout.cpp;h=60cdab8146c6490e07e810a1ca915e8385a0a243;hb=6958098c760e59aec59c462dccca6502cfbff6eb;hp=72c47d9bf718e688937deaa32b7025f756573c22;hpb=6931de4f317866a8d4874fa7f08926b91f55debf;p=inkscape.git

diff --git a/src/graphlayout/graphlayout.cpp b/src/graphlayout/graphlayout.cpp
index 72c47d9bf..60cdab814 100644
--- a/src/graphlayout/graphlayout.cpp
+++ b/src/graphlayout/graphlayout.cpp
@@ -3,7 +3,7 @@
  */
 /*
 * Authors:
-*   Tim Dwyer <tgdwyer@gmail.com>
+*   Tim Dwyer <Tim.Dwyer@infotech.monash.edu.au>
 *
 * Copyright (C) 2005 Authors
 *
@@ -14,8 +14,13 @@
 #include <map>
 #include <vector>
 #include <algorithm>
+#include <cstring>
+#include <cstdlib>
 #include <float.h>
 
+#include "desktop.h"
+#include "inkscape.h"
+#include "sp-namedview.h"
 #include "util/glib-list-iterators.h"
 #include "graphlayout/graphlayout.h"
 #include "sp-path.h"
@@ -33,7 +38,6 @@
 using namespace std;
 using namespace cola;
 using namespace vpsc;
-
 /**
  * Returns true if item is a connector
  */
@@ -45,6 +49,36 @@ bool isConnector(SPItem const *const i) {
 	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]];
+                NR::Rect const item_box(sp_item_bbox_desktop(u));
+                NR::Point const curr(item_box.midpoint());
+                NR::Point const dest(r->getCentreX(),r->getCentreY());
+                sp_item_move_rel(u, NR::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
@@ -76,6 +110,12 @@ void graphlayout(GSList const *const items) {
 	//Check 2 or more selected objects
 	if (n < 2) return;
 
+    // add the connector spacing to the size of node bounding boxes
+    // so that connectors can always be routed between shapes
+    SPDesktop* desktop = inkscape_active_desktop();
+    double spacing = 0;
+    if(desktop) spacing = desktop->namedview->connector_spacing+0.1;
+
 	map<string,unsigned> nodelookup;
 	vector<Rectangle*> rs;
 	vector<Edge> es;
@@ -84,14 +124,23 @@ void graphlayout(GSList const *const items) {
 		++i)
 	{
 		SPItem *u=*i;
-		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]));
+		boost::optional<NR::Rect> const item_box(sp_item_bbox_desktop(u));
+        if(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));
+        } 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");
+        }
 	}
 
-	SimpleConstraints scy;
+	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;
@@ -113,39 +162,50 @@ void graphlayout(GSList const *const items) {
 		++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];
-			}
-		
-			// 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, 
+        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;
+            }
+
+            // 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);
 		}
@@ -154,21 +214,17 @@ void graphlayout(GSList const *const items) {
 	double eweights[E];
 	fill(eweights,eweights+E,1);
     vector<Component*> cs;
-    connectedComponents(rs,es,cs);
+    connectedComponents(rs,es,scx,scy,cs);
     for(unsigned i=0;i<cs.size();i++) {
         Component* c=cs[i];
-		printf("Component %d:\n",i);
-		for(unsigned j=0;j<c->edges.size();j++) {
-			Edge& e=c->edges[j];
-			printf("(%d,%d) ",e.first,e.second);
-		}
         if(c->edges.size()<2) continue;
-		cout << endl;
-        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,NULL,&scy,NULL,NULL);
+                NULL,NULL,&c->scx,&c->scy,NULL,NULL);
         alg.run();
     }
+    separateComponents(cs);
 	
 	for (list<SPItem *>::iterator it(selected.begin());
 		it != selected.end();
@@ -176,13 +232,27 @@ void graphlayout(GSList const *const items) {
 	{
 		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(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];
+                boost::optional<NR::Rect> item_box(sp_item_bbox_desktop(u));
+                if(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));
+                }
+            }
 		}
 	}
+    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];
+    }
 }
 // vim: set cindent 
 // vim: ts=4 sw=4 et tw=0 wm=0