Skip to content

Commit

Permalink
build(release): merge branch develop (release 0.1.3)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcantondahmen committed Jun 9, 2021
2 parents 0c8bd58 + 603ad85 commit a8df665
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 15 deletions.
2 changes: 1 addition & 1 deletion revitron/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
DB = Autodesk.Revit.DB
LIB_DIR = parent(parent(__file__))
REVIT_VERSION = pyrevit.HOST_APP.uiapp.Application.VersionNumber
REVITRON_VERSION = '0.1.2'
REVITRON_VERSION = '0.1.3'


def _(element):
Expand Down
13 changes: 8 additions & 5 deletions revitron/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,14 @@ def applyStringFilter(self, paramName, value, evaluator, invert = False):
# While iterating that list, the parameter filter is applied each time
# to a fresh element collector that will be later merged or intersected with the others.
for valueProvider in revitron.ParameterValueProviders(paramName).get():
rule = revitron.DB.FilterStringRule(valueProvider, evaluator, value, True)
_filter = Filter()
_filter.collector = revitron.DB.FilteredElementCollector(revitron.DOC, self.getElementIds())
_filter.applyParameterFilter(rule, invert)
filters.append(_filter)
try:
rule = revitron.DB.FilterStringRule(valueProvider, evaluator, value, True)
_filter = Filter()
_filter.collector = revitron.DB.FilteredElementCollector(revitron.DOC, self.getElementIds())
_filter.applyParameterFilter(rule, invert)
filters.append(_filter)
except:
pass

if len(filters):
self.collector = filters[0].collector
Expand Down
24 changes: 15 additions & 9 deletions revitron/geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@ def getFaces(self):
"""
faces = []
for solid in self.getSolids():
for face in solid.Faces:
faces.append(face)
try:
for face in solid.Faces:
faces.append(face)
except:
pass
return faces


Expand All @@ -49,11 +52,14 @@ def getSolids(self):
list: A list of solid objects
"""
solids = []
for geo in self._geometry:
for item in geo.GetInstanceGeometry():
try:
if item.Volume:
solids.append(item)
except:
pass
try:
for geo in self._geometry:
for item in geo.GetInstanceGeometry():
try:
if item.Volume:
solids.append(item)
except:
pass
except:
pass
return solids

0 comments on commit a8df665

Please sign in to comment.