mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove redundant methods, implement assignment operator for widget

Browse Source
This commit is contained in:
ozantonkal 2013-07-03 22:27:09 +03:00
parent c8d2b5ff44
commit daa2a205a4
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,9 @@ namespace temp_viz
public:
Widget();
Widget(const Widget &other);
Widget& operator =(const Widget &other);
void copyTo(Widget &dst);
void setColor(const Color &color);
void setPose(const Affine3f &pose);
@ -134,6 +137,6 @@ namespace temp_viz
class LineWidget : public Widget
{
public:
LineWidget(const Point3f &pt1, const Point3f &pt2, const Color &color);
LineWidget(const Point3f &pt1, const Point3f &pt2, const Color &color = Color(255,255,255));
};
}

23
modules/viz/src/types.cpp
View File

@ -75,17 +75,6 @@ public:
return Affine3f(matrix_cv);
}
void setActorMapperInput(const vtkSmartPointer<vtkDataSet> &data)
{
vtkSmartPointer<vtkDataSetMapper> mapper = reinterpret_cast<vtkDataSetMapper*>(actor->GetMapper ());
if (mapper == 0)
{
mapper = vtkSmartPointer<vtkDataSetMapper>::New ();
actor->SetMapper(mapper);
}
mapper->SetInput (data);
}
protected:
vtkSmartPointer<vtkMatrix4x4> convertToVtkMatrix (const cv::Matx44f &m) const
@ -115,6 +104,18 @@ temp_viz::Widget::Widget(const Widget &other)
impl_ = other.impl_;
}
temp_viz::Widget& temp_viz::Widget::operator =(const Widget &other)
{
if (this != &other)
impl_ = other.impl_;
return *this;
}
void temp_viz::Widget::copyTo(Widget &dst)
{
// TODO Deep copy the data if there is any
}
void temp_viz::Widget::setColor(const Color &color)
{
impl_->setColor(color);

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

@ -97,6 +97,8 @@ TEST(Viz_viz3d, accuracy)
temp_viz::LineWidget lw(cv::Point3f(0.0,0.0,0.0), cv::Point3f(1.0,1.0,1.0), temp_viz::Color(0,255,0));
v.showWidget("line", lw);
temp_viz::LineWidget lw2 = lw;
while(!v.wasStopped())
{
// Creating new point cloud with id cloud1
@ -112,7 +114,7 @@ TEST(Viz_viz3d, accuracy)
v.setShapePose("circle1", cloudPosition);
v.setShapePose("sphere1", cloudPosition);
v.setShapePose("arrow1", cloudPosition);
lw.setColor(temp_viz::Color(col_blue, col_green, col_red));
lw2.setColor(temp_viz::Color(col_blue, col_green, col_red));
angle_x += 0.1f;
angle_y -= 0.1f;