jenncad 1.0.0.pre.alpha12 → 1.0.0.pre.alpha15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceeccb1511db4a12b24c38116c2daa1835f9a64f3c62fe8446feea6712c9f200
-  data.tar.gz: 5b25c737ac0ba61039f7a54d8810a6fd94f2057ca2c482027683105adc767e54
+  metadata.gz: 3eebd115b8e6783b61fff33f1b002f935f3d2c2023df70df9ff3b9850f12245f
+  data.tar.gz: 806a99e1195f98ee1e8450030f9e2809c11217af7bf19e8cac88ad9408146a40
 SHA512:
-  metadata.gz: e509d98347b1a96093fb62ccea12c3e71733f3af4e946694286783e54958245b99373c9721b338bc4da17ddac531a7b215b8394364b4af31aa82c3be8a183cc0
-  data.tar.gz: 14ecaa2c0698e5fad95d311f373f2399f98eaa5b1e0220dce807053ce7ea0b505f879dce042006232cac8b6d25dd6e9c08eb1a713f78a09aba9c47c1e9bbdf08
+  metadata.gz: a120ac12bfe18f3532560c10452ae9460d21bd8ba2e4d287669b9b23cdf903476541fed341b81ce7feb8e906ccc8087a7a0f46f5f49e63d66b6421cd8e4d0984
+  data.tar.gz: 06e239cea5a153ecb3b8ab1873574bc8d9a03e51d1c0d75e5fe72f393e1584971bbc2ba388d9da82ce58cc79c2f949e206962be9052da29b0a24e351c176a53d

data/lib/jenncad/default_profile.rb

@@ -16,6 +16,18 @@ module JennCad
       )
     end
 
+    # By default, jenncad will add coordinates of subsequent moves in the output
+    # i.e.
+    #   .move(x: 10, y: 20).move(x: 10) would result depending on the value of this option:
+    #
+    #   true = translate([10,20, 0])translate([10, 0, 0])
+    #   false = translate([20, 20, 0])
+    #
+    # defaults to false
+    def chain_moves
+      false
+    end
+
     def colors
       case @colors
       when nil, []

data/lib/jenncad/exporters/openscad.rb

@@ -45,11 +45,11 @@ module JennCad::Exporters
     def handle_command(i=1)
       case @children.size
       when 0
-        "#{@modifier}#{@command}(#{handle_args});"
+        "#{@modifier}#{@command}(#{handle_args(@args)});"
       when 1
-        "#{@modifier}#{@command}(#{handle_args})#{@children.first.handle_command(i+1)}"
+        "#{@modifier}#{@command}(#{handle_args(@args)})#{@children.first.handle_command(i+1)}"
       when (1..)
-        res = "#{@modifier}#{@command}(#{handle_args}){"
+        res = "#{@modifier}#{@command}(#{handle_args(@args)}){"
         res += nl
         inner = @children.map do |c|
           next if c == nil
@@ -68,17 +68,19 @@ module JennCad::Exporters
       }.join(nl)
     end
 
-    def handle_args
-      case @args
+    def handle_args(args)
+      case args
       when String, Symbol
-        return "\"#{@args}\""
+        return "\"#{args}\""
       when Array
-        return @args.map do |l|
+        return args.map do |l|
           if l == nil
             0
           elsif l.kind_of? Array
             l # skipping check of 2-dmin Arrays for now (used in multmatrix)
-          elsif l.to_i == l.to_f
+          elsif l == 0
+            0
+          elsif l == l.to_i
             l.to_i
           else
             l.to_f
@@ -86,15 +88,19 @@ module JennCad::Exporters
         end
       when Hash
         res = []
-        @args.each do |k,v|
+        args.each do |k,v|
           if k.to_s == "fn"
             k = "$fn"
           end
           if v == nil
             next
           end
-          if !v.kind_of?(Array) && !v.kind_of?(TrueClass) && !v.kind_of?(FalseClass) && v == v.to_i
+          if v.kind_of?(Array)
+            v = handle_args(v)
+          elsif !v.kind_of?(TrueClass) && !v.kind_of?(FalseClass) && v == v.to_i
             v = v.to_i
+          elsif v.kind_of? BigDecimal
+            v = v.to_f
           end
           if v.kind_of? String
             q = "\""
@@ -245,7 +251,8 @@ module JennCad::Exporters
 
     def handle_aggregation(part, tabindex=0)
       register_module(part) unless @modules[part.name]
-      transform(part) do
+      $log.debug "aggregation #{part.name} transformations: #{part.transformations.inspect}" if part && part.option(:debug)
+      transform(part.clone) do
         new_obj(part, part.name, nil)
       end
     end

data/lib/jenncad/extras/din912.rb

@@ -64,7 +64,7 @@ module JennCad::Extras
       if show
         res.color("Gainsboro")
         thread_length=Data[@size][:thread_length]
-        if total_length.to_f <= thread_length
+        if total_length.to_d <= thread_length
           res+= cylinder(d:@size+addtional_diameter, h:total_length).color("DarkGray")
         else
           res+= cylinder(d:@size+addtional_diameter, h:total_length-thread_length)

data/lib/jenncad/extras/din933.rb

@@ -48,7 +48,7 @@ module JennCad::Extras
                       14=> {head_side_to_side:22,head_length:9},
                       16=> {head_side_to_side:24,head_length:10},
                      }
-      head_dia = chart[@size][:head_side_to_side].to_f + head_margin.to_f
+      head_dia = chart[@size][:head_side_to_side].to_d + head_margin.to_d
       res = cylinder(d:(head_dia/Math.sqrt(3))*2,fn:6,h:chart[@size][:head_length]).move(z:-chart[@size][:head_length])
       total_length = @length + additional_length
       res+= cylinder(d:@size+addtional_diameter, h:total_length)

data/lib/jenncad/extras/iso7380.rb

@@ -36,7 +36,7 @@ module JennCad::Extras
 
     # ISO 7380
   	def bolt_7380(additional_length=0, addtional_diameter=0, head_margin=0)
-	    if head_margin.to_f != 0
+	    if head_margin.to_d != 0
 				puts "[warning] :head_margin is not implemented for 7380 bolts"
 			end
 			chart_iso7380 = {

data/lib/jenncad/features/aggregation.rb

@@ -5,7 +5,7 @@ module JennCad::Features
     def initialize(name=nil, part=nil)
       super({})
       @name = name.gsub(".","_")
-      @parts = [part] # NOTE: single length arrayto make checking children easier
+      @parts = [part]
     end
 
     def z

data/lib/jenncad/features/climb.rb

@@ -1,6 +1,8 @@
 module JennCad::Features
   class Climb < Feature
     def initialize(opts, block)
+      $log.warn "DEPRECATED feature: climb. Please use x.of (multiples_of example)"
+
       @opts = {
         offset: :auto,
         step: nil,
@@ -31,7 +33,7 @@ module JennCad::Features
         steps = @opts[:steps]
         (z  / steps).floor
       else
-        step.to_f
+        step.to_d
       end
     end
 
@@ -62,8 +64,8 @@ module JennCad::Features
 
       offset = get_offset(ref_z)
 
-      lo = (ref_z-offset*2).to_f % step.to_f
-      unless lo.to_f == 0.0
+      lo = (ref_z-offset*2).to_d % step.to_d
+      unless lo.to_d == 0.0
         puts "[Warning]: climb has leftover offset #{lo}"
       end
 

data/lib/jenncad/features/cuttable.rb

@@ -16,12 +16,12 @@ module JennCad::Features
 
     def prepare_cut(l, r, &block)
       part = block.call
-      if part.z.to_f > 0.0
+      if part.z.to_d > 0.0
         part.opts[:margins][:z] = 0.2
         if l == 0.0
           part.mz(r+0.1)
         else
-          part.mz(l+part.z.to_f-0.2)
+          part.mz(l+part.z.to_d-0.2)
         end
       else
         part.opts[:margins][:z] = 0.2

data/lib/jenncad/features/multiples_of.rb

@@ -0,0 +1,14 @@
+class Integer
+  def of(part=nil, anchor=:top_face)
+    return nil if part.nil?
+    num = self - 1
+
+    res = part.fix
+    num.times do
+      res += part.movea(anchor)
+    end
+    res
+  end
+end
+
+

data/lib/jenncad/features/path.rb

@@ -1,7 +1,7 @@
 module JennCad
   class RoundCorner
     attr_accessor :start_point, :end_point, :input_a, :output_a, :a, :l, :od, :id, :thing, :angle, :current_angle, :direction, :from, :ccw
-    def initialize(args, &thing)
+    def initialize(args)
       @start_point = args[:start_point]
       @end_point = args[:end_point]
       @a = args[:a]
@@ -11,7 +11,13 @@ module JennCad
       @id = args[:id]
       @input_a = args[:input_a] || 0
       @output_a = args[:output_a] || 0
-      @thing = thing
+      thing = Marshal.load(args[:thing])
+
+      @thing_dia = thing.d || thing.y
+      unless @thing_dia
+        $log.error "ERROR: cannot find diameter or y of thing #{thing.inspect}"
+        return
+      end
       @angle = args[:angle]
       @current_angle = args[:current_angle]
       @direction = args[:direction]
@@ -57,11 +63,7 @@ module JennCad
     end
 
     def positions
-      td = thing.yield.d || thing.yield.y
-      unless td
-        puts "ERROR: cannot find diameter or y of thing #{thing.yield.inspect}"
-        return
-      end
+      td = @thing_dia
       l = td + @id
       l2 = td / 2.0 + @id / 2.0
       r = 0
@@ -101,7 +103,7 @@ module JennCad
     end
 
     def part
-      d = thing.yield.d
+      d = @thing_dia
       len = d * 2 + @id
       x = Math::sin((@a/180.0)*Math::PI)*len
       y = Math::cos((@a/180.0)*Math::PI)*len
@@ -134,15 +136,15 @@ module JennCad
   end
 
   class Line
-    attr_accessor :start_point, :end_point, :l, :thing, :angle, :current_angle, :direction
-    def initialize(args, &thing)
+    attr_accessor :start_point, :end_point, :l, :angle, :current_angle, :direction
+    def initialize(args)
       @start_point = args[:start_point]
       @end_point = args[:end_point]
       @angle = args[:angle]
       @current_angle = args[:current_angle]
       @direction = args[:direction]
       @l = args[:l]
-      @thing = thing
+      @thing = args[:thing]
     end
 
     def sp_margin(margin)
@@ -181,8 +183,8 @@ module JennCad
 
     def part
       hull(
-        @thing.yield.move(x: @start_point[:x], y: @start_point[:y]),
-        @thing.yield.move(x: @end_point[:x], y: @end_point[:y])
+        Marshal.load(@thing).move(x: @start_point[:x], y: @start_point[:y]),
+        Marshal.load(@thing).move(x: @end_point[:x], y: @end_point[:y])
       )
     end
   end
@@ -191,7 +193,7 @@ module JennCad
 
     attr_accessor :elements, :lpos, :thing, :angle, :current_angle, :direction
     def initialize(args)
-      @thing = args[:part] #// cylinder(d: @d, z: @z)
+      @thing = store_thing_from(args[:part])
       @part = new_thing
       @angle = args[:a] || 0
       @current_angle = args[:a] || 0
@@ -207,10 +209,14 @@ module JennCad
       super(args)
     end
 
-    def new_thing
-      r = @thing.clone
+    def store_thing_from(thing)
+      r = Marshal.load(Marshal.dump(thing)) # make sure we don't edit the object in memory
       r.transformations = []
-      r
+      Marshal.dump(r)
+    end
+
+    def new_thing
+      Marshal.load(@thing)
     end
 
     def corner(args)
@@ -232,8 +238,9 @@ module JennCad
         from: args[:from],
         to: args[:to],
         a: args[:a],
-        direction: @direction
-      ){ new_thing }
+        direction: @direction,
+        thing: thing,
+      )
 
       _, ox, oy, x, y = rc.positions
       @lpos[:x] += x + ox
@@ -292,7 +299,7 @@ module JennCad
         return
       end
 
-      @steps << Line.new(start_point: { x: @lpos[:x], y: @lpos[:y] }, end_point: { x: @lpos[:x] + x, y: @lpos[:y] + y  }, angle: @angle, current_angle: @current_angle, direction: @direction, l: l){ new_thing }
+      @steps << Line.new(start_point: { x: @lpos[:x], y: @lpos[:y] }, end_point: { x: @lpos[:x] + x, y: @lpos[:y] + y  }, angle: @angle, current_angle: @current_angle, direction: @direction, l: l, thing: thing)
 
       add_lpos({x: x, y: y})
     end

data/lib/jenncad/features.rb

@@ -5,6 +5,8 @@ require "jenncad/features/openscad_include"
 require "jenncad/features/climb"
 require "jenncad/features/stl_import"
 require "jenncad/features/path"
+require "jenncad/features/multiples_of"
+
 
 
 

data/lib/jenncad/part.rb

@@ -3,9 +3,13 @@ module JennCad
   class Part < Thing
 
     def to_openscad
-      a = Aggregation.new(self.class.to_s, self.part)
+      a = Aggregation.new(self.class.to_s, self.get_contents)
       a.transformations = @transformations
-      a.color(:auto)
+      if self.has_explicit_color?
+        a.color(self.color)
+      else
+        a.color(:auto)
+      end
       a
     end
 

data/lib/jenncad/patches/array.rb

@@ -12,7 +12,7 @@ class Array
       else
         res = part
       end
-      res, z = res.mz(z), z + res.z.to_f unless skip_z
+      res, z = res.mz(z), z + res.z.to_d unless skip_z
       res
     end
     .union

data/lib/jenncad/primitives/boolean_object.rb

@@ -7,21 +7,29 @@ module JennCad::Primitives
       else
         @parts = parts
       end
+      if parts.first && parts.first.respond_to?(:debug?) && parts.first.debug?
+        $log.debug("Creating new #{self.class} for part #{parts}")
+      end
+
       @parent = @parts.first.parent
+
       after_add
     end
 
     def add_or_new(part)
       case @transformations
       when nil, []
+        $log.debug("adding new part to existing boolean object") if part && part.debug?
         add(part)
         self
       else
+        $log.debug("add_or_new: creating new boolean object") if part.debug?
         self.class.new(self, part)
       end
     end
 
     def add(part)
+      return if part.nil?
       @parts << part
       after_add
     end
@@ -41,25 +49,25 @@ module JennCad::Primitives
     end
 
     def inherit_z
-      heights = @parts.map{|l| l.calc_z.to_f}.uniq
+      heights = @parts.map{|l| l.calc_z.to_d}.uniq
       if heights.size > 1
         total_heights = []
         @parts.each do |p|
-          total_heights << p.z.to_f + p.calc_z.to_f
+          total_heights << p.z.to_d + p.calc_z.to_d
         end
         @z = total_heights.max
         @calc_z = heights.min
       else
-        @calc_z = heights.first.to_f
+        @calc_z = heights.first.to_d
         @z = @parts.map(&:z).compact.max
       end
     end
 
     def inherit_zref
       return if @parts.first == nil
-      #return if @parts.first.z.to_f == 0.0
+      #return if @parts.first.z.to_d == 0.0
       get_primitives(@parts[1..-1]).flatten.each do |part|
-        if part.z.to_f == 0.0
+        if part.z.to_d == 0.0
           part.set_option :zref, @parts.first
         end
       end

data/lib/jenncad/primitives/cube.rb

@@ -82,6 +82,13 @@ module JennCad::Primitives
       set_anchor :top_right, x: right, y: top
       set_anchor :bottom_left, x: left, y: bottom
       set_anchor :bottom_right, x: right, y: bottom
+      if @opts[:center_z]
+        set_anchor :bottom_face, z: -@z/2.0
+        set_anchor :top_face, z: @z/2.0
+      else
+        set_anchor :bottom_face, z: 0
+        set_anchor :top_face, z: @z
+      end
 
       # we need to re-do the inner ones, if they were defined
       if @inner_anchor_defs && @inner_anchor_defs.size > 0

data/lib/jenncad/primitives/cylinder.rb

@@ -1,6 +1,6 @@
 module JennCad::Primitives
   class Cylinder < Primitive
-    attr_accessor :d, :d1, :d2, :r, :fn
+    attr_accessor :d, :d1, :d2, :r, :fn, :anchors
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
         args = args.first
@@ -24,6 +24,7 @@ module JennCad::Primitives
         r2: nil,
         z: nil,
         r: 0,
+        cz: false,
         margins: {
           r: 0,
           d: 0,
@@ -41,6 +42,35 @@ module JennCad::Primitives
       handle_radius_diameter
       handle_fn
       super(args)
+      set_anchors
+    end
+
+    def set_anchors
+      @anchors = {} # reset anchors
+      if @opts[:d]
+        rad = @opts[:d] / 2.0
+      else
+        rad = @opts[:r]
+      end
+
+      # Similar to cube
+      set_anchor :left, x: -rad
+      set_anchor :right, x: rad
+      set_anchor :top, y: rad
+      set_anchor :bottom, y: -rad
+
+      # TODO: figure out if we also want to have "corners"
+      # - possibly move it like a cube
+      # - points at 45 ° angles might not be that useful unless you can get the point on the circle at a given angle
+      # - inner/outer points could be useful for small $fn values
+
+      if @opts[:cz]
+        set_anchor :bottom_face, z: -@z/2.0
+        set_anchor :top_face, z: @z/2.0
+      else
+        set_anchor :bottom_face, z: 0
+        set_anchor :top_face, z: @z
+      end
     end
 
     def openscad_params
@@ -60,20 +90,22 @@ module JennCad::Primitives
     # Centers the cylinder around it's center point by height
     # This will transform the cylinder around the center point.
     def cz
+      @opts[:cz] = true
       @transformations << Move.new(z: -@z / 2.0)
+      set_anchors
       self
     end
 
     def handle_fn
       case @opts[:fn]
         when nil, 0
-          $fn = auto_fn!
+          $fn = auto_dn!
         else
           @fn = @opts[:fn]
       end
     end
 
-    def auto_fn!
+    def auto_dn!
       case @d
         when (16..)
           @fn = (@d*4).ceil
@@ -85,25 +117,25 @@ module JennCad::Primitives
     def handle_radius_diameter
       case @opts[:d]
       when 0, nil
-        @r = @opts[:r].to_f + @opts[:margins][:r].to_f
+        @r = @opts[:r].to_d + @opts[:margins][:r].to_d
         @d = @r * 2.0
       else
-        @d = @opts[:d].to_f + @opts[:margins][:d].to_f
+        @d = @opts[:d].to_d + @opts[:margins][:d].to_d
         @r = @d / 2.0
       end
 
       case @opts[:d1]
       when 0, nil
       else
-        @d1 = @opts[:d1].to_f + @opts[:margins][:d].to_f
-        @d2 = @opts[:d2].to_f + @opts[:margins][:d].to_f
+        @d1 = @opts[:d1].to_d + @opts[:margins][:d].to_d
+        @d2 = @opts[:d2].to_d + @opts[:margins][:d].to_d
       end
 
       case @opts[:r1]
       when 0, nil
       else
-        @d1 = 2 * @opts[:r1].to_f + @opts[:margins][:d].to_f
-        @d2 = 2 * @opts[:r2].to_f + @opts[:margins][:d].to_f
+        @d1 = 2 * @opts[:r1].to_d + @opts[:margins][:d].to_d
+        @d2 = 2 * @opts[:r2].to_d + @opts[:margins][:d].to_d
       end
     end
 

data/lib/jenncad/primitives/primitive.rb

@@ -5,14 +5,14 @@ module JennCad::Primitives
     end
 
     def handle_margins
-      @x = @opts[:x] + @opts[:margins][:x]
-      @y = @opts[:y] + @opts[:margins][:y]
-      @z = @opts[:z] + @opts[:margins][:z]
+      @x = @opts[:x].to_d + @opts[:margins][:x].to_d
+      @y = @opts[:y].to_d + @opts[:margins][:y].to_d
+      @z = @opts[:z].to_d + @opts[:margins][:z].to_d
     end
 
     def handle_diameter
-      @d = opts[:d]
-      @r = opts[:r]
+      @d = opts[:d].to_d
+      @r = opts[:r].to_d
       if @d
         @r = @d/2.0
       elsif @r

data/lib/jenncad/primitives/slot.rb

@@ -36,10 +36,25 @@ module JennCad::Primitives
       @d = @opts[:d]
       @a = @opts[:a]
       @h = @opts[:h]
-      @r = @opts[:r]
+      @r = @opts[:r] || nil
+      if @r
+        @d = @r * 2
+      end
       @fn = @opts[:fn]
       @len_x = @opts[:x]
       @len_y = @opts[:y]
+      tx = @opts[:tx] || @opts[:total_x] || nil
+      ty = @opts[:ty] || @opts[:total_y] || nil
+      if tx
+        @len_x = tx - @d
+      end
+      if ty
+        @len_y = ty - @d
+      end
+
+      # TODO: this needs anchors like cube
+      # TODO: color on this needs to apply to hull, not on the cylinders.
+
     end
 
     def to_openscad
@@ -64,16 +79,16 @@ module JennCad::Primitives
     end
 
     def end_vector
-      if @a.to_f == 0.0
+      if @a.to_d == 0.0
         return [@len_x, 0] if @len_x
         return [0, @len_y] if @len_y
       end
       if @len_x
-        x = cos(PI*@a/180.0)*@len_x.to_f
-        y = sin(PI*@a/180.0)*@len_x.to_f
+        x = cos(PI*@a/180.0)*@len_x.to_d
+        y = sin(PI*@a/180.0)*@len_x.to_d
       else
-        x = -1* sin(PI*@a/180.0)*@len_y.to_f
-        y = cos(PI*@a/180.0)*@len_y.to_f
+        x = -1* sin(PI*@a/180.0)*@len_y.to_d
+        y = cos(PI*@a/180.0)*@len_y.to_d
       end
       [x,y]
     end

data/lib/jenncad/primitives/subtract_object.rb

@@ -2,13 +2,13 @@ module JennCad::Primitives
   class SubtractObject < BooleanObject
     def inherit_z
       @z = 0
-      @calc_z = parts.first.calc_z.to_f
+      @calc_z = parts.first.calc_z.to_d
 
       only_additives_of(@parts).each do |p|
         if option(:debug)
           $log.debug "inherit_z checks for: #{p}"
         end
-        z = p.z.to_f
+        z = p.z.to_d
         @z = z if z > @z
       end
       $log.debug "inherit_z called, biggest z found: #{@z}" if option(:debug)
@@ -80,7 +80,7 @@ module JennCad::Primitives
             part.opts[:margins][:z] += 0.004
            # part.z+=0.004
             part.mz(-0.002)
-          elsif part.calc_z.to_f+part.calc_h.to_f == compare_h
+          elsif part.calc_z.to_d+part.calc_h.to_d == compare_h
 #            puts "z fighting at top: #{compare_h}"
             #part.z+=0.004
             part.opts[:margins][:z] += 0.004

data/lib/jenncad/shortcuts.rb

@@ -92,13 +92,23 @@ module JennCad
 
   private
   def boolean_operation(part, klass)
+    if part.respond_to? :transformations
+      # Clone the part in place
+      part = part.fix
+    end
+
     case self
     when nil
       part
     when klass
       add_or_new(part)
     else
-      klass.new(self,part)
+      own_part = if self.respond_to? :transformations
+        self.fix # clone self
+      else
+        self
+      end
+      klass.new(own_part,part)
     end
   end
 end

data/lib/jenncad/thing.rb

@@ -20,6 +20,7 @@ module JennCad
       @anchors = {}
       @parent = args[:parent]
       @opts ||= args
+      @cache = nil
     end
 
     def option(key)
@@ -32,6 +33,23 @@ module JennCad
       @opts[key] = val
     end
 
+    def set_flag(key)
+      set_option(key, true)
+    end
+
+    def unset_flag(key)
+      set_option(key, false)
+    end
+
+    def debug?
+      option(:debug) || false
+    end
+
+    def fixate
+      Marshal.load(Marshal.dump(self))
+    end
+    alias :fix :fixate
+
     def set_parent(parent)
       @parent = parent
       self
@@ -39,13 +57,19 @@ module JennCad
 
     def anchor(name, thing=nil)
       if thing
-        return thing.anchor(name)
+        res = thing.anchor(name)
+        return res unless res.nil?
       end
       @anchors ||= {}
       if anch = @anchors[name]
         return anch
       elsif @parent
         return @parent.anchor(name)
+      elsif self.respond_to? :get_contents
+        con = get_contents
+        if con.respond_to? :anchor
+          con.anchor(name)
+        end
       end
     end
     alias :a :anchor
@@ -57,6 +81,22 @@ module JennCad
     end
     alias :sa :set_anchor
 
+    def set_anchor_from(name, new_name, args={})
+      a = anchor(name).dup
+      if !a
+        log.error "set_anchor_from couldn't find anchor #{name}"
+        return
+      end
+
+      [:x, :y, :z, :xy, :xz, :xyz, :yz].each do |key|
+        a[key] ||= 0.to_d
+        args[key] ||= 0.to_d
+        a[key] += args[key]
+      end
+      set_anchor new_name, a
+    end
+    alias :saf :set_anchor_from
+
     def auto_extrude
       ret = self.extrude
       ret.set_option(:auto_extrude, true)
@@ -86,7 +126,7 @@ module JennCad
       case self
       when UnionObject
         ref = self.parts.first
-        rz = self.z.to_f + self.calc_h.to_f
+        rz = self.z.to_d + self.calc_h.to_d
       when BooleanObject
         ref = self.parts.first
         rz = ref.calc_z + ref.calc_h
@@ -114,7 +154,7 @@ module JennCad
     alias :fy :flip_y
 
     def radians(a)
-      a.to_f/180.0*PI
+      a.to_d/180.0*PI
     end
 
     # experiment
@@ -174,21 +214,43 @@ module JennCad
     end
 
     def move(args={})
+      return self if args.nil? or args.empty?
+
       if args.kind_of? Array
         x,y,z = args
         return move(x:x, y:y, z:z)
       end
       args = parse_xyz_shortcuts(args)
 
+      if args[:x].to_d == 0.0 && args[:y].to_d == 0.0 && args[:z].to_d == 0.0
+        return self
+      end
+
       @transformations ||= []
       if args[:prepend]
         @transformations.prepend(Move.new(args))
       else
-        @transformations << Move.new(args)
+        lt = @transformations.last
+
+        chain = if args[:chain]
+          args[:chain]
+        else
+          $jenncad_profile.chain_moves
+        end
+
+        if lt && lt.class == Move && chain == false
+          $log.debug "#{self} at move: Adding to previous move #{lt.inspect} , args: #{args}" if self.debug?
+          lt.x += args[:x].to_d
+          lt.y += args[:y].to_d
+          lt.z += args[:z].to_d
+        else
+          $log.debug "#{self} at move: Adding move of #{args} to transformations" if self.debug?
+          @transformations << Move.new(args)
+        end
       end
-      @calc_x += args[:x].to_f
-      @calc_y += args[:y].to_f
-      @calc_z += args[:z].to_f
+      @calc_x += args[:x].to_d
+      @calc_y += args[:y].to_d
+      @calc_z += args[:z].to_d
       self
     end
     alias :translate :move
@@ -207,27 +269,39 @@ module JennCad
     end
 
     # move to anchor
-    def movea(key, thing=nil)
+    def movea(key, thing=nil, args={})
+      if thing.kind_of? Hash # if you leave out thing, args may be interpreted as thing
+        args = thing
+        thing = nil
+      end
+
       an = anchor(key, thing)
+
       unless an
         $log.error "Error: Anchor #{key} not found"
         $log.error "Available anchors: #{@anchors}"
         return self
       else
-        self.move(an.dup)
+        m = an.dup
+        if args[:chain]
+          m[:chain] = args[:chain]
+        end
+        if args[:inverted]
+          self.movei(m)
+        else
+          self.move(m)
+        end
       end
     end
 
     # move to anchor - inverted
-    def moveai(key, thing=nil)
-      an = anchor(key, thing)
-      unless an
-        $log.error "Error: Anchor #{key} not found"
-        $log.error "Available anchors: #{@anchors}"
-        return self
-      else
-        self.movei(an.dup)
+    def moveai(key, thing=nil, args={})
+      if thing.kind_of? Hash # if you leave out thing, args may be interpreted as thing
+        args = thing
+        thing = nil
       end
+      args[:inverted] = true
+      movea(key, thing, args)
     end
 
 
@@ -264,6 +338,7 @@ module JennCad
           to[key] = args[key]*-1
         end
       end
+      to[:chain] = args[:chain]
       move(to)
     end
 
@@ -327,7 +402,7 @@ module JennCad
     end
 
     def top_of(other_object)
-      self.move(z:other_object.z+other_object.calc_z.to_f)
+      self.move(z:other_object.z+other_object.calc_z.to_d)
     end
 
     def on_top_of(other_object)
@@ -341,36 +416,14 @@ module JennCad
     def get_children(item, stop_at)
       res = [item]
       if item.respond_to?(:parts) && item.parts != nil
-        item.parts.each do |part|
-          unless stop_at != nil && part.kind_of?(stop_at)
-            res << get_children(part, stop_at)
+        item.parts.each do |pa|
+          unless stop_at != nil && pa.kind_of?(stop_at)
+            res << get_children(pa, stop_at)
           end
         end
       end
       res
     end
-=begin    def make_openscad_compatible
-      make_openscad_compatible!(self)
-    end
-
-    def make_openscad_compatible!(item)
-      if item.respond_to?(:parts) && item.parts != nil
-        item.parts.each_with_index do |part, i|
-          if part.respond_to? :to_openscad
-            item.parts[i] = part.to_openscad
-          else
-            item.parts[i] = part.make_openscad_compatible
-          end
-        end
-      elsif item.respond_to? :part
-        item = item.part.make_openscad_compatible
-      end
-      if item.respond_to? :to_openscad
-        item = item.to_openscad
-      end
-      item
-    end
-=end
 
     def inherit_color(other)
       self.set_option(:color, other.option(:color))
@@ -386,11 +439,14 @@ module JennCad
 
     def only_color?(parts, lvl=0)
       return true if parts == nil
+      unless parts.kind_of? Array
+        parts = [parts]
+      end
 
       parts.each do |part|
-#        puts "  " * lvl + "[only_color?] #{part}"
+        #puts "  " * lvl + "[only_color?] #{part}"
         if part.has_explicit_color?
-#          puts "  " * lvl + "found explicit color here"
+          #puts "  " * lvl + "found explicit color here: #{part.color}"
           return false
         end
         if !only_color?(part.parts, lvl+1)
@@ -406,14 +462,14 @@ module JennCad
       parts.each do |part|
         unless part.has_explicit_color?
           if only_color?(part.parts, lvl+1)
-#            puts "  " * lvl + "children have no explicit color, setting it here"
+            #puts "  " * lvl + "children have no explicit color, setting it here"
             part.set_auto_color(col)
           else
-#            puts "  " * lvl + "[set_auto_color_for_children] #{part}"
+            #puts "  " * lvl + "[set_auto_color_for_children] #{part}"
             set_auto_color_for_children(col, part.parts, lvl+1)
           end
         else
-#          puts "  " * lvl + "[set_auto_color_for_children] this part has a color, ignoring their children"
+          #puts "  " * lvl + "[set_auto_color_for_children] this part has a color #{part.color}, ignoring their children"
         end
 
       end
@@ -467,6 +523,8 @@ module JennCad
         return "##{args}"
       when String
         return args
+      when Symbol
+        return args.to_s
       end
       nil
     end
@@ -489,8 +547,15 @@ module JennCad
 
     def get_contents
       return @parts unless @parts.nil?
+
+      if @cache
+        return @cache
+      end
+
       if self.respond_to? :part
-        return [part]
+        # cache things to prevent calling the code in #part multiple times
+        @cache = part
+        return @cache
       end
     end
 
@@ -503,6 +568,9 @@ module JennCad
 
     def find_calculated_h(parts)
       return if parts == nil
+      unless parts.kind_of? Array
+        parts = [parts]
+      end
       parts.each do |part|
         if z = calculated_h
           return z
@@ -513,6 +581,10 @@ module JennCad
 
     def set_heights_for_auto_extrude(parts, parent=nil)
       return if parts.nil?
+      unless parts.kind_of? Array
+        parts = [parts]
+      end
+
       parts.each do |part|
         if part.option(:auto_extrude)
           part.z = parent.calculated_h
@@ -561,7 +633,7 @@ module JennCad
     end
 
     def referenced_z
-     return false if @z.to_f != 0.0
+     return false if @z.to_d != 0.0
      return option(:zref) if option(:zref)
      return false
     end
@@ -576,7 +648,7 @@ module JennCad
       when nil, false
         @z + z_margin
       else
-        ref.z.to_f + ref.z_margin.to_f
+        ref.z.to_d + ref.z_margin.to_d
       end
     end
 
@@ -585,7 +657,7 @@ module JennCad
       when nil, {}
         0.0
       else
-        m[:z].to_f
+        m[:z].to_d
       end
     end
 

data/lib/jenncad/transformation/color.rb

@@ -16,7 +16,7 @@ module JennCad
 
     def self.check_color_array(a)
       if a.max > 1.0
-        a.map{|l| l.to_f/255.0}
+        a.map{|l| l.to_d/255.0}
       else
         a
       end

data/lib/jenncad/version.rb

@@ -1,4 +1,3 @@
 module JennCad
-  VERSION = "1.0.0-alpha12"
+  VERSION = "1.0.0-alpha15"
 end
-

data/lib/jenncad.rb

@@ -1,6 +1,7 @@
 require "logger"
 $log = Logger.new(STDOUT)
 
+require 'bigdecimal/util'
 require "geo3d"
 require "deep_merge"
 require "fileutils"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha12
+  version: 1.0.0.pre.alpha15
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-30 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -122,6 +122,7 @@ files:
 - lib/jenncad/features/climb.rb
 - lib/jenncad/features/cuttable.rb
 - lib/jenncad/features/feature.rb
+- lib/jenncad/features/multiples_of.rb
 - lib/jenncad/features/openscad_include.rb
 - lib/jenncad/features/path.rb
 - lib/jenncad/features/stl_import.rb