jenncad 1.0.0.pre.alpha13 → 1.0.0.pre.alpha16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4383fe5f1fe2d17d69eccd66bd28db4678281fd542bd13434064d4051044727
-  data.tar.gz: 0eb4435e845c47ec9b75d113c04b7beae9ce762a2dfa57b598412a243ded0163
+  metadata.gz: ef20af7d3fc9a11140dacb23030a9ba671a80cbd39491caed609d6755f8bc85c
+  data.tar.gz: 4e515e6fbedcfa16b315b8ea02cafe8a6d41207fbdd9aece996165edee7f9214
 SHA512:
-  metadata.gz: 35001c199911e59f66a2ef3ce3b8c6193e5654ebc5463f52add3cb11a5aa3c1684c51dbaad7a3edaf4c0042cf2b2d35410ea01bfdce45e5adc72a96f30ec002b
-  data.tar.gz: 163e8e50aa1dd6ba930fd41e93075aca9f8bed93c6650f3a9984fbc86ddb34f0ae4a499d7fc981a38dfe9bdb1f56a0667a4cec018a530b701f4707141d79233c
+  metadata.gz: 17111c38b461ecdf683d2813284279b4bced3296d97dc9aebdf17797955affea2ad275bd21f5935680c09a8f08234ebac9c5bbb67ce197fdfe6c3e0a6489d0cf
+  data.tar.gz: 9022e918187212aa81f4f02b28c9a9ac11d7b8d36c6afb36835346298309ec2204430478032c406177315ee9807d0513bb52f0d8581dfec9c3df13e91b42f5f8

data/lib/jenncad/commands.rb

@@ -118,15 +118,15 @@ module JennCad
         File.open(filename, "w") do |f|
           f.puts "class #{classname} < Part"
           f.puts "  def initialize(opts={})"
-          f.puts "    @opts = {"
-          f.puts "      x: 10,"
-          f.puts "      y: 10,"
-          f.puts "      z: 5,"
-          f.puts "    }.merge(opts)"
+          f.puts "    @x = 10"
+          f.puts "    @y = 10"
+          f.puts "    @z = 5"
           f.puts "  end"
           f.puts ""
           f.puts "  def part"
-          f.puts "    cube(@opts)"
+          f.puts "    base = cube(x: @x, y: @y, z: @z)"
+          f.puts "    res = base.fix"
+          f.puts "    res"
           f.puts "  end"
           f.puts "end"
         end

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 = "\""
@@ -172,6 +178,8 @@ module JennCad::Exporters
         new_obj(part, :projection, collect_params(part), parse(part.parts))
       when JennCad::Primitives::Polygon
         new_obj(part, :polygon, collect_params(part))
+      when JennCad::Primitives::Polyhedron
+        new_obj(part, :polyhedron, collect_params(part))
       when JennCad::StlImport
         new_obj(part, :import, collect_params(part))
       when JennCad::Part
@@ -206,7 +214,7 @@ module JennCad::Exporters
         return part.openscad_params
       end
       res = {}
-      [:d, :h, :d1, :d2, :size, :fn, :points, :file].each do |var|
+      [:d, :h, :d1, :d2, :size, :fn, :points, :paths, :faces, :convexity, :file].each do |var|
         if part.respond_to? var
           res[var] = part.send var
         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

@@ -6,6 +6,7 @@ module JennCad::Features
       super({})
       @name = name.gsub(".","_")
       @parts = [part]
+      @zref = 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

@@ -1,9 +1,54 @@
+module AutoName
+  def initialize(args={})
+    unless args.empty?
+      @auto_name = "#{self.class}_#{args.map{|key, val| "#{key}_#{val}"}.join('_')}"
+    end
+    super(args)
+  end
+end
+
 module JennCad
   # Part should be inherited from the user when making parts
   class Part < Thing
+    def self.inherited(subclass)
+      subclass.prepend(AutoName) if subclass.superclass == Part
+    end
+
+    # this function both gets and defines hardware
+    def hardware(hw_type=nil, args={})
+      @_hw ||= {}
+      if hw_type == nil
+        return @_hw
+      end
+
+      anchors = args[:anchor] || args[:anchors]
+      unless anchors.kind_of? Array
+        anchors = [anchors]
+      end
+
+      anchors.each do |a|
+        @_hw[a] = {
+          hw_type: hw_type,
+          size: args[:size],
+          d: args[:d],
+          len: args[:len],
+          pos: anchor(a, args[:from]),
+        }
+      end
+      self
+    end
+    alias :hw :hardware
+
+    def fix_name_for_openscad(name)
+      [":", ",", ".", "[", "]","-", " "].each do |key|
+        name.gsub!(key, "_")
+      end
+      name
+    end
 
     def to_openscad
-      a = Aggregation.new(self.class.to_s, self.get_contents)
+      name = @name || @auto_name || self.class.to_s
+      a = Aggregation.new(fix_name_for_openscad(name), self.get_contents)
       a.transformations = @transformations
       if self.has_explicit_color?
         a.color(self.color)

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,6 +7,9 @@ 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
 
@@ -16,9 +19,11 @@ module JennCad::Primitives
     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
@@ -44,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
@@ -94,6 +101,11 @@ module JennCad::Primitives
     end
 
     def inner_anchors(dist, prefix=:inner_, recreate=false)
+      if dist.nil?
+        $log.error "Distance of nil passed to inner anchors. Please check the variable name you passed along"
+        return self
+      end
+
       @inner_anchor_defs ||= []
       @inner_anchor_defs << { "dist": dist, "prefix": prefix } unless recreate
 

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,28 +117,36 @@ 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
 
+    def z=(val)
+      @z = val
+      @h = val
+      opts[:h] = val
+      opts[:z] = val
+      set_anchors
+    end
+
     def h
       z + z_margin
     end

data/lib/jenncad/primitives/linear_extrude.rb

@@ -4,7 +4,7 @@ module JennCad::Primitives
     def initialize(part, args={})
       @transformations = []
       @parts = [part]
-      @z = args[:h] || args[:height]
+      @z = args[:h] || args[:height] || args[:z]
       @center_bool = args[:center]
       @convexity = args[:convexity]
       @twist = args[:twist]

data/lib/jenncad/primitives/polygon.rb

@@ -1,9 +1,11 @@
 module JennCad::Primitives
   class Polygon < Primitive
-    attr_accessor :points
+    attr_accessor :points, :paths
     def initialize(args)
-      super
       @points = args[:points]
+      @paths = args[:paths]
+      @convexity = args[:convexity] || 10
+      super
     end
   end
 end