From 87afd33c0fc4665e0592fd8fd76f38b7e4d68f19 Mon Sep 17 00:00:00 2001
From: sckunkle <ppdplayer@gmail.com>
Date: Fri, 21 Feb 2020 11:19:24 -0600
Subject: [PATCH] improve code readability

---
 mbotmake | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/mbotmake b/mbotmake
index 389838b..2410766 100755
--- a/mbotmake
+++ b/mbotmake
@@ -50,6 +50,18 @@ def generateCommand(function, metadata, parameters, tags):
     ])
 
 
+def computeTime(prev, current):
+    if [current['x'], current['y'], current['z']] == [prev['x'], prev['y'], prev['z']] and current['a'] != prev['a']:
+        # retraction takes time as well, add it in
+        # time = sqrt((e2-e1)^2)/feedrate
+        distance = math.dist([current['a']], [prev['a']])
+    else:
+        # get time traveled by the equasion
+        # time = sqrt((x2-x1)^2 + (y2-y1)^2 + (z2-z1)^2)/feedrate
+        distance = math.dist([current['x'], current['y'], current['z']],
+                             [prev['x'], prev['y'], prev['z']])
+    return distance/current['feedrate']
+
 def createToolpath(filename, temp):
     corpus = open(filename).readlines()
     processed = []
@@ -96,7 +108,7 @@ def createToolpath(filename, temp):
             'z': 0.0
         }
     print('lines processed:')
-    print(printline.format(0, progresslen, 0/progresslen), end='')
+    print(printline.format(0, progresslen, 0.0), end='')
     """
     Quick reference:
     G0/G1 is move
@@ -144,16 +156,7 @@ def createToolpath(filename, temp):
                                               'z': False},
                                              axis,
                                              [])
-                if [axis['x'], axis['y'], axis['z']] == [prev['x'], prev['y'], prev['z']] and axis['a'] != prev['a']:
-                    # retraction takes time as well, add it in
-                    # time = sqrt((e2-e1)^2)/feedrate
-                    distance = math.dist([axis['a']], [prev['a']])
-                else:
-                    # get time traveled by the equasion
-                    # time = sqrt((x2-x1)^2 + (y2-y1)^2 + (z2-z1)^2)/feedrate
-                    distance = math.dist([axis['x'], axis['y'], axis['z']],
-                                        [prev['x'], prev['y'], prev['z']])
-                printersettings['time'] += distance/axis['feedrate']
+                printersettings['time'] += computeTime(prev, axis)
         elif line[0] == 'G92':
             for ax in line[1:]:
                 if ax[0] == 'E':
@@ -253,15 +256,10 @@ def main(argv):
 
 if __name__ == '__main__':
     if len(sys.argv) < 2:
-        print(
-"""Instructions:
-Drag and drop your generated gcode
-    file onto this executable.
-It will then output a makerbot file in
-    the dir that the original
-    gcode is placed in.
-Press enter to continue."""
-        )
+        print('Instructions:')
+        print('Drag and drop your generated gcode file onto this executable.')
+        print('It will then output a makerbot file in the dir that the original gcode is placed in.')
+        print('Press enter to continue.')
         input()
         sys.exit()
     main(sys.argv)