From 8c80e3ac4a6ae8a32f6cea1496811c6cc1fba9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 5 Jul 2016 14:53:16 +0200 Subject: [PATCH] Scalar3D => Vector3D --- src/octoprint/util/gcodeInterpreter.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/octoprint/util/gcodeInterpreter.py b/src/octoprint/util/gcodeInterpreter.py index b1b86ca4..c1c2a270 100644 --- a/src/octoprint/util/gcodeInterpreter.py +++ b/src/octoprint/util/gcodeInterpreter.py @@ -58,7 +58,7 @@ class Vector3D(object): # copy constructor other = args[0] if not isinstance(other, Vector3D): - raise ValueError("Object to copy must be a Scalar3D instance") + raise ValueError("Object to copy must be a Vector3D instance") self.x = other.x self.y = other.y @@ -78,7 +78,7 @@ class Vector3D(object): self.y + other[1], self.z + other[2]) else: - raise ValueError("other must be a Scalar3D instance or a list or tuple of length 3") + raise ValueError("other must be a Vector3D instance or a list or tuple of length 3") def __sub__(self, other): if isinstance(other, Vector3D): @@ -90,7 +90,7 @@ class Vector3D(object): self.y - other[1], self.z - other[2]) else: - raise ValueError("other must be a Scalar3D instance or a list or tuple") + raise ValueError("other must be a Vector3D instance or a list or tuple") def __mul__(self, other): if isinstance(other, (int, float)): @@ -112,7 +112,7 @@ class Vector3D(object): return self.x == other.x and self.y == other.y and self.z == other.z def __str__(self): - return "Scalar3D(x={}, y={}, z={}, length={})".format(self.x, self.y, self.z, self.length) + return "Vector3D(x={}, y={}, z={}, length={})".format(self.x, self.y, self.z, self.length) class AnalysisAborted(Exception):