jenncad 1.0.0.pre.alpha18 → 1.0.0.pre.alpha21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d05a39eda135dbbda74bcdc75c66a4c9d7620e426d5656e377442dcc17ef665
-  data.tar.gz: 1514fd3b8ecc502f95c0a9a7e93e13622e706d518abe31f7af4e60d56d85f357
+  metadata.gz: bf38a53bfb5d20ab5af97d24c948792ae3e5d577d63806f4a9d7008b5429f507
+  data.tar.gz: aae023c68738b1aee605fff567b3d0792f98753252858e1ee2569a18dd470daf
 SHA512:
-  metadata.gz: 9ea62b48418d86b7daa3f2ddcb895d03494942dea723fd60de9f81cbd25aab1d6aefd801136258192ab18b0dc9803cfe368cfb3f5b8bb1a33288eade384b7b96
-  data.tar.gz: e25c9f138b698f5c041dc7d0455a06807fe26ba12663039a9c522f0433d7435f3ecebdb72031069e81dea24414a8b0cfec76809a20bdedc50ab76442e7380b65
+  metadata.gz: fe8765bc981516be5fe1e94212e946a32d14baf295e0995be9820589dbe31b1be430a1792c1c8bd57ceaeab132ae495668ba8852fa7dbd16676b3345d3c4c8e8
+  data.tar.gz: 5667ae97532fa9094125d65603f8542a2cef77621c082ff2c097eebc3865ae5ca683ac16cc5cc9b2a3a09042ca6bd678cadd351f0fa468698e94fc56cf3bedfc

data/lib/jenncad/commands.rb

@@ -46,6 +46,7 @@ module JennCad
 
     class Build < Run
       option :binary, type: :boolean, default: false, desc: "run through admesh to create a binary stl"
+      option :only_print, type: :boolean, default: true, desc: "If a part has a print orientation set, only build that orientation as STL"
 
       def build(options)
         if options[:binary]
@@ -55,7 +56,13 @@ module JennCad
           end
         end
 
-        Dir.glob("output/**/*.scad").each do |file|
+        files = Dir.glob("output/**/*.scad")
+        if options[:only_print]
+          # Remove non _print.scad files from the list of files to build if we have a print orientation (and the only_print flag set)
+          files -= Dir.glob("output/**/*_print.scad").map{|x| x.gsub("_print.scad",".scad")}
+        end
+
+        files.each do |file|
           stl = file.gsub(".scad",".stl")
           build_stl(file, stl)
           convert_to_binary(stl) if options[:binary] && admesh_installed

data/lib/jenncad/features.rb

@@ -7,9 +7,6 @@ require "jenncad/features/stl_import"
 require "jenncad/features/path"
 require "jenncad/features/multiples_of"
 
-
-
-
 module JennCad
   include Features
 end

data/lib/jenncad/part.rb

@@ -10,6 +10,8 @@ end
 module JennCad
   # Part should be inherited from the user when making parts
   class Part < Thing
+    attr_accessor :d
+
     def self.inherited(subclass)
       subclass.prepend(AutoName) if subclass.superclass == Part
     end

data/lib/jenncad/primitives/boolean_object.rb

@@ -7,6 +7,11 @@ module JennCad::Primitives
       else
         @parts = parts
       end
+
+      if @parts.first.respond_to? :anchors
+        @anchors = @parts.first.anchors
+      end
+
       if parts.first && parts.first.respond_to?(:debug?) && parts.first.debug?
         $log.debug("Creating new #{self.class} for part #{parts}")
       end

data/lib/jenncad/primitives/circle.rb

@@ -1,5 +1,7 @@
 module JennCad::Primitives
   class Circle < Primitive
+    include CircleIsh
+
     attr_accessor :d, :r, :fn
     def initialize(args)
       if args.kind_of?(Array) && args[0].kind_of?(Hash)
@@ -38,21 +40,6 @@ module JennCad::Primitives
       set_anchors_2d
     end
 
-    def set_anchors_2d
-      @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
-    end
-
     def openscad_params
       res = {}
       [:d, :fn].each do |n|
@@ -61,49 +48,6 @@ module JennCad::Primitives
       res
     end
 
-    def handle_fn
-      case @opts[:fn]
-        when nil, 0
-          $fn = auto_dn!
-        else
-          @fn = @opts[:fn]
-      end
-    end
-
-    def auto_dn!
-      case @d
-        when (16..)
-          @fn = (@d*4).ceil
-        else
-          @fn = 64
-      end
-    end
-
-    def handle_radius_diameter
-      case @opts[:d]
-      when 0, nil
-        @r = @opts[:r].to_d + @opts[:margins][:r].to_d
-        @d = @r * 2.0
-      else
-        @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_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_d + @opts[:margins][:d].to_d
-        @d2 = 2 * @opts[:r2].to_d + @opts[:margins][:d].to_d
-      end
-    end
-
 
   end
 end

data/lib/jenncad/primitives/linear_extrude.rb

@@ -4,16 +4,25 @@ module JennCad::Primitives
     def initialize(part, args={})
       @transformations = []
       @parts = [part]
+      if args.kind_of? Numeric
+        args = {h: args}
+      end
+
       @z = args[:h] || args[:height] || args[:z]
       @center_bool = args[:center]
       @convexity = args[:convexity]
       @twist = args[:twist]
       @slices = args[:slices]
       @fn = args[:fn]
+      @opts = {
+        margins: {
+          z: 0,
+        }
+      }.deep_merge(args)
     end
 
     def height
-      @z
+      @z.to_d + @opts[:margins][:z].to_d
     end
 
     def openscad_params

data/lib/jenncad/primitives/slot.rb

@@ -1,5 +1,6 @@
 module JennCad::Primitives
   class Slot < Primitive
+    include CircleIsh
     attr_accessor :d, :r, :h, :fn, :len_x, :len_y
 
     def initialize(args)
@@ -28,7 +29,11 @@ module JennCad::Primitives
         x: 0,
         y: 0,
         z: nil,
+        d1: nil,
+        d2: nil,
+        mode: :auto,
         cz: false,
+        az: false,
         margins: {
           r: 0,
           d: 0,
@@ -61,8 +66,6 @@ module JennCad::Primitives
         @len_y = ty - @d
       end
 
-      # TODO: this needs anchors like cube
-      # TODO: color on this needs to apply to hull, not on the cylinders.
       set_anchors
     end
 
@@ -76,11 +79,7 @@ module JennCad::Primitives
 
     def set_anchors
       @anchors = {} # reset anchors
-      if @opts[:d]
-        rad = @opts[:d] / 2.0
-      else
-        rad = @opts[:r]
-      end
+      rad = radius
 
       if @x > 0
         set_anchor :left, x: - rad
@@ -120,9 +119,39 @@ module JennCad::Primitives
       end
     end
 
+    def get_mode
+      if @opts[:d1] && @opts[:d2]
+        case @opts[:mode]
+        when nil, :auto
+          :dia1
+        when :cyl
+          :cyl
+        else
+          :dia1
+        end
+      else
+        :default
+      end
+    end
+
     def to_openscad
-      c1 = cylinder(@opts)
-      c2 = cylinder(@opts)
+      mode = get_mode
+
+      opts = @opts.clone
+      opts.delete(:color)
+
+      case mode
+      when :default
+        c1 = ci(opts)
+        c2 = ci(opts)
+      when :dia1 # new default mode; d1 start dia, d2 end dia
+        c1 = ci(opts.merge(d: @opts[:d1]))
+        c2 = ci(opts.merge(d: @opts[:d2]))
+      when :cyl # old mode; use cylinders
+        c1 = cy(opts)
+        c2 = cy(opts)
+      end
+
       if @len_x
         c2.move(x:@len_x)
       end
@@ -130,6 +159,14 @@ module JennCad::Primitives
         c2.move(y:@len_y)
       end
       res = c1 & c2
+      if mode != :cyl && @z.to_d > 0
+        res = res.e(@z)
+      elsif @opts[:az] == true
+        # TODO: this needs testing, may not work
+        res = res.auto_extrude
+      end
+      res.inherit_color(self)
+
       if @a != 0.0
         res = res.rotate(z:@a)
       end

data/lib/jenncad/primitives/square.rb

@@ -42,6 +42,8 @@ module JennCad::Primitives
 
     def set_anchors_2d
       @anchors = {} # this resets anchors
+      @corners = [:top_right, :top_left, :bottom_right, :bottom_left]
+      @sides = [:left, :right, :top, :bottom]
 
       if @opts[:center] || @opts[:center_x]
         left = -@opts[:x] / 2.0

data/lib/jenncad/project.rb

@@ -17,10 +17,18 @@ module JennCad
       run_exports
     end
 
+    def run_export!(part, file)
+      part.openscad([output_dir,file].join("/"))
+    end
+
     def run_exports
       outputs.each do |name|
         part = self.send(name)
-        part.openscad([output_dir,"#{name}.scad"].join("/"))
+        run_export!(part, "#{name}.scad")
+        if part.respond_to? :print
+          part = self.send(name).print
+          run_export!(part, "#{name}_print.scad")
+        end
       end
     end
 

data/lib/jenncad/shared/circle_ish.rb

@@ -0,0 +1,65 @@
+module CircleIsh
+
+  def radius
+    if @opts[:d]
+      @opts[:d].to_d / 2.0
+    else
+      @opts[:r].to_d
+    end
+  end
+
+  def set_anchors_2d
+    @anchors = {} # reset anchors
+    rad = radius
+    # Similar to cube
+    set_anchor :left, x: -rad
+    set_anchor :right, x: rad
+    set_anchor :top, y: rad
+    set_anchor :bottom, y: -rad
+  end
+
+  def handle_fn
+    case @opts[:fn]
+      when nil, 0
+        $fn = auto_dn!
+      else
+        @fn = @opts[:fn]
+    end
+  end
+
+  def auto_dn!
+    case @d
+      when (16..)
+        @fn = (@d*4).ceil
+      else
+        @fn = 64
+    end
+  end
+
+  def handle_radius_diameter
+    case @opts[:d]
+    when 0, nil
+      @r = @opts[:r].to_d + @opts[:margins][:r].to_d
+      @d = @r * 2.0
+    else
+      @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_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_d + @opts[:margins][:d].to_d
+      @d2 = 2 * @opts[:r2].to_d + @opts[:margins][:d].to_d
+    end
+  end
+
+
+end

data/lib/jenncad/shared/cube_ish.rb

@@ -0,0 +1,3 @@
+module CubeIsh
+  # TBD
+end

data/lib/jenncad/shared.rb

@@ -0,0 +1,3 @@
+require "jenncad/shared/circle_ish"
+require "jenncad/shared/cube_ish"
+

data/lib/jenncad/shortcuts.rb

@@ -2,6 +2,7 @@ module JennCad
   def circle(args)
     Circle.new(args).set_parent(self)
   end
+  alias :ci :circle
 
   def square(args)
     Square.new(args).set_parent(self)
@@ -22,14 +23,17 @@ module JennCad
   def polygon(args)
     Polygon.new(args).set_parent(self)
   end
+  alias :pg :polygon
 
   def polyhedron(args)
     Polyhedron.new(args).set_parent(self)
   end
+  alias :phd :polyhedron
 
   def slot(*args)
     Slot.new(args).set_parent(self)
   end
+  alias :sl :slot
 
   def cube(*args)
     Cube.new(args).set_parent(self)
@@ -55,14 +59,19 @@ module JennCad
   def extrude(args={})
     LinearExtrude.new(self, args)
   end
+  alias :e :extrude
+  alias :ex :extrude
 
   def rotate_extrude(args={})
     RotateExtrude.new(self, args)
   end
+  alias :re :rotate_extrude
+  alias :rex :rotate_extrude
 
   def to_2d(args={})
     Projection.new(self, args)
   end
+  alias :as_2d :to_2d
 
   def union(*args)
     UnionObject.new(*args)

data/lib/jenncad/thing.rb

@@ -47,7 +47,6 @@ module JennCad
       self
     end
 
-
     def cut_to(face, part=nil, args={})
       an = anchor(face, part)
       unless an
@@ -145,6 +144,20 @@ module JennCad
     end
     alias :sa :set_anchor
 
+    def copy_anchors(thing)
+      @anchors = thing.anchors
+    end
+
+    def copy_anchor(name, thing=nil)
+      # since it might be confusing to use / use shortcuts for copy_anchor and copy_anchors, let copy_anchor copy all of them when only one parameter is given
+      if thing.nil?
+        return copy_anchors(name)
+      end
+      @anchors ||= {}
+      @anchors[name] = thing.anchor(name)
+    end
+    alias :cpa :copy_anchor
+
     def set_anchor_from(name, new_name, args={})
       unless name.kind_of? Symbol or name.kind_of? String
         $log.error "set_anchor_from: name must be a string or symbol. Supplied: #{name}"
@@ -363,6 +376,29 @@ module JennCad
       move(z:v)
     end
 
+    # Perform something at an anchor location block
+    def at(keys, thing=nil, args={}, &block)
+      unless keys.kind_of? Array
+        keys = [keys]
+      end
+
+      part = self
+      keys.each do |key|
+        if key.kind_of? Hash
+          an = key
+        else
+          an = anchor(key, thing, args)
+        end
+        unless an
+          $log.error "at on #{thing.class} could not find anchor #{key}"
+          an = {} # this will move by 0,0 and still display the block
+        end
+        part.movei(an)
+        part = block.yield.move(an)
+      end
+      part
+    end
+
     # move to anchor
     def movea(key, thing=nil, args={})
       if thing.kind_of? Hash # if you leave out thing, args may be interpreted as thing
@@ -445,8 +481,8 @@ module JennCad
     end
     alias :mi :mirror
 
-    def miz
-      mirror(z:1)
+    def mix
+      mirror(x:1)
     end
 
     def miy

data/lib/jenncad/version.rb

@@ -1,3 +1,3 @@
 module JennCad
-  VERSION = "1.0.0-alpha18"
+  VERSION = "1.0.0-alpha21"
 end

data/lib/jenncad.rb

@@ -23,6 +23,7 @@ require "jenncad/part"
 require "jenncad/project"
 require "jenncad/commands"
 
+require "jenncad/shared"
 require "jenncad/features"
 require "jenncad/primitives"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha18
+  version: 1.0.0.pre.alpha21
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-15 00:00:00.000000000 Z
+date: 2022-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -150,6 +150,9 @@ files:
 - lib/jenncad/profile_loader.rb
 - lib/jenncad/project.rb
 - lib/jenncad/register.rb
+- lib/jenncad/shared.rb
+- lib/jenncad/shared/circle_ish.rb
+- lib/jenncad/shared/cube_ish.rb
 - lib/jenncad/shortcuts.rb
 - lib/jenncad/thing.rb
 - lib/jenncad/transformation/color.rb