Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 7b06ae9a authored by CERUTTI Guillaume's avatar CERUTTI Guillaume
Browse files

slightly more modular approach

parent dc5a5d50
No related branches found
No related tags found
1 merge request!8build a CGAL image
Pipeline #953253 passed
......@@ -3,7 +3,7 @@
#include "CgalLabelledImage.h"
int buildCgalImage(Eigen::Array<unsigned short, Eigen::Dynamic, 1> image_array, Eigen::Array<int, 3, 1> shape, Eigen::Array<double, 3, 1> voxelsize)
CGAL::Image_3 buildCgalImage(Eigen::Array<unsigned short, Eigen::Dynamic, 1> image_array, Eigen::Array<int, 3, 1> shape, Eigen::Array<double, 3, 1> voxelsize)
{
_image* image = _createImage(
shape(0), shape(1), shape(2), 1,
......@@ -20,7 +20,6 @@ int buildCgalImage(Eigen::Array<unsigned short, Eigen::Dynamic, 1> image_array,
}
}
}
CGAL::Image_3 cgal_image(image);
return 0;
return CGAL::Image_3(image);
}
......@@ -5,4 +5,4 @@
#include <Eigen/Dense>
int buildCgalImage(Eigen::Array<unsigned short, Eigen::Dynamic, 1> image_array, Eigen::Array<int, 3, 1> shape, Eigen::Array<double, 3, 1> voxelsize={1.0, 1.0, 1.0});
\ No newline at end of file
CGAL::Image_3 buildCgalImage(Eigen::Array<unsigned short, Eigen::Dynamic, 1> image_array, Eigen::Array<int, 3, 1> shape, Eigen::Array<double, 3, 1> voxelsize={1.0, 1.0, 1.0});
\ No newline at end of file
......@@ -7,6 +7,16 @@
namespace py = pybind11;
int cgalLabelledImage(Eigen::Array<unsigned short, Eigen::Dynamic, 1> image_array, Eigen::Array<int, 3, 1> shape, Eigen::Array<double, 3, 1> voxelsize)
{
CGAL::Image_3 image = buildCgalImage(image_array, shape, voxelsize);
if ((image.xdim() != shape(0)) || (image.ydim() != shape(1)) || (image.zdim() != shape(2))) {
return EXIT_FAILURE;
}
return 0;
}
PYBIND11_MODULE(_wrp, m) {
py::class_<LabelledTetrahedralMesh>(m, "LabelledTetrahedralMesh")
.def(py::init<>())
......@@ -18,5 +28,5 @@ PYBIND11_MODULE(_wrp, m) {
m.def("make_tetrahedron", &makeTetrahedron);
m.def("build_cgal_image", &buildCgalImage, py::arg("image_array"), py::arg("shape"), py::arg("voxelsize"));
m.def("build_cgal_image", &cgalLabelledImage, py::arg("image_array"), py::arg("shape"), py::arg("voxelsize"));
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment