diff -r 25ee6b988b73 -r 8f987e376035 mapeditor.cpp
--- a/mapeditor.cpp	Tue Dec 15 09:14:59 2009 +0000
+++ b/mapeditor.cpp	Mon Jan 04 20:36:06 2010 +0000
@@ -113,10 +113,7 @@
 
 	// Action to embed LineEdit for heading in Scene
 	editingHeading=false;
-	lineEdit=new QLineEdit;
-	lineEdit->hide();
-	QGraphicsProxyWidget *pw=scene()->addWidget (lineEdit);
-	pw->setZValue (Z_LINEEDIT);
+	lineEdit=NULL;
 
 	a = new QAction( tr( "Edit heading","MapEditor" ), this);
 	a->setShortcut ( Qt::Key_Return );					//Edit heading
@@ -405,35 +402,55 @@
 
 QRectF MapEditor::getTotalBBox()	
 {
-	QRectF r;
+	QPen pen;
+	pen.setWidth (1);
+	pen.setCapStyle ( Qt::RoundCap );
+
+	QRectF rt;
 	BranchObj *bo;
-	for (int i=0;i<model->getRootItem()->branchCount(); i++)
+	BranchItem *cur=NULL;
+	BranchItem *prev=NULL;
+	model->nextBranch(cur,prev);
+	while (cur) 
 	{
-		bo=(BranchObj*)(model->getRootItem()->getBranchNum(i)->getLMO());
-		if (bo) r=addBBox (bo->getTotalBBox(), r);
+		if (!cur->hasHiddenExportParent())
+		{
+			bo=(BranchObj*)(cur->getLMO());
+			if (bo && bo->isVisibleObj())
+			{
+				bo->calcBBoxSizeWithChildren();
+				// FIXME-3 testing
+				//QRectF r1=bo->getBBoxSizeWithChildren();
+				QRectF r1=bo->getBBox();
+				//pen.setColor ( QColor(qrand()%32*8,qrand()%32*8,qrand()%32*8));
+				//mapScene->addRect (r1,pen);
+
+				if (rt.isNull()) rt=r1;
+				rt=addBBox (r1, rt);
+				//FIXME-2 cout <<"ME: r1="<<r1<<"  "<<cur->getHeadingStd()<<endl;
+				//cout <<"    rt="<<rt<<endl;
+			}
+		}
+		model->nextBranch(cur,prev);
 	}
-	return r;	
+	return rt;	
 }
 
 
-QPixmap MapEditor::getPixmap()
+QImage MapEditor::getImage()
 {
 	QRectF mapRect=getTotalBBox();
-	QPixmap pix((int)mapRect.width()+2,(int)mapRect.height()+2);
+	int w=mapRect.width()+2;
+	int h=mapRect.height()+2;
+	
+	QImage pix (w,h,QImage::Format_RGB32);
+
 	QPainter pp (&pix);
-	
+
 	pp.setRenderHints(renderHints());
-
-	// Don't print the visualisation of selection
-	model->unselect();
-
 	mapScene->render (	&pp, 
-		QRectF(0,0,mapRect.width()+2,mapRect.height()+2),
+		QRectF(0,0,w,h),
 		QRectF(mapRect.x(),mapRect.y(),mapRect.width(),mapRect.height() ));
-
-	// Restore selection
-	model->reselect();
-	
 	return pix;
 }
 
@@ -448,6 +465,42 @@
 	setRenderHint(QPainter::SmoothPixmapTransform,b);
 }
 
+void MapEditor::setHideTmp (bool b)	// FIXME-4 better use signals
+{
+/*
+	if (b)
+	{
+		setHideTmpMode (HideExport);
+		mapCenter->calcBBoxSizeWithChilds();
+		QRectF totalBBox=mapCenter->getTotalBBox();
+		//QRectF mapRect=totalBBox;
+		cout << "  map has =("<<totalBBox.x()<<","<<totalBBox.y()<<","<<totalBBox.width()<<","<<totalBBox.height()<<")\n";
+	
+		mapRect.setRect (totalBBox.x(), totalBBox.y(), 
+			totalBBox.width(), totalBBox.height());
+			
+		QCanvasRectangle *frame=new QCanvasRectangle (mapRect,mapScene);
+		frame->setBrush (QColor(white));
+		frame->setPen (QColor(black));
+		frame->setZValue(0);
+		frame->show();    
+		
+	}	
+	else	
+	{
+		setHideTmpMode (HideNone);
+	}	
+	cout <<"  hidemode="<<hidemode<<endl;
+*/
+/*
+	// Toggle hidemode
+	if (hidemode==HideExport)
+		setHideTmpMode (HideNone);
+	else	
+		setHideTmpMode (HideExport);
+*/		
+}
+
 TreeItem* MapEditor::findMapItem (QPointF p,TreeItem *exclude)
 {
 	// Start with mapcenter, no images allowed at rootItem
@@ -472,9 +525,7 @@
 void MapEditor::testFunction1()
 {
 	cout << "ME::test1  selected TI="<<model->getSelectedItem()<<endl;
-
-	for (int i=0; i<200;i++)
-		model->addNewBranch();
+	model->setExportMode (true);
 
 	/*
 	// Code copied from Qt sources
@@ -543,44 +594,13 @@
 	 animation->start();
  */
 
-/* FIXME-4 Hide hidden stuff temporary, maybe add this as regular function somewhere
-	if (hidemode==HideNone)
-	{
-		setHideTmpMode (HideExport);
-		mapCenter->calcBBoxSizeWithChilds();
-		QRectF totalBBox=mapCenter->getTotalBBox();
-		QRectF mapRect=totalBBox;
-		QCanvasRectangle *frame=NULL;
-
-		cout << "  map has =("<<totalBBox.x()<<","<<totalBBox.y()<<","<<totalBBox.width()<<","<<totalBBox.height()<<")\n";
-	
-		mapRect.setRect (totalBBox.x(), totalBBox.y(), 
-			totalBBox.width(), totalBBox.height());
-		frame=new QCanvasRectangle (mapRect,mapScene);
-		frame->setBrush (QColor(white));
-		frame->setPen (QColor(black));
-		frame->setZValue(0);
-		frame->show();    
-	}	
-	else	
-	{
-		setHideTmpMode (HideNone);
-	}	
-	cout <<"  hidemode="<<hidemode<<endl;
-	*/
-
-/*
-	// Toggle hidemode
-	if (hidemode==HideExport)
-		setHideTmpMode (HideNone);
-	else	
-		setHideTmpMode (HideExport);
-*/		
-
 }
 	
 void MapEditor::testFunction2()
 {
+	model->setExportMode (false);
+	return;
+
 	// Create list with all bounding polygons
 	QList <LinkableMapObj*> mapobjects;
 	QList <ConvexPolygon> polys; 
@@ -899,6 +919,10 @@
 	{
 		model->setSelectionBlocked(true);
 
+		lineEdit=new QLineEdit;
+		QGraphicsProxyWidget *pw=scene()->addWidget (lineEdit);
+		pw->setZValue (Z_LINEEDIT);
+
 		lineEdit->setText (bi->getHeading());
 		QPoint p = mapTo (this,bo->getAbsPos().toPoint() );
 		lineEdit->setGeometry(p.x(),p.y(),230,25);
@@ -915,9 +939,10 @@
 {
 	editingHeading=false;
 	lineEdit->releaseKeyboard();
+	lineEdit->clearFocus();
 	model->setHeading (lineEdit->text() );
 	model->setSelectionBlocked(false);
-	lineEdit->hide();
+	delete (lineEdit);
 
 	// Maybe reselect previous branch 
 	mainWindow->editHeadingFinished (model);
@@ -1281,7 +1306,7 @@
 
 			} // depth>0
 				// Maybe we can relink temporary?
-				if (dsti)	// FIXME-1 check if dsti is ancestor of myself!
+				if (dsti)
 				{
 					if (e->modifiers()==Qt::ControlModifier)
 					{