updated code to use mapper->SetInput instead of SetInputConnection. All widgets…

updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts

modules/core/include/opencv2/core/affine.hpp

@@ -113,6 +113,8 @@ namespace cv
 
         template <typename Y> operator Affine3<Y>() const;
 
+        template <typename Y> Affine3<Y> cast() const;
+
         Mat4 matrix;
 
 #if defined EIGEN_WORLD_VERSION && defined EIGEN_GEOMETRY_MODULE_H
@@ -421,6 +423,12 @@ cv::Affine3<T>::operator Affine3<Y>() const
     return Affine3<Y>(matrix);
 }
 
+template<typename T> template <typename Y> inline
+cv::Affine3<Y> cv::Affine3<T>::cast() const
+{
+    return Affine3<Y>(matrix);
+}
+
 template<typename T> inline
 cv::Affine3<T> cv::operator*(const cv::Affine3<T>& affine1, const cv::Affine3<T>& affine2)
 {

modules/viz/include/opencv2/viz.hpp

@@ -41,9 +41,6 @@
 //  * Ozan Tonkal, ozantonkal@gmail.com
 //  * Anatoly Baksheev, Itseez Inc.  myname.mysurname <> mycompany.com
 //
-//  OpenCV Viz module is complete rewrite of
-//  PCL visualization module (www.pointclouds.org)
-//
 //M*/
 
 #ifndef __OPENCV_VIZ_HPP__

modules/viz/src/clouds.cpp

@@ -54,9 +54,10 @@ cv::viz::WCloud::WCloud(InputArray cloud, InputArray colors)
 
     vtkSmartPointer<vtkCloudMatSource> cloud_source = vtkSmartPointer<vtkCloudMatSource>::New();
     cloud_source->SetColorCloud(cloud, colors);
+    cloud_source->Update();
 
     vtkSmartPointer<vtkPolyDataMapper> mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
-    mapper->SetInputConnection(cloud_source->GetOutputPort());
+    VtkUtils::SetInputData(mapper, cloud_source->GetOutput());
     mapper->SetScalarModeToUsePointData();
     mapper->ImmediateModeRenderingOff();
     mapper->SetScalarRange(0, 255);
@@ -74,9 +75,10 @@ cv::viz::WCloud::WCloud(InputArray cloud, const Color &color)
 {
     vtkSmartPointer<vtkCloudMatSource> cloud_source = vtkSmartPointer<vtkCloudMatSource>::New();
     cloud_source->SetCloud(cloud);
+    cloud_source->Update();
 
     vtkSmartPointer<vtkPolyDataMapper> mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
-    mapper->SetInputConnection(cloud_source->GetOutputPort());
+    VtkUtils::SetInputData(mapper, cloud_source->GetOutput());
     mapper->ImmediateModeRenderingOff();
     mapper->ScalarVisibilityOff();
 
@@ -127,15 +129,11 @@ void cv::viz::WCloudCollection::addCloud(InputArray cloud, InputArray colors, co
     {
         // This is the first cloud
         mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
-#if VTK_MAJOR_VERSION <= 5
-        mapper->SetInput(polydata);
-#else
-        mapper->SetInputData(polydata);
-#endif
         mapper->SetScalarRange(0, 255);
         mapper->SetScalarModeToUsePointData();
         mapper->ScalarVisibilityOn();
         mapper->ImmediateModeRenderingOff();
+        VtkUtils::SetInputData(mapper, polydata);
 
         actor->SetNumberOfCloudPoints(std::max(1, polydata->GetNumberOfPoints()/10));
         actor->GetProperty()->SetInterpolationToFlat();
@@ -147,16 +145,12 @@ void cv::viz::WCloudCollection::addCloud(InputArray cloud, InputArray colors, co
     vtkPolyData *currdata = vtkPolyData::SafeDownCast(mapper->GetInput());
     CV_Assert("Cloud Widget without data" && currdata);
 
-    vtkSmartPointer<vtkAppendPolyData> appendFilter = vtkSmartPointer<vtkAppendPolyData>::New();
-#if VTK_MAJOR_VERSION <= 5
-    appendFilter->AddInput(currdata);
-    appendFilter->AddInput(polydata);
-    mapper->SetInput(appendFilter->GetOutput());
-#else
-    appendFilter->AddInputData(currdata);
-    appendFilter->AddInputData(polydata);
-    mapper->SetInputData(appendFilter->GetOutput());
-#endif
+    vtkSmartPointer<vtkAppendPolyData> append_filter = vtkSmartPointer<vtkAppendPolyData>::New();
+    append_filter->AddInputConnection(currdata->GetProducerPort());
+    append_filter->AddInputConnection(polydata->GetProducerPort());
+    append_filter->Update();
+
+    VtkUtils::SetInputData(mapper, append_filter->GetOutput());
 
     actor->SetNumberOfCloudPoints(std::max(1, actor->GetNumberOfCloudPoints() + polydata->GetNumberOfPoints()/10));
 }
@@ -245,11 +239,7 @@ cv::viz::WCloudNormals::WCloudNormals(InputArray _cloud, InputArray _normals, in
     vtkSmartPointer<vtkDataSetMapper> mapper = vtkSmartPointer<vtkDataSetMapper>::New();
     mapper->SetColorModeToMapScalars();
     mapper->SetScalarModeToUsePointData();
-#if VTK_MAJOR_VERSION <= 5
-    mapper->SetInput(polyData);
-#else
-    mapper->SetInputData(polyData);
-#endif
+    VtkUtils::SetInputData(mapper, polyData);
 
     vtkSmartPointer<vtkActor> actor = vtkSmartPointer<vtkActor>::New();
     actor->SetMapper(mapper);
@@ -326,11 +316,7 @@ cv::viz::WMesh::WMesh(const Mesh3d &mesh)
     vtkSmartPointer<vtkDataSetMapper> mapper = vtkSmartPointer<vtkDataSetMapper>::New();
     mapper->SetScalarModeToUsePointData();
     mapper->ImmediateModeRenderingOff();
-#if VTK_MAJOR_VERSION <= 5
-    mapper->SetInput(polydata);
-#else
-    mapper->SetInputData(polydata);
-#endif
+    VtkUtils::SetInputData(mapper, polydata);
 
     vtkSmartPointer<vtkActor> actor = vtkSmartPointer<vtkActor>::New();
     //actor->SetNumberOfCloudPoints(std::max(1, polydata->GetNumberOfPoints() / 10));

modules/viz/src/interactor_style.cpp

@@ -564,7 +564,6 @@ void cv::viz::InteractorStyle::OnLeftButtonUp()
 void cv::viz::InteractorStyle::OnMiddleButtonDown()
 {
     Vec2i p(Interactor->GetEventPosition());
-
     MouseEvent::Type type = (Interactor->GetRepeatCount() == 0) ? MouseEvent::MouseButtonPress : MouseEvent::MouseDblClick;
     MouseEvent event(type, MouseEvent::MiddleButton, p, getModifiers());
     if (mouseCallback_)
@@ -586,7 +585,6 @@ void cv::viz::InteractorStyle::OnMiddleButtonUp()
 void cv::viz::InteractorStyle::OnRightButtonDown()
 {
     Vec2i p(Interactor->GetEventPosition());
-
     MouseEvent::Type type = (Interactor->GetRepeatCount() == 0) ? MouseEvent::MouseButtonPress : MouseEvent::MouseDblClick;
     MouseEvent event(type, MouseEvent::RightButton, p, getModifiers());
     if (mouseCallback_)