Changeset 144 in flair-src for trunk

Timestamp:

Feb 27, 2017, 10:59:54 AM (8 years ago)

Author:

Bayard Gildas

Message:

Go!

Location:

trunk/lib

Files:

• FlairCore/src/OneAxisRotation.cpp (modified) (1 diff)
• FlairCore/src/OneAxisRotation.h (modified) (1 diff)
• FlairCore/src/OneAxisRotation_impl.cpp (modified) (1 diff)
• FlairCore/src/unexported/OneAxisRotation_impl.h (modified) (1 diff)
• FlairSensorActuator/src/SimuCamera.cpp (modified) (2 diffs)
• FlairSensorActuator/src/SimuCamera.h (modified) (1 diff)
• FlairSimulator/src/Gui_impl.cpp (modified) (1 diff)
• FlairSimulator/src/Model_impl.cpp (modified) (1 diff)
• FlairSimulator/src/unexported/Gui_impl.h (modified) (1 diff)
• FlairVisionFilter/src/OpticalFlow.cpp (modified) (3 diffs)

trunk/lib/FlairCore/src/OneAxisRotation.cpp

@@ -56 +56 @@
 }
 
+float OneAxisRotation::GetAngle() const {
+  return pimpl_->GetAngle();
+}
+
+int OneAxisRotation::GetAxis() const {
+  return pimpl_->GetAxis();
+}
+
 } // end namespace core
 } // end namespace flair

trunk/lib/FlairCore/src/OneAxisRotation.h

@@ -82 +82 @@
   void ComputeRotation(core::RotationMatrix &matrix) const;
 
+  float GetAngle() const;
+  int GetAxis() const;
+
 private:
   const class OneAxisRotation_impl *pimpl_;

trunk/lib/FlairCore/src/OneAxisRotation_impl.cpp

@@ -74 +74 @@
   quat.ToEuler(euler);
 }
+
+int OneAxisRotation_impl::GetAxis() const {
+  return rot_axe->CurrentIndex();
+}
+
+float OneAxisRotation_impl::GetAngle() const {
+  return rot_value->Value();
+}
+

trunk/lib/FlairCore/src/unexported/OneAxisRotation_impl.h

@@ -40 +40 @@
   void ComputeRotation(flair::core::RotationMatrix &matrix) const;
   void ComputeRotation(flair::core::Euler &euler) const;
-
+  int GetAxis() const;
+  float GetAngle() const;
+  
 private:
   flair::gui::ComboBox *rot_axe;

trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

@@ -38 +38 @@
       Camera(name, width, height, cvimage::Type::Format::BGR) {
   data_rate =
-      new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 100, 1, 50);
+      new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 200, 1, 50);
 
   buf_size = width * height * channels;
@@ -82 +82 @@
 
     output->GetMutex();
+    //blocking read
     shmem->Read((char *)img->imageData, buf_size); // remplacer copie par
                                                    // échange de pointeur sur

trunk/lib/FlairSensorActuator/src/SimuCamera.h

@@ -19 +19 @@
 
 namespace flair {
-namespace core {
-class SharedMem;
-}
-namespace gui {
-class SpinBox;
-}
+  namespace core {
+    class SharedMem;
+  }
+  namespace gui {
+    class SpinBox;
+  }
 }
 

trunk/lib/FlairSimulator/src/Gui_impl.cpp

@@ -266 +266 @@
     }
 
-    for (size_t i = 0; i < models.size(); i++) {
-      models.at(i)->ProcessUpdate(NULL);
-    }
+//    for (size_t i = 0; i < models.size(); i++) {
+//      models.at(i)->ProcessUpdate(NULL);
+ProcessUpdate(NULL);
+Printf("Appel à ProcessUpdate depuis Gui_impl::RunGui\n");
+//    }
 
     // on fait ca ici, devrait etre un peu plus haut

trunk/lib/FlairSimulator/src/Model_impl.cpp

@@ -331 +331 @@
 
     self->ProcessUpdate(output);
+Printf("Appel à ProcessUpdate depuis Model_impl::Run\n"); //already done by Gui_impl::RunGui (dans le cas où il y a un GUI)
   }
 

trunk/lib/FlairSimulator/src/unexported/Gui_impl.h

@@ -25 +25 @@
 
 namespace irr {
-class IrrlichtDevice;
-namespace scene {
-class ISceneManager;
-class IMeshSceneNode;
-class ITriangleSelector;
-}
-namespace video {
-class IVideoDriver;
-}
-namespace gui {
-class IGUIFont;
-class IGUIEnvironment;
-}
+  class IrrlichtDevice;
+  namespace scene {
+    class ISceneManager;
+    class IMeshSceneNode;
+    class ITriangleSelector;
+  }
+  namespace video {
+    class IVideoDriver;
+  }
+  namespace gui {
+    class IGUIFont;
+    class IGUIEnvironment;
+  }
 }
 
 namespace flair {
-namespace core {
-class Object;
-}
-namespace simulator {
-class Model;
-class GenericObject;
-class Gui;
-class VisualizationCamera;
-}
+  namespace core {
+    class Object;
+    class IODevice;
+  }
+  namespace simulator {
+    class Model;
+    class GenericObject;
+    class Gui;
+    class VisualizationCamera;
+  }
 }
 
 class MyEventReceiver;
 
-class Gui_impl {
+class Gui_impl:public IODevice {
 public:
   Gui_impl(flair::simulator::Gui *self, int app_width, int app_height,

trunk/lib/FlairVisionFilter/src/OpticalFlow.cpp

@@ -53 +53 @@
 
     GroupBox* reglages_groupbox=new GroupBox(position,name);
-        rotation=new OneAxisRotation(reglages_groupbox->NewRow(),"post rotation");
-        max_features=new SpinBox(reglages_groupbox->NewRow(),"max features:",1,65535,1,1);
+    rotation=new OneAxisRotation(reglages_groupbox->NewRow(),"post rotation");
+    max_features=new SpinBox(reglages_groupbox->NewRow(),"max features:",1,65535,1,1);
 
     output=new OpticalFlowData(parent,max_features->Value());
@@ -85 +85 @@
     unsigned int i;
 
-    if(max_features->ValueChanged()==true)
-    {
+    if(max_features->ValueChanged()==true) {
         cvFree(&pointsA);
         cvFree(&pointsB);
@@ -125 +124 @@
 */
     //apply rotation
-    for(i=0;i<count;i++)
-    {
+    for(i=0;i<count;i++) {
         Vector3D tmp;
         tmp.x=pointsA[i].x;