current revision

ui/MainWindow.h

@@ -3,9 +3,12 @@
 
 #include <QWidget>
 
-class MapView;
+class MapView3D;
+class MapView2D;
+
 class MainMenu;
 class SensorDataWidget;
+class InfoWidget;
 
 class MainWindow : public QWidget {
 	Q_OBJECT
@@ -17,21 +20,22 @@ public:
 
 private:
 
-	MapView* mapView = nullptr;
+	MapView3D* mapView3D = nullptr;
+	MapView2D* mapView2D = nullptr;
+
 	MainMenu* mainMenu = nullptr;
+	InfoWidget* infoWidget = nullptr;
 	SensorDataWidget* sensorWidget = nullptr;
 
 public:
 
-	MapView* getMapView() const {return mapView;}
+	MapView3D* getMapView3D() const {return mapView3D;}
+	MapView2D* getMapView2D() const {return mapView2D;}
+
 	MainMenu* getMainMenu() const {return mainMenu;}
+	InfoWidget* getInfoWidget() const {return infoWidget;}
 	SensorDataWidget* getSensorDataWidget() const {return sensorWidget;}
 
-
-//	void setMapView(QWidget* widget) {mapView = widget; mapView->setParent(this);}
-//	void setMainMenu(QWidget* widget) {mainMenu = widget; mainMenu->setParent(this);}
-//	void setSensorWidget(QWidget* widget) {sensorWidget = widget; sensorWidget->setParent(this);}
-
 signals:
 
 public slots: