Many refactorings, initial support for custom headstock/body shapes

mnesarco · Apr 10, 2020 · 6eca359 · 6eca359
1 parent c1ca0d7
commit 6eca359
Show file tree

Hide file tree

Showing 24 changed files with 1,578 additions and 322 deletions.
diff --git a/docs/wiki/NeckProfileSpecs.svg b/docs/wiki/NeckProfileSpecs.svg
diff --git a/src/Init.py b/src/Init.py
@@ -8,3 +8,4 @@
 __copyright__    = "Copyright 2020, Frank D. Martinez. M."
 __license__      = "GPLv3"
 __maintainer__   = "https://github.com/mnesarco"
+
diff --git a/src/InitGui.py b/src/InitGui.py
@@ -35,6 +35,8 @@ def Initialize(self):
             "MarzCmdCreateNeck", 
             "MarzCmdCreateBody",
             "MarzCmdCreateConstructionLines", 
+            "MarzCmdImportBodyShape",
+            "MarzCmdImportHeadstockShape",
             #"MarzCmdCreateNeckPlanes", TODO: Fix
         ]
         if isVersion19():

diff --git a/src/Resources/icons/import_body_shape.svg b/src/Resources/icons/import_body_shape.svg
diff --git a/src/Resources/icons/import_headstock_shape.svg b/src/Resources/icons/import_headstock_shape.svg
diff --git a/src/marz_body_data.py b/src/marz_body_data.py
@@ -21,7 +21,7 @@ class BodyData(object):
     #! so two instances created with same data will hit the same
     #! cache entry.
     __slots__ = ['neckd', 'length', 'width', 'backThickness', 'topOffset',
-        'topThickness', 'neckPocketDepth', 'neckAngle', 'neckPocketLength', '_ihash']
+        'topThickness', 'neckPocketDepth', 'neckAngle', 'neckPocketLength', 'joint', '_ihash']
 
     def __init__(self, inst, neckd):
 
@@ -34,6 +34,7 @@ def __init__(self, inst, neckd):
         super().__setattr__('neckPocketLength', inst.body.neckPocketLength)
         super().__setattr__('neckAngle', inst.neck.angle)
         super().__setattr__('topOffset', inst.neck.topOffset)
+        super().__setattr__('joint', inst.neck.joint)
         super().__setattr__('neckd', neckd)
 
         # Calculate immutable hash
@@ -45,6 +46,7 @@ def __init__(self, inst, neckd):
             inst.body.neckPocketDepth, 
             inst.body.neckPocketLength,
             inst.neck.angle,
+            inst.neck.joint,
             neckd
         ))
         super().__setattr__('_ihash', ihash)
@@ -66,6 +68,7 @@ def __eq__(self, other):
             and self.neckAngle == other.neckAngle
             and self.topOffset == other.topOffset
             and self.neckd == other.neckd
+            and self.joint == other.joint
         )
 
     def totalThickness(self):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@
		__copyright__ = "Copyright 2020, Frank D. Martinez. M."
		__license__ = "GPLv3"
		__maintainer__ = "https://github.com/mnesarco"