jenncad 1.0.0.pre.alpha13 → 1.0.0.pre.alpha14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4383fe5f1fe2d17d69eccd66bd28db4678281fd542bd13434064d4051044727
-  data.tar.gz: 0eb4435e845c47ec9b75d113c04b7beae9ce762a2dfa57b598412a243ded0163
+  metadata.gz: beb1887d6ae1d3fc87da9c816de1cd2cb54ea5fb3ce7f1277ca6af8bcfc4e687
+  data.tar.gz: 5cc6fd0fc52de9b8b9087dfadd0387122014b157c9573b091aa7c4570a5f2c6a
 SHA512:
-  metadata.gz: 35001c199911e59f66a2ef3ce3b8c6193e5654ebc5463f52add3cb11a5aa3c1684c51dbaad7a3edaf4c0042cf2b2d35410ea01bfdce45e5adc72a96f30ec002b
-  data.tar.gz: 163e8e50aa1dd6ba930fd41e93075aca9f8bed93c6650f3a9984fbc86ddb34f0ae4a499d7fc981a38dfe9bdb1f56a0667a4cec018a530b701f4707141d79233c
+  metadata.gz: 8f86a697557b258219756ba02c0bb0e478d1c240c05fd53ecb1221749caedd4e7bf7c3395c439f9c0d426e33366d104e71c20a89bca894ee8e0c843733a0446d
+  data.tar.gz: 4ee555b106f36751024a876ece4880b3cea9138e606c541457a809828645f399f3a417cc0f40256e7363bf20f2b212a20f27166429337062a297caddb21931e1

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 = "\""

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/climb.rb

@@ -31,7 +31,7 @@ module JennCad::Features
         steps = @opts[:steps]
         (z  / steps).floor
       else
-        step.to_f
+        step.to_d
       end
     end
 
@@ -62,8 +62,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/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

@@ -44,25 +44,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/cylinder.rb

@@ -67,13 +67,13 @@ module JennCad::Primitives
     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 +85,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

@@ -79,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/thing.rb

@@ -93,7 +93,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
@@ -121,7 +121,7 @@ module JennCad
     alias :fy :flip_y
 
     def radians(a)
-      a.to_f/180.0*PI
+      a.to_d/180.0*PI
     end
 
     # experiment
@@ -181,21 +181,41 @@ 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
+          lt.x += args[:x].to_d
+          lt.y += args[:y].to_d
+          lt.z += args[:z].to_d
+        else
+          @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
@@ -214,7 +234,12 @@ 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
@@ -222,20 +247,26 @@ module JennCad
         $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
 
 
@@ -272,6 +303,7 @@ module JennCad
           to[key] = args[key]*-1
         end
       end
+      to[:chain] = args[:chain]
       move(to)
     end
 
@@ -335,7 +367,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)
@@ -564,7 +596,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
@@ -579,7 +611,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
 
@@ -588,7 +620,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,3 +1,3 @@
 module JennCad
-  VERSION = "1.0.0-alpha13"
+  VERSION = "1.0.0-alpha14"
 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.alpha13
+  version: 1.0.0.pre.alpha14
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d