added c++11 fixes
removed old components disabled activity (for compiling reasons) added wifi 2.4ghz hack
This commit is contained in:
14
Controller.h
14
Controller.h
@@ -2,9 +2,9 @@
|
||||
#define CONTROLLER_H
|
||||
|
||||
#include "misc/fixc11.h"
|
||||
#include "ipin/Scaler.h"
|
||||
#include "ipin/StepLoggerWrapper.h"
|
||||
#include "ipin/StepLoggerWrapperAndroid.h"
|
||||
//#include "ipin/Scaler.h"
|
||||
//#include "ipin/StepLoggerWrapper.h"
|
||||
//#include "ipin/StepLoggerWrapperAndroid.h"
|
||||
|
||||
class MainWindow;
|
||||
class MainMenu;
|
||||
@@ -42,11 +42,11 @@ public:
|
||||
|
||||
protected:
|
||||
|
||||
// scaling for the UAH building
|
||||
IPINScaler scaler = IPINScaler(1869, 1869, 40.51312440, -3.34959080, -40.73112000, 0.07596002);
|
||||
// // scaling for the UAH building
|
||||
// IPINScaler scaler = IPINScaler(1869, 1869, 40.51312440, -3.34959080, -40.73112000, 0.07596002);
|
||||
|
||||
//StepLoggerWrapper* sl = nullptr;
|
||||
StepLoggerWrapperAndroid* sl = nullptr;
|
||||
// //StepLoggerWrapper* sl = nullptr;
|
||||
// StepLoggerWrapperAndroid* sl = nullptr;
|
||||
|
||||
|
||||
private slots:
|
||||
|
||||
Reference in New Issue
Block a user