ppcurses 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24ac08644952676975408eb133016f10f3a39825
-  data.tar.gz: 0f7536cf358e3e4fce9db59d7eb912a59891d23f
+  metadata.gz: c8bdbca428f64c67ef820fe58eadf61028d1d98a
+  data.tar.gz: 504bb1ea95801d31262d2c94b9f3ca5df72766cb
 SHA512:
-  metadata.gz: 206b4615b6471629bc3cd087f7bfa5c32e57a42c55db96df5ac6675fd803e3136dc77f087683dadb985fa674cac9bd76c8c006187d07c077cea540fb916ec307
-  data.tar.gz: f62bf00745e11818ab02a52283a81e5251c35e01aaac07d8ded82ac643133cb0c87fbd798987ac1e359dddd4ee4abd6e3fcf9fb5f08ba5724b16dd87421f5700
+  metadata.gz: fdbfd2743fb1b43742a91fc750e5450c6045f1d247f94f5e6f619fa600ad6c0ae946f9ea183b1a44c0ff9a6e3ab43db3f168574768bac418b95a5fa72c8e5e0c
+  data.tar.gz: 1108125d7b75d5612d149e7ec31a066c8381d2a9f7a96453956bd71036ca186ca3efc523a70c296aab818cfea7094b00fc178062ba911171c8ec6ac410a3c4f7

data/lib/ppcurses.rb

@@ -30,6 +30,7 @@ module PPCurses
 
 
  require_relative  'ppcurses/application.rb'
+ require_relative  'ppcurses/notification_centre.rb'
  require_relative  'ppcurses/view.rb'
  require_relative  'ppcurses/menu_bar.rb'
  require_relative  'ppcurses/Screen.rb'

data/lib/ppcurses/Screen.rb

@@ -102,6 +102,10 @@ module PPCurses
       Curses.stdscr.setpos(y, x)
     end
 
+    def clrtoeol
+      Curses.stdscr.clrtoeol
+    end
+
     def attron(attributes)
       Curses.stdscr.attron(attributes)
     end

data/lib/ppcurses/application.rb

@@ -146,6 +146,21 @@ module PPCurses
 
 
     def content_view=(value)
+      
+      if @content_view != nil then
+        # Clear current content_view before reassignment
+        frame = @content_view.frame
+        x = frame.origin.x
+        y = frame.origin.y
+        height = frame.size.height
+        
+        for i in y..y+height-1
+          @screen.setpos( i, x )        
+          @screen.clrtoeol  ## TODO use width !!!
+        end
+        
+      end
+      
       @content_view=value
       @main_menu.next_responder=@content_view
     end

data/lib/ppcurses/form/button.rb

@@ -54,8 +54,8 @@ module PPCurses
     attr_accessor :selected
     attr_accessor :selected_element
 
-    attr_reader :button1
-    attr_reader :button2
+    attr_accessor :button1
+    attr_accessor :button2
 
     def initialize(button1_label, button2_label)
       @button1 = Button.new(button1_label)
@@ -72,7 +72,7 @@ module PPCurses
     end
 
     def height
-      1
+      2
     end
 
     def set_curs_pos(screen)

data/lib/ppcurses/form/form.rb

@@ -8,6 +8,9 @@ module PPCurses
     # Screen should be of type Curses::Window
     #
     def initialize
+      super
+      origin = Point.new( 1, 1 )
+      setFrameOrigin(origin)
       @elements = []
     end
 
@@ -29,7 +32,9 @@ module PPCurses
       if  @selected_element.nil?
         set_selected_element(@elements[0])
       end
-
+      
+      @frame.size.height += element.height
+      
     end
 
 
@@ -61,8 +66,8 @@ module PPCurses
 
     # TODO -- call display of subview???
     def display(screen)
-      y = 1
-      x = 1
+       y = @frame.origin.y
+       x = @frame.origin.x
 
       for i in 0..@elements.length - 1
         element = @elements[i]

data/lib/ppcurses/geometry.rb

@@ -1,11 +1,10 @@
 module PPCurses
 
-
   class Point
 
     attr_accessor :x, :y
 
-    def initialize( x, y )
+    def initialize( x=0, y=0 )
       @x = x
       @y = y
     end
@@ -14,10 +13,57 @@ module PPCurses
       "x=#{@x} y=#{@y}"
     end
 
+    def Point.zeroPoint
+      Point.new
+    end
+
   end
 
-  class Rect
+# -------------------------------------------------------------------
 
+  class Size
+    attr_accessor :width, :height
+    
+    def initialize( width=0, height=0 )
+      @width = width
+      @height = height
+    end
+    
+    def Size.zeroSize
+      Size.new
+    end
+    
+    def to_s
+      "width=#{@width} height=#{@height}"
+    end
+    
+  end
+
+# -------------------------------------------------------------------
+
+  class Rect
+    attr_accessor :origin, :size
+   
+    def initialize ( origin, size )
+      @origin = origin
+      @size = size
+    end
+   
+    def Rect.makeRect( x, y, w, h )
+      origin = Point.new(x, y)
+      size  = Size.new(w, h)
+      
+      rect = Rect.new( origin, size)
+    end
+   
+    def Rect.zeroRect
+      Rect.new( Point.zeroPoint, Size.zeroSize )
+    end
+   
+    def to_s
+      "origin[#{@origin}] size[#{@size}]"
+    end
+    
   end
 
 end

data/lib/ppcurses/menu/date_menu.rb

@@ -35,7 +35,7 @@ module PPCurses
   
   
     def show
-        y = 2
+      y = 2
       x = 2
 
       str_array = @meta_info.month_str_array

data/lib/ppcurses/notification_centre.rb

@@ -0,0 +1,65 @@
+module PPCurses
+
+  class NotificationCentre
+    
+    def initialize
+	    @listeners = Hash.new
+	  end
+  
+     @@default_centre =  PPCurses::NotificationCentre.new
+  
+    def NotificationCentre.default_centre
+		  @@default_centre
+	  end
+	
+	
+	  def add_observer( observer, selector, name, sender)
+
+      if @listeners.has_key?(name)
+	      sender_hash = @listeners.fetch(name)
+      else
+	      sender_hash = Hash.new
+		    @listeners.store(name, sender_hash)
+	    end
+	  
+	     sender_hash.store(sender, [observer, selector])
+	  
+	  end
+	
+	
+	  def post_notification ( name, sender )
+	  
+	    if @listeners.has_key?(name) == false then return end
+	  
+	    sender_hash =  @listeners.fetch(name)
+	  
+	    if sender_hash.has_key?(sender) == false then return end
+	  
+	    listener_info = sender_hash.fetch(sender)
+	    # observer = listener_info[0]  # Currently unused
+	    callback = listener_info[1] 
+	  
+	    notification = Notification.new(name, sender)
+	  
+	    callback.call ( notification )
+	  end
+	
+  end
+
+
+  class Notification
+  
+    attr_reader :name
+	  attr_reader :object
+  
+    def initialize( name, object )
+	    @name = name
+	    @object = object
+	  end
+  
+  
+  end
+
+
+
+end

data/lib/ppcurses/table_view.rb

@@ -1,4 +1,12 @@
+
+PPTableViewSelectionDidChangeNotification  = 'PPTableViewSelectionDidChangeNotification'
+PPTableViewSelectionIsChangingNotification = 'PPTableViewSelectionIsChangingNotification'
+PPTableViewEnterPressedNotification        = 'PPTableViewEnterPressedNotification'
+
 module PPCurses
+
+ 
+
 # Based loosely on ...
 #
 # https://developer.apple.com/library/mac/documentation/Cocoa/Reference/ApplicationKit/Classes/NSTableView_Class/index.html#//apple_ref/occ/cl/NSTableView
@@ -6,13 +14,17 @@ module PPCurses
 #
 class TableView < View
 
+ 
   attr_accessor :data_source
+  attr_reader   :selected_row
 
-
-  def selected_row
-
+  def initialize
+    super
+    origin = Point.new( 2, 2 )
+    setFrameOrigin(origin)
   end
 
+
   # A data source must implement a formal protocol
   #
   # - def number_of_rows_in_table(tableView)
@@ -21,12 +33,69 @@ class TableView < View
   def data_source=(val)
     PPCurses.implements_protocol( val, %w(number_of_rows_in_table object_value_for ))
     @data_source = val
+    @selected_row = 0
+    
+    # Determine frame size from datasource data
+    height = @data_source.number_of_rows_in_table(self)
+    width = 0    
+    for i in 0..@data_source.number_of_rows_in_table(self)-1
+      x = @data_source.object_value_for(self, 0, i).length
+      if x > width then width = x end
+    end
+    
+    sz = Size.new( width, height )
+    setFrameSize( sz )
+    
+  end
+
+  def display(screen)
+    
+    y = @frame.origin.y
+    x = @frame.origin.x
+    
+    for i in 0..@data_source.number_of_rows_in_table(self)-1
+      screen.setpos(y,x)
+      screen.attron(Curses::A_REVERSE) if i == selected_row
+      screen.addstr(@data_source.object_value_for(self, 0, i) )
+      screen.attroff(Curses::A_REVERSE) if i == selected_row
+      y += 1
+    end
   end
 
+
+  #  NSTableViewSelectionDidChangeNotification
+  #  NSNotificationCentre 
+  def key_down( key )
+      
+      notary = NotificationCentre.default_centre
+      
+      if key == KEY_DOWN        
+        notary.post_notification(PPTableViewSelectionIsChangingNotification, self) 
+        @selected_row += 1
+        if @selected_row > @data_source.number_of_rows_in_table(self) - 1 then
+          @selected_row = 0
+        end
+        notary.post_notification(PPTableViewSelectionDidChangeNotification, self)        
+      end
+      
+      if key == KEY_UP
+         notary.post_notification(PPTableViewSelectionIsChangingNotification, self) 
+         @selected_row -= 1
+         if @selected_row < 0 then @selected_row = @data_source.number_of_rows_in_table(self) - 1 end
+         notary.post_notification(PPTableViewSelectionDidChangeNotification, self)
+      end
+      
+      if key == ENTER
+        notary.post_notification(PPTableViewEnterPressedNotification, self) 
+      end
+      
+      
+  end
+  
 end
 
 
-# Based loosely on ...
+# Based on ...
 #
 # https://developer.apple.com/library/mac/documentation/Cocoa/Reference/ApplicationKit/Protocols/NSTableDataSource_Protocol/index.html#//apple_ref/occ/intf/NSTableViewDataSource
 
@@ -35,16 +104,22 @@ class SingleColumnDataSource
   def initialize(values)
     @values = values
   end
-
-  def number_of_rows_in_table
+  
+  # Returns the number of records managed for aTableView by the 
+  # data source object.
+  def number_of_rows_in_table( aTableView)
     @values.length
   end
-
-  def object_value_for(column, row_index)
+  
+  # Called by the table view to return the data object associated with 
+  # the specified row and column.
+  def object_value_for(aTableview, column, row_index)
     @values[row_index]
   end
 end
 
+
+
 class TableViewDataSource
 
   def TableViewDataSource.from_string_array(values)

data/lib/ppcurses/view.rb

@@ -10,6 +10,16 @@ module PPCurses
 
   class View  < ResponderManager
 
+    attr_accessor :frame
+
+    # Extending classes should set the appropriate frame size;
+    # the default implementation sets the frame to a zero rect
+    # which, although avoids pointer errors, isn't very useful.
+    def initialize
+      @frame = Rect.zeroRect
+    end
+    
+
     ## Managing the View Hierarchy
 
     # superview
@@ -40,6 +50,19 @@ module PPCurses
 
     #
 
+    ## Modifying the Frame Rectangle
+
+   
+    def setFrameOrigin( origin )
+      @frame.origin = origin
+    end
+    
+    
+    def setFrameSize( size )
+      @frame.size = size
+    end
+
+
   end
 
 end

data/test/table_view/testTableView.rb

@@ -2,15 +2,57 @@
 
 require 'rubygems'
 require_relative '../../lib/ppcurses.rb'
+# ------------------------------------------------------------------------------
+# Tableview callbacks
+# ------------------------------------------------------------------------------
+@select_count = 0
+def select_counter ( notification )
+  @select_count += 1
+end
 
-@app = PPCurses::Application.new
+@enter_count = 0
+def item_chosen ( notification )
+  @enter_count += 1
+  
+  if notification.object.selected_row == 0
+    @app.content_view = @music_form
+  end
+  
+end
+
+def music_cancel
+   @app.content_view = @table_view
+end
+
+def music_submit
+   @app.content_view = @table_view
+end
+# ------------------------------------------------------------------------------
 
-table_view = PPCurses::TableView.new
+@music_form = PPCurses::Form.new
+media = PPCurses::RadioButtonGroup.new(' Media Type', %w(CD Vinyl MP3) )
+buttons = PPCurses::ButtonPair.new('Submit', 'Cancel')
+buttons.button1.action = method(:music_submit)
+buttons.button2.action = method(:music_cancel)
+@music_form.add(media)
+@music_form.add(buttons)
+
+
+@app = PPCurses::Application.new
+@table_view = PPCurses::TableView.new
 
 values = %w(Music Reading Lifts)
 data_source = PPCurses::SingleColumnDataSource.new(values)
 
-table_view.data_source=data_source
+@table_view.data_source=data_source
+
+@app.content_view = @table_view
+
+notary = PPCurses::NotificationCentre.default_centre
+notary.add_observer(self, method(:select_counter),  PPTableViewSelectionDidChangeNotification, @table_view )
+notary.add_observer(self, method(:item_chosen),  PPTableViewEnterPressedNotification, @table_view )
+
+@app.launch
 
-@app.content_view = table_view
-@app.launch
+puts "Number of selection changes was: #{@select_count} "
+puts "Enter was pressed #{@enter_count} times."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ppcurses
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Matthieu Cormier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies: []
 description: A curses abstraction layer.
 email: mcormier@preenandprune.com
@@ -48,6 +48,7 @@ files:
 - lib/ppcurses/menu/date_menu.rb
 - lib/ppcurses/menu/menu_item.rb
 - lib/ppcurses/menu_bar.rb
+- lib/ppcurses/notification_centre.rb
 - lib/ppcurses/table_view.rb
 - lib/ppcurses/view.rb
 - lib/ppcurses/window/pp_window.rb