chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
03940ee
)
Slight speedup on gcode loader.
author
daid303
<daid303@gmail.com>
Wed, 13 Mar 2013 14:46:39 +0000
(15:46 +0100)
committer
daid303
<daid303@gmail.com>
Wed, 13 Mar 2013 14:46:39 +0000
(15:46 +0100)
Cura/util/gcodeInterpreter.py
patch
|
blob
|
history
diff --git
a/Cura/util/gcodeInterpreter.py
b/Cura/util/gcodeInterpreter.py
index a4a3de4d71b14822fe76ea8328d375aca3c28f26..633468675e7ae6ec39c6cd54aed2468137bc8e1b 100644
(file)
--- a/
Cura/util/gcodeInterpreter.py
+++ b/
Cura/util/gcodeInterpreter.py
@@
-2,7
+2,6
@@
from __future__ import absolute_import
import sys
import math
-import re
import os
import time
@@
-134,7
+133,7
@@
class gcode(object):
if f is not None:
feedRate = f
if x is not None or y is not None or z is not None:
- totalMoveTimeMinute +=
(oldPos - pos).vsize(
) / feedRate
+ totalMoveTimeMinute +=
math.sqrt((oldPos.x - pos.x) * (oldPos.x - pos.x) + (oldPos.y - pos.y) * (oldPos.y - pos.y)
) / feedRate
moveType = 'move'
if e is not None:
if not absoluteE: