Commit b50d7779 authored by ozantonkal's avatar ozantonkal

cloudwidget private implementation for duplicate code, add cv_assert(exists),…

cloudwidget private implementation for duplicate code, add cv_assert(exists), fix bug point_step bug in CloudNormalsWidget
parent cc08149d
...@@ -103,6 +103,8 @@ namespace temp_viz ...@@ -103,6 +103,8 @@ namespace temp_viz
public: public:
CloudWidget(InputArray _cloud, InputArray _colors); CloudWidget(InputArray _cloud, InputArray _colors);
CloudWidget(InputArray _cloud, const Color &color = Color::white()); CloudWidget(InputArray _cloud, const Color &color = Color::white());
private:
struct CreateCloudWidget;
}; };
class CV_EXPORTS CloudNormalsWidget : public Widget class CV_EXPORTS CloudNormalsWidget : public Widget
......
This diff is collapsed.
...@@ -889,9 +889,7 @@ bool temp_viz::Viz3d::VizImpl::removeWidget(const String &id) ...@@ -889,9 +889,7 @@ bool temp_viz::Viz3d::VizImpl::removeWidget(const String &id)
{ {
WidgetActorMap::iterator wam_itr = widget_actor_map_->find(id); WidgetActorMap::iterator wam_itr = widget_actor_map_->find(id);
bool exists = wam_itr != widget_actor_map_->end(); bool exists = wam_itr != widget_actor_map_->end();
CV_Assert(exists);
if (!exists)
return std::cout << "[removeWidget] A widget with id <" << id << "> does not exist!" << std::endl, false;
if (!removeActorFromRenderer (wam_itr->second.actor)) if (!removeActorFromRenderer (wam_itr->second.actor))
return false; return false;
...@@ -904,10 +902,8 @@ bool temp_viz::Viz3d::VizImpl::setWidgetPose(const String &id, const Affine3f &p ...@@ -904,10 +902,8 @@ bool temp_viz::Viz3d::VizImpl::setWidgetPose(const String &id, const Affine3f &p
{ {
WidgetActorMap::iterator wam_itr = widget_actor_map_->find(id); WidgetActorMap::iterator wam_itr = widget_actor_map_->find(id);
bool exists = wam_itr != widget_actor_map_->end(); bool exists = wam_itr != widget_actor_map_->end();
if (!exists) CV_Assert(exists);
{
return std::cout << "[setWidgetPose] A widget with id <" << id << "> does not exist!" << std::endl, false;
}
vtkLODActor *actor; vtkLODActor *actor;
if ((actor = vtkLODActor::SafeDownCast(wam_itr->second.actor))) if ((actor = vtkLODActor::SafeDownCast(wam_itr->second.actor)))
{ {
...@@ -923,10 +919,8 @@ bool temp_viz::Viz3d::VizImpl::updateWidgetPose(const String &id, const Affine3f ...@@ -923,10 +919,8 @@ bool temp_viz::Viz3d::VizImpl::updateWidgetPose(const String &id, const Affine3f
{ {
WidgetActorMap::iterator wam_itr = widget_actor_map_->find(id); WidgetActorMap::iterator wam_itr = widget_actor_map_->find(id);
bool exists = wam_itr != widget_actor_map_->end(); bool exists = wam_itr != widget_actor_map_->end();
if (!exists) CV_Assert(exists);
{
return std::cout << "[setWidgetPose] A widget with id <" << id << "> does not exist!" << std::endl, false;
}
vtkLODActor *actor; vtkLODActor *actor;
if ((actor = vtkLODActor::SafeDownCast(wam_itr->second.actor))) if ((actor = vtkLODActor::SafeDownCast(wam_itr->second.actor)))
{ {
...@@ -952,10 +946,8 @@ temp_viz::Affine3f temp_viz::Viz3d::VizImpl::getWidgetPose(const String &id) con ...@@ -952,10 +946,8 @@ temp_viz::Affine3f temp_viz::Viz3d::VizImpl::getWidgetPose(const String &id) con
{ {
WidgetActorMap::const_iterator wam_itr = widget_actor_map_->find(id); WidgetActorMap::const_iterator wam_itr = widget_actor_map_->find(id);
bool exists = wam_itr != widget_actor_map_->end(); bool exists = wam_itr != widget_actor_map_->end();
if (!exists) CV_Assert(exists);
{
return Affine3f();
}
vtkLODActor *actor; vtkLODActor *actor;
if ((actor = vtkLODActor::SafeDownCast(wam_itr->second.actor))) if ((actor = vtkLODActor::SafeDownCast(wam_itr->second.actor)))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment