simplyfy ijk handling

This commit is contained in:
Nikolay Khabarov
2017-05-21 18:50:07 +03:00
parent 3dde415ab6
commit ff373809b1
2 changed files with 7 additions and 42 deletions

View File

@@ -69,37 +69,13 @@ class TestGCode(unittest.TestCase):
def test_radius(self):
gc = GCode.parse_line("G2I1J2K3")
self.assertEqual(gc.radius(None, self.default, 1).x, 1)
self.assertEqual(gc.radius(None, self.default, 1).y, 2)
self.assertEqual(gc.radius(None, self.default, 1).z, 3)
self.assertEqual(gc.radius(self.default, 1).x, 1)
self.assertEqual(gc.radius(self.default, 1).y, 2)
self.assertEqual(gc.radius(self.default, 1).z, 3)
gc = GCode.parse_line("G3")
self.assertEqual(gc.radius(None, self.default, 1).x, self.default.x)
self.assertEqual(gc.radius(None, self.default, 1).y, self.default.y)
self.assertEqual(gc.radius(None, self.default, 1).z, self.default.z)
self.assertRaises(GCodeException, GCode.parse_line, "R1I2")
self.assertRaises(GCodeException, GCode.parse_line, "R1J2")
self.assertRaises(GCodeException, GCode.parse_line, "R1K2")
gc = GCode.parse_line("G3R9")
self.assertAlmostEqual(gc.radius(Plane.PLANE_XY, self.default, 1).x,
math.sqrt(40.5), 9)
self.assertAlmostEqual(gc.radius(Plane.PLANE_XY, self.default, 1).y,
math.sqrt(40.5), 9)
self.assertEqual(gc.radius(Plane.PLANE_XY, self.default, 1).z,
self.default.z)
gc = GCode.parse_line("G3R-10")
self.assertAlmostEqual(gc.radius(Plane.PLANE_ZX, self.default, 1).x,
-math.sqrt(50), 9)
self.assertEqual(gc.radius(Plane.PLANE_ZX, self.default, 1).y,
self.default.y)
self.assertAlmostEqual(gc.radius(Plane.PLANE_ZX, self.default, 1).z,
-math.sqrt(50), 9)
gc = GCode.parse_line("G3R11")
self.assertEqual(gc.radius(Plane.PLANE_YZ, self.default, 1).x,
self.default.x)
self.assertAlmostEqual(gc.radius(Plane.PLANE_YZ, self.default, 1).y,
math.sqrt(60.5), 9)
self.assertAlmostEqual(gc.radius(Plane.PLANE_YZ, self.default, 1).z,
math.sqrt(60.5), 9)
self.assertEqual(gc.radius(self.default, 1).x, self.default.x)
self.assertEqual(gc.radius(self.default, 1).y, self.default.y)
self.assertEqual(gc.radius(self.default, 1).z, self.default.z)
def test_multiply(self):
# getting coordinates could modify value be specified multiplier.