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

iteractor work

Browse Source
This commit is contained in:
Anatoly Baksheev 2014-02-16 21:27:25 +04:00
parent fb7e74c511
commit fde0185a77
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/viz/doc/widget.rst
View File

@ -934,7 +934,7 @@ This 3D Widget defines a collection of clouds. ::
void addCloud(InputArray cloud, InputArray colors, const Affine3d &pose = Affine3d::Identity()); void addCloud(InputArray cloud, InputArray colors, const Affine3d &pose = Affine3d::Identity());
//! All points in cloud have the same color //! All points in cloud have the same color
void addCloud(InputArray cloud, const Color &color = Color::white(), Affine3d &pose = Affine3d::Identity()); 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(); void finalize();
}; };
@ -1030,8 +1030,8 @@ viz::WWidgetMerger
--------------------- ---------------------
.. ocv:class:: 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, 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. 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 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 //! Add widget to merge with optional position change
void addWidget(const Widget3D& widget, const Affine3d &pose = Affine3d::Identity()); void addWidget(const Widget3D& widget, const Affine3d &pose = Affine3d::Identity());
//! Repacks internal structure to sinle widget //! Repacks internal structure to single widget
void finalize(); void finalize();
}; };
viz::WWidgetMerger::WWidgetMerger viz::WWidgetMerger::WWidgetMerger
--------------------------------------- ---------------------------------------
Constructs a WWidgetMerger. Constructs a WWidgetMerger.

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

@ -346,7 +346,7 @@ namespace cv
void addCloud(InputArray cloud, InputArray colors, const Affine3d &pose = Affine3d::Identity()); void addCloud(InputArray cloud, InputArray colors, const Affine3d &pose = Affine3d::Identity());
//! All points in cloud have the same color //! All points in cloud have the same color
void addCloud(InputArray cloud, const Color &color = Color::white(), const Affine3d &pose = Affine3d::Identity()); 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(); void finalize();
}; };
@ -363,7 +363,6 @@ namespace cv
WMesh(InputArray cloud, InputArray polygons, InputArray colors = noArray(), InputArray normals = noArray()); WMesh(InputArray cloud, InputArray polygons, InputArray colors = noArray(), InputArray normals = noArray());
}; };
class CV_EXPORTS WWidgetMerger : public Widget3D class CV_EXPORTS WWidgetMerger : public Widget3D
{ {
public: public:
@ -372,7 +371,7 @@ namespace cv
//! Add widget to merge with optional position change //! Add widget to merge with optional position change
void addWidget(const Widget3D& widget, const Affine3d &pose = Affine3d::Identity()); void addWidget(const Widget3D& widget, const Affine3d &pose = Affine3d::Identity());
//! Repacks internal structure to sinle widget //! Repacks internal structure to single widget
void finalize(); void finalize();
}; };

3
modules/viz/src/vtk/vtkCocoaInteractorFix.mm
View File

@ -148,7 +148,7 @@
renWin->SetRootWindow(NULL); renWin->SetRootWindow(NULL);
} }
} }
} }
@end @end
@ -209,4 +209,3 @@ vtkSmartPointer<vtkRenderWindowInteractor> cv::viz::vtkCocoaRenderWindowInteract
{ {
return vtkSmartPointer<vtkCocoaRenderWindowInteractorFix>::New(); return vtkSmartPointer<vtkCocoaRenderWindowInteractorFix>::New();
} }

1
modules/viz/src/vtk/vtkVizInteractorStyle.cpp
View File

@ -1074,4 +1074,3 @@ void cv::viz::vtkVizInteractorStyle::PrintSelf(ostream& os, vtkIndent indent)
os << indent << "AngleStepSize: " << AngleStepSize << "\n"; os << indent << "AngleStepSize: " << AngleStepSize << "\n";
os << indent << "MotionUserScale: "<< MotionUserScale << "\n"; os << indent << "MotionUserScale: "<< MotionUserScale << "\n";
} }

1
modules/viz/test/test_viz3d.cpp
View File

@ -59,6 +59,5 @@ TEST(Viz_viz3d, DISABLED_develop)
//cv::Mat cloud = cv::viz::readCloud(get_dragon_ply_file_path()); //cv::Mat cloud = cv::viz::readCloud(get_dragon_ply_file_path());
//---->>>>> </to_test_in_future> //---->>>>> </to_test_in_future>
viz.spin(); viz.spin();
} }