# HG changeset patch
# User insilmaril
# Date 1200328019 0
# Node ID 687833b29c4e1c70db91c1f7be09238e13a241a7
# Parent  6b7b49e367b84e8973bba69333e8f9495b04e45b
Added french manual by Claude

diff -r 6b7b49e367b8 -r 687833b29c4e mapcenterobj.cpp
--- a/mapcenterobj.cpp	Mon Jan 07 14:52:51 2008 +0000
+++ b/mapcenterobj.cpp	Mon Jan 14 16:26:59 2008 +0000
@@ -1,7 +1,8 @@
 #include <QDateTime>
 
+#include "floatimageobj.h"
+#include "geometry.h"
 #include "mapcenterobj.h"
-#include "floatimageobj.h"
 
 /////////////////////////////////////////////////////////////////
 // MapCenterObj
@@ -106,11 +107,11 @@
 		if (lmo!= NULL) return lmo;
 	}
 	// is p in MapCenter?
-	if (inBox (p) && (this != excludeLMO) ) return this;
+	if (inBox (p,clickBox) && (this != excludeLMO) ) return this;
 
 	// Search float images
 	for (int i=0; i<floatimage.size(); ++i)
-		if (floatimage.at(i)->inBox(p) && (floatimage.at(i) != excludeLMO) && floatimage.at(i)->getParObj()!= excludeLMO) return floatimage.at(i);
+		if (inBox(p,floatimage.at(i)->getClickBox()) && (floatimage.at(i) != excludeLMO) && floatimage.at(i)->getParObj()!= excludeLMO) return floatimage.at(i);
 
 	// nothing found
 	return NULL;
diff -r 6b7b49e367b8 -r 687833b29c4e selection.cpp
--- a/selection.cpp	Mon Jan 07 14:52:51 2008 +0000
+++ b/selection.cpp	Mon Jan 14 16:26:59 2008 +0000
@@ -4,6 +4,7 @@
 
 #include "mainwindow.h"
 #include "mapeditor.h"
+#include "vymmodel.h"
 
 
 
@@ -18,16 +19,14 @@
 {
 }
 
-void Selection::setMapEditor (MapEditor *me)
+void Selection::setModel (VymModel *m)
 {
-	mapEditor=me;
-	mapCenter=me->getMapCenter();
-	scene=mapCenter->getScene();
+	model=m;
+	scene=model->getScene();
 }
 
 void Selection::copy(const Selection &other)
 {
-	mapCenter=other.mapCenter;
 	selectList=other.selectList;
 	lastSelectList=other.lastSelectList;
 }
@@ -77,13 +76,13 @@
 	selboxList.append (sb);
 	lmo->select();
 	update();
-	mainWindow->updateSatellites (mapEditor);	// update branchPropWindow...
+	mainWindow->updateSatellites (model->getMapEditor() );	// update branchPropWindow...
 	return true;
 }
 
 bool Selection::select (const QString &s)	// TODO no multiselections yet
 {
-	LinkableMapObj *lmo=mapCenter->findObjBySelect(s);
+	LinkableMapObj *lmo=model->findObjBySelect(s);
 
 	// Finally select the found object
 	if (lmo)