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

hide VizMap and VizPair from public interface

Browse Source
This commit is contained in:
Ozan Tonkal 2013-09-11 13:23:57 +02:00
parent 9895093524
commit 620d92824c
3 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/viz/include/opencv2/viz.hpp
View File

@ -57,9 +57,6 @@ namespace cv
{
namespace viz
{
typedef std::map<String, Viz3d> VizMap;
typedef std::pair<String, Viz3d> VizPair;
//! takes coordiante frame data and builds transfrom to global coordinate frame
CV_EXPORTS Affine3f makeTransformToGlobal(const Vec3f& axis_x, const Vec3f& axis_y, const Vec3f& axis_z, const Vec3f& origin = Vec3f::all(0));
@ -112,7 +109,9 @@ namespace cv
static VizAccessor * instance_;
static bool is_instantiated_;
static VizMap viz_map_;
struct VizAccessorImpl;
static VizAccessorImpl * impl_;
friend class Viz3d;
};

10
modules/viz/src/precomp.hpp
View File

@ -134,6 +134,16 @@ namespace cv
}
#include "viz3d_impl.hpp"
namespace cv
{
namespace viz
{
typedef std::map<std::string, Viz3d> VizMap;
typedef std::pair<std::string, Viz3d> VizPair;
}
}
#include <opencv2/core.hpp>
#include <opencv2/viz.hpp>
#include <opencv2/viz/types.hpp>

34
modules/viz/src/viz.cpp
View File

@ -138,11 +138,23 @@ namespace cv
cv::viz::VizAccessor * cv::viz::VizAccessor::instance_ = 0;
bool cv::viz::VizAccessor::is_instantiated_ = false;
cv::viz::VizMap cv::viz::VizAccessor::viz_map_;
cv::viz::VizAccessor::VizAccessorImpl * cv::viz::VizAccessor::impl_ = 0;
cv::viz::VizAccessor::VizAccessor() {}
struct cv::viz::VizAccessor::VizAccessorImpl
{
cv::viz::VizMap viz_map;
};
cv::viz::VizAccessor::~VizAccessor() {}
cv::viz::VizAccessor::VizAccessor() { impl_ = new cv::viz::VizAccessor::VizAccessorImpl;}
cv::viz::VizAccessor::~VizAccessor()
{
if(impl_)
{
delete impl_;
impl_ = 0;
}
}
cv::viz::VizAccessor & cv::viz::VizAccessor::getInstance()
{
@ -170,8 +182,8 @@ cv::viz::Viz3d cv::viz::VizAccessor::get(const String & window_name)
String name;
generateWindowName(window_name, name);
VizMap::iterator vm_itr = viz_map_.find(name);
bool exists = vm_itr != viz_map_.end();
VizMap::iterator vm_itr = impl_->viz_map.find(name);
bool exists = vm_itr != impl_->viz_map.end();
if (exists) return vm_itr->second;
else return Viz3d(window_name);
}
@ -179,10 +191,10 @@ cv::viz::Viz3d cv::viz::VizAccessor::get(const String & window_name)
void cv::viz::VizAccessor::add(Viz3d window)
{
String window_name = window.getWindowName();
VizMap::iterator vm_itr = viz_map_.find(window_name);
bool exists = vm_itr != viz_map_.end();
VizMap::iterator vm_itr = impl_->viz_map.find(window_name);
bool exists = vm_itr != impl_->viz_map.end();
if (exists) return ;
viz_map_.insert(VizPair(window_name, window));
impl_->viz_map.insert(VizPair(window_name, window));
}
void cv::viz::VizAccessor::remove(const String &window_name)
@ -191,10 +203,10 @@ void cv::viz::VizAccessor::remove(const String &window_name)
String name;
generateWindowName(window_name, name);
VizMap::iterator vm_itr = viz_map_.find(name);
bool exists = vm_itr != viz_map_.end();
VizMap::iterator vm_itr = impl_->viz_map.find(name);
bool exists = vm_itr != impl_->viz_map.end();
if (!exists) return ;
viz_map_.erase(vm_itr);
impl_->viz_map.erase(vm_itr);
}
void cv::viz::VizAccessor::generateWindowName(const String &window_name, String &output)