Changeset 144 in flair-src


Ignore:
Timestamp:
Feb 27, 2017, 10:59:54 AM (4 years ago)
Author:
Bayard Gildas
Message:

Go!

Location:
trunk/lib
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairCore/src/OneAxisRotation.cpp

    r15 r144  
    5656}
    5757
     58float OneAxisRotation::GetAngle() const {
     59  return pimpl_->GetAngle();
     60}
     61
     62int OneAxisRotation::GetAxis() const {
     63  return pimpl_->GetAxis();
     64}
     65
    5866} // end namespace core
    5967} // end namespace flair
  • trunk/lib/FlairCore/src/OneAxisRotation.h

    r15 r144  
    8282  void ComputeRotation(core::RotationMatrix &matrix) const;
    8383
     84  float GetAngle() const;
     85  int GetAxis() const;
     86
    8487private:
    8588  const class OneAxisRotation_impl *pimpl_;
  • trunk/lib/FlairCore/src/OneAxisRotation_impl.cpp

    r103 r144  
    7474  quat.ToEuler(euler);
    7575}
     76
     77int OneAxisRotation_impl::GetAxis() const {
     78  return rot_axe->CurrentIndex();
     79}
     80
     81float OneAxisRotation_impl::GetAngle() const {
     82  return rot_value->Value();
     83}
     84
  • trunk/lib/FlairCore/src/unexported/OneAxisRotation_impl.h

    r15 r144  
    4040  void ComputeRotation(flair::core::RotationMatrix &matrix) const;
    4141  void ComputeRotation(flair::core::Euler &euler) const;
    42 
     42  int GetAxis() const;
     43  float GetAngle() const;
     44 
    4345private:
    4446  flair::gui::ComboBox *rot_axe;
  • trunk/lib/FlairSensorActuator/src/SimuCamera.cpp

    r137 r144  
    3838      Camera(name, width, height, cvimage::Type::Format::BGR) {
    3939  data_rate =
    40       new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 100, 1, 50);
     40      new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 200, 1, 50);
    4141
    4242  buf_size = width * height * channels;
     
    8282
    8383    output->GetMutex();
     84    //blocking read
    8485    shmem->Read((char *)img->imageData, buf_size); // remplacer copie par
    8586                                                   // échange de pointeur sur
  • trunk/lib/FlairSensorActuator/src/SimuCamera.h

    r137 r144  
    1919
    2020namespace flair {
    21 namespace core {
    22 class SharedMem;
    23 }
    24 namespace gui {
    25 class SpinBox;
    26 }
     21  namespace core {
     22    class SharedMem;
     23  }
     24  namespace gui {
     25    class SpinBox;
     26  }
    2727}
    2828
  • trunk/lib/FlairSimulator/src/Gui_impl.cpp

    r134 r144  
    266266    }
    267267
    268     for (size_t i = 0; i < models.size(); i++) {
    269       models.at(i)->ProcessUpdate(NULL);
    270     }
     268//    for (size_t i = 0; i < models.size(); i++) {
     269//      models.at(i)->ProcessUpdate(NULL);
     270ProcessUpdate(NULL);
     271Printf("Appel à ProcessUpdate depuis Gui_impl::RunGui\n");
     272//    }
    271273
    272274    // on fait ca ici, devrait etre un peu plus haut
  • trunk/lib/FlairSimulator/src/Model_impl.cpp

    r70 r144  
    331331
    332332    self->ProcessUpdate(output);
     333Printf("Appel à ProcessUpdate depuis Model_impl::Run\n"); //already done by Gui_impl::RunGui (dans le cas où il y a un GUI)
    333334  }
    334335
  • trunk/lib/FlairSimulator/src/unexported/Gui_impl.h

    r70 r144  
    2525
    2626namespace irr {
    27 class IrrlichtDevice;
    28 namespace scene {
    29 class ISceneManager;
    30 class IMeshSceneNode;
    31 class ITriangleSelector;
    32 }
    33 namespace video {
    34 class IVideoDriver;
    35 }
    36 namespace gui {
    37 class IGUIFont;
    38 class IGUIEnvironment;
    39 }
     27  class IrrlichtDevice;
     28  namespace scene {
     29    class ISceneManager;
     30    class IMeshSceneNode;
     31    class ITriangleSelector;
     32  }
     33  namespace video {
     34    class IVideoDriver;
     35  }
     36  namespace gui {
     37    class IGUIFont;
     38    class IGUIEnvironment;
     39  }
    4040}
    4141
    4242namespace flair {
    43 namespace core {
    44 class Object;
    45 }
    46 namespace simulator {
    47 class Model;
    48 class GenericObject;
    49 class Gui;
    50 class VisualizationCamera;
    51 }
     43  namespace core {
     44    class Object;
     45    class IODevice;
     46  }
     47  namespace simulator {
     48    class Model;
     49    class GenericObject;
     50    class Gui;
     51    class VisualizationCamera;
     52  }
    5253}
    5354
    5455class MyEventReceiver;
    5556
    56 class Gui_impl {
     57class Gui_impl:public IODevice {
    5758public:
    5859  Gui_impl(flair::simulator::Gui *self, int app_width, int app_height,
  • trunk/lib/FlairVisionFilter/src/OpticalFlow.cpp

    r122 r144  
    5353
    5454    GroupBox* reglages_groupbox=new GroupBox(position,name);
    55         rotation=new OneAxisRotation(reglages_groupbox->NewRow(),"post rotation");
    56         max_features=new SpinBox(reglages_groupbox->NewRow(),"max features:",1,65535,1,1);
     55    rotation=new OneAxisRotation(reglages_groupbox->NewRow(),"post rotation");
     56    max_features=new SpinBox(reglages_groupbox->NewRow(),"max features:",1,65535,1,1);
    5757
    5858    output=new OpticalFlowData(parent,max_features->Value());
     
    8585    unsigned int i;
    8686
    87     if(max_features->ValueChanged()==true)
    88     {
     87    if(max_features->ValueChanged()==true) {
    8988        cvFree(&pointsA);
    9089        cvFree(&pointsB);
     
    125124*/
    126125    //apply rotation
    127     for(i=0;i<count;i++)
    128     {
     126    for(i=0;i<count;i++) {
    129127        Vector3D tmp;
    130128        tmp.x=pointsA[i].x;
Note: See TracChangeset for help on using the changeset viewer.