From: Anatoly Baksheev <no@email>
Date: Sun, 16 Feb 2014 17:27:25 +0000 (+0400)
Subject: iteractor work
X-Git-Tag: accepted/tizen/ivi/20140515.103456~1^2~46^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fde0185a774b258988c9e37efbb8be14090e581a;p=profile%2Fivi%2Fopencv.git

iteractor work
---

diff --git a/modules/viz/doc/widget.rst b/modules/viz/doc/widget.rst
index 31546ae..0884ece 100644
--- a/modules/viz/doc/widget.rst
+++ b/modules/viz/doc/widget.rst
@@ -934,7 +934,7 @@ This 3D Widget defines a collection of clouds. ::
         void addCloud(InputArray cloud, InputArray colors, const Affine3d &pose = Affine3d::Identity());
         //! All points in cloud have the same color
         void addCloud(InputArray cloud, const Color &color = Color::white(), Affine3d &pose = Affine3d::Identity());
-        //! Repacks internal structure to sinle cloud
+        //! Repacks internal structure to single cloud
         void finalize();
     };
 
@@ -1030,8 +1030,8 @@ viz::WWidgetMerger
 ---------------------
 .. ocv:class:: WWidgetMerger
 
-This class allos to merge several widgets to single one. It has quite limited functionality and can't merge widgets with different attributes. For instance, 
-if widgetA has color array and widgetB has only global color defined, then result of merge won't have color at all. The class is suitable for merging large amount of similar widgets.
+This class allows to merge several widgets to single one. It has quite limited functionality and can't merge widgets with different attributes. For instance,
+if widgetA has color array and widgetB has only global color defined, then result of merge won't have color at all. The class is suitable for merging large amount of similar widgets. ::
 
     class CV_EXPORTS WWidgetMerger : public Widget3D
     {
@@ -1041,11 +1041,10 @@ if widgetA has color array and widgetB has only global color defined, then resul
         //! Add widget to merge with optional position change
         void addWidget(const Widget3D& widget, const Affine3d &pose = Affine3d::Identity());
 
-        //! Repacks internal structure to sinle widget
+        //! Repacks internal structure to single widget
         void finalize();
     };
 
-
 viz::WWidgetMerger::WWidgetMerger
 ---------------------------------------
 Constructs a WWidgetMerger.
diff --git a/modules/viz/include/opencv2/viz/widgets.hpp b/modules/viz/include/opencv2/viz/widgets.hpp
index 0c2a4f7..2949598 100644
--- a/modules/viz/include/opencv2/viz/widgets.hpp
+++ b/modules/viz/include/opencv2/viz/widgets.hpp
@@ -346,7 +346,7 @@ namespace cv
             void addCloud(InputArray cloud, InputArray colors, const Affine3d &pose = Affine3d::Identity());
             //! All points in cloud have the same color
             void addCloud(InputArray cloud, const Color &color = Color::white(), const Affine3d &pose = Affine3d::Identity());
-            //! Repacks internal structure to sinle cloud
+            //! Repacks internal structure to single cloud
             void finalize();
         };
 
@@ -363,7 +363,6 @@ namespace cv
             WMesh(InputArray cloud, InputArray polygons, InputArray colors = noArray(), InputArray normals = noArray());
         };
 
-
         class CV_EXPORTS WWidgetMerger : public Widget3D
         {
         public:
@@ -372,7 +371,7 @@ namespace cv
             //! Add widget to merge with optional position change
             void addWidget(const Widget3D& widget, const Affine3d &pose = Affine3d::Identity());
 
-            //! Repacks internal structure to sinle widget
+            //! Repacks internal structure to single widget
             void finalize();
         };
 
diff --git a/modules/viz/src/vtk/vtkCocoaInteractorFix.mm b/modules/viz/src/vtk/vtkCocoaInteractorFix.mm
index 23bba55..dad41b0 100644
--- a/modules/viz/src/vtk/vtkCocoaInteractorFix.mm
+++ b/modules/viz/src/vtk/vtkCocoaInteractorFix.mm
@@ -148,7 +148,7 @@
             renWin->SetRootWindow(NULL);
         }
     }
-} 
+}
 
 @end
 
@@ -209,4 +209,3 @@ vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteract
 {
     return vtkSmartPointer<vtkCocoaRenderWindowInteractorFix>::New();
 }
-
diff --git a/modules/viz/src/vtk/vtkVizInteractorStyle.cpp b/modules/viz/src/vtk/vtkVizInteractorStyle.cpp
index 57aee63..9b5eca2 100644
--- a/modules/viz/src/vtk/vtkVizInteractorStyle.cpp
+++ b/modules/viz/src/vtk/vtkVizInteractorStyle.cpp
@@ -1074,4 +1074,3 @@ void cv::viz::vtkVizInteractorStyle::PrintSelf(ostream& os, vtkIndent indent)
     os << indent << "AngleStepSize: " << AngleStepSize << "\n";
     os << indent << "MotionUserScale: "<< MotionUserScale << "\n";
 }
-
diff --git a/modules/viz/test/test_viz3d.cpp b/modules/viz/test/test_viz3d.cpp
index 45d3cdc..45128df 100644
--- a/modules/viz/test/test_viz3d.cpp
+++ b/modules/viz/test/test_viz3d.cpp
@@ -59,6 +59,5 @@ TEST(Viz_viz3d, DISABLED_develop)
     //cv::Mat cloud = cv::viz::readCloud(get_dragon_ply_file_path());
     //---->>>>> </to_test_in_future>
 
-
     viz.spin();
 }