Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mnesarco/MarzWorkbench
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.1.2-preview
Choose a base ref
...
head repository: mnesarco/MarzWorkbench
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on May 6, 2024

  1. Create FUNDING.yml

    Added liberapay funding
    mnesarco authored May 6, 2024
    Copy the full SHA
    e68b581 View commit details
  2. updated example

    mnesarco committed May 6, 2024
    Copy the full SHA
    96c2091 View commit details
  3. Copy the full SHA
    51b9a58 View commit details
  4. fix some cutaway bugs

    mnesarco committed May 6, 2024
    Copy the full SHA
    97f618c View commit details
  5. Headless example

    mnesarco committed May 6, 2024
    Copy the full SHA
    0946a3a View commit details
  6. Updated version

    mnesarco committed May 6, 2024
    Copy the full SHA
    0f2886e View commit details
  7. typo

    mnesarco committed May 6, 2024
    Copy the full SHA
    1823bb8 View commit details
  8. Copy the full SHA
    a891b9a View commit details
  9. Copy the full SHA
    bc1cdae View commit details

Commits on May 9, 2024

  1. Shorter Workbench label

    mnesarco committed May 9, 2024
    Copy the full SHA
    3b4ccb8 View commit details

Commits on May 11, 2024

  1. Updated Inkscape extension

    mnesarco committed May 11, 2024
    Copy the full SHA
    0bdffdd View commit details

Commits on May 12, 2024

  1. inkscape extension doc

    mnesarco committed May 12, 2024
    Copy the full SHA
    c75cf3f View commit details
  2. inkscape extension update

    mnesarco committed May 12, 2024
    Copy the full SHA
    7888b74 View commit details
  3. Icon Revision (#35)

    Icon Revision
    Reqrefusion authored May 12, 2024
    Copy the full SHA
    9b78a37 View commit details
  4. pick icon

    mnesarco committed May 12, 2024
    Copy the full SHA
    88ec5c3 View commit details
  5. Copy the full SHA
    815620a View commit details
  6. version update

    mnesarco committed May 12, 2024
    Copy the full SHA
    bf2cb50 View commit details

Commits on May 13, 2024

  1. Minor icon optimization

    mnesarco committed May 13, 2024
    Copy the full SHA
    c646fa3 View commit details
  2. toggle icon overlay

    mnesarco committed May 13, 2024
    Copy the full SHA
    38b28d9 View commit details
  3. minor styling

    mnesarco committed May 13, 2024
    Copy the full SHA
    a14333b View commit details

Commits on Aug 15, 2024

  1. Copy the full SHA
    70e36d2 View commit details

Commits on Aug 21, 2024

  1. Copy the full SHA
    48462b3 View commit details

Commits on Aug 22, 2024

  1. Copy the full SHA
    ad988ec View commit details
  2. Update version

    mnesarco committed Aug 22, 2024
    Copy the full SHA
    9188d36 View commit details

Commits on Nov 2, 2024

  1. Copy the full SHA
    849b47a View commit details
  2. Code cleanup

    mnesarco committed Nov 2, 2024
    Copy the full SHA
    f295455 View commit details
  3. Code cleanup second pass

    mnesarco committed Nov 2, 2024
    Copy the full SHA
    763f891 View commit details

Commits on Nov 3, 2024

  1. Fix dependencies

    mnesarco committed Nov 3, 2024
    Copy the full SHA
    3fbd046 View commit details

Commits on Nov 4, 2024

  1. Copy the full SHA
    2ed2ff2 View commit details

Commits on Nov 7, 2024

  1. fix issue #42: numpy.typing

    mnesarco committed Nov 7, 2024
    Copy the full SHA
    347633e View commit details
  2. Update version

    mnesarco committed Nov 7, 2024
    Copy the full SHA
    5b358fc View commit details

Commits on Nov 16, 2024

  1. Copy the full SHA
    f5b3026 View commit details

Commits on Nov 20, 2024

  1. Copy the full SHA
    c15f128 View commit details
  2. bump version

    mnesarco committed Nov 20, 2024
    Copy the full SHA
    911a471 View commit details
  3. PySide6 Screen Geometry

    mnesarco committed Nov 20, 2024
    Copy the full SHA
    7bfc907 View commit details

Commits on Nov 21, 2024

  1. Copy the full SHA
    6ab5870 View commit details

Commits on Dec 23, 2024

  1. Fix inlay svg example

    mnesarco committed Dec 23, 2024
    Copy the full SHA
    584363d View commit details
Showing with 9,347 additions and 4,090 deletions.
  1. +14 −0 .github/FUNDING.yml
  2. +2 −1 .gitignore
  3. +126 −2 .vscode/settings.json
  4. +5 −1 README.md
  5. +58 −495 Resources/examples/Blackmachine_B6/body.svg
  6. BIN Resources/examples/Blackmachine_B6/cad.FCStd
  7. +23 −199 Resources/examples/Blackmachine_B6/headstock.svg
  8. +2,359 −0 Resources/examples/Headless/body.svg
  9. BIN Resources/examples/Headless/cad.FCStd
  10. +87 −0 Resources/examples/Headless/headstock.svg
  11. +99 −0 Resources/examples/Headless/inlays.svg
  12. BIN Resources/examples/Headless/preview.png
  13. +14 −95 Resources/icons/2d.svg
  14. +17 −115 Resources/icons/3d.svg
  15. +24 −72 Resources/icons/Marz.svg
  16. +7 −76 Resources/icons/body.svg
  17. +13 −0 Resources/icons/bridge.svg
  18. +50 −150 Resources/icons/data.svg
  19. +15 −132 Resources/icons/export_svg.svg
  20. +24 −104 Resources/icons/fretboard.svg
  21. +176 −33 Resources/icons/guitar_2d.svg
  22. +78 −183 Resources/icons/headstock.svg
  23. +16 −129 Resources/icons/import_svg.svg
  24. +211 −82 Resources/icons/instrument_feature.svg
  25. +7 −125 Resources/icons/neck.svg
  26. +6 −97 Resources/icons/nut.svg
  27. +62 −146 Resources/icons/view_2d.svg
  28. +93 −0 Resources/icons/view_2d_off.svg
  29. +57 −151 Resources/icons/view_3d.svg
  30. +129 −0 Resources/icons/view_3d_off.svg
  31. +1 −0 Resources/inkscape/marz/marz.md5
  32. +343 −8 Resources/inkscape/marz/marz.py
  33. +0 −191 Resources/inkscape/marz/marz.yaml
  34. BIN Resources/inkscape/marz/marz.zip
  35. +0 −10 Resources/inkscape/marz/marz_arguments.py
  36. +83 −61 Resources/inkscape/marz/marz_body.inx
  37. +0 −236 Resources/inkscape/marz/marz_build.py
  38. +36 −0 Resources/inkscape/marz/marz_fb_inlays.inx
  39. +0 −32 Resources/inkscape/marz/marz_fretboard_inlays.inx
  40. +59 −41 Resources/inkscape/marz/marz_headstock.inx
  41. +1,028 −0 Resources/inkscape/marz/meta.py
  42. +33 −29 Resources/intro.html
  43. +54 −1 changelog.md
  44. +20 −20 docs/examples/example-fret-inlays.svg
  45. +1 −1 docs/examples/fcuc2023/Headstock.svg
  46. +1 −2 freecad/marz/__init__.py
  47. +2 −2 freecad/marz/command/__init__.py
  48. +1 −1 freecad/marz/command/parameters.py
  49. +20 −1 freecad/marz/command/visibility.py
  50. +19 −0 freecad/marz/curves/__init__.py
  51. +2,045 −0 freecad/marz/curves/gordon.py
  52. +4 −7 freecad/marz/extension/fcdoc.py
  53. +1,642 −869 freecad/marz/extension/fcui.py
  54. +8 −8 freecad/marz/extension/qt.py
  55. +9 −6 freecad/marz/extension/threading.py
  56. +3 −12 freecad/marz/extension/version.py
  57. +10 −4 freecad/marz/feature/body.py
  58. +3 −1 freecad/marz/feature/document.py
  59. +62 −64 freecad/marz/feature/edit_form_layout.py
  60. +12 −8 freecad/marz/feature/import_svg.py
  61. +21 −17 freecad/marz/feature/style.py
  62. +10 −7 freecad/marz/feature/widget_about.py
  63. +1 −8 freecad/marz/init_gui.py
  64. +35 −50 freecad/marz/model/gordon_neck.py
  65. +2 −2 manifest.ini
  66. +3 −2 package.xml
  67. +4 −1 setup.py
14 changes: 14 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: mnesarco
issuehunt: # Replace with a single IssueHunt username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
polar: # Replace with a single Polar username
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -3,4 +3,5 @@ notes.ipynb
.env
build/
lab.ipynb
__bawr_cache__/
__bawr_cache__/
/notebook.py
128 changes: 126 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -17,19 +17,23 @@
"freecad",
"fretboard",
"Fretwire",
"gordon",
"inkex",
"inkscape",
"ISVGDocumentElement",
"linexy",
"Luthiery",
"marz",
"Marz",
"marzguitars",
"OCCT",
"Peghead",
"pivy",
"pixmap",
"Pixmap",
"Preselection",
"qobject",
"reparametrize",
"rgetattr",
"rsetattr",
"SETIN",
@@ -38,6 +42,126 @@
"Trussrod",
"unpolish"
],
"python.defaultInterpreterPath": "/usr/bin/python3",
"editor.fontLigatures": true
"better-comments.multilineComments": false,
"better-comments.tags": [

{
"tag": "!",
"color": "#FF2D00",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
},
{
"tag": "?",
"color": "#3498DB",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
},
{
"tag": "//",
"color": "#474747",
"strikethrough": true,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
},
{
"tag": "todo",
"color": "#FF8C00",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
},
{
"tag": "*",
"color": "#98C379",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
},
{
"tag": "<<",
"color": "#a0db8e",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": true
},
{
"tag": ":",
"color": "#d191b2",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
},
{
"tag": "%",
"color": "#3498DB",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
},
{
"tag": "@",
"color": "#ff8300",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
},
{
"tag": "$",
"color": "#b4a7d6",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
},
{
"tag": ";",
"color": "#999999",
"strikethrough": false,
"underline": false,
"backgroundColor": "transparent",
"bold": false,
"italic": false
}
],
"editor.rulers": [
80, 100, 120
],
"editor.fontLigatures": true,
"licenser.license": "GPLv3",
"licenser.projectName": "Marz",
"licenser.author": "Frank David Martinez M (mnesarco)",
"[python]": {
"diffEditor.ignoreTrimWhitespace": false,
"gitlens.codeLens.symbolScopes": [
"!Module"
],
"editor.formatOnType": true,
"editor.defaultFormatter": "charliermarsh.ruff",
"editor.wordBasedSuggestions": "off"
},
"ruff.nativeServer": true,
"ruff.lineLength": 80

}
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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

@@ -109,3 +108,8 @@ and it is very practical for quick calculations and references, but it is 2D and
I decided to go to the next level and make it 3D, so I started this project and work on this in my
free time. This is a work in progress thing.

## Contributors

### Icons

Icons redesign by Turan Furkan TOPAK (https://github.com/Reqrefusion)
Loading