potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial

Browse Source
This commit is contained in:
Ozan Tonkal
2013-09-07 13:20:13 +02:00
parent 9a91a12fb2
commit fdbf20c172
9 changed files with 43 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/viz/include/opencv2/viz/widgets.hpp
+28
View File
@@ -6,6 +6,34 @@ namespace cv
{
namespace viz
{
/////////////////////////////////////////////////////////////////////////////
/// Widget rendering properties
enum RenderingProperties
{
VIZ_POINT_SIZE,
VIZ_OPACITY,
VIZ_LINE_WIDTH,
VIZ_FONT_SIZE,
VIZ_COLOR,
VIZ_REPRESENTATION,
VIZ_IMMEDIATE_RENDERING,
VIZ_SHADING
};
enum RenderingRepresentationProperties
{
REPRESENTATION_POINTS,
REPRESENTATION_WIREFRAME,
REPRESENTATION_SURFACE
};
enum ShadingRepresentationProperties
{
SHADING_FLAT,
SHADING_GOURAUD,
SHADING_PHONG
};
/////////////////////////////////////////////////////////////////////////////
/// The base class for all widgets
class CV_EXPORTS Widget
modules/viz/src/common.h
-39
View File
@@ -1,39 +0,0 @@
#pragma once
#include <opencv2/core/cvdef.h>
#include <opencv2/core.hpp>
#include <opencv2/viz/types.hpp>
namespace cv
{
namespace viz
{
enum RenderingProperties
{
VIZ_POINT_SIZE,
VIZ_OPACITY,
VIZ_LINE_WIDTH,
VIZ_FONT_SIZE,
VIZ_COLOR,
VIZ_REPRESENTATION,
VIZ_IMMEDIATE_RENDERING,
VIZ_SHADING
};
enum RenderingRepresentationProperties
{
REPRESENTATION_POINTS,
REPRESENTATION_WIREFRAME,
REPRESENTATION_SURFACE
};
enum ShadingRepresentationProperties
{
SHADING_FLAT,
SHADING_GOURAUD,
SHADING_PHONG
};
}
}
modules/viz/src/interactor_style.h
-1
View File
@@ -1,6 +1,5 @@
#pragma once
#include "viz_types.h"
#include <opencv2/viz/types.hpp>
namespace cv
modules/viz/src/precomp.hpp
+7
View File
@@ -76,6 +76,13 @@
#undef __DEPRECATED_DISABLED__
#endif
namespace cv
{
namespace viz
{
typedef std::map<std::string, vtkSmartPointer<vtkProp> > WidgetActorMap;
}
}
#include "viz3d_impl.hpp"
#include <opencv2/core.hpp>
modules/viz/src/viz3d_impl.hpp
-2
View File
@@ -2,8 +2,6 @@
#include <opencv2/viz.hpp>
#include "interactor_style.h"
#include "viz_types.h"
#include "common.h"
struct cv::viz::Viz3d::VizImpl
{
modules/viz/src/viz_types.h
-12
View File
@@ -1,12 +0,0 @@
#pragma once
#include "precomp.hpp"
namespace cv
{
namespace viz
{
typedef std::map<std::string, vtkSmartPointer<vtkProp> > WidgetActorMap;
}
}
modules/viz/test/test_viz3d.cpp
+4 -1
View File
@@ -44,6 +44,7 @@
#include <opencv2/core.hpp>
#include <opencv2/imgproc.hpp>
#include <opencv2/highgui.hpp>
#include <opencv2/calib3d.hpp>
#include <fstream>
#include <string>
@@ -100,6 +101,7 @@ TEST(Viz_viz3d, accuracy)
viz::CoordinateSystemWidget csw;
viz::TextWidget tw("TEST", Point(100, 100), 20);
viz::CloudWidget pcw(cloud, colors);
// pcw.setRenderingProperty(VIZ_LINE_WIDTH));
viz::CloudWidget pcw2(cloud, viz::Color::magenta());
// viz.showWidget("line", lw);
@@ -135,7 +137,7 @@ TEST(Viz_viz3d, accuracy)
viz::Mesh3d mesh = cv::viz::Mesh3d::loadMesh("/Users/nerei/horse.ply");
viz::MeshWidget mw(mesh);
// viz::MeshWidget mw(mesh);
// viz.showWidget("mesh", mw);
Mat img = imread("opencv.png");
@@ -173,6 +175,7 @@ TEST(Viz_viz3d, accuracy)
//viz.showWidget("trajectory1", viz::TrajectoryWidget(trajectory, viz::Color(0,255,255), true, 0.5));
viz.showWidget("trajectory2", viz::TrajectoryWidget(trajectory, K, 1.0, viz::Color(255,0,255)));
// cv::Rodrigues2(Vec3f(), Mat());
// viz.showWidget("trajectory1", viz::TrajectoryWidget(trajectory/*, viz::Color::yellow()*/));