FHWS/YASMIN
Archived
3
0
Fork 0
Code Issues 12 Pull Requests Releases Wiki Activity

added c++11 fixes

Browse Source 
removed old components
disabled activity (for compiling reasons)
added wifi 2.4ghz hack
This commit is contained in:
k-a-z-u
2018-07-11 13:23:18 +02:00
parent b0712ec005
commit bb974d3871
18 changed files with 107 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/MainWindow.cpp
View File

@@ -27,7 +27,7 @@ MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {
// ensure we are fullscreen
showMaximized();
sleep(1);
// sleep(1);
emit resizeEvent(nullptr);
// important! must be called AFTER window is visible

1
ui/debug/PlotGPS.cpp
View File

@@ -1,3 +1,4 @@
#include "../misc/fixc11.h"
#include "PlotGPS.h"
#include <QPainter>

1
ui/debug/PlotGPS.h
View File

@@ -3,6 +3,7 @@
#include <QWidget>
#include "../misc/fixc11.h"
#include "../sensors/GPSSensor.h"
#include <Indoor/data/Timestamp.h>

1
ui/debug/PlotTurns.cpp
View File

@@ -1,3 +1,4 @@
#include "../misc/fixc11.h"
#include "PlotTurns.h"
#include <QPainter>

1
ui/debug/PlotTurns.h
View File

@@ -2,6 +2,7 @@
#define PLOTTURNS_H
#include <QWidget>
#include "../misc/fixc11.h"
#include "../sensors/TurnSensor.h"
#include "../sensors/CompassSensor.h"

50
ui/debug/SensorDataWidget.cpp
View File

@@ -156,25 +156,25 @@ public:
}
void add(const Timestamp ts, const ActivityData& data) {
// void add(const Timestamp ts, const ActivityData& data) {
static int skip = 0;
if ((++skip % 8) != 0) {return;}
// static int skip = 0;
// if ((++skip % 8) != 0) {return;}
float offset = 0;
switch(data.curActivity) {
case ActivityButterPressure::Activity::DOWN: offset = -0.5; break;
case ActivityButterPressure::Activity::UP: offset = +0.5; break;
case ActivityButterPressure::Activity::STAY: offset = +0.1; break;
}
// float offset = 0;
// switch(data.curActivity) {
// case ActivityButterPressure::Activity::DOWN: offset = -0.5; break;
// case ActivityButterPressure::Activity::UP: offset = +0.5; break;
// case ActivityButterPressure::Activity::STAY: offset = +0.1; break;
// }
addLineNode(ts, line[0].getData().front().val + offset, 1);
if (needsRefresh(ts)) {
limit();
refresh(ts);
}
// addLineNode(ts, line[0].getData().front().val + offset, 1);
// if (needsRefresh(ts)) {
// limit();
// refresh(ts);
// }
}
// }
void limit() {
@@ -224,8 +224,8 @@ SensorDataWidget::SensorDataWidget(QWidget* parent) : QWidget(parent) {
SensorFactory::get().getSteps().addListener(this);
SensorFactory::get().getTurns().addListener(this);
SensorFactory::get().getWiFi().addListener(this);
SensorFactory::get().getActivity().addListener(this);
SensorFactory::get().getCompass().addListener(this);
// SensorFactory::get().getActivity().addListener(this);
// SensorFactory::get().getCompass().addListener(this);
SensorFactory::get().getGPS().addListener(this);
}
@@ -253,20 +253,20 @@ void SensorDataWidget::onSensorData(Sensor<BarometerData>* sensor, const Timesta
((PlotBaro*)plotBaro)->add(ts, data);
}
void SensorDataWidget::onSensorData(Sensor<ActivityData>* sensor, const Timestamp ts, const ActivityData& data) {
(void) sensor;
((PlotBaro*)plotBaro)->add(ts, data);
}
//void SensorDataWidget::onSensorData(Sensor<ActivityData>* sensor, const Timestamp ts, const ActivityData& data) {
// (void) sensor;
// ((PlotBaro*)plotBaro)->add(ts, data);
//}
void SensorDataWidget::onSensorData(Sensor<TurnData>* sensor, const Timestamp ts, const TurnData& data) {
(void) sensor;
((PlotTurns*)plotTurn)->add(ts, data);
}
void SensorDataWidget::onSensorData(Sensor<CompassData>* sensor, const Timestamp ts, const CompassData& data) {
(void) sensor;
((PlotTurns*)plotTurn)->add(ts, data);
}
//void SensorDataWidget::onSensorData(Sensor<CompassData>* sensor, const Timestamp ts, const CompassData& data) {
// (void) sensor;
// ((PlotTurns*)plotTurn)->add(ts, data);
//}
void SensorDataWidget::onSensorData(Sensor<GPSData>* sensor, const Timestamp ts, const GPSData& data) {
(void) sensor;

13
ui/debug/SensorDataWidget.h
View File

@@ -12,7 +12,7 @@
#include "../sensors/StepSensor.h"
#include "../sensors/TurnSensor.h"
#include "../sensors/WiFiSensor.h"
#include "../sensors/ActivitySensor.h"
//#include "../sensors/ActivitySensor.h"
#include "../sensors/GPSSensor.h"
#include "../sensors/CompassSensor.h"
@@ -25,12 +25,13 @@ class SensorDataWidget :
public SensorListener<AccelerometerData>,
public SensorListener<GyroscopeData>,
public SensorListener<BarometerData>,
public SensorListener<ActivityData>,
//public SensorListener<ActivityData>,
public SensorListener<StepData>,
public SensorListener<TurnData>,
public SensorListener<WiFiMeasurements>,
public SensorListener<GPSData>,
public SensorListener<CompassData> {
public SensorListener<GPSData>
//public SensorListener<CompassData>
{
Q_OBJECT
@@ -46,9 +47,9 @@ public:
void onSensorData(Sensor<StepData>* sensor, const Timestamp ts, const StepData& data) override;
void onSensorData(Sensor<TurnData>* sensor, const Timestamp ts, const TurnData& data) override;
void onSensorData(Sensor<WiFiMeasurements>* sensor, const Timestamp ts, const WiFiMeasurements& data) override;
void onSensorData(Sensor<ActivityData>* sensor, const Timestamp ts, const ActivityData& data) override;
//void onSensorData(Sensor<ActivityData>* sensor, const Timestamp ts, const ActivityData& data) override;
void onSensorData(Sensor<GPSData>* sensor, const Timestamp ts, const GPSData& data) override;
void onSensorData(Sensor<CompassData>* sensor, const Timestamp ts, const CompassData& data) override;
//void onSensorData(Sensor<CompassData>* sensor, const Timestamp ts, const CompassData& data) override;
private: