Temporary commit

Author: mpoudot

src/Core/Geom/OCCHelper.cpp

@@ -1002,17 +1002,60 @@ computeArea(const TopoDS_Shape& volume)
 void OCCHelper::
 computeBoundingBox(const TopoDS_Shape& shape, gp_Pnt& pmin, gp_Pnt& pmax)
 {
+    Bnd_Box box0;
+    double xmin, ymin, zmin, xmax, ymax, zmax;
+    BRepBndLib::Add(shape, box0);
+    box0.Get(xmin, ymin, zmin, xmax, ymax, zmax);
+    std::cout << "Avec Add : box(["<<xmin<<", "<<ymin<<", "<<zmin<<"],["<<xmax<<", "<<ymax<<", "<<zmax<<"])"<<std::endl;
+
+    Bnd_Box box4;
+    BRepBndLib::Add(shape, box4, false);
+    box4.Get(xmin, ymin, zmin, xmax, ymax, zmax);
+    std::cout << "Avec Add false : box(["<<xmin<<", "<<ymin<<", "<<zmin<<"],["<<xmax<<", "<<ymax<<", "<<zmax<<"])"<<std::endl;
+
+    Bnd_Box box5;
+    BRepBndLib::Add(shape, box5);
+    box5.SetGap(0.0);
+    box5.Get(xmin, ymin, zmin, xmax, ymax, zmax);
+    std::cout << "Avec Add set Gap à 0 : box(["<<xmin<<", "<<ymin<<", "<<zmin<<"],["<<xmax<<", "<<ymax<<", "<<zmax<<"])"<<std::endl;
+
+    Bnd_Box box1;
+    BRepBndLib::AddClose(shape, box1);
+    box1.Get(xmin, ymin, zmin, xmax, ymax, zmax);
+    std::cout << "Avec AddClose: box(["<<xmin<<", "<<ymin<<", "<<zmin<<"],["<<xmax<<", "<<ymax<<", "<<zmax<<"])"<<std::endl;
+
+    Bnd_Box box2;
+    BRepBndLib::AddOptimal(shape, box2);
+    box2.Get(xmin, ymin, zmin, xmax, ymax, zmax);
+    std::cout << "Avec AddOptimal : box(["<<xmin<<", "<<ymin<<", "<<zmin<<"],["<<xmax<<", "<<ymax<<", "<<zmax<<"])"<<std::endl;
+
+    Bnd_Box box3;
+    BRepBndLib::AddOptimal(shape, box3, false, false);
+    box3.Get(xmin, ymin, zmin, xmax, ymax, zmax);
+    std::cout << "Avec AddOptimal false false : box(["<<xmin<<", "<<ymin<<", "<<zmin<<"],["<<xmax<<", "<<ymax<<", "<<zmax<<"])"<<std::endl;
+
+    Bnd_Box box6;
+    BRepBndLib::AddOptimal(shape, box6, false, false);
+    box6.Get(xmin, ymin, zmin, xmax, ymax, zmax);
+    box6.SetGap(0.0);
+    std::cout << "Avec AddOptimal false false setGap à 0 : box(["<<xmin<<", "<<ymin<<", "<<zmin<<"],["<<xmax<<", "<<ymax<<", "<<zmax<<"])"<<std::endl;
+
     Bnd_Box box;
+    /*
     BRepCheck_Analyzer analyzer(shape);
-
     if (analyzer.IsValid()) {
+        std::cout << "On utilise AddClose" << std::endl;
         BRepBndLib::AddClose(shape, box);
+        box.Get(xmin, ymin, zmin, xmax, ymax, zmax);
+        std::cout << "Dans le if: box(["<<xmin<<", "<<ymin<<", "<<zmin<<"],["<<xmax<<", "<<ymax<<", "<<zmax<<"])"<<std::endl;
     } else {
+        std::cout << "On utilise AddOptimal" << std::endl;
         BRepBndLib::AddOptimal(shape, box);
     }
 
     if (box.IsVoid())
     {
+        std::cout << "On utilise Add" << std::endl;
         BRepBndLib::Add(shape, box);
     }
 
@@ -1032,11 +1075,19 @@ computeBoundingBox(const TopoDS_Shape& shape, gp_Pnt& pmin, gp_Pnt& pmax)
         // Vérifier si l'une des dimensions est nulle ou quasi-nulle
         double tolerance =  1e-7;
         if (width < tolerance || height < tolerance || depth < tolerance) {
+            std::cout << "On utilise Add" << std::endl;
             BRepBndLib::Add(shape, box);
         }
     }
-    double xmin, ymin, zmin, xmax, ymax, zmax;
+    */
+   //BRepBndLib::AddOptimal(shape, box);
+    BRepBndLib::AddOptimal(shape, box);
+    box.SetGap(0.0);
+
+    //double xmin, ymin, zmin, xmax, ymax, zmax;
     box.Get(xmin, ymin, zmin, xmax, ymax, zmax);
+    std::cout << "Au final: box(["<<xmin<<", "<<ymin<<", "<<zmin<<"],["<<xmax<<", "<<ymax<<", "<<zmax<<"])"<<std::endl;
+
     pmin.SetCoord(xmin, ymin, zmin);
     pmax.SetCoord(xmax, ymax, zmax);
 }

test_link/test_bounding_box.py

@@ -0,0 +1,95 @@
+import math
+import os
+import pyMagix3D as Mgx3D
+import pytest
+
+step_file_name = "mambo/Basic/B18.step"
+
+def assertPoint(tm, name, x, y, z):
+    p = tm.getCoord(name)
+    assert math.isclose(p.getX(), x, rel_tol=1e-10)
+    assert math.isclose(p.getY(), y, rel_tol=1e-10)
+    assert math.isclose(p.getZ(), z, rel_tol=1e-10)
+
+# Issue 225 : Le bloc créé par boite englobante d'un volume peut avoir de mauvaises dimensions
+def test_issue225(capfd):
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager()
+    tm = ctx.getTopoManager ()
+
+    magix3d_test_data_dir = os.environ['MAGIX3D_TEST_DATA_DIR']
+    full_path = os.path.join(magix3d_test_data_dir, step_file_name)
+
+    ctx.setLengthUnit(Mgx3D.Unit.centimeter)
+    gm.importSTEP(full_path)
+    assert gm.getNbVolumes()==1
+    tm.newFreeTopoOnGeometry("Vol0000")
+    assert math.isclose(tm.getEdgeLength("Ar0002"), 0.1, abs_tol=1e-7) #0.1
+    assert math.isclose(tm.getEdgeLength("Ar0007"), 0.1, abs_tol=1e-7) #0.10003610119179525
+    assert math.isclose(tm.getEdgeLength("Ar0009"), 0.05, abs_tol=1e-7) #0.05000000000000623
+
+# Issue 262 : Le bloc créé par boite englobante d'un volume peut avoir de mauvaises dimensions
+# la création d'un bloc sur une sphère crée un bloc plat
+def test_issue262():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager()
+    tm = ctx.getTopoManager()
+    # Création du volume Vol0000
+    gm.newSphere (Mgx3D.Point(0, 0, 0), 1, Mgx3D.Portion.ENTIER)
+    # Création d'un bloc topologique structuré sans projection (Vol0000)
+    tm.newFreeTopoOnGeometry ("Vol0000")
+
+    assertPoint(tm, "Som0000", -1, -1, -1)
+    assertPoint(tm, "Som0007", 1, 1, 1)
+
+    # Annulation de : Création d'un bloc topologique structuré sans projection (Vol0000)
+    ctx.undo()
+    # Création d'un bloc unitaire mis dans le groupe AAA
+    ctx.getTopoManager().newFreeBoundedTopoInGroup ("AAA", 3, ["Vol0000"])
+
+    assertPoint(tm, "Som0000", -1, -1, -1)
+    assertPoint(tm, "Som0007", 1, 1, 1)
+
+def test_freeboundedtopoForPoints():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager ()
+    tm = ctx.getTopoManager ()
+
+    gm.newVertex(Mgx3D.Point(-1.8, -.7, 1.2))
+    gm.newVertex(Mgx3D.Point(-.7, .45, -.1))
+    tm.newFreeBoundedTopoInGroup ("aaa", 3, ["Pt0000","Pt0001"])
+    assertPoint(tm, "Som0007", -0.7, 0.45, 1.2)
+
+def test_freeboundedtopoForSphere():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager ()
+    tm = ctx.getTopoManager ()
+
+    gm.newSphere (Mgx3D.Point(0, 0, 0), 1, 150)
+    tm.newFreeTopoOnGeometry ("Vol0000")
+    assertPoint(tm, "Som0007", 1.0, 1.0, 1.0)
+
+def test_freeboundedtopoForCylinder():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager ()
+    tm = ctx.getTopoManager ()
+
+    gm.newCylinder (Mgx3D.Point(0, 0, 0), 1, Mgx3D.Vector(10, 0, 0), 360)
+    tm.newFreeTopoOnGeometry ("Vol0000")
+    assertPoint(tm, "Som0007", 10, 1.0, 1.0)
+
+def test_bounding_box_with_scale():
+    ctx = Mgx3D.getStdContext()
+    ctx.clearSession() # Clean the session after the previous test
+    gm = ctx.getGeomManager ()
+    tm = ctx.getTopoManager ()
+
+    gm.newSphere (Mgx3D.Point(0, 0, 0), 1, 125)
+    gm.scaleAll(10, 20, 10)
+    tm.newFreeTopoOnGeometry ("Vol0000")
+    assertPoint(tm, "Som0007", 10.0, 20.0, 10.0)

test_link/test_free_bounded_topo.py

@@ -1,5 +1,7 @@
 import pyMagix3D as Mgx3D
 
+# Issue 228 : L'ordre des entités créées par la commande sectionByPlane peut varier d'une exécution à l'autre
+# Corrigé par le nouveau calcul de boite englobante
 def test_order_join_curves():
 	ctx = Mgx3D.getStdContext()
 	ctx.clearSession() # Clean the session after the previous test