From 85f0eddddc74f075a92b059014b4880b5e15e81b Mon Sep 17 00:00:00 2001 From: wandererfan Date: Sun, 10 May 2020 08:18:46 -0400 Subject: [PATCH] [TD]minor py fixes --- src/Mod/TechDraw/App/CosmeticEdgePy.xml | 2 +- src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp | 5 ++++- src/Mod/TechDraw/App/DrawUtil.cpp | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Mod/TechDraw/App/CosmeticEdgePy.xml b/src/Mod/TechDraw/App/CosmeticEdgePy.xml index 98d12e36bd..76583a8cd3 100644 --- a/src/Mod/TechDraw/App/CosmeticEdgePy.xml +++ b/src/Mod/TechDraw/App/CosmeticEdgePy.xml @@ -57,7 +57,7 @@ - The appearance attributes (style, color, weight, visible) for this CosmeticEdge. + The appearance attributes (style, weight, color, visible) for this CosmeticEdge. diff --git a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp index 507d39df18..f0cea0925b 100644 --- a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp +++ b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp @@ -45,7 +45,10 @@ using namespace TechDraw; // returns a string which represents the object e.g. when printed in python std::string CosmeticEdgePy::representation(void) const { - return ""; + std::stringstream ss; + ss << " at " << std::hex << this; + return ss.str(); +// return ""; } PyObject *CosmeticEdgePy::PyMake(struct _typeobject *, PyObject *, PyObject *) // Python wrapper diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp index d753a19e12..893aa6778b 100644 --- a/src/Mod/TechDraw/App/DrawUtil.cpp +++ b/src/Mod/TechDraw/App/DrawUtil.cpp @@ -669,7 +669,7 @@ App::Color DrawUtil::pyTupleToColor(PyObject* pColor) { // Base::Console().Message("DU::pyTupleToColor()\n"); double red = 0.0, green = 0.0, blue = 0.0, alpha = 0.0; - App::Color c(red, blue, green, alpha); + App::Color c(red, green, blue, alpha); if (PyTuple_Check(pColor)) { int tSize = (int) PyTuple_Size(pColor); if (tSize > 2) { @@ -684,7 +684,7 @@ App::Color DrawUtil::pyTupleToColor(PyObject* pColor) PyObject* pAlpha = PyTuple_GetItem(pColor,3); alpha = PyFloat_AsDouble(pAlpha); } - c = App::Color(red, blue, green, alpha); + c = App::Color(red, green, blue, alpha); } return c; }