Fix rebase mixup
This commit is contained in:
parent
00706ff3f6
commit
ae0687d7f1
|
@ -20,7 +20,8 @@ import inspect
|
||||||
|
|
||||||
def getDescriptions():
|
def getDescriptions():
|
||||||
return {edge.char : edge.description for edge in globals().values()
|
return {edge.char : edge.description for edge in globals().values()
|
||||||
if inspect.isclass(edge) and issubclass(edge, Edge) and edge.char}
|
if inspect.isclass(edge) and issubclass(edge, BaseEdge)
|
||||||
|
and edge.char}
|
||||||
|
|
||||||
class BoltPolicy:
|
class BoltPolicy:
|
||||||
"""Abstract class
|
"""Abstract class
|
||||||
|
@ -184,7 +185,7 @@ class BaseEdge:
|
||||||
"""Space the edge needs outside of the inner space of the part"""
|
"""Space the edge needs outside of the inner space of the part"""
|
||||||
return self.width() + self.margin()
|
return self.width() + self.margin()
|
||||||
|
|
||||||
class Edge:
|
class Edge(BaseEdge):
|
||||||
"""Straight edge"""
|
"""Straight edge"""
|
||||||
char = 'e'
|
char = 'e'
|
||||||
description = "Straight Edge"
|
description = "Straight Edge"
|
||||||
|
|
Loading…
Reference in New Issue