fixed some minor bugs using ble on android

added BLE to the evaluation of the particle filter
made first evaluation inside fhws
This commit is contained in:
mail@toni-fetzer.de
2019-06-10 16:58:24 +02:00
parent ef6066ae14
commit 7fe0f22a6e
9 changed files with 311 additions and 231 deletions

View File

@@ -22,32 +22,33 @@ class InfoWidget;
class MapView3D;
class MapView2D;
class WiFiModel;
class BeaconModel;
namespace NM {
template <typename T> class NavMesh;
class NavMeshTriangle;
template <typename T> class NavMesh;
class NavMeshTriangle;
}
namespace Floorplan {
class IndoorMap;
class IndoorMap;
}
class Controller : public QObject {
Q_OBJECT
Q_OBJECT
public:
/** ctor */
explicit Controller();
/** ctor */
explicit Controller();
public:
MapView3D* getMapView3D() const;
MapView2D* getMapView2D() const;
MapView3D* getMapView3D() const;
MapView2D* getMapView2D() const;
MainMenu* getMainMenu() const;
InfoWidget* getInfoWidget() const;
MainMenu* getMainMenu() const;
InfoWidget* getInfoWidget() const;
protected:
@@ -60,26 +61,27 @@ protected:
private slots:
void onLoadButton();
void onDebugButton();
void onStartButton();
void onLoadButton();
void onDebugButton();
void onStartButton();
void onTransparentButton();
void onCameraButton();
void on3DButton();
void onTransparentButton();
void onCameraButton();
void on3DButton();
private:
void loadGrid(QDir dir);
void loadNavMesh(QDir dir);
void loadGrid(QDir dir);
void loadNavMesh(QDir dir);
MainWindow* mainWindow;
MainWindow* mainWindow;
Grid<MyGridNode>* grid = nullptr;
NM::NavMesh<NM::NavMeshTriangle>* navMesh = nullptr;
NavController* nav = nullptr;
Floorplan::IndoorMap* im = nullptr;
Grid<MyGridNode>* grid = nullptr;
NM::NavMesh<NM::NavMeshTriangle>* navMesh = nullptr;
NavController* nav = nullptr;
Floorplan::IndoorMap* im = nullptr;
WiFiModel* wifiModel = nullptr;
BeaconModel* bleModel = nullptr;
};