generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix aspect_ratio computation from fovs, add casting for camerapositionwidget, trajectorywidget

Browse Source
This commit is contained in:
ozantonkal 2013-07-25 10:23:24 +02:00
parent 769512db2d
commit aa2594c06c
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,6 +231,8 @@ namespace cv
template<> CV_EXPORTS TextWidget Widget::cast<TextWidget>(); template<> CV_EXPORTS TextWidget Widget::cast<TextWidget>();
template<> CV_EXPORTS ImageOverlayWidget Widget::cast<ImageOverlayWidget>(); template<> CV_EXPORTS ImageOverlayWidget Widget::cast<ImageOverlayWidget>();
template<> CV_EXPORTS Image3DWidget Widget::cast<Image3DWidget>(); template<> CV_EXPORTS Image3DWidget Widget::cast<Image3DWidget>();
template<> CV_EXPORTS CameraPositionWidget Widget::cast<CameraPositionWidget>();
template<> CV_EXPORTS TrajectoryWidget Widget::cast<TrajectoryWidget>();
template<> CV_EXPORTS CloudWidget Widget::cast<CloudWidget>(); template<> CV_EXPORTS CloudWidget Widget::cast<CloudWidget>();
template<> CV_EXPORTS CloudNormalsWidget Widget::cast<CloudNormalsWidget>(); template<> CV_EXPORTS CloudNormalsWidget Widget::cast<CloudNormalsWidget>();
template<> CV_EXPORTS MeshWidget Widget::cast<MeshWidget>(); template<> CV_EXPORTS MeshWidget Widget::cast<MeshWidget>();

17
modules/viz/src/shape_widgets.cpp
View File

@ -1003,9 +1003,10 @@ cv::viz::CameraPositionWidget::CameraPositionWidget(const Vec2f &fov, double sca
camera->SetFocalPoint(0.0,0.0,1.0); camera->SetFocalPoint(0.0,0.0,1.0);
camera->SetClippingRange(0.01, scale); camera->SetClippingRange(0.01, scale);
double aspect_ratio = tan(fov[0] * 0.5) / tan(fov[1] * 0.5);
double planesArray[24]; double planesArray[24];
// Default aspect ratio = 1.0? fovx/fovy? camera->GetFrustumPlanes(aspect_ratio, planesArray);
camera->GetFrustumPlanes(1.0, planesArray);
vtkSmartPointer<vtkPlanes> planes = vtkSmartPointer<vtkPlanes>::New(); vtkSmartPointer<vtkPlanes> planes = vtkSmartPointer<vtkPlanes>::New();
planes->SetFrustumPlanes(planesArray); planes->SetFrustumPlanes(planesArray);
@ -1122,6 +1123,12 @@ cv::viz::CameraPositionWidget::CameraPositionWidget(const Matx33f &K, const Mat
WidgetAccessor::setProp(*this, actor); WidgetAccessor::setProp(*this, actor);
} }
template<> cv::viz::CameraPositionWidget cv::viz::Widget::cast<cv::viz::CameraPositionWidget>()
{
Widget3D widget = this->cast<Widget3D>();
return static_cast<CameraPositionWidget&>(widget);
}
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
/// trajectory widget implementation /// trajectory widget implementation
@ -1279,3 +1286,9 @@ cv::viz::TrajectoryWidget::TrajectoryWidget(const std::vector<Affine3f> &path, c
WidgetAccessor::setProp(*this, actor); WidgetAccessor::setProp(*this, actor);
setColor(color); setColor(color);
} }
template<> cv::viz::TrajectoryWidget cv::viz::Widget::cast<cv::viz::TrajectoryWidget>()
{
Widget3D widget = this->cast<Widget3D>();
return static_cast<TrajectoryWidget&>(widget);
}