Merge branch 'develop' of https://github.com/david-cattermole/mayaMat…

…chMoveSolver into develop

CMakeLists.txt

@@ -61,8 +61,7 @@ project(mayaMatchMoveSolver)
 set(PROJECT_VERSION_MAJOR 0)
 set(PROJECT_VERSION_MINOR 5)
 set(PROJECT_VERSION_PATCH 0)
-set(PROJECT_VERSION_TWEAK beta4)
-set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}")
+set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 set(PROJECT_HOMEPAGE_URL "https://github.com/david-cattermole/mayaMatchMoveSolver")
 set(PROJECT_DESCRIPTION "Bundle Adjustment solver for MatchMove tasks in Autodesk Maya.")
 set(PROJECT_AUTHOR "David Cattermole and others (see AUTHORS.txt file)")

README.md

@@ -57,6 +57,7 @@ changes.
 
 | Releases                                                                                | Description                                        |
 | --------------------------------------------------------------------------------------- | -------------------------------------------------- |
+| [v0.4.9](https://github.com/david-cattermole/mayaMatchMoveSolver/releases/tag/v0.4.9)   | Bug fix for Surface Cluster.                       |
 | [v0.4.8](https://github.com/david-cattermole/mayaMatchMoveSolver/releases/tag/v0.4.8)   | Add Create Rivet and Surface Cluster tools.        |
 | [v0.4.7](https://github.com/david-cattermole/mayaMatchMoveSolver/releases/tag/v0.4.7)   | Bug fix for "Convert to Marker" tool.              |
 | [v0.4.6](https://github.com/david-cattermole/mayaMatchMoveSolver/releases/tag/v0.4.6)   | Bug fix for solver and minor features.             |

docs/source/tools.rst

@@ -28,6 +28,7 @@ Pages dedicated to specific tools:
     tools_linetools
     tools_displaytools
     tools_zdepthtools
+    tools_meshtools
     tools_generaltools
     tools_inputoutput
     tools_hotkeys

docs/source/tools_meshtools.rst

@@ -0,0 +1,23 @@
+Mesh Tools
+==========
+
+*Write section description here.*
+
+.. _mesh-from-points-ref:
+
+Mesh From Points
+----------------
+
+*Write mesh from points tool description here*
+
+.. figure:: images/tools_mesh_from_points_window.png
+    :alt: Mesh from Points Window.
+    :align: right
+    :width: 100%
+
+To open the window, use this Python command:
+
+.. code:: python
+
+    import mmSolver.tools.meshfrompoints.tool as tool
+    tool.main()

pylintrc

@@ -14,7 +14,7 @@ ignore=CVS,.git
 # Add files or directories matching the regex patterns to the blacklist. The
 # regex matches against base names, not paths.
 ignore-paths=^python/mmSolver/tools/mltools/*.py$,
-             ^python/mmSolver/tools/meshfromlocators/delaunator.py$
+             ^python/mmSolver/tools/meshfrompoints/delaunator.py$
 
 # Pickle collected data for later comparisons.
 persistent=yes

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.black]
 line-length = 88  # The black default is a good compromise.
 skip-string-normalization = 1
-target-version = ['py36', 'py37', 'py38', 'py39', 'py310', 'py311', 'py312']
+target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
 include = '\.py$'
 extend-exclude = '''
 /(

python/CMakeLists.txt

@@ -194,9 +194,9 @@ if (MMSOLVER_BUILD_QT_UI)
             ${CMAKE_CURRENT_BINARY_DIR}/mmSolver/tools/surfacecluster/ui/ui_surfacecluster_layout.py
             )
 
-    compile_qt_ui_to_python_file("meshfromlocators"
-            ${CMAKE_CURRENT_SOURCE_DIR}/mmSolver/tools/meshfromlocators/ui/meshfromlocators_layout.ui
-            ${CMAKE_CURRENT_BINARY_DIR}/mmSolver/tools/meshfromlocators/ui/ui_meshfromlocators_layout.py
+    compile_qt_ui_to_python_file("meshfrompoints"
+            ${CMAKE_CURRENT_SOURCE_DIR}/mmSolver/tools/meshfrompoints/ui/meshfrompoints_layout.ui
+            ${CMAKE_CURRENT_BINARY_DIR}/mmSolver/tools/meshfrompoints/ui/ui_meshfrompoints_layout.py
             )
 
     compile_qt_ui_to_python_file("imagecacheprefs"

python/mmSolver/tools/meshfromlocators/__init__.py → python/mmSolver/tools/meshfrompoints/__init__.py

@@ -16,5 +16,5 @@
 # along with mmSolver.  If not, see <https://www.gnu.org/licenses/>.
 #
 """
-Mesh From Locators tool.
+Mesh From Points tool.
 """

python/mmSolver/tools/meshfrompoints/constant.py

@@ -0,0 +1,39 @@
+# Copyright (C) 2024 Patcha Saheb Binginapalli.
+#
+# This file is part of mmSolver.
+#
+# mmSolver is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# mmSolver is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with mmSolver.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+WINDOW_TITLE = 'Mesh From Points'
+
+# We must have at least 3 points to make a mesh.
+MINIMUM_NUMBER_OF_POINTS = 3
+
+# The different types of meshes that can be created.
+MESH_TYPE_FULL_MESH_VALUE = 'full_mesh'
+MESH_TYPE_BORDER_MESH_VALUE = 'border_mesh'
+MESH_TYPE_BORDER_EDGE_STRIP_MESH_VALUE = 'border_edge_strip_mesh'
+MESH_TYPE_VALUES = [
+    MESH_TYPE_FULL_MESH_VALUE,
+    MESH_TYPE_BORDER_MESH_VALUE,
+    MESH_TYPE_BORDER_EDGE_STRIP_MESH_VALUE,
+]
+
+# Default values.
+DEFAULT_MESH_NAME = 'meshFromPoints'
+DEFAULT_STRIP_WIDTH = 1.0
+
+# Config value keys.
+CONFIG_STRIP_WIDTH_KEY = 'mmSolver_meshfrompoints_stripWidth'