many changes :P

MainWindow.cpp

@@ -9,6 +9,8 @@
 
 #include <Indoor/floorplan/v2/Floorplan.h>
 
+#include "mapview/3D/MapView3D.h"
+
 #include "mapview/tools/ToolMoveMap.h"
 #include "mapview/tools/ToolRuler.h"
 #include "mapview/tools/ToolMapZoom.h"
@@ -24,9 +26,12 @@
 MainWindow::MainWindow(QWidget *parent) :
 	QMainWindow(parent),
 	ui(new Ui::MainWindow) {
+
 	ui->setupUi(this);
 
 	mapView2D = new MapView2D();
+	mapView3D = new MapView3D();
+
 	elementParamWidget = new ElementParamWidget();
 	layerParamWidget = new LayerParamWidget();
 	actionWidget = new ActionWidget();
@@ -35,18 +40,29 @@ MainWindow::MainWindow(QWidget *parent) :
 	ui->layButtons->addWidget(toolBoxWidget);
 
 	ui->layMap->addWidget(mapView2D);
+	ui->layMap->addWidget(mapView3D);
 
 	ui->layTree->addWidget(layerParamWidget);
 	ui->layTree->addWidget(elementParamWidget);
 	ui->layTree->addWidget(actionWidget);
 
 
+
 }
 
 MainWindow::~MainWindow() {
 	delete ui;
 }
 
+
+QAction* MainWindow::getShow3DFloorplan() {
+	return ui->actShow3DFloorplan;
+}
+
+QAction* MainWindow::getShow3DGrid() {
+	return ui->actShow3DGrid;
+}
+
 QTreeView* MainWindow::getTree() {
 	return ui->layerTree;
 }