generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed Affine3f from coordinate frame constructor

Browse Source
This commit is contained in:
Anatoly Baksheev 2013-07-13 01:49:59 +04:00
parent 328f0e32d8
commit f480eca668
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/viz/include/opencv2/viz/widgets.hpp
View File

@ -103,13 +103,13 @@ namespace temp_viz
class CV_EXPORTS CoordinateSystemWidget : public Widget3D class CV_EXPORTS CoordinateSystemWidget : public Widget3D
{ {
public: public:
CoordinateSystemWidget(double scale, const Affine3f& affine); CoordinateSystemWidget(double scale = 1.0);
}; };
class CV_EXPORTS PolyLineWidget : public Widget3D class CV_EXPORTS PolyLineWidget : public Widget3D
{ {
public: public:
PolyLineWidget(InputArray _points, const Color &color = Color::white()); PolyLineWidget(InputArray points, const Color &color = Color::white());
private: private:
struct CopyImpl; struct CopyImpl;

16
modules/viz/src/simple_widgets.cpp
View File

@ -283,7 +283,7 @@ template<> temp_viz::CubeWidget temp_viz::Widget::cast<temp_viz::CubeWidget>()
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
/// coordinate system widget implementation /// coordinate system widget implementation
temp_viz::CoordinateSystemWidget::CoordinateSystemWidget(double scale, const Affine3f& affine) temp_viz::CoordinateSystemWidget::CoordinateSystemWidget(double scale)
{ {
vtkSmartPointer<vtkAxes> axes = vtkSmartPointer<vtkAxes>::New (); vtkSmartPointer<vtkAxes> axes = vtkSmartPointer<vtkAxes>::New ();
axes->SetOrigin (0, 0, 0); axes->SetOrigin (0, 0, 0);
@ -313,20 +313,6 @@ temp_viz::CoordinateSystemWidget::CoordinateSystemWidget(double scale, const Aff
vtkSmartPointer<vtkLODActor> actor = vtkSmartPointer<vtkLODActor>::New(); vtkSmartPointer<vtkLODActor> actor = vtkSmartPointer<vtkLODActor>::New();
actor->SetMapper(mapper); actor->SetMapper(mapper);
cv::Vec3d t = affine.translation();
actor->SetPosition (t[0], t[1], t[2]);
cv::Matx33f m = affine.rotation();
cv::Vec3f rvec;
cv::Rodrigues(m, rvec);
float r_angle = cv::norm(rvec);
rvec *= 1.f/r_angle;
actor->SetOrientation(0,0,0);
actor->RotateWXYZ(r_angle*180/CV_PI,rvec[0], rvec[1], rvec[2]);
WidgetAccessor::setProp(*this, actor); WidgetAccessor::setProp(*this, actor);
} }

2
modules/viz/src/viz_main.cpp
View File

@ -7,7 +7,7 @@
#ifndef __APPLE__ #ifndef __APPLE__
vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew () vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew ()
{ {
return (vtkRenderWindowInteractor::New ()); return vtkRenderWindowInteractor::New();
} }
#endif #endif