jenncad 1.0.0.pre.alpha7 → 1.0.0.pre.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b41052c4c676ae59a808744715a5e10b1c1086350d4c7769b87d054f51d171
-  data.tar.gz: a620928785ad237699d0afff433912a8b5c5f6d765492d4d1f72d4d4d83fb962
+  metadata.gz: 14729ddf8a7adb190fd55bd555bff63515420acd3468daaa2d254a06069f213d
+  data.tar.gz: 41237b37c2a7bb301981fce8a44d7772e37fcd75880dba73b47872d4f9729dbe
 SHA512:
-  metadata.gz: 2118f2cff401f4874c6dda0f801cfda1666e0b032158e088ff83ecf24072654a7545fc4ecd9e245398d2de2497f7b363a7a2fe4db90856d87a9a2a60ff39816b
-  data.tar.gz: dd82a60377991ec146d6d9c259e19df75ee752b25eb1b44ed5cc2b33aea3f7b791726dd8ee12182ac323ad7902f75da5b8d5127858efa235d4792ac0755fa52e
+  metadata.gz: 58e2c3db175c7fdbcdc34817460f44460766c4469dca347fe4a98163c2dd212e9510069f458ee152475385bb56d80f5a62b119002b8debd9c41b7a05ec567fe0
+  data.tar.gz: d094fd51199bb1de45d3952f9fc66f4f2aa685177f3c4064c984459b95ad4082d1af52b202bedf71a749e5a9c8347eea334042703aea5c229e591537fb9e2a5b

data/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

data/bin/jenncad

@@ -1,6 +1,5 @@
 #!/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

data/examples/README

@@ -0,0 +1,4 @@
+Find the examples at:
+
+https://github.com/jglauche/jenncad-examples
+

data/jenncad.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "dry-cli"
   gem.add_runtime_dependency "activesupport"
   gem.add_runtime_dependency "observr"
+  gem.add_runtime_dependency "logger"
 end

data/lib/jenncad/commands.rb

@@ -1,10 +1,11 @@
+require "dry/cli"
 module JennCad
   module Commands
     extend Dry::CLI::Registry
     MAGIC = "jenncad-append-project-magic"
 
     class Run < Dry::CLI::Command
-      argument :name, required: false
+      argument :name, required: false, desc: "project file, defaults to dirname.rb by default"
 
       def guess_executable(dir=Dir.pwd)
         dir.split("/").last.to_s + ".rb"
@@ -41,16 +42,23 @@ module JennCad
         end
       end
 
-      def build
-        admesh_installed = system("admesh --version > /dev/null")
-        unless admesh_installed
-          puts "Warning: cannot find admesh, stl export will be in ASCII"
+    end
+
+    class Build < Run
+      option :binary, type: :boolean, default: false, desc: "run through admesh to create a binary stl"
+
+      def build(options)
+        if options[:binary]
+          admesh_installed = system("admesh --version > /dev/null")
+          unless admesh_installed
+            puts "Warning: cannot find admesh, stl export will be in ASCII"
+          end
         end
 
         Dir.glob("output/**/*.scad").each do |file|
           stl = file.gsub(".scad",".stl")
           build_stl(file, stl)
-          convert_to_binary(stl) if admesh_installed
+          convert_to_binary(stl) if options[:binary] && admesh_installed
         end
       end
 
@@ -63,16 +71,15 @@ module JennCad
         system("admesh #{stl} -b #{stl}")
       end
 
-    end
 
-    class Build < Run
-      def call(name: nil, **)
+      def call(options)
+        name = options[:name]
         unless name
           name = guess_executable
         end
         if check_executable(name)
           execute(name)
-          build
+          build(options)
         end
       end
     end

data/lib/jenncad/features/aggregation.rb

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

data/lib/jenncad/features/path.rb

@@ -0,0 +1,339 @@
+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)
+      @start_point = args[:start_point]
+      @end_point = args[:end_point]
+      @a = args[:a]
+      @ccw = args[:ccw] || false
+      @l = args[:l]
+      @od = args[:od]
+      @id = args[:id]
+      @input_a = args[:input_a] || 0
+      @output_a = args[:output_a] || 0
+      @thing = thing
+      @angle = args[:angle]
+      @current_angle = args[:current_angle]
+      @direction = args[:direction]
+      @to = args[:to]
+      @from = args[:from]
+
+      if @a < 0
+        @from = case @from
+          when :left
+            :right
+          when :right
+            :left
+          when :top, :up
+            :bottom
+          when :down, :bottom
+            :up
+          else
+            # // unimplemented
+            @from
+        end
+      end
+
+    end
+
+    def set_angles(cur, total, direction)
+      @current_angle = cur
+      @angle = normalize(total)
+      @direction = direction
+    end
+
+    def normalize(angle)
+      if angle < 0
+        angle += 360
+      end
+      if angle >= 360
+        angle -= 360
+      end
+      angle
+    end
+
+    def margin
+      return @od
+    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
+      l = td + @id
+      l2 = td / 2.0 + @id / 2.0
+      r = 0
+      ox = 0
+      oy = 0
+      cr = 180
+      case @from
+        when :left
+          r = 0
+          oy = -l
+        when :top, :up
+          r = -90
+          ox = -l
+          cr = 0
+        when :right
+          r = 180
+          oy = l
+        when :bottom, :down
+          cr = 0
+          r = 90
+          ox = l
+        # TODO: so this doesn't work yet,
+        #       need to figure out the maths to translate this
+        when 0..360
+          r = 180-@from
+          cr = @a
+      end
+
+      r2 = cr + r + @a   # 180+@a
+      x = - l2 * Math::sin((r2/180.0)*Math::PI)
+      y = - l2 * Math::cos((r2/180.0)*Math::PI)
+
+
+
+      return r, ox/2.0, oy/2.0, x, y
+
+    end
+
+    def part
+      d = thing.yield.d
+      len = d * 2 + @id
+      x = Math::sin((@a/180.0)*Math::PI)*len
+      y = Math::cos((@a/180.0)*Math::PI)*len
+
+      res  = circle(d: len)
+      res -= circle(d: @id)
+      points = [[0,0]]
+      points << [0, len]
+      points << [x, y]
+
+      res *= polygon(points:points)
+
+      r, ox, oy, x, y = positions
+      res = res.rotate(z: r).move(x: ox, y: oy)
+      res = res.auto_extrude#.color("red")
+
+      #res += slot(d: 1.2, y: len/2.0, h: 10).rotate(z: r_midpoint).color("red")
+      #res += cylinder(d: 1, h: 10).move(x: x+ox,y: y+oy)
+
+      #res.moveh(x: thing.yield.d, y: -thing.yield.d)
+      res.move(x: @start_point[:x], y: @start_point[:y])
+
+      #res += cylinder(d: 1, h: 15).color("red").move(x: @start_point[:x], y: @start_point[:y]).move(z:-1)
+
+
+      res
+
+    end
+
+  end
+
+  class Line
+    attr_accessor :start_point, :end_point, :l, :thing, :angle, :current_angle, :direction
+    def initialize(args, &thing)
+      @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
+    end
+
+    def sp_margin(margin)
+      @start_point[:x] -= margin[:x]
+      @start_point[:y] -= margin[:y]
+    end
+
+    def ep_margin(margin)
+      @end_point[:x] -= margin[:x]
+      @end_point[:y] -= margin[:y]
+    end
+
+    def shrink_ep(len)
+      sx, sy = @start_point[:x], @start_point[:y]
+      ex, ey = @end_point[:x], @end_point[:y]
+      vx = ex-sx
+      vy = ey-sy
+      l = Math::sqrt(vx**2 + vy**2)
+      factor = len / l
+      @end_point[:x] -= vx * factor
+      @end_point[:y] -= vy * factor
+      #puts "#{sx} x #{sy}  => #{ex} x #{ey} , shrink #{factor} "
+    end
+
+    def shrink_sp(len)
+      sx, sy = @start_point[:x], @start_point[:y]
+      ex, ey = @end_point[:x], @end_point[:y]
+      vx = ex-sx
+      vy = ey-sy
+      l = Math::sqrt(vx**2 + vy**2)
+      factor = len / l
+      @start_point[:x] -= vx * factor
+      @start_point[:y] -= vy * factor
+    end
+
+
+    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])
+      )
+    end
+  end
+
+  class Path < Thing
+
+    attr_accessor :elements, :lpos, :thing, :angle, :current_angle, :direction
+    def initialize(args)
+      @thing = args[:part] #// cylinder(d: @d, z: @z)
+      @part = new_thing
+      @angle = args[:a] || 0
+      @current_angle = args[:a] || 0
+      @direction = 0
+      @name = args[:name] || "Path"
+      @calc_h = @part.z
+      @dir = 0
+      @lpos = {x: 0, y: 0, l: 0, a: 0}
+      @coords = []
+      @steps = []
+      @parts = [new_thing]
+
+      super(args)
+    end
+
+    def new_thing
+      r = @thing.clone
+      r.transformations = []
+      r
+    end
+
+    def corner(args)
+      od = args[:od]
+      id = args[:id]
+      if id.nil? && od
+        id = new_thing.d
+        #puts "od: #{od} , thing d #{new_thing.d} new id #{id}"
+      end
+      if od.nil? && id
+        od = id + new_thing.d
+      end
+      rc = RoundCorner.new(
+        start_point: { x: @lpos[:x], y: @lpos[:y] },
+        end_point: { x: @lpos[:x], y: @lpos[:y] },
+        od: od,
+        id: id,
+        ccw: args[:ccw],
+        from: args[:from],
+        to: args[:to],
+        a: args[:a],
+        direction: @direction
+      ){ new_thing }
+
+      _, ox, oy, x, y = rc.positions
+      @lpos[:x] += x + ox
+      @lpos[:y] += y + oy
+
+      @steps << rc
+    end
+
+    def line(args)
+      if args[:l]
+        args[:a] ||= 0
+        if args[:a] > 0
+          @direction = 1
+        elsif args[:a] < 0
+          @direction = -1
+        else
+          @direction = 0
+        end
+
+        @angle += args[:a]
+        @current_angle = args[:a]
+
+        l = args[:l]
+        gamma = 90
+        alpha = @angle
+        beta = gamma - alpha
+
+        case
+        when alpha == 90, alpha == -270
+          x = l
+          y = 0
+        when alpha == 180, alpha == -180
+          x = 0
+          y = -l
+        when alpha == 270, alpha == -90
+          x = -l
+          y = 0
+        when alpha == 360, alpha == 0
+          x = 0
+          y = l
+        else
+          y = l/Math::sin(radians(gamma)) * Math::sin(radians(beta))
+          x = y/Math::sin(radians(beta)) * Math::sin(radians(alpha))
+        end
+      elsif args[:x] || args[:y]
+        x = args[:x] || 0
+        y = args[:y] || 0
+
+        dx = @lpos[:x] - x
+        dy = @lpos[:y] - y
+
+        l = Math::sqrt(dx*dx + dy*dy)
+        alpha = Math::atan2(x, y)*180/Math::PI
+      else
+        puts "Error in line(): Please specify either :l, :x or :y"
+        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 }
+
+      add_lpos({x: x, y: y})
+    end
+
+    def add_lpos(lpos)
+      #puts "x: #{lpos[:x]}, y: #{lpos[:y]}"
+      [:x, :y].each do |key|
+        @lpos[key] += lpos[key]
+      end
+      @coords << lpos
+    end
+
+    def pos
+      [@lpos[:x], @lpos[:y]]
+    end
+
+    def center
+      @steps << Move.new(x: @lpos[:x] * -1, y: @lpos[:y] * -1)
+      self
+    end
+
+    def assemble
+      @steps.each_with_index do |step, i|
+        if @steps[i+1] && @steps[i+1].class == Line && step.class == RoundCorner
+          step.set_angles(@steps[i+1].current_angle, @steps[i+1].angle, @steps[i+1].direction)
+        end
+      end
+      res = nil
+      @steps.each do |step|
+        if step.kind_of? Transformation
+          res.transformations << step
+        else
+          res += step.part
+        end
+      end
+      set_heights_for_auto_extrude([res], self)
+      res.transformations << @transformations
+      Aggregation.new(@name, res)
+    end
+
+  end
+end
+
+

data/lib/jenncad/features.rb

@@ -4,6 +4,8 @@ require "jenncad/features/cuttable"
 require "jenncad/features/openscad_include"
 require "jenncad/features/climb"
 require "jenncad/features/stl_import"
+require "jenncad/features/path"
+
 
 
 module JennCad

data/lib/jenncad/primitives/boolean_object.rb

@@ -7,6 +7,8 @@ module JennCad::Primitives
       else
         @parts = parts
       end
+      @parent = @parts.first.parent
+
       after_add
     end