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

simpler way to filter roughly equal depth values

Browse Source
This commit is contained in:
sliptonic
2022-03-17 18:13:52 -05:00
committed by Russell Johnson
parent 6b9312c567
commit cf64b06c89
1 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/Mod/Path/PathScripts/PathUtils.py
View File

@@ -737,50 +737,59 @@ class depth_params(object):
to be removed, so as to eliminate an effective step-down depth with the removal
of repetitive roughly-equal values."""
if len(depths) == 2:
if PathGeom.isRoughly(depths[0], depths[1]):
return [depths[1]]
return depths
depthcopy = depths.copy() #make a copy so we don't touch original
depthcopy.reverse() # reverse it low to high
keep = [depthcopy[0]] # initialize keep list with first element
for depth in depthcopy[1:]: # iterate the list from second element on
if not PathGeom.isRoughly(depth, keep[-1]): #Compare each to the last kept item
keep.append(depth) # if different, add to keep
keep.reverse() # reverse results back high to low
return keep
# print("raw depths: {}".format(depths))
# if len(depths) == 2:
# if PathGeom.isRoughly(depths[0], depths[1]):
# return [depths[1]]
# return depths
uniqueDepths = depths
lastDepth = None
maxLoops = 0
while maxLoops < 10:
# print("\nStart scan... uniqueDepths: {}".format(uniqueDepths))
stop = True
keep = []
# Filter out unique values from consecutive pairs
for i in range(0, len(uniqueDepths) - 1):
dep1 = uniqueDepths[i]
dep2 = uniqueDepths[i + 1]
# print("comparing: {} and {}".format(dep1, dep2))
# print("lastDepth: {}".format(lastDepth))
# # print("raw depths: {}".format(depths))
if PathGeom.isRoughly(dep1, dep2):
if PathGeom.isRoughly(lastDepth, dep2):
keep.pop()
keep.append(dep2)
# Cycle again if a roughly-equal pair is found
stop = False
else:
if lastDepth is None:
keep.append(dep1)
else:
if not PathGeom.isRoughly(lastDepth, dep1):
keep.append(dep1)
keep.append(dep2)
# uniqueDepths = depths
# lastDepth = None
# maxLoops = 0
# while maxLoops < 10:
# # print("\nStart scan... uniqueDepths: {}".format(uniqueDepths))
# stop = True
# keep = []
# # Filter out unique values from consecutive pairs
# for i in range(0, len(uniqueDepths) - 1):
# dep1 = uniqueDepths[i]
# dep2 = uniqueDepths[i + 1]
# # print("comparing: {} and {}".format(dep1, dep2))
# # print("lastDepth: {}".format(lastDepth))
lastDepth = dep2
# Efor
uniqueDepths = keep
maxLoops += 1
if stop:
break
# if PathGeom.isRoughly(dep1, dep2):
# if PathGeom.isRoughly(lastDepth, dep2):
# keep.pop()
# keep.append(dep2)
# # Cycle again if a roughly-equal pair is found
# stop = False
# else:
# if lastDepth is None:
# keep.append(dep1)
# else:
# if not PathGeom.isRoughly(lastDepth, dep1):
# keep.append(dep1)
# keep.append(dep2)
# print("uniqueDepths: {}".format(uniqueDepths))
return uniqueDepths
# lastDepth = dep2
# # Efor
# uniqueDepths = keep
# maxLoops += 1
# if stop:
# break
# # print("uniqueDepths: {}".format(uniqueDepths))
# return uniqueDepths
def __equal_steps(self, start, stop, max_size):
"""returns a list of depths beginning with the bottom (included), ending