crystalscad 0.3.5 → 0.3.6

data/lib/crystalscad/Assembly.rb

@@ -19,8 +19,15 @@ module CrystalScad
 
 	  def initialize(args={})
 	    @args = args if @args == nil
-      @@bom.add(description) unless args[:no_bom] == true
+      add_to_bom
 	  end
+
+		def add_to_bom
+			if !@bom_added				
+				@@bom.add(description) unless @args[:no_bom] == true
+				@bom_added = true
+			end
+		end		
 	  
 	  def description
 	    "No description set for Class #{self.class.to_s}"

data/lib/crystalscad/Gears.rb

@@ -49,7 +49,7 @@ module CrystalScad::Gears
 		def output
 			res = cylinder(d:@module*@teeth+@output_margin_dia,h:@height+@output_margin_height)
 			if @hub_height.to_f > 0 && @hub_dia.to_f > 0
-				res += cylinder(d:@hub_dia+@output_margin_dia,h:@hub_height+@output_margin_height).translate(z:@height+@output_margin_height)
+				res += cylinder(d:@hub_dia+@output_margin_dia,h:@hub_height+@output_margin_height).translate(z:@height)
 			end   
 
 			res   

data/lib/crystalscad/Hardware.rb

@@ -30,8 +30,6 @@ module CrystalScad::Hardware
 			@size = size
 			@length = length
 			@transformations ||= []
-
-			@@bom.add(description)
 		end
 
 		def description
@@ -46,11 +44,13 @@ module CrystalScad::Hardware
 		end
 
 		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"
 		end
 
 		def show
+			add_to_bom
 			return transform(bolt_912(0,0)) if @args[:type] == "912"
 			return transform(bolt_7380(0,0)) if @args[:type] == "7380"
 		end 
@@ -135,7 +135,6 @@ module CrystalScad::Hardware
 
 											}
 			@height = @chart_din125[@size][:height]
-			super(args)		
 		end
 
 		def description
@@ -143,6 +142,7 @@ module CrystalScad::Hardware
 		end
 		
 		def show
+			add_to_bom
 			washer = cylinder(d:@chart_din125[@size][:outer_diameter].to_f,h:@chart_din125[@size][:height].to_f)
 			washer-= cylinder(d:@size,h:@chart_din125[@size][:outer_diameter].to_f+0.2).translate(z:-0.1)
 			washer.color("Gainsboro")
@@ -158,7 +158,7 @@ module CrystalScad::Hardware
 			@material = args[:material] ||= "8.8"
 			@surface = args[:surface] ||= "zinc plated"
 
-			@@bom.add(description) unless args[:no_bom] == true
+			@args = args
 			prepare_data
 		end
 
@@ -194,11 +194,13 @@ module CrystalScad::Hardware
 	
 		end
 
-		def output(margin=0.3)
+		def output(margin=0.3)	
+			add_to_bom
 			return nut_934(margin)
 		end
 
 		def show
+			add_to_bom
 			return nut_934
 		end
 

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystalscad
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Joachim Glauche
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-24 00:00:00 Z
+date: 2013-12-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyscad