Removed CurvesWB direct dependency

mnesarco · Nov 2, 2024 · 849b47a · 849b47a
1 parent 9188d36
commit 849b47a
Show file tree

Hide file tree

Showing 13 changed files with 2,268 additions and 160 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,11 +17,13 @@
         "freecad",
         "fretboard",
         "Fretwire",
+        "gordon",
         "inkex",
         "inkscape",
         "ISVGDocumentElement",
         "linexy",
         "Luthiery",
+        "marz",
         "Marz",
         "marzguitars",
         "OCCT",
@@ -30,6 +32,7 @@
         "Pixmap",
         "Preselection",
         "qobject",
+        "reparametrize",
         "rgetattr",
         "rsetattr",
         "SETIN",
@@ -39,5 +42,10 @@
         "unpolish"
     ],
     "python.defaultInterpreterPath": "/usr/bin/python3",
-    "editor.fontLigatures": true
+    "editor.fontLigatures": true,
+    "licenser.license": "GPLv3",
+    "licenser.projectName": "Marz",
+    "licenser.author": "Frank David Martinez M (mnesarco)",
+    "ruff.format.args": ["--config", "line-length=120"]
+
 }
diff --git a/README.md b/README.md
@@ -90,7 +90,6 @@ The Wiki contains some useful documents: [Wiki](https://github.com/mnesarco/Marz
 ## Requirements
 
 * FreeCAD v0.21+ ([releases](https://github.com/FreeCAD/FreeCAD/releases/))
-* Curves Workbench 0.6.31+ (Install using AddonManager)
 
 ## Install
 

diff --git a/Resources/intro.html b/Resources/intro.html
@@ -1,22 +1,22 @@
 <html>
     <style>
-        a { 
-            color: #325ca1; 
+        a {
+            color: #325ca1;
             text-decoration: none;
         }
-        .dep-supported { 
-            color: green; 
-            font-weight: normal; 
+        .dep-supported {
+            color: green;
+            font-weight: normal;
         }
-        .dep-unsupported { 
-            color: red; 
-            font-weight: bold; 
+        .dep-unsupported {
+            color: red;
+            font-weight: bold;
         }
-        table.env-table td, table.env-table th { 
+        table.env-table td, table.env-table th {
             color: #333333;
-            border: 1px solid #c0c0c0; 
-            font-size: 12pt; 
-            font-weight: normal; 
+            border: 1px solid #c0c0c0;
+            font-size: 12pt;
+            font-weight: normal;
             padding: 5px;
             text-align: left;
         }
@@ -42,7 +42,7 @@
             background-color: #e0e0e0;
             text-align: center;
         }
-    </style>    
+    </style>
 
     <h1>Examples</h1>
     <table class="examples" cellspacing="10">
@@ -52,7 +52,7 @@ <h1>Examples</h1>
                     <p>Black Machine B6</p>
                     <p>
                         <img src="{{__base__}}/examples/Blackmachine_B6/preview.png" width="200" />
-                    </p>                    
+                    </p>
                 </a>
             </td>
             <td>
@@ -92,7 +92,7 @@ <h1>Inkscape Extension</h1>
             <li><a href="download:inkscape/marz/marz.zip">Download here</a></li>
             <li>Install it in Inkscape: Extensions/Manage Extensions.../Install packages/Install package</li>
             <li>Once installed, access it in Extensions/FreeCAD/Marz Guitars Selector...</li>
-        </ul>        
+        </ul>
     </p>
 
 
@@ -118,15 +118,10 @@ <h3>Local Environment</h3>
             <td>{{freecad_version}}</td>
             <td>{{freecad_supported}}</td>
         </tr>
-        <tr>
-            <td>Curves Workbench</td>
-            <td>{{curves_version}}</td>
-            <td>{{curves_supported}}</td>
-        </tr>
     </table>
-
 
-    <br /> 
+
+    <br />
     <h1>Help</h1>
 
     <h3>FreeCAD Forum</h3>
@@ -140,7 +135,7 @@ <h3>FreeCAD Forum</h3>
     <h3>Youtube channel</h3>
     <ul>
         <li>
-            <a href="https://www.youtube.com/@mnesarcox">https://www.youtube.com/@mnesarcox</a>    
+            <a href="https://www.youtube.com/@mnesarcox">https://www.youtube.com/@mnesarcox</a>
         </li>
     </ul>
 
@@ -155,18 +150,18 @@ <h3>Wiki</h3>
     <h3>Bug tracking</h3>
     <ul>
         <li>
-            <a href="https://github.com/mnesarco/MarzWorkbench/issues">https://github.com/mnesarco/MarzWorkbench/issues</a>     
+            <a href="https://github.com/mnesarco/MarzWorkbench/issues">https://github.com/mnesarco/MarzWorkbench/issues</a>
         </li>
     </ul>
 
 
-    <br /> 
+    <br />
     <h2>Operating system support</h2>
     <p>
-        Any OS supported by the current version of FreeCAD should work,<br /> 
-        but in case of issues related to the OS, <b>Linux</b> has first<br /> 
-        class support and issues will be resolved there first. Issues<br /> 
-        specifically related to <b>Mac</b> or <b>Windows</b> has second<br /> 
+        Any OS supported by the current version of FreeCAD should work,<br />
+        but in case of issues related to the OS, <b>Linux</b> has first<br />
+        class support and issues will be resolved there first. Issues<br />
+        specifically related to <b>Mac</b> or <b>Windows</b> has second<br />
         class support and has lower priority.<br />
     </p>
 

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Marz Workbench Changelog
 
+## 0.1.9 (Nov 1st 2024)
+
+- Removed CurvesWB dependency
+
 ## 0.1.8 (Aug 22th 2024)
 
 - Improve neck-headstock transition geometry (Issue #40)
@@ -59,7 +63,7 @@
 
 - GUI
   - FreeCAD's Property editor is now in readonly mode
-  - New custom Property editor 
+  - New custom Property editor
   - New import svg ui with preview and validation
   - Imported files are now embedded into the document to keep everything together and can be exported back
   - Grouping all parts in the three

diff --git a/freecad/marz/__init__.py b/freecad/marz/__init__.py
@@ -18,11 +18,10 @@
 # |  along with Marz Workbench.  If not, see <https://www.gnu.org/licenses/>. |
 # +---------------------------------------------------------------------------+
 
-__version__ = "0.1.8"
+__version__ = "0.1.9"
 __author__ = "Frank David Martinez M <mnesarco at gmail.com>"
 __copyright__ = "Copyright (c) 2020, Frank David Martinez M."
 __license__ = "GPLv3"
 __maintainer__ = "https://github.com/mnesarco/"
 
-__dep_min_curves__ = '0.6.31'
 __dep_min_freecad__ = '0.21.1'
diff --git a/freecad/marz/curves/__init__.py b/freecad/marz/curves/__init__.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# +---------------------------------------------------------------------------+
+# |  Copyright (c) 2020 Frank Martinez <mnesarco at gmail.com>                |
+# |                                                                           |
+# |  This file is part of Marz Workbench.                                     |
+# |                                                                           |
+# |  Marz Workbench is free software: you can redistribute it and/or modify   |
+# |  it under the terms of the GNU General Public License as published by     |
+# |  the Free Software Foundation, either version 3 of the License, or        |
+# |  (at your option) any later version.                                      |
+# |                                                                           |
+# |  Marz Workbench 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 General Public License for more details.                             |
+# |                                                                           |
+# |  You should have received a copy of the GNU General Public License        |
+# |  along with Marz Workbench.  If not, see <https://www.gnu.org/licenses/>. |
+# +---------------------------------------------------------------------------+