From 458296ced54f8dfdac303a998b7b53f905bd2462 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Thu, 27 Aug 2020 09:31:51 +0200 Subject: [PATCH 1/3] add a factor 1.001 to the default values of the spacing --- .../demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp index 4a99a1101c0..da4934b0dc4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp @@ -417,11 +417,11 @@ void Polyhedron_demo_affine_transform_plugin::grid() Scene_item::Bbox b = item->bbox(); - double x_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), + double x_t(1.001*CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), Kernel::Point_3((b.max)(0), (b.min)(1), (b.min)(2))))), - y_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), + y_t(CGAL::sqrt(1.001*CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), Kernel::Point_3((b.min)(0), (b.max)(1), (b.min)(2))))), - z_t(CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), + z_t(CGAL::sqrt(1.001*CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), Kernel::Point_3((b.min)(0), (b.min)(1), (b.max)(2))))); GridDialog dialog(mw); From 7fd1d41c33f7deb57b463ed5804352644fd4c33a Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Thu, 27 Aug 2020 13:51:58 +0200 Subject: [PATCH 2/3] Fix spacing method --- .../Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp index da4934b0dc4..2fde8fc8faf 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp @@ -417,12 +417,9 @@ void Polyhedron_demo_affine_transform_plugin::grid() Scene_item::Bbox b = item->bbox(); - double x_t(1.001*CGAL::sqrt(CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), - Kernel::Point_3((b.max)(0), (b.min)(1), (b.min)(2))))), - y_t(CGAL::sqrt(1.001*CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), - Kernel::Point_3((b.min)(0), (b.max)(1), (b.min)(2))))), - z_t(CGAL::sqrt(1.001*CGAL::squared_distance(Kernel::Point_3((b.min)(0), (b.min)(1), (b.min)(2)), - Kernel::Point_3((b.min)(0), (b.min)(1), (b.max)(2))))); + double x_t(1.001*((b.max)(0)- b.min(0))), + y_t(1.001*((b.max)(1)- b.min(1))), + z_t(1.001*((b.max)(2)- b.min(2))); GridDialog dialog(mw); dialog.x_space_doubleSpinBox->setValue(x_t); From a6199184befe11bf69deee5c537d0529820b8df2 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 21 Sep 2020 09:55:13 +0200 Subject: [PATCH 3/3] Add parenthesis around b.min --- .../demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp index 2fde8fc8faf..cc8a0328100 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Affine_transform_plugin.cpp @@ -417,9 +417,9 @@ void Polyhedron_demo_affine_transform_plugin::grid() Scene_item::Bbox b = item->bbox(); - double x_t(1.001*((b.max)(0)- b.min(0))), - y_t(1.001*((b.max)(1)- b.min(1))), - z_t(1.001*((b.max)(2)- b.min(2))); + double x_t(1.001*((b.max)(0)- (b.min)(0))), + y_t(1.001*((b.max)(1)- (b.min)(1))), + z_t(1.001*((b.max)(2)- (b.min)(2))); GridDialog dialog(mw); dialog.x_space_doubleSpinBox->setValue(x_t);