removed Affine3f from coordinate frame constructor

diff --git a/modules/viz/include/opencv2/viz/widgets.hpp b/modules/viz/include/opencv2/viz/widgets.hpp
index 0471ff986106f9b947262aa3ceb809cd32805174..d44e22f04cf3e2982b9c0c0d6e5b7b5474896de5 100644 (file)
--- a/modules/viz/include/opencv2/viz/widgets.hpp
+++ b/modules/viz/include/opencv2/viz/widgets.hpp
@@ -103,13 +103,13 @@ namespace temp_viz
     class CV_EXPORTS CoordinateSystemWidget : public Widget3D
     {
     public:
-        CoordinateSystemWidget(double scale, const Affine3f& affine);
+        CoordinateSystemWidget(double scale = 1.0);
     };
     
     class CV_EXPORTS PolyLineWidget : public Widget3D
     {
     public:
-        PolyLineWidget(InputArray _points, const Color &color = Color::white());
+        PolyLineWidget(InputArray points, const Color &color = Color::white());
         
     private:
         struct CopyImpl;

diff --git a/modules/viz/src/simple_widgets.cpp b/modules/viz/src/simple_widgets.cpp
index d9184d365b5b301d2cdbe8704c5eb092e42a358e..35c972fc0acdeb8024418150c09970294a682eb9 100644 (file)
--- a/modules/viz/src/simple_widgets.cpp
+++ b/modules/viz/src/simple_widgets.cpp
@@ -283,7 +283,7 @@ template<> temp_viz::CubeWidget temp_viz::Widget::cast<temp_viz::CubeWidget>()
 ///////////////////////////////////////////////////////////////////////////////////////////////
 /// 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 ();
     axes->SetOrigin (0, 0, 0);
@@ -313,20 +313,6 @@ temp_viz::CoordinateSystemWidget::CoordinateSystemWidget(double scale, const Aff
 
     vtkSmartPointer<vtkLODActor> actor = vtkSmartPointer<vtkLODActor>::New();
     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);
 }

diff --git a/modules/viz/src/viz_main.cpp b/modules/viz/src/viz_main.cpp
index 442a5ff8e7fa0270dcfed8a5cd776f6154687df9..5dcc7c41ce9bb3c8f0a48a5338218da25f4a5a89 100644 (file)
--- a/modules/viz/src/viz_main.cpp
+++ b/modules/viz/src/viz_main.cpp
@@ -7,7 +7,7 @@
 #ifndef __APPLE__
 vtkRenderWindowInteractor* vtkRenderWindowInteractorFixNew ()
 {
-  return (vtkRenderWindowInteractor::New ());
+  return vtkRenderWindowInteractor::New();
 }
 #endif