diff -r 0fad394bc330 -r 31841b366d5e mapeditor.cpp
--- a/mapeditor.cpp	Wed Mar 10 15:36:19 2010 +0000
+++ b/mapeditor.cpp	Mon Mar 15 11:49:42 2010 +0000
@@ -497,6 +497,7 @@
 */		
 }
 
+#include <iostream>
 void MapEditor::autoLayout()
 {
 	// Create list with all bounding polygons
@@ -559,7 +560,7 @@
 					if (polygonCollision (polys.at(i),polys.at(j), QPointF(0,0)).intersect )
 					{
 						collisions++;
-						//qDebug() << "Collision: "<<headings[i]<<" - "<<headings[j];
+						if (debug) qDebug() << "Collision: "<<headings[i]<<" - "<<headings[j];
 						v=polys.at(j).centroid()-polys.at(i).centroid();
 						// Move also away if centroids are identical
 						if (v.isNull()) 
@@ -570,20 +571,22 @@
 							//qDebug() << v;
 						}
 						v.normalize();
-						v.scale (2);
 						//qDebug() <<  "  v="<<v;
-						vectors[j]=v;
-						vectors[i]=v;
+						vectors[j]=v*10000/polys.at(j).weight();		
+						vectors[i]=v*10000/polys.at(i).weight();		
 						vectors[i].invert();
+						//FIXME-3 outer loop, "i" get's changed several times...
+						// Better not move away from centroid of 2 colliding polys, but from centroid of _all_
 					}  
 				}
 			}
 			for (int i=0;i<vectors.size();i++)
 			{
 				//qDebug() << " v="<<vectors[i]<<" "<<headings[i];
+				if (!vectors[i].isNull() )
 				polys[i].translate (vectors[i]);
 			}
-			if (debug) qDebug()<< "Collisions: "<<collisions;
+			if (debug) qDebug()<< "Collisions total: "<<collisions;
 			//collisions=0;
 		}	
 
@@ -593,9 +596,14 @@
 		{
 			Vector v=polys[i].at(0)-orgpos[i];
 			orients.append (mapobjects[i]->getOrientation());
-		//	mapobjects[i]->moveBy(v.x(),v.y() );
-		//	mapobjects[i]->setRelPos();
-			model->startAnimation ((BranchObj*)mapobjects[i], mapobjects[i]->getAbsPos(), mapobjects[i]->getAbsPos() + v);
+			if (!v.isNull())
+			{
+				if (debug) cout<<" Moving "<<polys.at(i).weight()<<" "<<mapobjects[i]->getAbsPos()<<" -> "<<mapobjects[i]->getAbsPos() + v<<"  "<<headings[i].toStdString()<<endl;
+				//mapobjects[i]->moveBy(v.x(),v.y() );
+				//mapobjects[i]->setRelPos();
+				model->startAnimation ((BranchObj*)mapobjects[i], v);
+				if (debug) cout<<i<< " Weight: "<<polys.at(i).weight()<<" "<<v<<" "<<headings.at(i).toStdString()<<endl;
+			}
 		}	
 		/*
 		model->reposition();	
@@ -607,9 +615,9 @@
 				break;
 			}
 		*/
+	
 		break;
 
-
 		//orientationChanged=false;
 	} // loop if orientation has changed