From b5ff6a966bf67774c2edf6b8d7dd85bd63a2f826 Mon Sep 17 00:00:00 2001 From: jaseg Date: Mon, 8 May 2023 23:11:51 +0200 Subject: [PATCH] Fix variable expression calculation --- gerbonara/aperture_macros/expression.py | 2 +- gerbonara/cad/protoboard.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gerbonara/aperture_macros/expression.py b/gerbonara/aperture_macros/expression.py index ca8c15c..99d02eb 100644 --- a/gerbonara/aperture_macros/expression.py +++ b/gerbonara/aperture_macros/expression.py @@ -167,7 +167,7 @@ class VariableExpression(Expression): def optimized(self, variable_binding={}): if self.number in variable_binding: - return ConstantExpression(expr(variable_binding[self.number]).optimized(variable_binding)) + return expr(variable_binding[self.number]).optimized(variable_binding) return self def __eq__(self, other): diff --git a/gerbonara/cad/protoboard.py b/gerbonara/cad/protoboard.py index 91b07d1..6984ed6 100644 --- a/gerbonara/cad/protoboard.py +++ b/gerbonara/cad/protoboard.py @@ -715,14 +715,14 @@ def _demo(): #pattern3 = EmptyProtoArea(copper_fill=True) #stack = TwoSideLayout(pattern2, pattern3) #pattern2 = PatternProtoArea(2.54, obj=PoweredProto(), margin=1) - #pattern3 = PatternProtoArea(2.54, obj=RFGroundProto()) + pattern = PatternProtoArea(2.54, obj=RFGroundProto()) #stack = PropLayout([pattern2, pattern3], 'h', [0.5, 0.5]) #pattern = PropLayout([pattern1, stack], 'h', [0.5, 0.5]) #pattern = PatternProtoArea(2.54, obj=ManhattanPads(2.54)) #pattern = PatternProtoArea(2.54*1.5, obj=THTFlowerProto()) #pattern = PatternProtoArea(2.54, obj=THTPad.circle(0, 0, 0.9, 1.8, paste=False)) #pattern = PatternProtoArea(2.54, obj=PoweredProto()) - pattern = PatternProtoArea(2.54, obj=AlioCell(), margin=2) + #pattern = PatternProtoArea(2.54, obj=AlioCell(), margin=2) pb = ProtoBoard(50, 47, pattern, mounting_hole_dia=3.2, mounting_hole_offset=5) #pb = ProtoBoard(10, 10, pattern1) print(pb.pretty_svg())