kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

move Placement.isNull to Placement.isIdentity

Browse Source 
add isNull for backward compatibility
This commit is contained in:
wmayer
2017-12-13 19:13:18 +01:00
parent b22f231345
commit 0d7831e196
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Base/PlacementPyImp.cpp
View File

@@ -247,8 +247,20 @@ void PlacementPy::setRotation(Py::Object arg)
throw Py::TypeError("either Rotation or tuple of four floats expected");
}
PyObject *PlacementPy::getCustomAttributes(const char* /*attr*/) const
PyObject *PlacementPy::getCustomAttributes(const char* attr) const
{
// for backward compatibility
if (strcmp(attr, "isNull") == 0) {
PyObject *w, *res;
#if PY_MAJOR_VERSION >= 3
w = PyUnicode_InternFromString("isIdentity");
#else
w = PyString_InternFromString("isIdentity");
#endif
res = PyObject_GenericGetAttr(const_cast<PlacementPy *>(this), w);
Py_XDECREF(w);
return res;
}
return 0;
}

8
src/Mod/Arch/ArchComponent.py
View File

@@ -491,7 +491,7 @@ class Component:
#print("Processing subshapes of ",obj.Label, " : ",obj.Additions)
if placement:
if placement.isNull():
if placement.isIdentity():
placement = None
else:
placement = FreeCAD.Placement(placement)
@@ -625,19 +625,19 @@ class Component:
else:
shape = r
obj.Shape = self.spread(obj,shape,placement)
if not placement.isNull():
if not placement.isIdentity():
obj.Placement = placement
else:
if allownosolid:
obj.Shape = self.spread(obj,shape,placement)
if not placement.isNull():
if not placement.isIdentity():
obj.Placement = placement
else:
FreeCAD.Console.PrintWarning(obj.Label + " " + translate("Arch","has no solid")+"\n")
else:
if allowinvalid:
obj.Shape = self.spread(obj,shape,placement)
if not placement.isNull():
if not placement.isIdentity():
obj.Placement = placement
else:
FreeCAD.Console.PrintWarning(obj.Label + " " + translate("Arch","has an invalid shape")+"\n")

2
src/Mod/Arch/importIFClegacy.py
View File

@@ -1212,7 +1212,7 @@ def getTuples(data,scale=1,placement=None,normal=None,close=True):
for v in verts:
pt = v.Point
if placement:
if not placement.isNull():
if not placement.isIdentity():
pt = placement.multVec(pt)
if rnd:
pt = DraftVecUtils.rounded(pt)