mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor naming

Browse Source
This commit is contained in:
Anatoly Baksheev 2013-07-09 19:35:26 +04:00
parent 200b254bad
commit 509a93c7ce
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/viz/include/opencv2/viz/widget_accessor.hpp
View File

@ -2,7 +2,7 @@
#include <opencv2/core/cvdef.h>
#include <vtkSmartPointer.h>
#include <vtkLODActor.h>
#include <vtkProp.h>
namespace temp_viz
{
@ -13,6 +13,6 @@ namespace temp_viz
struct CV_EXPORTS WidgetAccessor
{
static vtkSmartPointer<vtkProp> getProp(const Widget &widget);
static void setProp(Widget &widget, vtkSmartPointer<vtkProp> actor);
static void setProp(Widget &widget, vtkSmartPointer<vtkProp> prop);
};
}

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

@ -15,7 +15,6 @@ namespace temp_viz
Widget& operator =(const Widget &other);
~Widget();
private:
class Impl;
Impl *impl_;

12
modules/viz/src/widget.cpp
View File

@ -6,10 +6,10 @@
class temp_viz::Widget::Impl
{
public:
vtkSmartPointer<vtkProp> actor;
vtkSmartPointer<vtkProp> prop;
int ref_counter;
Impl() : actor(0) {}
Impl() : prop(0) {}
};
temp_viz::Widget::Widget() : impl_(0)
@ -59,12 +59,12 @@ void temp_viz::Widget::release()
vtkSmartPointer<vtkProp> temp_viz::WidgetAccessor::getProp(const Widget& widget)
{
return widget.impl_->actor;
return widget.impl_->prop;
}
void temp_viz::WidgetAccessor::setProp(Widget& widget, vtkSmartPointer<vtkProp> actor)
void temp_viz::WidgetAccessor::setProp(Widget& widget, vtkSmartPointer<vtkProp> prop)
{
widget.impl_->actor = actor;
widget.impl_->prop = prop;
}
///////////////////////////////////////////////////////////////////////////////////////////////
@ -191,4 +191,4 @@ void temp_viz::Widget2D::setColor(const Color &color)
Color c = vtkcolor(color);
actor->GetProperty ()->SetColor (c.val);
actor->Modified ();
}
}