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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

singleton manager

File:

• trunk/lib/FlairSensorActuator/src/Camera.cpp (modified) (2 diffs)

trunk/lib/FlairSensorActuator/src/Camera.cpp

@@ -35 +35 @@
 namespace sensor {
 
-Camera::Camera(const FrameworkManager *parent, string name, uint16_t width,
+Camera::Camera(string name, uint16_t width,
                uint16_t height, cvimage::Type::Format format)
-    : IODevice(parent, name) {
+    : IODevice(getFrameworkManager(), name) {
   plot_tab = NULL;
         logFormat=LogFormat::NONE;
@@ -45 +45 @@
         
   // station sol
-  main_tab = new Tab(parent->GetTabWidget(), name);
+  main_tab = new Tab(getFrameworkManager()->GetTabWidget(), name);
   tab = new TabWidget(main_tab->NewRow(), name);
   sensor_tab = new Tab(tab, "Setup");