current revision

This commit is contained in:
2016-09-28 12:16:45 +02:00
parent 075d8bb633
commit d47322e73b
90 changed files with 8228 additions and 606 deletions

View File

@@ -1,75 +1,31 @@
#include <misc/fixc11.h>
#include <QGuiApplication>
#include <QQmlApplicationEngine>
//#include <QGuiApplication>
//#include <QQmlApplicationEngine>
#include <QApplication>
#include <QMainWindow>
#include <QGridLayout>
#include <QFile>
#include <Indoor/math/Interpolator.h>
#include <Indoor/grid/factory/v2/Importance.h>
#include <Indoor/nav/dijkstra/Dijkstra.h>
#include <Indoor/nav/dijkstra/DijkstraPath.h>
#include "sensors/SensorFactory.h"
#include "Controller.h"
#include "ui/map/MapView.h"
#include "ui/map/3D/MapView3D.h"
#include <iostream>
#include <Indoor/floorplan/v2/FloorplanReader.h>
#include <Indoor/api/DummyAPI.h>
#include <Indoor/sensors/radio/WiFiGridNode.h>
#include <Indoor/sensors/radio/WiFiGridEstimator.h>
#include <Indoor/sensors/radio/model/WiFiModelLogDist.h>
struct MyNode : public GridPoint, public GridNode, public WiFiGridNode<10> {
float navImportance;
MyNode() {;}
MyNode(const float x_cm, const float y_cm, const float z_cm) : GridPoint(x_cm, y_cm, z_cm) {;}
public:
static void staticSerialize(std::ostream& out) {
WiFiGridNode::staticSerialize(out);
}
static void staticDeserialize(std::istream& inp) {
WiFiGridNode::staticDeserialize(inp);
}
};
#include "tests/RuntimeTests.h"
int main(int argc, char *argv[]) {
RuntimeTests::run();
QApplication app(argc, argv);
std::cout << "resampling mit streuung? z.B in nachbar nodes?";
std::cout << "gerade am anfang geht seeehr viel verloren";
Controller ctrl;
Point3 eye(40,42,1.8);
ctrl.getMapView()->setLookEye(eye);
ctrl.getMapView()->setLookDir(Point3(-1, 0, -0.1));
// auto run = [&] () {
// static float r = 0;
// while(true) {
// r += 0.01;
// eye += Point3(-0.01, 0, 0);
// ctrl.getMapView()->setLookEye(eye);
// usleep(1000*50);
// }
// };
// std::thread t(run);
ctrl.getMapView3D()->setLookEye(eye);
ctrl.getMapView3D()->setLookDir(Point3(-1, 0, -0.1));
return app.exec();