diff --git a/src/Mod/Path/App/ToolPy.xml b/src/Mod/Path/App/ToolPy.xml index af60f46527..687dae2032 100644 --- a/src/Mod/Path/App/ToolPy.xml +++ b/src/Mod/Path/App/ToolPy.xml @@ -86,9 +86,9 @@ HighCarbonToolSteel CastAlloy, Ceramics, Diamond, Sialon or Undefined returns a copy of this tool - + - fromTemplate(xmlString|dictionary) ... fills receiver with values from the template string or dictionary + setFromTemplate(xmlString|dictionary) ... fills receiver with values from the template string or dictionary diff --git a/src/Mod/Path/App/TooltablePyImp.cpp b/src/Mod/Path/App/TooltablePyImp.cpp index 3b5e5f9d1a..cd6ff64ece 100644 --- a/src/Mod/Path/App/TooltablePyImp.cpp +++ b/src/Mod/Path/App/TooltablePyImp.cpp @@ -288,7 +288,7 @@ PyObject* ToolPy::copy(PyObject * args) } -PyObject* ToolPy::fromTemplate(PyObject * args) +PyObject* ToolPy::setFromTemplate(PyObject * args) { char *pstr = 0; PyObject *dict = 0; diff --git a/src/Mod/Path/PathScripts/PathToolController.py b/src/Mod/Path/PathScripts/PathToolController.py index 69bb2a8404..660ce08ec5 100644 --- a/src/Mod/Path/PathScripts/PathToolController.py +++ b/src/Mod/Path/PathScripts/PathToolController.py @@ -99,7 +99,7 @@ class ToolController: for t in template.iter(ToolControllerTemplate.Tool): tool = Path.Tool() - tool.fromTemplate(xml.tostring(t)) + tool.setFromTemplate(xml.tostring(t)) obj.Tool = tool def templateAttrs(self, obj): diff --git a/src/Mod/Path/PathTests/TestPathTool.py b/src/Mod/Path/PathTests/TestPathTool.py index fee996b9f6..eca405877c 100644 --- a/src/Mod/Path/PathTests/TestPathTool.py +++ b/src/Mod/Path/PathTests/TestPathTool.py @@ -71,7 +71,7 @@ class TestPathTool(PathTestBase): t0 = self.test00() t1 = Path.Tool() - t1.fromTemplate(t0.templateAttrs()) + t1.setFromTemplate(t0.templateAttrs()) self.assertEqual(t0.Name, t1.Name) self.assertEqual(t0.ToolType, t1.ToolType)