Merge mrealgorithmspy in mrmeshpy (#187)

* Merge mrealgorithmspy in mrmeshpy

* update python scripts

* update scripts

* fix win container tag

* pybind progress bar fixes

Co-authored-by: MaxRayskiy <mraiskii@adalisk.com>
Co-authored-by: Grant Karapetyan <gkarapetyan@adalisk.com>

Author: 3 people

CMakeLists.txt

@@ -111,7 +111,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/MRMesh ./MRMesh)
 IF(NOT MR_EMSCRIPTEN)
   add_subdirectory(${PROJECT_SOURCE_DIR}/mrmeshpy ./mrmeshpy)
   add_subdirectory(${PROJECT_SOURCE_DIR}/mrmeshnumpy ./mrmeshnumpy)
-  add_subdirectory(${PROJECT_SOURCE_DIR}/mrealgorithmspy ./mrealgorithmspy)
   add_subdirectory(${PROJECT_SOURCE_DIR}/meshconv ./meshconv)
 ENDIF() # NOT MR_EMSCRIPTEN
 add_subdirectory(${PROJECT_SOURCE_DIR}/MRTest ./MRTest)

doxygen/HowToExamples.dox

@@ -109,7 +109,9 @@ Mesh modification examples
 import mrmeshpy
 mesh = mrmeshpy.load_mesh("mesh.stl")
 
-mrmeshpy.relax(mesh,5,Null)
+relaxParams = mrmeshpy.MeshRelaxParams()
+relaxParams.iterations = 5
+mrmeshpy.relax(mesh, relaxParams)
 
 props = mrmeshpy.SubdivideSettings()
 props.maxDeviationAfterFlip = 0.5

python_test/booleanExposing.py

@@ -13,9 +13,9 @@ def isEqualVector3(a, b):
 meshA = mrmesh.make_cube(size, pos1)
 meshB = mrmesh.make_cube(size, pos2)
 
-bOperation = mrealgorithms.BooleanOperation.Intersection
-bResMapper = mrealgorithms.BooleanResultMapper()
-bResult = mrealgorithms.boolean( meshA, meshB, bOperation, None, bResMapper )
+bOperation = mrmesh.BooleanOperation.Intersection
+bResMapper = mrmesh.BooleanResultMapper()
+bResult = mrmesh.boolean( meshA, meshB, bOperation, None, bResMapper )
 
 bResMesh = bResult.mesh
 
@@ -27,10 +27,10 @@ def isEqualVector3(a, b):
 assert( bResMesh.topology.findHoleRepresentiveEdges().size() == 0 )
 
 
-brmmAA = bResMapper.map( meshA.topology.getValidVerts(), mrealgorithms.BooleanResMapObj.A )
-brmmAB = bResMapper.map( meshA.topology.getValidVerts(), mrealgorithms.BooleanResMapObj.B )
-brmmBA = bResMapper.map( meshB.topology.getValidVerts(), mrealgorithms.BooleanResMapObj.A )
-brmmBB = bResMapper.map( meshB.topology.getValidVerts(), mrealgorithms.BooleanResMapObj.B )
+brmmAA = bResMapper.map( meshA.topology.getValidVerts(), mrmesh.BooleanResMapObj.A )
+brmmAB = bResMapper.map( meshA.topology.getValidVerts(), mrmesh.BooleanResMapObj.B )
+brmmBA = bResMapper.map( meshB.topology.getValidVerts(), mrmesh.BooleanResMapObj.A )
+brmmBB = bResMapper.map( meshB.topology.getValidVerts(), mrmesh.BooleanResMapObj.B )
 
 assert( brmmAA.size() == 14)
 assert( brmmAA.count() == 1)

python_test/decimate.py

@@ -14,9 +14,9 @@ def isEqualVector3(a, b):
 # TEST 1
 
 mesh = mrmesh.make_cube(size, pos1)
-settings = mrealgorithms.DecimateSettings()
+settings = mrmesh.DecimateSettings()
 
-result = mrealgorithms.decimate( mesh, settings )
+result = mrmesh.decimate( mesh, settings )
 
 assert( result.vertsDeleted == 0 )
 assert( result.facesDeleted == 0 )
@@ -32,14 +32,14 @@ def isEqualVector3(a, b):
 meshA = mrmesh.make_cube(size, pos1)
 meshB = mrmesh.make_cube(size, pos2)
 
-bOperation = mrealgorithms.BooleanOperation.Intersection
-bResMapper = mrealgorithms.BooleanResultMapper()
-bResult = mrealgorithms.boolean( meshA, meshB, bOperation, None, bResMapper )
+bOperation = mrmesh.BooleanOperation.Intersection
+bResMapper = mrmesh.BooleanResultMapper()
+bResult = mrmesh.boolean( meshA, meshB, bOperation, None, bResMapper )
 
 mesh = bResult.mesh
-settings = mrealgorithms.DecimateSettings()
+settings = mrmesh.DecimateSettings()
 
-result = mrealgorithms.decimate( mesh, settings )
+result = mrmesh.decimate( mesh, settings )
 
 assert( isEqualVector3( mesh.computeBoundingBox(mesh.topology.getValidFaces(), mrmesh.AffineXf3() ).min , pos1 ) )
 assert( isEqualVector3( mesh.computeBoundingBox(mesh.topology.getValidFaces(), mrmesh.AffineXf3() ).max , pos3 ) )

python_test/helper/__init__.py

@@ -3,4 +3,3 @@
 # insert 0 to find mrpy.so in working directory and not in system
 sys.path.insert(0, os.getcwd())
 import mrmeshpy as mrmesh
-import mrealgorithmspy as mrealgorithms

python_test/pointCloudTriangulation.py

@@ -3,8 +3,8 @@
 torusMesh = mrmesh.make_torus(2,1,32,32,None)
 torusPointCloud = mrmesh.mesh_to_points(torusMesh, True, None)
 
-params = mrealgorithms.TriangulationParameters()
-restored = mrealgorithms.triangulate_point_cloud(torusPointCloud, params)
+params = mrmesh.TriangulationParameters()
+restored = mrmesh.triangulate_point_cloud(torusPointCloud, params)
 
 assert( len(restored.points.vec) == 1024 )
 assert( restored.topology.getValidVerts().count() == 1024 )

python_test/relax.py

@@ -0,0 +1,12 @@
+from helper import *
+
+R1 = 2
+R2_1 = 1
+R2_2 = 2.5
+torus = mrmesh.make_spikes_test_torus(R1, R2_1, R2_2, 10, 12, None)
+
+params = mrmesh.MeshRelaxParams()
+params.iterations = 5
+res = mrmesh.relax(torus, params)
+
+assert(res)

scripts/MeshLib-dev.spec

@@ -86,7 +86,6 @@ if [ -d /usr/lib/python3.9 ]; then
  fi
  sudo ln -sf /usr/local/lib/MeshLib/mrmeshpy.so /usr/lib/python3.9/site-packages/mrmeshpy.so
  sudo ln -sf /usr/local/lib/MeshLib/mrmeshnumpy.so /usr/lib/python3.9/site-packages/mrmeshnumpy.so
- sudo ln -sf /usr/local/lib/MeshLib/mrealgorithmspy.so /usr/lib/python3.9/site-packages/mrealgorithmspy.so
  printf "Python3 has symlink to MR libs. Run 'sudo ln -sf /usr/local/lib/MeshLib/mr<lib_name>py.so /<pathToPython>/site-packages/mr<lib_name>py.so' for custom python installations\n"
 fi
 

scripts/postinstall.sh

@@ -15,7 +15,6 @@ if [ -d /usr/lib/python3.9 ]; then
  fi
  sudo ln -sf /usr/local/lib/MeshLib/mrmeshpy.so /usr/local/lib/python3.9/dist-packages/mrmeshpy.so
  sudo ln -sf /usr/local/lib/MeshLib/mrmeshnumpy.so /usr/local/lib/python3.9/dist-packages/mrmeshnumpy.so
- sudo ln -sf /usr/local/lib/MeshLib/mrealgorithmspy.so /usr/local/lib/python3.9/dist-packages/mrealgorithmspy.so
  printf "Python3 has symlink to MR libs. Run 'sudo ln -sf /usr/local/lib/MeshLib/mr<lib_name>py.so /<pathToPython>/dist-packages/mr<lib_name>py.so' for custom python installations\n"
 fi
 

source/MRTest/CMakeLists.txt

@@ -8,15 +8,13 @@ add_executable(${PROJECT_NAME} MRTestApp.cpp)
 
 IF(NOT ${distro} STREQUAL "Fedora Linux")
  target_link_libraries(${PROJECT_NAME} PRIVATE
-         mrealgorithmspy
          MRMesh
          spdlog
          mrmeshpy
  )
 ELSE()
   IF (NOT MR_EMSCRIPTEN)
     target_link_libraries(${PROJECT_NAME} PRIVATE
-        mrealgorithmspy
         MRMesh
         fmt
         gtest