update load_table sketch

Author: monkstone

samples/processing_app/topics/advanced_data/library/bubble/bubble.rb

@@ -1,5 +1,4 @@
 # The bubble library, include BubbleStruct
-
 class Bubble
   include Processing::Proxy
 
@@ -16,8 +15,8 @@ def initialize(x, y, diameter, name)
 
   # Checking if mouse is over the Bubble
   def rollover(px, py)
-    d = dist(px,py,x,y)
-    @over = (d < diameter/2)? true : false
+    d = dist(px, py, x, y)
+    @over = (d < diameter / 2.0) ? true : false
   end
 
   # Display the Bubble
@@ -26,15 +25,21 @@ def display
     stroke_weight(2)
     noFill
     ellipse(x, y, diameter, diameter)
-    if (over)
-      fill(0)
-      text_align(CENTER)
-      text(name, x, y + diameter / 2 + 20)
-    end
+    return unless over
+    fill(0)
+    text_align(CENTER)
+    text(name, x, y + diameter / 2 + 20)
+  end
+
+  def to_a
+    [x, y, diameter, name]
   end
 
   def to_hash
-    {'position' => {'x' => x, 'y' => y}, 'diameter' => diameter, 'label' => name}
+    { 'position' => { 'x' => x, 'y' => y },
+      'diameter' => diameter,
+      'label' => name
+    }
   end
 
   def to_struct

samples/processing_app/topics/advanced_data/load_save_table.rb

@@ -1,9 +1,9 @@
 #
 # Loading Tabular Data
-# after Daniel Shiffman, by Martin Prout.  
-# 
+# after Daniel Shiffman, by Martin Prout.
+#
 # This example demonstrates how to use CSV
-# to retrieve data from a CSV file and make objects 
+# to retrieve data from a CSV file and make objects
 # from that data.
 #
 # Here is what the CSV looks like:
@@ -32,54 +32,36 @@ def draw
     b.display
     b.rollover(mouse_x, mouse_y)
   end
-  
   text_align(LEFT)
   fill(0)
   text('Click to add bubbles.', 10, height - 10)
 end
 
 def load_data
   # Load CSV file into an Array of Hash objects
-  # :headers option indicates the file has a header row
-  @data = CSV.read('data/data.csv', :headers => true).map{|row| row.to_hash}
-  
-  # The size of the array of Bubble objects is determined by the total number of 'rows' in the CSV
-  @bubbles = [] 
-  
-  data.each do |row|
-    # You access the values via their column name (set by using headers option above)
+  # headers: option indicates the file has a header row
+  @bubbles = []
+  CSV.foreach('data/data.csv', headers: true) do |row|
     x = row['x'].to_f
     y = row['y'].to_f
     d = row['diameter'].to_f
-    n = row['name'] 
+    n = row['name']
     # Make a Bubble object out of the data read
     bubbles << Bubble.new(x, y, d, n)
-  end  
-  
+  end
 end
 
 def mouse_pressed
-  # Create a new 'row' hash
-  row = {'x' => mouse_x.to_s, 'y' => mouse_y.to_s, 'diameter' => random(40, 80).to_s, 'name' => 'Blah'}
-  # add the row to the existing data array
-  data << row
-  
-  # If the table has more than 10 rows
-  if (data.size > 10)
-    # Delete the oldest row
-    data.shift 
-  end
-  # read column names from data, and generate csv 'string' that can be written to file  
-  column_names = data.first.keys
-  s = CSV.generate do |csv|
-    csv << column_names
-    data.each do |row|
-      csv << row.values
+  bubbles << Bubble.new(mouse_x, mouse_y, rand(40..80), 'blah')
+  # If there are more than 10 bubbles delete the oldest bubble
+  bubbles.shift if bubbles.size > 10
+  # Writing the csv data back to the same file, (also specify UTF-8 format)
+  CSV.open('data/data.csv', 'w:UTF-8') do |csv|
+    csv << %w(x y diameter name) # create csv headers
+    bubbles.each do |bubble|
+      csv << bubble.to_a       # write back bubble data
     end
   end
-  # Writing the csv data back to the same file, (also specify UTF-8 format)
-  File.open('data/data.csv', 'w:UTF-8') { |file| file.write(s)}  
   # And reloading it
   load_data
 end
-