improved editor feeling with line insert and up/down keys

Author: marcel12bell

main/canvas.rb

@@ -7,10 +7,8 @@ def initialize(lines)
 
   def draw_canvas
     elements = @lines.elements
-    elements.each do |e|
-      e.each_pair{|key, line| 
-        send_if_runnable(line.methode, line.arguments) if line.methode
-      }
+    elements.each do |str_obj|
+        send_if_runnable(str_obj.methode, str_obj.arguments) if str_obj.methode
     end
   end
 

main/cursor.rb

@@ -33,6 +33,10 @@ def go_to_new_line #after tap enter button
     @y += $app.line_height+$app.line_space
   end
 
+  def go_to_previous_line
+    @y -= $app.line_height+$app.line_space
+  end
+
   private
   def editor_line
     #return true, if the is a line to edit on

main/editor.rb

@@ -14,12 +14,10 @@ def draw_content
   end
 
   def draw_text
-    @lines.elements.each do |e|
-        e.each_pair do |key, string_object| 
-            eval("text '#{string_object.content}',
+    @lines.elements.each do |str_obj|
+            eval("text '#{str_obj.content}',
                          #{$app.width/2},
-                         #{string_object.get_position.to_a.last}")
-        end
+                         #{str_obj.get_position.to_a.last}")
     end
   end
 

main/lines.rb

@@ -4,11 +4,7 @@ def initialize
     @elements = []
     @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) }
-      found_key ? this_hash[missing_key] = this_hash[found_key] : :undefined
-      } #source: http://www.developwithpurpose.com/ruby-hash-awesomeness-part-2/
+    @positiontable = generate_hashtable
     initialize_positiontable
   end
 
@@ -28,13 +24,17 @@ def position(x,y)
     [$app.start_of_editor_text, y]
   end
 
-  def new_or_next_line(cursor)
-    if last_line_of_editor(cursor.y_position)
-      update_positiontable_with_new_line
-      cursor.go_to_new_line
-    else
+  def make_new_line(cursor)
+      update_positiontable_with_new_line(cursor)
       cursor.go_to_new_line
-    end
+  end
+
+  def previous_line(cursor)
+    cursor.go_to_previous_line unless first_line_of_editor(cursor.y_position)
+  end
+
+  def next_line(cursor)
+    cursor.go_to_new_line unless last_line_of_editor(cursor.y_position)
   end
 
   def elements
@@ -45,39 +45,62 @@ def current_content(y)
     @positiontable[y].content
   end
 
-  def delete_last_key(y)
-    @positiontable[y].delete
+  def delete_last_key(cursor)
+    y = cursor.y_position
+    if @positiontable[y].content.empty?
+      cursor.go_to_previous_line unless first_line_of_editor(y)
+    else
+      @positiontable[y].delete
+    end
   end
 
 
   private
-
   def initialize_positiontable
+    str_obj = StringObject.new("")
+    @elements << str_obj
     begin_of_line = 0
     line_range = [begin_of_line..@line_height + @line_space]
-    string_object = StringObject.new("")
-    string_object.set_position = line_range
-    @elements << { line_range[0] => string_object }
-    @elements.each do |e| #should wok with first
-      @positiontable.update(e)
-    end
+    str_obj.set_position = line_range
+    @positiontable.update({ line_range[0] => str_obj })
   end
 
   def last_line_of_editor(y)
-    @positiontable[y] == @elements.last.to_a.last.last #ugly
+    @positiontable[y] == @elements.last
   end
 
-  def update_positiontable_with_new_line
-    #create_line_element with position range
-    begin_of_line = @line_height + @line_space
-    begin_of_line *= @elements.count if @elements
-    line_range = [begin_of_line..begin_of_line + @line_height + @line_space]
+  def first_line_of_editor(y)
+    @positiontable[y] == @elements.first
+  end
+
+  def update_positiontable_with_new_line(cursor)
+    @new_positiontable = generate_hashtable #make new one becouse of content generated on mouseover
     string_object = StringObject.new("")
-    string_object.set_position = line_range
-    @elements << { line_range[0] => string_object }
-    @elements.each do |e|
-      @positiontable.update(e)
+    position = line_number(on_position_of(cursor))
+    @elements.insert(position, string_object )
+    @elements.each_with_index do |e , idx|
+      line_range = find_position_range(idx)
+      e.set_position = line_range
+      @new_positiontable.update({ line_range[0] => e })
     end
+    @positiontable = @new_positiontable
+  end
+
+  def generate_hashtable
+    Hash.new {|this_hash,missing_key|
+      found_key = this_hash.keys.find { |this_key|
+            this_key.class == Range && this_key.include?(missing_key) }
+      found_key ? this_hash[missing_key] = this_hash[found_key] : :undefined
+      }#source: http://www.developwithpurpose.com/ruby-hash-awesomeness-part-2/
+  end
+
+  def find_position_range(idx)
+    begin_of_line = (@line_height + @line_space) * idx
+    line_range = [begin_of_line..begin_of_line + @line_height + @line_space]
+    return line_range
   end
 
+  def line_number(str_obj) #begins with 0!!
+    str_obj.position.first.last/(@line_height + @line_space)
+  end
 end

main/parse.rb

@@ -11,9 +11,20 @@ def update_line(key, key_code)
         #do nothing because shift was pressed
       when 10 #after return ad a new line
         #check cursor for new line position
-        @lines.new_or_next_line(@cursor)
+        @lines.make_new_line(@cursor)
       when 8
-        @lines.delete_last_key(@cursor.y_position)
+        @lines.delete_last_key(@cursor)
+      when 38 #up
+        @lines.previous_line(@cursor)
+      when 40 #down
+        @lines.next_line(@cursor)
+
+      when 37 #left
+      when 39 #right
+      when 157 #command
+      when 17 #ctrl
+      when 18 #alt
+        
       else
         string_object = @lines.on_position_of(@cursor)
         #update line key

simple_live_coding.rb

@@ -35,7 +35,7 @@ def setup
     #frameRate 25
 
     #initial drawing for testing:
-    "rect 20 30 30 40".chars.each{ |c| @parser.update_line(c, 0) }
+    #"rect 20 30 30 40".chars.each{ |c| @parser.update_line(c, 0) }
   end
 
   def draw
@@ -55,7 +55,7 @@ def draw
     fill color 104, 153, 0
 
     if mouse_pressed?
-      sleep(0.2) #needed because of unintented param change line selection 
+      sleep(0.12) #needed because of unintented param change line selection 
       loop
       @watcher.check_param(mouse_x, mouse_y)
     else
@@ -85,4 +85,4 @@ def mouse_pressed
 
 end
 
-RubyDraw.new :title => "simple_live_coding"
+RubyDraw.new :title => "simple_live_coding"