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

28
MainWindow.cpp
View File

@@ -2,8 +2,9 @@
#include "ui_MainWindow.h"
#include <QGraphicsScene>
#include <QStatusBar>
#include "mapview/MapView2D.h"
#include "mapview/2D/MapView2D.h"
#include "mapview/model/MMFloorObstacleLine.h"
@@ -11,9 +12,9 @@
#include "mapview/3D/MapView3D.h"
#include "mapview/tools/ToolMoveMap.h"
#include "mapview/tools/ToolRuler.h"
#include "mapview/tools/ToolMapZoom.h"
#include "mapview/2D/tools/ToolMoveMap.h"
#include "mapview/2D/tools/ToolRuler.h"
#include "mapview/2D/tools/ToolMapZoom.h"
#include "params/ElementParamWidget.h"
#include "params/LayerParamWidget.h"
@@ -37,7 +38,13 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
this->setStyleSheet(css);
layerTree = new QTreeView();
{
layerTree = new QTreeView();
QString css;
//css += "QTreeView::item:selected:active {background-color: #888888;}";
//css += "QTreeView::item:selected:!active {background-color: #888888;}";
layerTree->setStyleSheet(css);
}
mapView2D = new MapView2D();
mapView3D = new MapView3D();
@@ -51,7 +58,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
QDockWidget* toolBoxWidgetDock = new QDockWidget("", this); toolBoxWidgetDock->setWidget(toolBoxWidget);
addDockWidget(Qt::LeftDockWidgetArea, toolBoxWidgetDock);
// layers
QDockWidget* layerTreeDock = new QDockWidget("layers", this); layerTreeDock->setWidget(layerTree);
addDockWidget(Qt::RightDockWidgetArea, layerTreeDock);
@@ -68,8 +74,16 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
QDockWidget* actionWidgetDock = new QDockWidget("actions", this); actionWidgetDock->setWidget(actionWidget);
addDockWidget(Qt::RightDockWidgetArea, actionWidgetDock);
// status
statusBar = new QStatusBar(); this->setStatusBar(statusBar);
QHBoxLayout* layStatus = new QHBoxLayout(statusBar); statusBar->setLayout(layStatus);
statusBarText1 = new QLabel(statusBar); layStatus->addWidget(statusBarText1);
statusBarText1->setMinimumWidth(200);
// tools
connect(&mapView2D->getTools(), &Tools::onHelpTextChange, [&] (QString txt) {
statusBarText1->setText(txt);
});
QSplitter* splitter = new QSplitter(Qt::Orientation::Vertical);
setCentralWidget(splitter);