diff --git a/modules/viz/include/opencv2/viz/types.hpp b/modules/viz/include/opencv2/viz/types.hpp index 6085da2f2..fd504a784 100644 --- a/modules/viz/include/opencv2/viz/types.hpp +++ b/modules/viz/include/opencv2/viz/types.hpp @@ -16,14 +16,17 @@ namespace temp_viz typedef cv::Vec4d Vec4d; typedef cv::Vec2d Vec2d; typedef cv::Vec2i Vec2i; + typedef cv::Vec3b Vec3b; typedef cv::Matx33d Matx33d; typedef cv::Affine3f Affine3f; typedef cv::Affine3d Affine3d; typedef cv::Point3f Point3f; + typedef cv::Point3d Point3d; typedef cv::Matx44d Matx44d; typedef cv::Matx44f Matx44f; typedef cv::Size Size; typedef cv::Point Point; + typedef cv::InputArray InputArray; diff --git a/modules/viz/include/opencv2/viz/viz3d.hpp b/modules/viz/include/opencv2/viz/viz3d.hpp index 2e89e5f90..3a861eeff 100644 --- a/modules/viz/include/opencv2/viz/viz3d.hpp +++ b/modules/viz/include/opencv2/viz/viz3d.hpp @@ -27,7 +27,7 @@ namespace temp_viz void addCoordinateSystem(double scale, const Affine3f& t, const String &id = "coordinate"); - void showPointCloud(const std::string& id, cv::InputArray cloud, cv::InputArray colors, const cv::Affine3f& pose = cv::Affine3f::Identity()); + void showPointCloud(const String& id, InputArray cloud, InputArray colors, const Affine3f& pose = Affine3f::Identity()); bool addPointCloudNormals (const Mat &cloud, const Mat& normals, int level = 100, float scale = 0.02f, const String &id = "cloud"); diff --git a/modules/viz/src/q/viz3d_impl.hpp b/modules/viz/src/q/viz3d_impl.hpp index 17b643c2e..169666141 100644 --- a/modules/viz/src/q/viz3d_impl.hpp +++ b/modules/viz/src/q/viz3d_impl.hpp @@ -103,7 +103,7 @@ public: * \param[in] colors color input in the same order of the points or single uniform color * \param[in] pose transform to be applied on the point cloud */ - void showPointCloud(const std::string& id, cv::InputArray cloud, cv::InputArray colors, const cv::Affine3f& pose = cv::Affine3f::Identity()); + void showPointCloud(const String& id, InputArray cloud, InputArray colors, const Affine3f& pose = Affine3f::Identity()); bool addPolygonMesh (const Mesh3d& mesh, const cv::Mat& mask, const std::string &id = "polygon"); bool updatePolygonMesh (const Mesh3d& mesh, const cv::Mat& mask, const std::string &id = "polygon"); diff --git a/modules/viz/src/viz3d.cpp b/modules/viz/src/viz3d.cpp index 4b2e3b19e..e06c85ca0 100644 --- a/modules/viz/src/viz3d.cpp +++ b/modules/viz/src/viz3d.cpp @@ -23,7 +23,7 @@ void temp_viz::Viz3d::addCoordinateSystem(double scale, const Affine3f& t, const impl_->addCoordinateSystem(scale, t, id); } -void temp_viz::Viz3d::showPointCloud(const std::string& id, cv::InputArray cloud, cv::InputArray colors, const cv::Affine3f& pose) +void temp_viz::Viz3d::showPointCloud(const String& id, InputArray cloud, InputArray colors, const Affine3f& pose) { impl_->showPointCloud(id, cloud, colors, pose); } diff --git a/modules/viz/src/viz3d_impl.cpp b/modules/viz/src/viz3d_impl.cpp index 692e9960d..615f035e8 100644 --- a/modules/viz/src/viz3d_impl.cpp +++ b/modules/viz/src/viz3d_impl.cpp @@ -28,10 +28,10 @@ void temp_viz::Viz3d::VizImpl::setPosition (int x, int y) { window_->SetPosition void temp_viz::Viz3d::VizImpl::setSize (int xw, int yw) { window_->SetSize (xw, yw); } -void temp_viz::Viz3d::VizImpl::showPointCloud(const std::string& id, cv::InputArray cloud, cv::InputArray colors, const cv::Affine3f& pose) +void temp_viz::Viz3d::VizImpl::showPointCloud(const String& id, InputArray cloud, InputArray colors, const Affine3f& pose) { - cv::Mat cloudMat = cloud.getMat(); - cv::Mat colorsMat = colors.getMat(); + Mat cloudMat = cloud.getMat(); + Mat colorsMat = colors.getMat(); CV_Assert(cloudMat.type() == CV_32FC3 && colorsMat.type() == CV_8UC3 && cloudMat.size() == colorsMat.size()); vtkSmartPointer<vtkPolyData> polydata; @@ -84,13 +84,13 @@ void temp_viz::Viz3d::VizImpl::showPointCloud(const std::string& id, cv::InputAr // If a point is NaN, ignore it for(int y = 0; y < cloudMat.rows; ++y) { - const cv::Point3f* crow = cloudMat.ptr<cv::Point3f>(y); + const Point3f* crow = cloudMat.ptr<Point3f>(y); for(int x = 0; x < cloudMat.cols; ++x) if (cvIsNaN(crow[x].x) != 1 && cvIsNaN(crow[x].y) != 1 && cvIsNaN(crow[x].z) != 1) { // Points are transformed based on pose parameter - cv::Point3f transformed_point = pose * crow[x]; - memcpy (&data[j++ * 3], &transformed_point, sizeof(cv::Point3f)); + Point3f transformed_point = pose * crow[x]; + memcpy (&data[j++ * 3], &transformed_point, sizeof(Point3f)); } } nr_points = j; @@ -118,11 +118,11 @@ void temp_viz::Viz3d::VizImpl::showPointCloud(const std::string& id, cv::InputAr j = 0; for(int y = 0; y < colorsMat.rows; ++y) { - const cv::Vec3b* crow = colorsMat.ptr<cv::Vec3b>(y); - const cv::Point3f* cloud_row = cloudMat.ptr<cv::Point3f>(y); + const Vec3b* crow = colorsMat.ptr<Vec3b>(y); + const Point3f* cloud_row = cloudMat.ptr<Point3f>(y); for(int x = 0; x < colorsMat.cols; ++x) if (cvIsNaN(cloud_row[x].x) != 1 && cvIsNaN(cloud_row[x].y) != 1 && cvIsNaN(cloud_row[x].z) != 1) - memcpy (&colors_data[j++ * 3], &crow[x], sizeof(cv::Vec3b)); + memcpy (&colors_data[j++ * 3], &crow[x], sizeof(Vec3b)); } reinterpret_cast<vtkUnsignedCharArray*>(&(*scalars))->SetArray (colors_data, 3 * nr_points, 0); @@ -152,9 +152,6 @@ void temp_viz::Viz3d::VizImpl::showPointCloud(const std::string& id, cv::InputAr // Save the viewpoint transformation matrix to the global actor map vtkSmartPointer<vtkMatrix4x4> transformation = vtkSmartPointer<vtkMatrix4x4>::New(); convertToVtkMatrix (sensor_origin, sensor_orientation, transformation); -// convertToVtkMatrix (pose.matrix, transformation); - - std::cout << transformation->GetElement(0,3) << endl; (*cloud_actor_map_)[id].viewpoint_transformation_ = transformation; }