crystalscad 0.2.6 → 0.2.7

data/lib/crystalscad/Hardware.rb

@@ -33,18 +33,45 @@ module CrystalScad::Hardware
 		end
 
 		def description
-			"M#{@size}x#{@length} Bolt, DIN #{@args[:type]}, #{@args[:material]} #{@args[:surface]}"
+		  norm = ""
+		  if ["912"].include? @args[:type]
+		    norm = "DIN"
+		  elsif ["7380"].include? @args[:type]
+		    norm = "ISO"
+		  end
+		  
+			"M#{@size}x#{@length} Bolt, #{norm} #{@args[:type]}, #{@args[:material]} #{@args[:surface]}"
 		end
 
 		def output
-			return bolt_912(@args[:additional_length],@args[:additional_diameter])
+			return bolt_912(@args[:additional_length],@args[:additional_diameter]) if @args[:type] == "912"
+			return bolt_7380(@args[:additional_length],@args[:additional_diameter]) if @args[:type] == "7380"
 		end
 
 		def show
-			return bolt_912(0,0)
-		end
-
-		# currently only din912	
+			return bolt_912(0,0) if @args[:type] == "912"
+			return bolt_7380(0,0) if @args[:type] == "7380"
+		end 
+  
+    # ISO 7380
+  	def bolt_7380(additional_length=0, addtional_diameter=0)
+	    chart_iso7380 = {
+	                    3 => {head_dia:5.7,head_length:1.65},
+	                    4 => {head_dia:7.6,head_length:2.2},
+	                    5 => {head_dia:9.5,head_length:2.75},
+	                    6 => {head_dia:10.5,head_length:3.3},
+	                    8 => {head_dia:14,head_length:4.4},
+	                    10=> {head_dia:17.5,head_length:5.5},
+	                    12=> {head_dia:21,head_length:6.6},
+	    
+	    
+	    }
+	  	res = cylinder(d1:chart_iso7380[@size][:head_dia]/2.0,d2:chart_iso7380[@size][:head_dia],h:chart_iso7380[@size][:head_length]).translate(z:-chart_iso7380[@size][:head_length]).color("Gainsboro") 
+      total_length = @length + additional_length
+      res+= cylinder(d:@size+addtional_diameter, h:total_length).color("DarkGray")		
+	  end
+
+    # DIN 912
 		def bolt_912(additional_length=0, addtional_diameter=0)
 			
 	
@@ -176,6 +203,7 @@ module CrystalScad::Hardware
 			@args[:configuration] ||= 1
 			@args[:gap] ||= 8.13
 			@args[:thickness] ||= 2.55
+			@args[:simple] ||= false
 		end
 
 		def output(length=nil)
@@ -195,19 +223,22 @@ module CrystalScad::Hardware
 		end
 
 		def single_profile
-			start=@args[:thickness].to_f/Math.sqrt(2);
-		 
-			gap = @args[:gap]
-			thickness = @args[:thickness]
-			size= @args[:size]
-			profile = square(size:gap+thickness,center:true);
-		  (0..3).each{|d|
-		      profile+=polygon(points:[[0,0],[0,start],[size/2-thickness-start,size/2-thickness],[gap/2,size/2-thickness],[gap/2,size/2],[size/2,size/2],[size/2,gap/2],[size/2-thickness,gap/2],[size/2-thickness,size/2-thickness-start],[start,0]]).rotate(z:d*90)
-		  }
-			profile-=circle(r:gap/2,center:true);
-			profile=profile.translate(x:size/2,y:size/2);
-		
-			return profile.linear_extrude(height:@args[:length],convexity:2)		
+		  if @args[:simple] == true
+		    return cube([@args[:size],@args[:size],@args[:length]])
+		  else
+			  start=@args[:thickness].to_f/Math.sqrt(2);
+		   
+			  gap = @args[:gap]
+			  thickness = @args[:thickness]
+			  size= @args[:size]
+			  profile = square(size:gap+thickness,center:true);
+		    (0..3).each{|d|
+		        profile+=polygon(points:[[0,0],[0,start],[size/2-thickness-start,size/2-thickness],[gap/2,size/2-thickness],[gap/2,size/2],[size/2,size/2],[size/2,gap/2],[size/2-thickness,gap/2],[size/2-thickness,size/2-thickness-start],[start,0]]).rotate(z:d*90)
+		    }
+			  profile-=circle(r:gap/2,center:true);
+			  profile=profile.translate(x:size/2,y:size/2);
+        return profile.linear_extrude(height:@args[:length],convexity:2)	
+      end				
 		end
 
 		def multi_profile

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-17 00:00:00 Z
+date: 2013-09-19 00:00:00 Z
 dependencies: []
 
 description: Inspired by SolidPython, based on RubyScad