Fixed up ToolController template arguments and loading for the switch to JSON.

src/Mod/Path/PathTests/TestPathToolController.py

@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+
+# ***************************************************************************
+# *                                                                         *
+# *   Copyright (c) 2017 sliptonic <shopinthewoods@gmail.com>               *
+# *                                                                         *
+# *   This program is free software; you can redistribute it and/or modify  *
+# *   it under the terms of the GNU Lesser General Public License (LGPL)    *
+# *   as published by the Free Software Foundation; either version 2 of     *
+# *   the License, or (at your option) any later version.                   *
+# *   for detail see the LICENCE text file.                                 *
+# *                                                                         *
+# *   This program is distributed in the hope that it will be useful,       *
+# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+# *   GNU Library General Public License for more details.                  *
+# *                                                                         *
+# *   You should have received a copy of the GNU Library General Public     *
+# *   License along with this program; if not, write to the Free Software   *
+# *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  *
+# *   USA                                                                   *
+# *                                                                         *
+# ***************************************************************************
+
+import FreeCAD
+import Path
+import PathScripts.PathToolController as PathToolController
+
+from PathTests.PathTestUtils import PathTestBase
+
+class TestPathToolController(PathTestBase):
+
+    def setUp(self):
+        self.doc = FreeCAD.newDocument("TestPathToolController")
+
+    def tearDown(self):
+        FreeCAD.closeDocument(self.doc.Name)
+
+    def createTool(self, name='t1', diameter=1.75):
+        return Path.Tool(name=name, diameter=diameter)
+
+    def test00(self):
+        '''Verify ToolController templateAttrs'''
+        t  = self.createTool('T1')
+        tc = PathToolController.Create('TC0', t)
+
+        tc.Label = 'ToolController'
+        tc.ToolNumber = 7
+        tc.VertFeed = '3 in/s'
+        tc.HorizFeed = '10 mm/s'
+        tc.VertRapid = 40
+        tc.HorizRapid = 28
+        tc.SpindleDir = 'Reverse'
+        tc.SpindleSpeed = 12000
+
+        attrs = tc.Proxy.templateAttrs(tc)
+
+        self.assertEqual(attrs['name'], 'TC0')
+        self.assertEqual(attrs['label'], 'ToolController')
+        self.assertEqual(attrs['nr'], 7)
+        self.assertEqual(attrs['vfeed'], '76.2 mm/s')
+        self.assertEqual(attrs['hfeed'], '10 mm/s')
+        self.assertEqual(attrs['vrapid'], '40 mm/s')
+        self.assertEqual(attrs['hrapid'], '28 mm/s')
+        self.assertEqual(attrs['dir'], 'Reverse')
+        self.assertEqual(attrs['speed'], 12000)
+        self.assertEqual(attrs['tool'], t.templateAttrs())
+
+        return tc
+
+    def test01(self):
+        '''Verify ToolController template roundtrip.'''
+
+        tc0 = self.test00()
+        tc1 = PathToolController.FromTemplate(tc0.Proxy.templateAttrs(tc0))
+
+        self.assertNotEqual(tc0.Name, tc1.Name)
+        self.assertNotEqual(tc0.Label, tc1.Label)
+        self.assertEqual(tc0.ToolNumber, tc1.ToolNumber)
+        self.assertRoughly(tc0.VertFeed, tc1.VertFeed)
+        self.assertRoughly(tc0.HorizFeed, tc1.HorizFeed)
+        self.assertRoughly(tc0.VertRapid, tc1.VertRapid)
+        self.assertRoughly(tc0.HorizRapid, tc1.HorizRapid)
+        self.assertEqual(tc0.SpindleDir, tc1.SpindleDir)
+        self.assertRoughly(tc0.SpindleSpeed, tc1.SpindleSpeed)
+        self.assertEqual(tc0.Tool.Name, tc1.Tool.Name)
+        self.assertRoughly(tc0.Tool.Diameter, tc1.Tool.Diameter)