Merge pull request #32 from itised/parts-path-fixes

moved parts to their own directory

15 files changed, 9 insertions, 7 deletions

diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py
index 21af75b..27e74c6 100644
--- a/src/dactyl_manuform.py
+++ b/src/dactyl_manuform.py
@@ -39,9 +39,11 @@ except Exception:
     print('Setting Current Engine = {}'.format(ENGINE))
 
 if save_dir in ['', None, '.']:
-    save_path = os.path.join(r"..", "things")
+    save_path = path.join(r"..", "things")
+    parts_path = path.join(r"..", "src", "parts")
 else:
-    save_path = os.path.join(r"..", "things", save_dir)
+    save_path = path.join(r"..", "things", save_dir)
+    parts_path = path.join(r"..", r"..", "src", "parts")
 
 ###############################################
 # END EXTREMELY UGLY BOOTSTRAP
@@ -96,7 +98,7 @@ else:
 
 if 'HS_' in plate_style:
     symmetry = "asymmetric"
-    plate_file = path.join("..", "src", r"hot_swap_plate")
+    plate_file = path.join(parts_path, r"hot_swap_plate")
     plate_offset = 0.0
 
 if (trackball_in_wall or ('TRACKBALL' in thumb_style)) and not ball_side == 'both':
@@ -277,10 +279,10 @@ def trackball_socket(segments=100, side="right"):
     # cyl = translate(cyl, (0, 0, -8))
     # shape = union([shape, cyl])
 
-    tb_file = path.join("..", "src", r"trackball_socket_body_34mm")
-    tbcut_file = path.join("..", "src", r"trackball_socket_cutter_34mm")
-    sens_file = path.join("..", "src", r"trackball_sensor_mount")
-    senscut_file = path.join("..", "src", r"trackball_sensor_cutter")
+    tb_file = path.join(parts_path, r"trackball_socket_body_34mm")
+    tbcut_file = path.join(parts_path, r"trackball_socket_cutter_34mm")
+    sens_file = path.join(parts_path, r"trackball_sensor_mount")
+    senscut_file = path.join(parts_path, r"trackball_sensor_cutter")
 
 
     # shape = import_file(tb_file)
diff --git a/src/hot_swap_plate.step b/src/parts/hot_swap_plate.step
index fb793d0..fb793d0 100644
--- a/src/hot_swap_plate.step
+++ b/src/parts/hot_swap_plate.step
diff --git a/src/hot_swap_plate.stl b/src/parts/hot_swap_plate.stl
index 5b56f19..5b56f19 100644
--- a/src/hot_swap_plate.stl
+++ b/src/parts/hot_swap_plate.stl
diff --git a/src/sensor_holder.step b/src/parts/sensor_holder.step
index 5f78418..5f78418 100644
--- a/src/sensor_holder.step
+++ b/src/parts/sensor_holder.step
diff --git a/src/sensor_holder.stl b/src/parts/sensor_holder.stl
index 71ab0a8..71ab0a8 100644
--- a/src/sensor_holder.stl
+++ b/src/parts/sensor_holder.stl
diff --git a/src/trackball_fused_34mm.step b/src/parts/trackball_fused_34mm.step
index 851ae14..851ae14 100644
--- a/src/trackball_fused_34mm.step
+++ b/src/parts/trackball_fused_34mm.step
diff --git a/src/trackball_fused_34mm.stl b/src/parts/trackball_fused_34mm.stl
index 83aca37..83aca37 100644
--- a/src/trackball_fused_34mm.stl
+++ b/src/parts/trackball_fused_34mm.stl
diff --git a/src/trackball_sensor_cutter.step b/src/parts/trackball_sensor_cutter.step
index 7dcdf81..7dcdf81 100644
--- a/src/trackball_sensor_cutter.step
+++ b/src/parts/trackball_sensor_cutter.step
diff --git a/src/trackball_sensor_cutter.stl b/src/parts/trackball_sensor_cutter.stl
index 8e7fdc5..8e7fdc5 100644
--- a/src/trackball_sensor_cutter.stl
+++ b/src/parts/trackball_sensor_cutter.stl
diff --git a/src/trackball_sensor_mount.step b/src/parts/trackball_sensor_mount.step
index 3b015a0..3b015a0 100644
--- a/src/trackball_sensor_mount.step
+++ b/src/parts/trackball_sensor_mount.step
diff --git a/src/trackball_sensor_mount.stl b/src/parts/trackball_sensor_mount.stl
index b3e1afa..b3e1afa 100644
--- a/src/trackball_sensor_mount.stl
+++ b/src/parts/trackball_sensor_mount.stl
diff --git a/src/trackball_socket_body_34mm.step b/src/parts/trackball_socket_body_34mm.step
index 79e88ba..79e88ba 100644
--- a/src/trackball_socket_body_34mm.step
+++ b/src/parts/trackball_socket_body_34mm.step
diff --git a/src/trackball_socket_body_34mm.stl b/src/parts/trackball_socket_body_34mm.stl
index c1320ca..c1320ca 100644
--- a/src/trackball_socket_body_34mm.stl
+++ b/src/parts/trackball_socket_body_34mm.stl
diff --git a/src/trackball_socket_cutter_34mm.step b/src/parts/trackball_socket_cutter_34mm.step
index caf7a6f..caf7a6f 100644
--- a/src/trackball_socket_cutter_34mm.step
+++ b/src/parts/trackball_socket_cutter_34mm.step
diff --git a/src/trackball_socket_cutter_34mm.stl b/src/parts/trackball_socket_cutter_34mm.stl
index 4bfe4cb..4bfe4cb 100644
--- a/src/trackball_socket_cutter_34mm.stl
+++ b/src/parts/trackball_socket_cutter_34mm.stl