Changeset 137 in flair-src for trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

Timestamp:

02/14/17 15:06:20 (7 years ago)

Author:

Sanahuja Guillaume

Message:

singleton manager

File:

• trunk/lib/FlairSensorActuator/src/SimuCamera.cpp (modified) (3 diffs)

trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

@@ -18 +18 @@
 #include "SimuCamera.h"
 #include <FrameworkManager.h>
+#include <GroupBox.h>
 #include <SpinBox.h>
-#include <GroupBox.h>
-#include <cvimage.h>
+//#include <cvimage.h>
 #include <SharedMem.h>
 #include <sstream>
@@ -32 +32 @@
 namespace sensor {
 
-SimuCamera::SimuCamera(const FrameworkManager *parent, string name,
+SimuCamera::SimuCamera(string name,
                        uint16_t width, uint16_t height, uint8_t channels,
                        uint32_t dev_id, uint8_t priority)
-    : Thread(parent, name, priority),
-      Camera(parent, name, width, height, cvimage::Type::Format::BGR) {
+    : Thread(getFrameworkManager(), name, priority),
+      Camera(name, width, height, cvimage::Type::Format::BGR) {
   data_rate =
       new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 100, 1, 50);
@@ -52 +52 @@
 SimuCamera::SimuCamera(const IODevice *parent, string name, uint16_t width,
                        uint16_t height, uint8_t channels, uint32_t dev_id)
-    : Thread(parent, name, 0), Camera(parent, name) {
+    : Thread(parent, name, 0), Camera(parent,name) {
   data_rate = NULL;