FHWS/IndoorMap
Archived
2
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

a whole lotta work!!

Browse Source 
- refactoring
- completely changed the tooling (adding elements)
- better re-use for more stable editing
- new elements
- ui adjustments
- LINT for stair-editing
- many more changes
This commit is contained in:
FrankE
2016-08-29 19:05:46 +02:00
parent 86c76b1284
commit fa06320219
51 changed files with 880 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
MainController.cpp
View File

@@ -5,11 +5,11 @@
#include "mapview/model/MapModelElement.h"
#include "mapview/tools/ToolSelector.h"
#include "mapview/tools/ToolMoveMap.h"
#include "mapview/tools/ToolMapZoom.h"
#include "mapview/tools/ToolRuler.h"
#include "mapview/tools/ToolMapGrid.h"
#include "mapview/2D/tools/ToolSelector.h"
#include "mapview/2D/tools/ToolMoveMap.h"
#include "mapview/2D/tools/ToolMapZoom.h"
#include "mapview/2D/tools/ToolRuler.h"
#include "mapview/2D/tools/ToolMapGrid.h"
#include "params/ElementParamWidget.h"
#include "params/LayerParamWidget.h"
@@ -49,13 +49,17 @@ MainController::MainController() {
ToolMapGrid* mapGrid = new ToolMapGrid();
ToolSelector* mapSelector = new ToolSelector();
mapView2D->getTools().enable(mapGrid);
mapView2D->getTools().enable(moveMap);
mapView2D->getTools().enable(mapZoom);
mapView2D->getTools().enable(mapSelector);
mapView2D->getTools().enable(ruler);
mapView2D->getTools().addBackground(mapGrid);
mapView2D->getTools().addBackground(moveMap);
mapView2D->getTools().addBackground(mapZoom);
mapView2D->getTools().addBackground(ruler);
mapView2D->getTools().setMain(mapSelector);
//connect(layerTree, SIGNAL(activated(QModelIndex)), this, SLOT(layerSelected(QModelIndex)));
connect(layerTree->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), this, SLOT(layerSelected(QModelIndex)));
connect(layerTree, SIGNAL(clicked(QModelIndex)), this, SLOT(layerSelected(QModelIndex)));
connect(mapSelector, SIGNAL(onMapElementSelected(MapModelElement*)), this, SLOT(mapElementSelected(MapModelElement*)));
connect(mw->getMapView2D(), SIGNAL(onElementChange(MV2DElement*)), this, SLOT(curMapElementChanged()));
@@ -77,9 +81,13 @@ MainController::MainController() {
connect(mw, &MainWindow::onGridShowEdges, [&] (const bool show) {mw->getMapView3D()->getGridRenderer()->setShowEdges(show);} );
mapModel->load("../IndoorMap/maps/SHL20.xml");
//mapModel->load("../IndoorMap/maps/SHL21.xml");
//mapModel->load("../IndoorMap/maps/test.xml");
//mapModel->load("/mnt/data/workspaces/IPIN2016/IPIN2016/competition/maps/CAR/CAR9.xml");
//mapModel->load("/mnt/data/workspaces/IPIN2016/IPIN2016/competition/maps/UAH/UAH7_test.xml");
mapModel->load("/mnt/data/workspaces/IPIN2016/IPIN2016/competition/maps/UJI-TI/UJI-TI4.xml");
}
void MainController::onShow3DFloorplan() {