cleanup

Author: marcel12bell

main/canvas.rb

@@ -19,7 +19,7 @@ def draw_canvas
 
   def send_if_runnable(methode, args)
     begin
-      send(methode.to_s, *args)
+      send(methode, *args)
     rescue Exception => e
       puts "#{ e } (#{ e.class })!"
     end

main/cursor.rb

@@ -3,7 +3,8 @@ class Cursor
 
   def initialize(line)
     @line = line
-    @x, @y = $start_of_editor_text, $editor_top_margin
+    @x = $app.start_of_editor_text
+    @y = $app.editor_top_margin
   end
 
   def set_position(x,y) #on mouse down
@@ -13,11 +14,11 @@ def set_position(x,y) #on mouse down
   end
 
   def get_position
-    return @x, @y
+    [@x, @y]
   end
 
   def y_position
-    return @y
+    @y
   end
 
   def draw_line
@@ -29,7 +30,7 @@ def draw_line
   end
 
   def go_to_new_line #after tap enter button
-    @y += $line_height+$line_space
+    @y += $app.line_height+$app.line_space
   end
 
   private

main/editor.rb

@@ -17,16 +17,16 @@ def draw_text
     @lines.elements.each do |e|
         e.each_pair do |key, string_object| 
             eval("text '#{string_object.content}',
-                         #{$width/2},
+                         #{$app.width/2},
                          #{string_object.get_position.to_a.last}")
         end
     end
   end
 
   def draw_explanation
       return eval("text '#{@description.explanation}', 
-                         #{$width-@description.explanation_length-$editor_right_margin}, 
-                         #{@description.position+$editor_top_margin}")
+                         #{$app.width-@description.explanation_length-$app.editor_right_margin}, 
+                         #{@description.position+$app.editor_top_margin}")
 
   end
 end

main/lines.rb

@@ -2,8 +2,8 @@ class Lines
 
   def initialize
     @elements = []
-    @line_height = $line_height
-    @line_space = $line_space
+    @line_height = $app.line_height
+    @line_space = $app.line_space
     @positiontable = Hash.new {|this_hash,missing_key| 
       found_key = this_hash.keys.find { |this_key| 
             this_key.class == Range && this_key.include?(missing_key) }
@@ -25,7 +25,7 @@ def position(x,y)
     #get the linge and extract x, y param
     line_range = @positiontable[y].get_position
     y = line_range.to_a.last
-    return $start_of_editor_text, y
+    [$app.start_of_editor_text, y]
   end
 
   def new_or_next_line(cursor)

main/string_object.rb

@@ -32,9 +32,9 @@ def arguments
 
   def update_argument(x_mouse, y_mouse)
     update_argument_position
-    arg = find_argument($pressed[0])
+    arg = find_argument($app.pressed[0])
     if arg
-      new_arg_value = -$width/2+x_mouse+$editor_left_margin-length((methode+ " ").to_s)-length(@object_list[1][0..arg].join(" ").to_s)+$initial_arg_value
+      new_arg_value = -$app.width/2+x_mouse+$app.editor_left_margin-length((methode+ " ").to_s)-length(@object_list[1][0..arg].join(" ").to_s)+$app.initial_arg_value
       @object_list[1][arg] = new_arg_value
       @content = @object_list.first + " " + @object_list[1].join(" ") + "\n" if @object_list.first
     end
@@ -67,7 +67,7 @@ def length(s)
     end
 
     def update_argument_position
-      start_position = $width/2+$editor_left_margin+length((methode).to_s)
+      start_position = $app.width/2+$app.editor_left_margin+length((methode).to_s)
       arg_length_new = 0
       space = length(" ")
       @argument_position = Hash.new {|this_hash,missing_key| #set always a new hash to keep track of growing numbers

main/watch.rb

@@ -6,7 +6,7 @@ def initialize(lines, description, cursor)
   end
 
   def check_line(x, y)
-    if x > ($width/2) + $editor_left_margin
+    if x > ($app.width/2) + $app.editor_left_margin
       if @lines.positiontable(y) == :undefined
         @description.position = [-50] # set it outside the view field
       else
@@ -19,7 +19,7 @@ def check_line(x, y)
   def check_param(x,y)
     y_position = @cursor.y_position
     string_object = @lines.positiontable(y_position)
-    if (string_object.position[0]).include?($pressed[1])
+    if (string_object.position[0]).include?($app.pressed[1])
       string_object.update_argument(x,y) unless string_object == :undefined
     end
   end

simple_live_coding.rb

@@ -2,27 +2,27 @@
 
 class RubyDraw < Processing::App
 
-require_relative 'main/string_object'
-require_relative 'main/lines'
-require_relative 'main/cursor'
-require_relative 'main/parse'
-require_relative 'main/description_list'
-require_relative 'main/editor'
-require_relative 'main/canvas'
-require_relative 'main/watch'
+  require_relative 'main/string_object'
+  require_relative 'main/lines'
+  require_relative 'main/cursor'
+  require_relative 'main/parse'
+  require_relative 'main/description_list'
+  require_relative 'main/editor'
+  require_relative 'main/canvas'
+  require_relative 'main/watch'
 
-  def setup
-    $width = 700
-    $height = 600
-    $editor_left_margin = 10
-    $editor_right_margin = 15
-    $editor_top_margin = 15
-    $start_of_editor_text = $width/2
-    $line_height = 13
-    $line_space = 2
+  attr_reader :editor_left_margin, :editor_right_margin, :editor_top_margin, :start_of_editor_text, :line_height, :line_space, :pressed, :initial_arg_value
 
+  def setup
+    size 700, 600 # access with $app.width
+    @editor_left_margin = 10
+    @editor_right_margin = 15
+    @editor_top_margin = 15
+    @start_of_editor_text = 350
+    @line_height = 13
+    @line_space = 2
+    @pressed = false #check if mouse pressed
 
-    size 700, 600 # needs to be hardcoded
     @lines = Lines.new
     @cursor = Cursor.new(@lines)
     @parser = Parse.new(@lines, @cursor)
@@ -39,23 +39,24 @@ def draw
     background 55
     @canvas.draw_canvas
     fill color 304, 353, 300
-    rect ($width/2)-10,0,($width/2)+10,height
+    rect ($app.width/2)-10,0,($app.width/2)+10,height
     fill color 104, 153, 0
     @editor.draw_content
 
 
-    text "this is a DEMO app", $width/2, $height-40
-    text "write 'rect 20 20 200 200' and drag the values...", $width/2, $height-20
+    text "this is a DEMO app", $app.width/2, $app.height-40
+    text "write 'rect 20 20 200 200' and drag the values...", $app.width/2, $app.height-20
 
     fill color 14, 13, 0
-    @cursor.draw_line
+    @cursor.draw_line #we need a line marking the text position
     fill color 104, 153, 0
 
     if mouse_pressed?
+      sleep(0.2) #needed because of unintented param change line selection 
       loop
       @watcher.check_param(mouse_x, mouse_y)
     else
-      $pressed = false
+      @pressed = false
       no_loop
     end
 
@@ -73,8 +74,8 @@ def mouse_moved
 
 
   def mouse_pressed
-    $pressed = [mouse_x, mouse_y]
-    $initial_arg_value = @watcher.get_param(mouse_x, mouse_y) #get the initial value from watcher
+    @pressed = [mouse_x, mouse_y]
+    @initial_arg_value = @watcher.get_param(mouse_x, mouse_y) #get the initial value from watcher
     @cursor.set_position(mouse_x, mouse_y)
     redraw
   end