tweaked formatting problems

GaitRehabilitation · Jan 10, 2019 · 982efb5 · 982efb5
1 parent fd7c226
commit 982efb5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,7 @@ set (SOURCES
   forms/profiledialog.cpp
   forms/mbientconfigpanel.cpp
 
-        common/main.cpp
+  common/main.cpp
   common/metawearwrapperbase.cpp
   common/util.cpp
   common/BluetoothAddress.cpp)
@@ -45,7 +45,7 @@ set(HEADERS
   forms/profiledialog.h
   forms/mbientconfigpanel.h
 
-        common/metawearwrapperbase.h
+  common/metawearwrapperbase.h
   common/util.h
   common/BaseDiscoveryAgent.h
   common/BluetoothAddress.h)

diff --git a/forms/mbientconfigpanel.cpp b/forms/mbientconfigpanel.cpp
@@ -6,7 +6,6 @@
 #include "ui_mbientconfigpanel.h"
 
 #include "QCheckBox"
-#include "mbientconfigpanel.h"
 #include "common/metawearwrapperbase.h"
 
 #include <metawear/sensor/gyro_bmi160.h>
@@ -21,12 +20,13 @@
 #include "common/metawearwrapper.h"
 #include "common/DiscoveryAgent.h"
 
+
 const float MbientConfigPanel::ACC_ODR_RANGE[] = {2.0f, 4.0f, 8.0f, 16.0f};
 const float MbientConfigPanel::ACC_FSR_RANGE[] = {12.5f, 50.f,100.0f,200.0f};
 const float MbientConfigPanel::FUSION_RANGE[] = {8.0f,12.5f,50.0f,100.0f};
 
 
-MbientConfigPanel::MbientConfigPanel(QWidget *parent) : ui(new Ui::MbientConfigPanel){
+MbientConfigPanel::MbientConfigPanel(QWidget *parent) : QWidget(parent), ui(new Ui::MbientConfigPanel){
     ui->setupUi(this);
 
     ui->accelerationContainer->setEnabled(false);
@@ -354,3 +354,4 @@ float MbientConfigPanel::toFusionSampleRangeIndex(int index) {
     }
     return FUSION_RANGE[index];
 }
+
diff --git a/forms/mbientconfigpanel.h b/forms/mbientconfigpanel.h
@@ -9,9 +9,6 @@
 #include <QVariantMap>
 #include <3rdparty/mbientlab/src/metawear/sensor/gyro_bmi160.h>
 
-namespace Ui {
-    class MbientConfigPanel;
-}
 
 #define GYRO "gyro"
 #define MAC "mac"
@@ -26,6 +23,9 @@ namespace Ui {
 
 class MetawearWrapperBase;
 class MetawearWrapper;
+namespace Ui {
+    class MbientConfigPanel;
+}
 class MbientConfigPanel : public QWidget {
     Q_OBJECT
 private: