jenncad 1.0.0.pre.alpha4 → 1.0.0.pre.alpha8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea1fa04592f59d248c5801c3b645f16429bd7ae9f0b754aa467c8a401c89ec4b
-  data.tar.gz: 4df185f63b22b5945784cf820b4af937e4fbc660875f36093bbd5ebe9baa2aa9
+  metadata.gz: 6f2310cb82dee6ece32a91135d15ffe4c6d69695e4af8ed9aabd91906ce22088
+  data.tar.gz: b36e9d1c8f926fb2858fb017aaced7cfe363b9c7e26fa3bd071eb677bff90e3c
 SHA512:
-  metadata.gz: '0809987ec1b33518b17402acb27b659da2dc7b97ee304d1549abd857ae4448e0342d6ee4523e8d2277d7ce765e1278f996af9882b5da91b71c93acec8bd9ffd9'
-  data.tar.gz: e412b05272163c37096d36a44d83ac3d3c5ae07089d7d8d7236c1c53a263c24742566b691efbb5a03c9148960cb7734eb2859bc279e450e34c131fda2ae85af5
+  metadata.gz: e1877c0c6f9f7bc509b8aacc97383ed451bc50b7de61c6dafd49e2b25ec51da4b877b683ddbe0563c69c771aba4e8a543c71aee9be0708d5b08ef593b0053d23
+  data.tar.gz: 0a25cd07dd118d1beb5f819f3ec60262cabb9793b5867d93d642ee95e64ff2f8229d72283ad98ca6d197b79e273f4a00e4aba2c9e709dcb7c17dd7b7e4f4a6e9

data/bin/jenncad

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 require "jenncad"
-
 JennCad::Commands.register "", JennCad::Commands::Observe
 JennCad::Commands.register "run", JennCad::Commands::Observe
 JennCad::Commands.register "build", JennCad::Commands::Build
 JennCad::Commands.register "new", JennCad::Commands::NewPart
 JennCad::Commands.register "create", JennCad::Commands::NewProject
 
-Hanami::CLI.new(JennCad::Commands).call
+Dry::CLI.new(JennCad::Commands).call

data/jenncad.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 2.6.0"
   gem.add_runtime_dependency "geo3d"
   gem.add_runtime_dependency "deep_merge"
-  gem.add_runtime_dependency "hanami-cli"
+  gem.add_runtime_dependency "dry-cli"
   gem.add_runtime_dependency "activesupport"
   gem.add_runtime_dependency "observr"
 end

data/lib/jenncad/commands.rb

@@ -1,8 +1,10 @@
+require "dry/cli"
 module JennCad
   module Commands
-    extend Hanami::CLI::Registry
+    extend Dry::CLI::Registry
+    MAGIC = "jenncad-append-project-magic"
 
-    class Run < Hanami::CLI::Command
+    class Run < Dry::CLI::Command
       argument :name, required: false
 
       def guess_executable(dir=Dir.pwd)
@@ -87,7 +89,7 @@ module JennCad
       end
     end
 
-    class NewPart < Hanami::CLI::Command
+    class NewPart < Dry::CLI::Command
       include ActiveSupport::Inflector
       desc "creates a new part in a project"
       argument :name, required: true
@@ -122,16 +124,40 @@ module JennCad
           f.puts "  end"
           f.puts "end"
         end
-        puts "part #{filename} created. In your #{executable} add to class #{executable_class}:"
-        puts "  def #{name}"
-        puts "    #{classname}.new(config)"
-        puts "  end"
+
+        lines  = File.readlines(executable)
+        magic_line = nil;
+        lines.each_with_index do |l, i|
+          if l.rindex(MAGIC)
+            magic_line = i
+          end
+        end
+        puts "part #{filename} created."
+        if !magic_line
+          puts "In your #{executable} add to class #{executable_class}:"
+          puts "  def #{name}"
+          puts "    #{classname}.new(config)"
+          puts "  end"
+          puts ""
+          puts "For jenncad to insert this line automatically, add this line to your project file before the \"end\"-statement of your class:"
+          puts "##{MAGIC}"
+        else
+          data  = "\n"
+          data += "  def #{name}\n"
+          data += "    #{classname}.new(config)\n"
+          data += "  end\n"
+          lines.insert(magic_line, data)
+          f = File.open(executable, "w")
+          f.write(lines.join)
+          f.close
+        end
+
 
       end
 
     end
 
-    class NewProject < Hanami::CLI::Command
+    class NewProject < Dry::CLI::Command
       include ActiveSupport::Inflector
       desc "generates a new project"
       argument :name, required: true
@@ -152,9 +178,7 @@ module JennCad
           f.puts "    {}"
           f.puts "  end"
           f.puts ""
-          f.puts "  def #{name}"
-          f.puts "    cube(10,10,10)"
-          f.puts "  end"
+          f.puts "  # #{MAGIC}"
           f.puts "end"
           f.puts ""
           f.puts "#{classname}.new.run"

data/lib/jenncad/part.rb

@@ -2,9 +2,8 @@ module JennCad
   # Part should be inherited from the user when making parts
   class Part < Thing
 
-    def to_openscad #make_openscad_compatible
-#      auto_color
-      a = Aggregation.new(self.class.to_s, self.part) #make_openscad_compatible!(self.part))
+    def to_openscad
+      a = Aggregation.new(self.class.to_s, self.part)
       a.transformations = @transformations
       a.color(:auto)
       a

data/lib/jenncad/primitives/cube.rb

@@ -2,10 +2,9 @@ module JennCad::Primitives
   class Cube < Primitive
     extend JennCad::Features::Cuttable
 
-    def initialize(args)
-      if args.kind_of?(Array) && args[0].kind_of?(Hash)
-        args = args.first
-      end
+
+    def feed_opts(args)
+      # FIXME: this doesn't seem to work
       if args.kind_of? Array
         m = {}
         if args.last.kind_of? Hash
@@ -13,7 +12,13 @@ module JennCad::Primitives
         end
         args = [:x, :y, :z].zip(args.flatten).to_h
         args.deep_merge!(m)
+        @opts.deep_merge!(args)
+      else
+        @opts.deep_merge!(args)
       end
+    end
+
+    def initialize(args)
       @opts = {
         x: 0,
         y: 0,
@@ -27,10 +32,18 @@ module JennCad::Primitives
         center_y: false,
         center_x: false,
         center_z: false,
-      }.deep_merge!(args)
-      handle_margins
+      }
+      if args.kind_of? Array
+        args.each do |a|
+          feed_opts(parse_xyz_shortcuts(a))
+        end
+      else
+        feed_opts(parse_xyz_shortcuts(args))
+      end
+
 
-      super(args)
+      handle_margins
+      super(z: @opts[:z])
       @h = @z.dup
       @calc_h = @z.dup
     end
@@ -42,30 +55,34 @@ module JennCad::Primitives
 
     def not_centered
       @opts[:center] = false
+      self
     end
     alias :nc :not_centered
 
     def cx
       nc
       @opts[:center_x] = true
+      self
     end
 
     def cy
       nc
       @opts[:center_y] = true
+      self
     end
 
     def cz
       nc
       @opts[:center_z] = true
+      self
     end
 
     def centered_axis
       return [:x, :y] if @opts[:center]
       a = []
       a << :x if @opts[:center_x]
-      a << :y if @opts[:center_x]
-      a << :z if @opts[:center_x]
+      a << :y if @opts[:center_y]
+      a << :z if @opts[:center_z]
       a
     end
 

data/lib/jenncad/primitives/cylinder.rb

@@ -57,6 +57,13 @@ module JennCad::Primitives
       res
     end
 
+    # Centers the cylinder around it's center point by height
+    # This will transform the cylinder around the center point.
+    def cz
+      @transformations << Move.new(z: -@z / 2.0)
+      self
+    end
+
     def handle_fn
       case @opts[:fn]
         when nil, 0

data/lib/jenncad/primitives/linear_extrude.rb

@@ -1,10 +1,10 @@
 module JennCad::Primitives
-  attr_accessor :center_bool, :convexity, :twist, :slices, :height
+  attr_accessor :center_bool, :convexity, :twist, :slices
   class LinearExtrude < JennCad::Thing
-    def initialize(part, args)
+    def initialize(part, args={})
       @transformations = []
       @parts = [part]
-      @height = args[:h] || args[:height]
+      @z = args[:h] || args[:height]
       @center_bool = args[:center]
       @convexity = args[:convexity]
       @twist = args[:twist]
@@ -12,6 +12,10 @@ module JennCad::Primitives
       @fn = args[:fn]
     end
 
+    def height
+      @z
+    end
+
     def openscad_params
       res = {}
       [:height, :convexity, :twist, :slices, :fn].each do |n|

data/lib/jenncad/primitives/rounded_cube.rb

@@ -1,5 +1,5 @@
 module JennCad::Primitives
-  class RoundedCube < Primitive
+  class RoundedCube < Cube
     attr_accessor :d, :r
     include JennCad::Features::Cuttable
 
@@ -23,6 +23,10 @@ module JennCad::Primitives
         z: nil,
         r: nil,
         flat_edges: nil,
+        center: true,
+        center_y: false,
+        center_x: false,
+        center_z: false,
         margins: {
           r: 0,
           d: 0,
@@ -39,17 +43,18 @@ module JennCad::Primitives
     def to_openscad
       return cube(@opts) if @d == 0
       # make diameter not bigger than any side
-      @d = [@d, @x, @y].min
+      d = [@d, @x, @y].min
       res = HullObject.new(
-        cylinder(d:@d, h:z+z_margin).moveh(x: -@x + @d, y: @y - @d),
-        cylinder(d:@d).moveh(x: @x - @d, y: @y - @d),
-        cylinder(d:@d).moveh(x: -@x + @d, y: -@y + @d),
-        cylinder(d:@d).moveh(x: @x - @d, y: -@y + @d),
-      )
+        cylinder(d:d, h:z+z_margin),
+        cylinder(d:d).move(x: @x - d, y: 0),
+        cylinder(d:d).move(x: 0, y: @y - d),
+        cylinder(d:d).move(x: @x - d, y: @y - d),
+      ).moveh(xy: d)
 
       res += flat_edge(@opts[:flat_edges])
 
       res.transformations = @transformations
+      res.moveh(centered_axis.to_h{|a| [a, -@opts[a]] })
       res
     end
 

data/lib/jenncad/primitives/subtract_object.rb

@@ -55,6 +55,7 @@ module JennCad::Primitives
           part.opts[:margins] ||= {}
           if part.referenced_z && part.z != 0.0
             case part
+            when JennCad::Circle
             when JennCad::BooleanObject
             when JennCad::Aggregation
             else

data/lib/jenncad/shortcuts.rb

@@ -42,7 +42,7 @@ module JennCad
     StlImport.new(file, args)
   end
 
-  def extrude(args)
+  def extrude(args={})
     LinearExtrude.new(self, args)
   end
 

data/lib/jenncad/thing.rb

@@ -7,6 +7,7 @@ module JennCad
     attr_accessor :calc_x, :calc_y, :calc_z, :calc_h
     attr_accessor :shape
     attr_accessor :angle, :fn
+    attr_accessor :anchor
 
     def initialize(args={})
       @transformations = []
@@ -28,6 +29,41 @@ module JennCad
       @opts[key] = val
     end
 
+    def set_anchor(args)
+      self.anchor ||= {}
+      args.each do |key, val|
+        self.anchor[key] = val
+      end
+    end
+
+    def movea(key)
+      a = self.anchor[key]
+      unless a
+        puts "Error: Anchor #{key} not found"
+        puts "Available anchor: #{self.anchor}"
+        return self
+      else
+        self.movei(a)
+      end
+    end
+
+    def movei(args)
+      to = {}
+      [:x, :y, :z].each do |key|
+        if args[key]
+          to[key] = args[key]*-1
+        end
+      end
+      move(to)
+    end
+
+
+    def auto_extrude
+      ret = self.extrude
+      ret.set_option(:auto_extrude, true)
+      ret
+    end
+
     def rotate(args)
       @transformations ||= []
       @transformations << Rotate.new(args)
@@ -96,17 +132,43 @@ module JennCad
       [v.x,v.y,v.z]
     end
 
-    # todo: check if that works
     def rotate_around(point,args)
-      x,y,z= point.x, point.y, point.z
+      x,y,z= point[:x], point[:y], point[:z]
       self.move(x:-x,y:-y,z:-z).rotate(args).move(x:x,y:y,z:z)
     end
 
+    def parse_xyz_shortcuts(args)
+      [:x, :y, :z].each do |key|
+        args[key] ||= 0.0
+      end
+
+      if args[:xy]
+        args[:x] += args[:xy]
+        args[:y] += args[:xy]
+      end
+      if args[:xyz]
+        args[:x] += args[:xyz]
+        args[:y] += args[:xyz]
+        args[:z] += args[:xyz]
+      end
+      if args[:xz]
+        args[:x] += args[:xz]
+        args[:z] += args[:xz]
+      end
+      if args[:yz]
+        args[:y] += args[:yz]
+        args[:z] += args[:yz]
+      end
+      return args
+    end
+
     def move(args)
       if args.kind_of? Array
         x,y,z = args
         return move(x:x, y:y, z:z)
       end
+      args = parse_xyz_shortcuts(args)
+
       @transformations ||= []
       if args[:prepend]
         @transformations.prepend(Move.new(args))
@@ -139,9 +201,9 @@ module JennCad
         x,y,z = args
         args = {x: x, y: y, z: z}
       end
-      args[:x] = args[:x] / 2.0 unless args[:x] == nil
-      args[:y] = args[:y] / 2.0 unless args[:y] == nil
-      args[:z] = args[:z] / 2.0 unless args[:z] == nil
+      [:x, :y, :z, :xy, :xyz, :xz, :yz].each do |key|
+        args[key] = args[key] / 2.0 unless args[key] == nil
+      end
 
       move(args)
     end
@@ -228,8 +290,7 @@ module JennCad
       end
       res
     end
-
-    def make_openscad_compatible
+=begin    def make_openscad_compatible
       make_openscad_compatible!(self)
     end
 
@@ -250,6 +311,7 @@ module JennCad
       end
       item
     end
+=end
 
     def has_explicit_color?
       if option(:auto_color) == false
@@ -307,11 +369,11 @@ module JennCad
         ac = auto_color
         unless ac.nil?
           #puts "auto color to #{ac}"
-          if only_color?(self.parts)
+          if only_color?(get_contents)
             set_option :color, ac
             set_option :auto_color, true
           else
-            set_auto_color_for_children(ac, self.parts)
+            set_auto_color_for_children(ac, get_contents)
           end
 
         end
@@ -361,12 +423,44 @@ module JennCad
       option(:color)
     end
 
-    def openscad(file)
-      if @parts == nil
-        if self.respond_to? :part
-          @parts = [part]
+    def get_contents
+      return @parts unless @parts.nil?
+      if self.respond_to? :part
+        return [part]
+      end
+    end
+
+    def calculated_h
+      return @z unless @z.nil? || @z == 0
+      return @h unless @h.nil? || @h == 0
+      return @calc_h unless @calc_h.nil? || @calc_h == 0
+      return @calc_z unless @calc_z.nil? || @calc_z == 0
+    end
+
+    def find_calculated_h(parts)
+      return if parts == nil
+      parts.each do |part|
+        if z = calculated_h
+          return z
+        end
+        get_calculated_h(part.get_contents)
+      end
+    end
+
+    def set_heights_for_auto_extrude(parts, parent=nil)
+      return if parts.nil?
+      parts.each do |part|
+        if part.option(:auto_extrude)
+          part.z = parent.calculated_h
         end
+        set_heights_for_auto_extrude(part.get_contents, part)
       end
+    end
+
+    def openscad(file)
+      set_heights_for_auto_extrude(get_contents)
+
+      @parts = get_contents
 
       JennCad::Exporters::OpenScad.new(self).save(file)
     end

data/lib/jenncad/version.rb

@@ -1,4 +1,4 @@
 module JennCad
-  VERSION = "1.0.0-alpha4"
+  VERSION = "1.0.0-alpha8"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha4
+  version: 1.0.0.pre.alpha8
 platform: ruby
 authors:
 - Jennifer Glauche
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geo3d
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hanami-cli
+  name: dry-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="