crystalscad 0.3.11 → 0.3.12

data/README.md

@@ -7,9 +7,10 @@ Installation:
 ===========
 Dependencies:
 - Ruby 1.9.3
-- inotifywait
 - gem rubyscad
 - gem requireall
+- gem observr (optional)
+
 
 Install via gem:
 

data/examples/threads2.rb

@@ -79,7 +79,6 @@ pos = male.threads_bottom.first.position_on(female.threads_top.first,rotation)
 res += female.show.rotate(rotation).mirror(z:1).translate(pos)
 
 
-
 rotation = {y:-90}
 pos = male.threads_left.first.position_on(female.threads_top.first,rotation)
 res += female.show.rotate(rotation).translate(pos)

data/lib/crystalscad/Hardware.rb

@@ -26,6 +26,7 @@ module CrystalScad::Hardware
 			# options for output only:	
 			@args[:additional_length] ||= 0
 			@args[:additional_diameter] ||= 0.3 
+			@args[:head_margin] ||= 0.0
 
 			if @args[:washer] == true
 				@washer = Washer.new(size,{:material => @args[:material], :surface => @args[:surface]})
@@ -38,7 +39,7 @@ module CrystalScad::Hardware
 
 		def description
 		  norm = ""
-		  if ["912"].include? @args[:type]
+		  if ["912","933"].include? @args[:type]
 		    norm = "DIN"
 		  elsif ["7380"].include? @args[:type]
 		    norm = "ISO"
@@ -49,16 +50,33 @@ module CrystalScad::Hardware
 
 		def output
 			add_to_bom
-			return transform(bolt_912(@args[:additional_length],@args[:additional_diameter])) if @args[:type] == "912"
-			return transform(bolt_7380(@args[:additional_length],@args[:additional_diameter])) if @args[:type] == "7380"
+			case @args[:type].to_s
+  			when "912"
+    			res = bolt_912(@args[:additional_length], @args[:additional_diameter])
+  			when "933"
+    			res = bolt_933(@args[:additional_length], @args[:additional_diameter], @args[:head_margin])
+	      when "7380"
+    			res = bolt_7380(@args[:additional_length], @args[:additional_diameter])
+		    else
+		      raise "unkown type #{args[:type]} for Bolt!"
+		  end
+		  
+		  return transform(res)
 		end
 
 		def show
 			add_to_bom
-			res = bolt_912(0,0) if @args[:type] == "912"
-			res = bolt_7380(0,0) if @args[:type] == "7380"
-			raise "unkown type #{args[:type]} for Bolt!" if res == nil
-			
+			case @args[:type].to_s
+  			when "912"
+    			res = bolt_912(0,0)
+  			when "933"
+    			res = bolt_933(0,0)
+	      when "7380"
+    			res = bolt_7380(0,0)
+		    else
+		      raise "unkown type #{args[:type]} for Bolt!"
+		  end
+						
 			if @washer
 				res += @washer.show
 				res = res.translate(z:-@washer.height)
@@ -131,7 +149,28 @@ module CrystalScad::Hardware
 			end				
 			res
 		end
-				
+	  
+	  def bolt_933(additional_length=0, addtional_diameter=0, head_margin=0)
+	
+			chart        = {2 => {head_side_to_side:4,head_length:1.4},
+              			  2.5=> {head_side_to_side:5,head_length:1.7},
+			                3 => {head_side_to_side:5.5,head_length:2},
+											4 => {head_side_to_side:7,head_length:2.8},
+											5 => {head_side_to_side:8,head_length:3.5},
+											6	=> {head_side_to_side:10,head_length:4},
+											8	=> {head_side_to_side:13,head_length:5.5},
+	  									10=> {head_side_to_side:17,head_length:7},
+	  									12=> {head_side_to_side:19,head_length:8},
+	  									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
+    	res = cylinder(d:(head_dia/Math.sqrt(3))*2,fn:6,h:chart[@size][:head_length]).translate(z:-chart[@size][:head_length]).color("Gainsboro") 
+      total_length = @length + additional_length
+      res+= cylinder(d:@size+addtional_diameter, h:total_length).color("DarkGray")		
+										
+	  end
+	  
 	end
 	
 	class Washer	< CrystalScad::Assembly

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-27 00:00:00 +01:00
-default_executable: 
+date: 2014-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyscad
@@ -86,7 +85,6 @@ files:
 - skeleton_project/assemblies/example.rb
 - skeleton_project/observe.sh
 - skeleton_project/skeleton.rb
-has_rdoc: true
 homepage: http://github.com/Joaz/CrystalScad
 licenses: 
 - GPL-3
@@ -118,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: CrystalScad is a framework for programming OpenScad models in Ruby