Skip to content

Commit 849b47a

Browse files
mnesarcomnesarco
committed
Removed CurvesWB direct dependency
1 parent 9188d36 commit 849b47a

File tree

13 files changed

+2268
-160
lines changed

13 files changed

+2268
-160
lines changed

‎.vscode/settings.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@
1717
"freecad",
1818
"fretboard",
1919
"Fretwire",
20+
"gordon",
2021
"inkex",
2122
"inkscape",
2223
"ISVGDocumentElement",
2324
"linexy",
2425
"Luthiery",
26+
"marz",
2527
"Marz",
2628
"marzguitars",
2729
"OCCT",
@@ -30,6 +32,7 @@
3032
"Pixmap",
3133
"Preselection",
3234
"qobject",
35+
"reparametrize",
3336
"rgetattr",
3437
"rsetattr",
3538
"SETIN",
@@ -39,5 +42,10 @@
3942
"unpolish"
4043
],
4144
"python.defaultInterpreterPath": "/usr/bin/python3",
42-
"editor.fontLigatures": true
45+
"editor.fontLigatures": true,
46+
"licenser.license": "GPLv3",
47+
"licenser.projectName": "Marz",
48+
"licenser.author": "Frank David Martinez M (mnesarco)",
49+
"ruff.format.args": ["--config", "line-length=120"]
50+
4351
}

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ The Wiki contains some useful documents: [Wiki](https://github.com/mnesarco/Marz
9090
## Requirements
9191

9292
* FreeCAD v0.21+ ([releases](https://github.com/FreeCAD/FreeCAD/releases/))
93-
* Curves Workbench 0.6.31+ (Install using AddonManager)
9493

9594
## Install
9695

‎Resources/intro.html‎

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<html>
22
<style>
3-
a {
4-
color: #325ca1;
3+
a {
4+
color: #325ca1;
55
text-decoration: none;
66
}
7-
.dep-supported {
8-
color: green;
9-
font-weight: normal;
7+
.dep-supported {
8+
color: green;
9+
font-weight: normal;
1010
}
11-
.dep-unsupported {
12-
color: red;
13-
font-weight: bold;
11+
.dep-unsupported {
12+
color: red;
13+
font-weight: bold;
1414
}
15-
table.env-table td, table.env-table th {
15+
table.env-table td, table.env-table th {
1616
color: #333333;
17-
border: 1px solid #c0c0c0;
18-
font-size: 12pt;
19-
font-weight: normal;
17+
border: 1px solid #c0c0c0;
18+
font-size: 12pt;
19+
font-weight: normal;
2020
padding: 5px;
2121
text-align: left;
2222
}
@@ -42,7 +42,7 @@
4242
background-color: #e0e0e0;
4343
text-align: center;
4444
}
45-
</style>
45+
</style>
4646

4747
<h1>Examples</h1>
4848
<table class="examples" cellspacing="10">
@@ -52,7 +52,7 @@ <h1>Examples</h1>
5252
<p>Black Machine B6</p>
5353
<p>
5454
<img src="{{__base__}}/examples/Blackmachine_B6/preview.png" width="200" />
55-
</p>
55+
</p>
5656
</a>
5757
</td>
5858
<td>
@@ -92,7 +92,7 @@ <h1>Inkscape Extension</h1>
9292
<li><a href="download:inkscape/marz/marz.zip">Download here</a></li>
9393
<li>Install it in Inkscape: Extensions/Manage Extensions.../Install packages/Install package</li>
9494
<li>Once installed, access it in Extensions/FreeCAD/Marz Guitars Selector...</li>
95-
</ul>
95+
</ul>
9696
</p>
9797

9898

@@ -118,15 +118,10 @@ <h3>Local Environment</h3>
118118
<td>{{freecad_version}}</td>
119119
<td>{{freecad_supported}}</td>
120120
</tr>
121-
<tr>
122-
<td>Curves Workbench</td>
123-
<td>{{curves_version}}</td>
124-
<td>{{curves_supported}}</td>
125-
</tr>
126121
</table>
127-
128122

129-
<br />
123+
124+
<br />
130125
<h1>Help</h1>
131126

132127
<h3>FreeCAD Forum</h3>
@@ -140,7 +135,7 @@ <h3>FreeCAD Forum</h3>
140135
<h3>Youtube channel</h3>
141136
<ul>
142137
<li>
143-
<a href="https://www.youtube.com/@mnesarcox">https://www.youtube.com/@mnesarcox</a>
138+
<a href="https://www.youtube.com/@mnesarcox">https://www.youtube.com/@mnesarcox</a>
144139
</li>
145140
</ul>
146141

@@ -155,18 +150,18 @@ <h3>Wiki</h3>
155150
<h3>Bug tracking</h3>
156151
<ul>
157152
<li>
158-
<a href="https://github.com/mnesarco/MarzWorkbench/issues">https://github.com/mnesarco/MarzWorkbench/issues</a>
153+
<a href="https://github.com/mnesarco/MarzWorkbench/issues">https://github.com/mnesarco/MarzWorkbench/issues</a>
159154
</li>
160155
</ul>
161156

162157

163-
<br />
158+
<br />
164159
<h2>Operating system support</h2>
165160
<p>
166-
Any OS supported by the current version of FreeCAD should work,<br />
167-
but in case of issues related to the OS, <b>Linux</b> has first<br />
168-
class support and issues will be resolved there first. Issues<br />
169-
specifically related to <b>Mac</b> or <b>Windows</b> has second<br />
161+
Any OS supported by the current version of FreeCAD should work,<br />
162+
but in case of issues related to the OS, <b>Linux</b> has first<br />
163+
class support and issues will be resolved there first. Issues<br />
164+
specifically related to <b>Mac</b> or <b>Windows</b> has second<br />
170165
class support and has lower priority.<br />
171166
</p>
172167

‎changelog.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Marz Workbench Changelog
22

3+
## 0.1.9 (Nov 1st 2024)
4+
5+
- Removed CurvesWB dependency
6+
37
## 0.1.8 (Aug 22th 2024)
48

59
- Improve neck-headstock transition geometry (Issue #40)
@@ -59,7 +63,7 @@
5963

6064
- GUI
6165
- FreeCAD's Property editor is now in readonly mode
62-
- New custom Property editor
66+
- New custom Property editor
6367
- New import svg ui with preview and validation
6468
- Imported files are now embedded into the document to keep everything together and can be exported back
6569
- Grouping all parts in the three

‎freecad/marz/__init__.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818
# | along with Marz Workbench. If not, see <https://www.gnu.org/licenses/>. |
1919
# +---------------------------------------------------------------------------+
2020

21-
__version__ = "0.1.8"
21+
__version__ = "0.1.9"
2222
__author__ = "Frank David Martinez M <mnesarco at gmail.com>"
2323
__copyright__ = "Copyright (c) 2020, Frank David Martinez M."
2424
__license__ = "GPLv3"
2525
__maintainer__ = "https://github.com/mnesarco/"
2626

27-
__dep_min_curves__ = '0.6.31'
2827
__dep_min_freecad__ = '0.21.1'

‎freecad/marz/curves/__init__.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# -*- coding: utf-8 -*-
2+
# +---------------------------------------------------------------------------+
3+
# | Copyright (c) 2020 Frank Martinez <mnesarco at gmail.com> |
4+
# | |
5+
# | This file is part of Marz Workbench. |
6+
# | |
7+
# | Marz Workbench is free software: you can redistribute it and/or modify |
8+
# | it under the terms of the GNU General Public License as published by |
9+
# | the Free Software Foundation, either version 3 of the License, or |
10+
# | (at your option) any later version. |
11+
# | |
12+
# | Marz Workbench is distributed in the hope that it will be useful, |
13+
# | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14+
# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15+
# | GNU General Public License for more details. |
16+
# | |
17+
# | You should have received a copy of the GNU General Public License |
18+
# | along with Marz Workbench. If not, see <https://www.gnu.org/licenses/>. |
19+
# +---------------------------------------------------------------------------+

0 commit comments

Comments
 (0)