implemented actor representation methods in viz3d

pull/1453/head
ozantonkal 12 years ago committed by Ozan Tonkal
parent cf36b8f817
commit 4f416352e1
  1. 4
      modules/viz/include/opencv2/viz/viz3d.hpp
  2. 4
      modules/viz/src/viz3d.cpp
  3. 30
      modules/viz/src/viz3d_impl.cpp
  4. 13
      modules/viz/src/viz3d_impl.hpp

@ -57,6 +57,10 @@ namespace cv
void setRenderingProperty(int property, double value, const String &id); void setRenderingProperty(int property, double value, const String &id);
double getRenderingProperty(int property, const String &id); double getRenderingProperty(int property, const String &id);
void setRepresentationToSurface();
void setRepresentationToWireframe();
void setRepresentationToPoints();
private: private:
struct VizImpl; struct VizImpl;

@ -76,3 +76,7 @@ cv::String cv::viz::Viz3d::getWindowName() const { return impl_->getWindowName()
void cv::viz::Viz3d::setRenderingProperty(int property, double value, const String &id) { getWidget(id).setRenderingProperty(property, value); } void cv::viz::Viz3d::setRenderingProperty(int property, double value, const String &id) { getWidget(id).setRenderingProperty(property, value); }
double cv::viz::Viz3d::getRenderingProperty(int property, const String &id) { return getWidget(id).getRenderingProperty(property); } double cv::viz::Viz3d::getRenderingProperty(int property, const String &id) { return getWidget(id).getRenderingProperty(property); }
void cv::viz::Viz3d::setRepresentationToSurface() { impl_->setRepresentationToSurface(); }
void cv::viz::Viz3d::setRepresentationToWireframe() { impl_->setRepresentationToWireframe(); }
void cv::viz::Viz3d::setRepresentationToPoints() { impl_->setRepresentationToPoints(); }

@ -423,33 +423,33 @@ void cv::viz::Viz3d::VizImpl::resetCameraViewpoint (const std::string &id)
} }
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
void cv::viz::Viz3d::VizImpl::setRepresentationToSurfaceForAllActors () void cv::viz::Viz3d::VizImpl::setRepresentationToSurface()
{ {
vtkActorCollection * actors = renderer_->GetActors (); vtkActorCollection * actors = renderer_->GetActors();
actors->InitTraversal (); actors->InitTraversal();
vtkActor * actor; vtkActor * actor;
while ((actor = actors->GetNextActor ()) != NULL) while ((actor = actors->GetNextActor()) != NULL)
actor->GetProperty ()->SetRepresentationToSurface (); actor->GetProperty()->SetRepresentationToSurface();
} }
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
void cv::viz::Viz3d::VizImpl::setRepresentationToPointsForAllActors () void cv::viz::Viz3d::VizImpl::setRepresentationToPoints()
{ {
vtkActorCollection * actors = renderer_->GetActors (); vtkActorCollection * actors = renderer_->GetActors();
actors->InitTraversal (); actors->InitTraversal();
vtkActor * actor; vtkActor * actor;
while ((actor = actors->GetNextActor ()) != NULL) while ((actor = actors->GetNextActor()) != NULL)
actor->GetProperty ()->SetRepresentationToPoints (); actor->GetProperty()->SetRepresentationToPoints();
} }
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
void cv::viz::Viz3d::VizImpl::setRepresentationToWireframeForAllActors () void cv::viz::Viz3d::VizImpl::setRepresentationToWireframe()
{ {
vtkActorCollection * actors = renderer_->GetActors (); vtkActorCollection * actors = renderer_->GetActors();
actors->InitTraversal (); actors->InitTraversal();
vtkActor *actor; vtkActor *actor;
while ((actor = actors->GetNextActor ()) != NULL) while ((actor = actors->GetNextActor()) != NULL)
actor->GetProperty ()->SetRepresentationToWireframe (); actor->GetProperty()->SetRepresentationToWireframe();
} }
////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////

@ -39,16 +39,9 @@ public:
} }
} }
// to implement in Viz3d with shorter name void setRepresentationToSurface();
void setRepresentationToSurfaceForAllActors(); void setRepresentationToPoints();
void setRepresentationToPointsForAllActors(); void setRepresentationToWireframe();
void setRepresentationToWireframeForAllActors();
// //////////////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////////////

Loading…
Cancel
Save