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

Show: more fixes

Browse Source
This commit is contained in:
DeepSOIC
2018-05-13 02:02:32 +03:00
committed by Yorik van Havre
parent 1bf9da8a2a
commit 75ba527311
2 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Mod/Show/Containers.py
View File

@@ -44,17 +44,17 @@ class Container(object):
self.self_check()
container = self.Object
if container.hasExtension("App::OriginGroupExtension"):
if container.hasExtension('App::OriginGroupExtension'):
if container.Origin is not None:
return [container.Origin]
elif container.isDerivedFrom("App::Origin"):
elif container.isDerivedFrom('App::Origin'):
return container.OriginFeatures
def getDynamicChildren(self):
self.self_check()
container = self.Object
if container.isDerivedFrom("App::Document"):
if container.isDerivedFrom('App::Document'):
# find all objects not contained by any Part or Body
result = set(container.Objects)
for obj in container.Objects:
@@ -62,13 +62,13 @@ class Container(object):
children = set(getAllChildren(obj))
result = result - children
return result
elif container.hasExtension("App::GroupExtension"):
elif container.hasExtension('App::GroupExtension'):
result = container.Group
if container.hasExtension('App::GeoFeatureGroupExtension'):
#geofeaturegroup's group contains all objects within the CS, we don't want that
result = [obj for obj in result if obj.getParentGroup() is not container]
return result
elif container.isDerivedFrom("App::Origin"):
elif container.isDerivedFrom('App::Origin'):
return []
raise RuntimeError("getDynamicChildren: unexpected container type!")
@@ -77,27 +77,45 @@ class Container(object):
self.self_check()
container = self.Object
if container.isDerivedFrom("App::Document"):
if container.isDerivedFrom('App::Document'):
return True #Document is a special thing... is it a CS or not is a matter of coding convenience.
elif container.hasExtension("App::GeoFeatureGroupExtension"):
elif container.hasExtension('App::GeoFeatureGroupExtension'):
return True
else:
return False
def getCSChildren(self):
def isAVisGroup(self):
self.self_check()
container = self.Object
if container.isDerivedFrom('App::Document'):
return False #Document is a special thing... Return value is a matter of coding convenience.
elif container.hasExtension('App::GeoFeatureGroupExtension'):
return True
elif container.isDerivedFrom('App::Origin'):
return True
else:
return False
#temporary solution. To be replaced with a separate Container-like structure.
def _getCSChildren(self):
if not self.isACS():
raise TypeError("Container is not a coordinate system")
container = self.Object
if container.isDerivedFrom("App::Document"):
if container.isDerivedFrom('App::Document'):
result = set(container.Objects)
for obj in container.Objects:
if isAContainer(obj) and Container(obj).isACS():
children = set(Container(obj).getCSChildren())
children = set(Container(obj)._getCSChildren())
result = result - children
return result
elif container.hasExtension('App::GeoFeatureGroupExtension'):
return container.Group + self.getStaticChildren()
result = container.Group + self.getStaticChildren()
if hasattr(container, 'Origin') and container.Origin is not None:
result = result + container.Origin.OriginFeatures
return result
else:
assert(False)

27
src/Mod/Show/TempoVis.py
View File

@@ -59,7 +59,13 @@ class TempoVis(FrozenClass):
self.__define_attributes()
self.document = document
@staticmethod
def is3DObject(obj):
"""is3DObject(obj): tests if the object is supposed to ever have some 3d geometry.
TempoVis is made only for objects in 3d view, so all objects that don't pass this check should be ignored."""
return obj.isDerivedFrom('App::GeoFeature') or obj.isDerivedFrom('App::Origin')
def modifyVPProperty(self, doc_obj_or_list, prop_name, new_value):
'''modifyVPProperty(self, doc_obj_or_list, prop_name, new_value): modifies
prop_name property of ViewProvider of doc_obj_or_list, and remembers
@@ -70,6 +76,8 @@ class TempoVis(FrozenClass):
if not hasattr(doc_obj_or_list, '__iter__'):
doc_obj_or_list = [doc_obj_or_list]
for doc_obj in doc_obj_or_list:
if not self.is3DObject(doc_obj):
continue
if not hasattr(doc_obj.ViewObject, prop_name):
App.Console.PrintWarning("TempoVis: object {obj} has no attribute {attr}. Skipped.\n"
.format(obj= doc_obj.Name, attr= prop_name))
@@ -85,11 +93,11 @@ class TempoVis(FrozenClass):
def show(self, doc_obj_or_list):
'''show(doc_obj_or_list): shows objects (sets their Visibility to True). doc_obj_or_list can be a document object, or a list of document objects'''
self.modifyVPProperty(doc_obj_or_list, "Visibility", True)
self.modifyVPProperty(doc_obj_or_list, 'Visibility', True)
def hide(self, doc_obj_or_list):
'''hide(doc_obj_or_list): hides objects (sets their Visibility to False). doc_obj_or_list can be a document object, or a list of document objects'''
self.modifyVPProperty(doc_obj_or_list, "Visibility", False)
self.modifyVPProperty(doc_obj_or_list, 'Visibility', False)
def get_all_dependent(self, doc_obj):
'''get_all_dependent(doc_obj): gets all objects that depend on doc_obj. Containers of the object are excluded from the list.'''
@@ -230,6 +238,8 @@ class TempoVis(FrozenClass):
if not hasattr(doc_obj_or_list, '__iter__'):
doc_obj_or_list = [doc_obj_or_list]
for doc_obj in doc_obj_or_list:
if not self.is3DObject(doc_obj):
continue
if doc_obj.Document is not self.document: #ignore objects from other documents
raise ValueError("Document object to be modified does not belong to document TempoVis was made for.")
oldval = self._getPickStyle(doc_obj.ViewObject)
@@ -268,7 +278,9 @@ class TempoVis(FrozenClass):
is placement's XY plane), and should be in global CS.
Offest shifts the plane; positive offset reveals more material, negative offset
hides more material."""
if not hasattr(obj, 'Placement'):
return #can't clip these yet... skip them for now.
node = self._getClipplaneNode(obj.ViewObject, make_if_missing= enable)
if node is None:
if enable:
@@ -300,8 +312,11 @@ class TempoVis(FrozenClass):
if not hasattr(doc_obj_or_list, '__iter__'):
doc_obj_or_list = [doc_obj_or_list]
for doc_obj in doc_obj_or_list:
if not self.is3DObject(doc_obj):
continue
if doc_obj.Document is not self.document: #ignore objects from other documents
raise ValueError("Document object to be modified does not belong to document TempoVis was made for.")
print("Clipping {obj}".format(obj= doc_obj.Name))
self._enableClipPlane(doc_obj, enable, placement, offset)
self.restore_on_delete = True
if doc_obj.Name not in self.data_pickstyle:
@@ -325,7 +340,9 @@ class TempoVis(FrozenClass):
for i in range(len(chain)):
cnt = chain[i]
cnt_next = chain[i+1] if i+1 < len(chain) else aroundObject
for obj in Container(cnt).getCSChildren():
for obj in Container(cnt)._getCSChildren():
if not self.is3DObject(obj):
continue
if obj is not cnt_next:
if obj.ViewObject.Visibility:
result.append(obj)