rearrange widget constructors

modules/viz/include/opencv2/viz/widget_accessor.hpp

@@ -12,7 +12,7 @@ namespace temp_viz
     //It is indended for those users who want to develop own widgets system using VTK library API.
     struct CV_EXPORTS WidgetAccessor
     {
-        static vtkSmartPointer<vtkProp> getActor(const Widget &widget);
-        static void setVtkProp(Widget &widget, vtkSmartPointer<vtkProp> actor);
+        static vtkSmartPointer<vtkProp> getProp(const Widget &widget);
+        static void setProp(Widget &widget, vtkSmartPointer<vtkProp> actor);
     };
 }

modules/viz/include/opencv2/viz/widgets.hpp

@@ -132,6 +132,9 @@ namespace temp_viz
         TextWidget(const String &text, const Point2i &pos, int font_size = 10, const Color &color = Color::white());
         TextWidget(const Widget& other) : Widget2D(other) {}
         TextWidget& operator=(const Widget &other);
+        
+        void setText(const String &text);
+        String getText() const;
     };
     
     class CV_EXPORTS CloudWidget : public Widget3D

modules/viz/src/viz3d_impl.cpp

@@ -874,7 +874,7 @@ void temp_viz::Viz3d::VizImpl::showWidget(const String &id, const Widget &widget
         removeActorFromRenderer(wam_itr->second.actor);
     }
     // Get the actor and set the user matrix
-    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getActor(widget));
+    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getProp(widget));
     if (actor)
     {
         // If the actor is 3D, apply pose
@@ -882,8 +882,8 @@ void temp_viz::Viz3d::VizImpl::showWidget(const String &id, const Widget &widget
         actor->SetUserMatrix (matrix);
         actor->Modified();
     }
-    renderer_->AddActor(WidgetAccessor::getActor(widget));
-    (*widget_actor_map_)[id].actor = WidgetAccessor::getActor(widget);
+    renderer_->AddActor(WidgetAccessor::getProp(widget));
+    (*widget_actor_map_)[id].actor = WidgetAccessor::getProp(widget);
 }
 
 void temp_viz::Viz3d::VizImpl::removeWidget(const String &id)
@@ -902,7 +902,7 @@ temp_viz::Widget temp_viz::Viz3d::VizImpl::getWidget(const String &id) const
     CV_Assert(exists);
     
     Widget widget;
-    WidgetAccessor::setVtkProp(widget, wam_itr->second.actor);
+    WidgetAccessor::setProp(widget, wam_itr->second.actor);
     return widget;
 }
 

modules/viz/src/widget.cpp

@@ -57,12 +57,12 @@ void temp_viz::Widget::release()
 ///////////////////////////////////////////////////////////////////////////////////////////////
 /// widget accessor implementaion
 
-vtkSmartPointer<vtkProp> temp_viz::WidgetAccessor::getActor(const Widget& widget)
+vtkSmartPointer<vtkProp> temp_viz::WidgetAccessor::getProp(const Widget& widget)
 {
     return widget.impl_->actor;
 }
 
-void temp_viz::WidgetAccessor::setVtkProp(Widget& widget, vtkSmartPointer<vtkProp> actor)
+void temp_viz::WidgetAccessor::setProp(Widget& widget, vtkSmartPointer<vtkProp> actor)
 {
     widget.impl_->actor = actor;
 }
@@ -94,14 +94,14 @@ struct temp_viz::Widget3D::MatrixConverter
 temp_viz::Widget3D::Widget3D(const Widget& other) : Widget(other)
 {
     // Check if other's actor is castable to vtkProp3D
-    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getActor(other));
+    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getProp(other));
     CV_Assert(actor);
 }
 
 temp_viz::Widget3D& temp_viz::Widget3D::operator =(const Widget &other)
 {
     // Check if other's actor is castable to vtkProp3D
-    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getActor(other));
+    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getProp(other));
     CV_Assert(actor);
     
     Widget::operator=(other);
@@ -110,7 +110,7 @@ temp_viz::Widget3D& temp_viz::Widget3D::operator =(const Widget &other)
 
 void temp_viz::Widget3D::setPose(const Affine3f &pose)
 {
-    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getActor(*this));
+    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getProp(*this));
     CV_Assert(actor);
     
     vtkSmartPointer<vtkMatrix4x4> matrix = convertToVtkMatrix(pose.matrix);
@@ -120,7 +120,7 @@ void temp_viz::Widget3D::setPose(const Affine3f &pose)
 
 void temp_viz::Widget3D::updatePose(const Affine3f &pose)
 {
-    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getActor(*this));
+    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getProp(*this));
     CV_Assert(actor);
     
     vtkSmartPointer<vtkMatrix4x4> matrix = actor->GetUserMatrix();
@@ -140,7 +140,7 @@ void temp_viz::Widget3D::updatePose(const Affine3f &pose)
 
 temp_viz::Affine3f temp_viz::Widget3D::getPose() const
 {
-    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getActor(*this));
+    vtkProp3D *actor = vtkProp3D::SafeDownCast(WidgetAccessor::getProp(*this));
     CV_Assert(actor);
     
     vtkSmartPointer<vtkMatrix4x4> matrix = actor->GetUserMatrix();
@@ -151,7 +151,7 @@ temp_viz::Affine3f temp_viz::Widget3D::getPose() const
 void temp_viz::Widget3D::setColor(const Color &color)
 {
     // Cast to actor instead of prop3d since prop3d doesn't provide getproperty
-    vtkActor *actor = vtkActor::SafeDownCast(WidgetAccessor::getActor(*this));
+    vtkActor *actor = vtkActor::SafeDownCast(WidgetAccessor::getProp(*this));
     CV_Assert(actor);
     
     Color c = vtkcolor(color);
@@ -171,14 +171,14 @@ void temp_viz::Widget3D::setColor(const Color &color)
 temp_viz::Widget2D::Widget2D(const Widget &other) : Widget(other)
 {
     // Check if other's actor is castable to vtkActor2D
-    vtkActor2D *actor = vtkActor2D::SafeDownCast(WidgetAccessor::getActor(other));
+    vtkActor2D *actor = vtkActor2D::SafeDownCast(WidgetAccessor::getProp(other));
     CV_Assert(actor);
 }
 
 temp_viz::Widget2D& temp_viz::Widget2D::operator=(const Widget &other)
 {
     // Check if other's actor is castable to vtkActor2D
-    vtkActor2D *actor = vtkActor2D::SafeDownCast(WidgetAccessor::getActor(other));
+    vtkActor2D *actor = vtkActor2D::SafeDownCast(WidgetAccessor::getProp(other));
     CV_Assert(actor);
     Widget::operator=(other);
     return *this;
@@ -186,7 +186,7 @@ temp_viz::Widget2D& temp_viz::Widget2D::operator=(const Widget &other)
 
 void temp_viz::Widget2D::setColor(const Color &color)
 {
-    vtkActor2D *actor = vtkActor2D::SafeDownCast(WidgetAccessor::getActor(*this));
+    vtkActor2D *actor = vtkActor2D::SafeDownCast(WidgetAccessor::getProp(*this));
     CV_Assert(actor);
     Color c = vtkcolor(color);
     actor->GetProperty ()->SetColor (c.val);