suzanne.soy/Lattice2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: suzanne.soy:filters
Branches Tags
suzanne.soy:master
suzanne.soy:filters
suzanne.soy:reference-placement
suzanne.soy:SpreadsheetParaSeries
..
compare: suzanne.soy:master
Branches Tags
suzanne.soy:filters
suzanne.soy:master
suzanne.soy:reference-placement
suzanne.soy:SpreadsheetParaSeries

No commits in common. "filters" and "master" have entirely different histories.
filters ... master

4 changed files with 8 additions and 317 deletions
Show Stats Expand all files Collapse all files

2
README.md
View File

@ -101,8 +101,6 @@ For Documentation see the [Lattice2 wiki](https://github.com/DeepSOIC/Lattice2/w
If you need help on something specific, you can ask a question on [FreeCAD forum](http://forum.freecadweb.org/) (there is no Lattice forum yet...). You can also ask me directly. **Note:** If you post to the forum, please add this to your post so that I get a notification:
`[quote=DeepSOIC user_id=3888]Ding![/quote]`
NEW!: [Github Discussions for Lattice2](https://github.com/DeepSOIC/Lattice2/discussions) are enabled, you are welcome to ask questions and post random thoughts there!
## Contributing
If you have found a bug or are requesting a new feature, please first check to see if it has been previously reported already on the [Lattice2 Github repo issue tracker](https://github.com/DeepSOIC/Lattice2/issues). If not, feel free to open a ticket.

267
lattice2Downgrade.py
View File

@ -22,11 +22,8 @@
#***************************************************************************
from lattice2Common import *
from lattice2Utils import getAnnotatedShapes
import lattice2Markers as markers
import lattice2CompoundExplorer as LCE
from lattice2BaseFeature import assureProperty #assureProperty(self, selfobj, proptype, propname, defvalue, group, tooltip)
import logging
import math
@ -58,264 +55,12 @@ def makeLatticeDowngrade(name):
_ViewProviderLatticeDowngrade(obj.ViewObject)
return obj
allowed_attributes = {
'.StartPoint' : 'vector',
'.EndPoint' : 'vector',
'.Construction' : 'bool'
}
example = """
# Write one instruction per line. Indentation is irrelevant but other whitespace is significant. Syntax is as follows:
# In the stack representations below, the topmost element is on the right.
# <instruction> : <stack before> : <stack after> : description
# QUOTE : ... : ... closure : quotes the following instructions until "QUOTE END" for later use via CALL, PARTIAL or a higher-order function like MAP
# END QUOTE : ends quotation mode
# CALL : ... closure : ...UpdatedStack : calls the closure and lets it manipulate the stack (no protection). The closure's saved stack is appended, so its instructions start executing with the stack "... saved"
# PARTIAL : ... arg closure : ... closure' : adds the arg on top of the saved stack of the closure
# DEBUG : ... : ... : prints the current stack
# MAP : ... list closure : ... list' : calls the closure for each of the elements of the list. The closure's instructions are executed with the stack "... saved elt". After each call, the top of the stack is popped and stored in a list. This list is left as the top of the stack at the end
# FILTER : ... list closure : ... list' : calls the closure for each of the elements of the list. The closure's instructions are executed with the stack "... saved elt". After each call, the top of the stack is popped and if it is true, the original element is added to a list. This list is left as the top of the stack at the end
# STR some text : ... : ... string : pushes "some text" on the stack. The entire line is pushed after removing the first four characters "STR "
# FLOAT 3.14 : ... : ... float : pushes 3.14 on the stack
# INT 123 : ... : ... int : pushes 123 on the stack
# BOOL True : ... : ... bool : pushes True on the stack. Booleans are True or False
# NOT : ... bool : ... bool : pops the top of the stack which must be a boolean, and pushes back its negation
# EQUAL : ... t t : ... bool : pops two elements, pushes True if top == bot, False otherwise. Comparing elements of different types will always return False.
# LT : ... t t : ... bool : pops two elements, pushes True if top < bot, False otherwise. Comparing elements of different types will always return False.
# GT : ... t t : ... bool : pops two elements, pushes True if top > bot, False otherwise. Comparing elements of different types will always return False.
# LE : ... t t : ... bool : pops two elements, pushes True if top <= bot, False otherwise. Comparing elements of different types will always return False.
# GE : ... t t : ... bool : pops two elements, pushes True if top >= bot, False otherwise. Comparing elements of different types will always return False.
# AND : ... bool bool : ... bool : pops two booleans, pushes (top and bot)
# OR : ... bool bool : ... bool : pops two booleans, pushes (top or bot)
# XOR : ... bool bool : ... bool : pops two booleans, pushes (top xor bot)
# NAND : ... bool bool : ... bool : pops two booleans, pushes (top nand bot)
# NOR : ... bool bool : ... bool : pops two booleans, pushes (top nor bot)
# NXOR : ... bool bool : ... bool : pops two booleans, pushes (top nxor bot)
# DROP : ... t : ... : pops the top of the stack and discards it
# DUP : ... t : ... t t : pops the top of the stack, and pushes it back twice (duplication of the top of the stack)
# SWAP : ... t u : ... u t : pops two elements, and pushes them back in reverse order
# PAIR : ... t u : ... pair : pops two elements, and pushes a pair containing these two elements
# UNPAIR : ... pair : ... t u : pops a pair and pushes its two elements back onto the stack
# NIL : ... : ... list : pushes the empty list onto the stack
# CONS : ... list t : ... list : pops two elements, adds the top at the head of the bot, and pushes back the new list
# UNCONS : ... list : ... list t : pops the top of the stack which must be a list, and pushes back the tail of the list and its first element
# NOP : ... : ... : No operation (NOOP is also accepted)
# SET xyz : ... t : ... : pops the top of the stack, and saves it as a global variable named xyz
# GET xyz : ... : ... t : pushes the contents of the global variable xyz on top of the stack
# .Annotations.xyz : ... annotated_shape : ... string : gets the annotation from the given geometry element. Annotations are stored as dummy de-activated Block constraints named __theannotation.123 (where 123 is the constraint's ID) and some extra annotations are supplied by some Python objects (e.g. .Annotations.Geometry for sketches). A separate macro allows setting these annotations.
# .attribute : ... geometry : ... u : gets the attribute from the object on the top of the stack. Allowed attributes are {allowed_attributes}
# The initial stack contains a list of sketch geometry elements.
QUOTE
.Annotations.Geometry
.Construction
NOT
END QUOTE
FILTER
"""
example = example.format(allowed_attributes=",".join(sorted(["%s (%s)" % (k,v) for k,v in allowed_attributes.items()])))
def interpret_map(stack, env, closure, lst):
result = []
for elt in lst:
stack, env = interpret(stack + closure[1] + [elt], env, closure[0])
result.append(stack[-1])
stack = stack[:-1]
return (stack + [('list', result)], env)
def interpret_filter(stack, env, closure, lst):
result = []
for elt in lst:
stack, env = interpret(stack + closure[1] + [elt], env, closure[0])
if stack[-1][0] != 'bool':
raise ValueError("closure passed as an argument to filter should return a bool, but it returned a " + str(stack[-1][0]))
if stack[-1][1] == True:
result.append(elt)
elif stack[-1][1] == False:
pass
else:
raise ValueError("internal error: invalid boolean value: " + repr(stack[-1][1]))
stack = stack[:-1]
return (stack + [('list', result)], env)
boolOperations = {
'AND': (lambda x, y: x and y),
'OR': (lambda x, y: x or y),
'XOR': (lambda x, y: (x or y) and (not (x and y))),
'NAND': (lambda x, y: not (x and y)),
'NOR': (lambda x, y: not (x or y)),
'NXOR': (lambda x, y: (x and y) or (not (x or y)))
}
def interpret(stack, env, program):
quoting = 0
for line in program:
if line.strip() == '':
pass # no-op
# quotations
elif quoting > 0:
if stack[-1][0] != 'closure':
raise ValueError("while in quote mode the top of the stack should be a closure")
if line == 'END QUOTE':
quoting = quoting - 1
elif line == 'QUOTE':
quoting = quoting + 1
if quoting > 0: # if this wasn't the last 'END QUOTE', i.e. after decrementing we're still quoting, then add the instruction to the closure
stack[-1] = ('closure', (stack[-1][1][0] + [line], stack[-1][1][1]))
else:
pass
elif line == 'QUOTE':
stack.append(('closure', ([],[])))
quoting = 1
# functions
elif line == 'CALL':
if stack[-1][0] != "closure":
raise ValueError("CALL expected a closure")
stack, env = interpret(stack[:-1] + stack[-1][1][1], env, stack[-1][1][0])
elif line == 'PARTIAL':
# push stack[-2] onto the closure's stack
if stack[-1][0] != "closure":
raise ValueError("PARTIAL expected a closure")
stack = stack[:-2] + [('closure', (stack[-1][1][0], stack[-1][1][1] + [stack[-2]]))]
elif line == 'MAP':
if stack[-1][0] != "closure":
raise ValueError("MAP expected a closure at the top of the stack")
if stack[-2][0] != "list":
raise ValueError("MAP expected a list as the second (deeper) element on the stack")
closure = stack[-1][1]
stack, env = interpret_map(stack[:-2], env, stack[-1][1], stack[-2][1])
elif line == 'FILTER':
if stack[-1][0] != "closure":
raise ValueError("FILTER expected a closure at the top of the stack")
if stack[-2][0] != "list":
raise ValueError("FILTER expected a list as the second (deeper) element on the stack")
closure = stack[-1][1]
stack, env = interpret_filter(stack[:-2], env, stack[-1][1], stack[-2][1])
elif line == 'DEBUG':
print('stack:')
for i,x in enumerate(reversed(stack)):
print(str(i) + ": " + str(x))
elif line.startswith('STR '):
stack.append(("string", line[len('STR '):]))
elif line.startswith('FLOAT '):
stack.append(("float", float(line[len('FLOAT '):])))
elif line.startswith('INT '):
stack.append(("int", int(line[len('INT '):])))
elif line.startswith('BOOL '):
b = line[len('BOOL '):]
if b != "True" and b != "False":
raise ValueError("Invalid boolean literal, expected True or False")
stack.append(("bool", line[len('BOOL '):] == "True"))
elif line == 'NOT':
if stack[-1][0] != "bool":
raise ValueError("NOT expected a boolean at the top of the stack")
stack = stack[:-1] + [("bool", not stack[-1][1])]
elif line == 'EQUAL':
stack = stack[:-2] + [("bool", stack[-1] == stack[-2])]
elif line == 'LT':
stack = stack[:-2] + [("bool", stack[-1] < stack[-2])]
elif line == 'GT':
stack = stack[:-2] + [("bool", stack[-1] > stack[-2])]
elif line == 'LE':
stack = stack[:-2] + [("bool", stack[-1] <= stack[-2])]
elif line == 'GE':
stack = stack[:-2] + [("bool", stack[-1] >= stack[-2])]
elif line in boolOperations:
if stack[-1][0] != "bool":
raise ValueError(line + " expected a boolean at the top of the stack")
if stack[-2][0] != "bool":
raise ValueError(line + " expected a boolean as the second (deeper) element on the stack")
stack = stack[:-2] + [("bool", boolOperations[line](stack[-1], stack[-2]))]
elif line == 'DROP':
stack = stack[:-1]
elif line == 'DUP':
stack.append(stack[-1])
elif line == 'SWAP':
stack = stack[:-2] + [stack[-1], stack[-2]]
elif line == 'PAIR':
stack = stack[:-2] + [("pair", stack[-1], stack[-2])]
elif line == 'UNPAIR':
if stack[-1][0] != "pair":
raise ValueError("UNPAIR expected a pair")
stack = stack[:-1] + [stack[-1][1][0], stack[-1][1][1]]
elif line == 'NIL':
stack.append(('list', []))
elif line == 'CONS':
if stack[-2][0] != "list":
raise ValueError("CONS expected a list as the second (deeper) element on the stack")
stack = stack[:-2] + [('list', [stack[-1]] + stack[-2][1])]
elif line == 'UNCONS':
if stack[-1][0] != "list":
raise ValueError("UNCONS expected a list on the stack")
stack = stack[:-1] + [('list', stack[-1][1][1:]), stack[-1][1][0]]
elif line == 'NOP' or line == 'NOOP':
pass
elif line.startswith('SET '):
env[line[len('SET '):]] = stack[-1]
stack = stack[:-1]
elif line.startswith('GET '):
stack.append(env[line[len('GET '):]])
elif line.startswith('.Annotations.'):
annotationName = line[len('.Annotations.'):]
if stack[-1][0] != "annotated_shape":
raise ValueError(".Annotations expected an annotated shape")
stack = stack[:-1] + [stack[-1][1][1].get(annotationName, ('none', None))]
elif line in allowed_attributes.keys():
if stack[-1][0] != "geometry":
raise ValueError(line + " expected a geometry elemnt")
stack = stack[:-1] + [(allowed_attributes[line], getattr(stack[-1][1][1], line[1:]))]
else:
raise ValueError('Unknown operation: "' + line + '", repr=' + repr(line) + ". empty after strip=" + str(line.strip() == '') + ", len=" + str(len(line)))
return stack, env
def user_filter_old(filter, sketch):
filter = [line.lstrip() for line in filter.split('\n')]
filter = [line for line in filter if not line.startswith('#') and line != '']
stack = [('list', [('annotated_shape', sh) for sh in getAnnotatedShapes(sketch)])]
stack, env = interpret(stack, {}, filter)
if len(stack) != 1:
raise ValueError("The stack should contain a single element after applying the filter's operations.")
if stack[0][0] != 'list':
raise ValueError("The stack should contain a list after applying the filter's operations.")
for i, (type, g) in enumerate(stack[0][1]):
if type != 'annotated_shape':
raise ValueError("The stack should contain a list of annotated shape elemnents after applying the filter's operations, wrong type for list element " + str(i) + " : " + str(type))
return [shape for type,(shape,annotations) in stack[0][1]]
def parse(str):
for c in str:
if c == '(':
pass
elif c == 'TODO':
pass
def user_filter(filter, sketch):
filter = parse(filter)
#… TODO
stack = [('list', [('annotated_shape', sh) for sh in getAnnotatedShapes(sketch)])]
stack, env = interpret(stack, {}, filter)
if len(stack) != 1:
raise ValueError("The stack should contain a single element after applying the filter's operations.")
if stack[0][0] != 'list':
raise ValueError("The stack should contain a list after applying the filter's operations.")
for i, (type, g) in enumerate(stack[0][1]):
if type != 'annotated_shape':
raise ValueError("The stack should contain a list of annotated shape elemnents after applying the filter's operations, wrong type for list element " + str(i) + " : " + str(type))
return [shape for type,(shape,annotations) in stack[0][1]]
class _latticeDowngrade:
"The latticeDowngrade object"
_DowngradeModeList = ['Leaves','CompSolids','Solids','Shells','OpenWires','Faces','Wires','Edges','SketchEdges','Seam edges','Non-seam edges','Vertices']
_DowngradeModeList = ['Leaves','CompSolids','Solids','Shells','OpenWires','Faces','Wires','Edges','Seam edges','Non-seam edges','Vertices']
def __init__(self,obj):
self.Type = "latticeDowngrade"
@ -324,13 +69,9 @@ class _latticeDowngrade:
obj.addProperty("App::PropertyEnumeration","Mode","latticeDowngrade","Type of elements to output.")
obj.Mode = ['bypass'] + self._DowngradeModeList
obj.Mode = 'bypass'
obj.Proxy = self
self.assureProperties(obj)
def assureProperties(self, selfobj):
assureProperty(selfobj, "App::PropertyStringList", "Filter", example.split('\n'), "latticeDowngrade", "Filter applied to the SubLink list")
def execute(self,obj):
rst = [] #variable to receive the final list of shapes
@ -363,8 +104,6 @@ class _latticeDowngrade:
rst = shp.Wires
elif obj.Mode == 'Edges':
rst = shp.Edges
elif obj.Mode == 'SketchEdges':
rst = user_filter('\n'.join(obj.Filter), obj.Base)
elif obj.Mode == 'Seam edges':
rst = getAllSeams(shp)
elif obj.Mode == 'Non-seam edges':

29
lattice2TopoSeries.py
View File

@ -32,12 +32,10 @@ import FreeCAD as App
import Part
from lattice2Common import *
from lattice2Utils import getAnnotatedShapes
import lattice2BaseFeature
import lattice2Executer as Executer
import lattice2Markers as markers
import lattice2Subsequencer as Subsequencer
from lattice2BaseFeature import assureProperty #assureProperty(self, selfobj, proptype, propname, defvalue, group, tooltip)
# --------------------------- general routines ------------------------------------------------
@ -94,13 +92,6 @@ class LatticeTopoSeries(lattice2BaseFeature.LatticeFeature):
obj.addProperty("App::PropertyEnumeration","Recomputing","Lattice TopoSeries","Sets recomputing policy.")
obj.Recomputing = ["Disabled", "Recompute Once", "Enabled"]
obj.Recomputing = "Disabled" # recomputing TopoSeries can be very long, so disable it by default
self.assureProperties(obj)
def assureProperties(self, selfobj):
# We cannot use a hidden PythonObject property, because it contains Edges and they are not serializable
#assureProperty(selfobj, "App::PropertyPythonObject", "AnnotatedShapes", [], "Lattice TopoSeries", "internal: stores the list of shapes with their annotations")
self.AnnotatedShapes = []
def makeSubsequence(self, selfobj, object_to_loop):
@ -137,8 +128,6 @@ class LatticeTopoSeries(lattice2BaseFeature.LatticeFeature):
if selfobj.Recomputing == "Disabled":
raise ValueError(selfobj.Name+": recomputing of this object is currently disabled. Modify 'Recomputing' property to enable it.")
try:
allAnnotatedShapes = []
self.assureProperties(selfobj)
# do the subsequencing in this document first, to verify stuff is set up correctly, and to obtain sequence length
if self.isVerbose():
@ -195,7 +184,7 @@ class LatticeTopoSeries(lattice2BaseFeature.LatticeFeature):
doc2.recompute()
#get shape
annotatedShapes = None
shape = None
for obj in doc2.Objects:
if 'Invalid' in obj.State:
Executer.error(obj,"Recomputing shape for subsequence index "+repr(i)+" failed.")
@ -208,11 +197,10 @@ class LatticeTopoSeries(lattice2BaseFeature.LatticeFeature):
pass
if scale < DistConfusion * 100:
scale = 1.0
annotatedShapes = [(markers.getNullShapeShape(scale), { 'IsNullShape': ('boolean', True) })]
if annotatedShapes is None:
annotatedShapes = getAnnotatedShapes(object_to_take_in_doc2)
output_shapes.append(Part.Compound([sh for sh, ann in annotatedShapes]))
allAnnotatedShapes.extend(annotatedShapes)
shape = markers.getNullShapeShape(scale)
if shape is None:
shape = object_to_take_in_doc2.Shape.copy()
output_shapes.append(shape)
#update progress
if bGui:
@ -235,7 +223,6 @@ class LatticeTopoSeries(lattice2BaseFeature.LatticeFeature):
selfobj.Shape = Part.makeCompound(output_shapes)
self.AnnotatedShapes = allAnnotatedShapes
output_is_lattice = lattice2BaseFeature.isObjectLattice(screen(selfobj.ObjectToTake))
if 'Auto' in selfobj.isLattice:
@ -247,12 +234,6 @@ class LatticeTopoSeries(lattice2BaseFeature.LatticeFeature):
selfobj.Recomputing = "Disabled"
return "suppress" # "suppress" disables most convenience code of lattice2BaseFeature. We do it because we build a nested array, which are not yet supported by lattice WB.
def getAnnotatedShapes(self, selfobj):
# The attribute is not serializable (because it contains Edges), so it is necessary to execute() the object at least once to get the AnnotatedShapes
if not hasattr(self, 'AnnotatedShapes'):
self.execute(selfobj)
return self.AnnotatedShapes
class ViewProviderLatticeTopoSeries(lattice2BaseFeature.ViewProviderLatticeFeature):
def getIcon(self):

27
lattice2Utils.py
View File

@ -21,8 +21,6 @@
#* *
#***************************************************************************
import re
__title__="Utility functions for Lattice2"
__author__ = "DeepSOIC"
__url__ = ""
@ -94,28 +92,3 @@ def linkSubList_convertToOldStyle(references):
# old style references, no conversion required
result.append(tup)
return result
def getAnnotatedShape(object, i, g, annotations_from_constraints):
kvs = annotations_from_constraints.get(i, '')
kvs = kvs.split(',')
if kvs == ['']:
kvs = []
kvs = [kv.split('=',1) for kv in kvs]
kvs = [(kv[0], ('string', kv[1])) if len(kv) == 2 else (kv[0], ('bool', True)) for kv in kvs]
kvs = dict(kvs, Geometry=('geometry', g))
sh = g.toShape().copy()
sh.Placement = object.Placement
return (sh, kvs)
def getAnnotatedShapes(object):
""" returns a list of the form [ (shape, { 'k': ('type', v), … }) …] """
if object.TypeId == 'Sketcher::SketchObject':
constraint_re_matches = [(c,re.match(r"^__(.*)\.[0-9]+$", c.Name)) for c in object.Constraints]
annotations_from_constraints = dict((c.First,match.group(1)) for c,match in constraint_re_matches if match)
return [getAnnotatedShape(object, i, g, annotations_from_constraints) for i,g in enumerate(object.Geometry)]
elif hasattr(object, 'getAnnotatedShapes') and callable(object.getAnnotatedShapes):
return object.getAnnotatedShapes()
elif hasattr(object, 'Proxy') and hasattr(object.Proxy, 'getAnnotatedShapes') and callable(object.Proxy.getAnnotatedShapes):
return object.Proxy.getAnnotatedShapes(object)
else:
return [(object.Shape.copy(), dict())]