MINT-core 1.0.1 → 2.0.0

data/Rakefile

@@ -14,23 +14,22 @@ $hoe = Hoe.spec 'MINT-core' do
   self.developer 'Sebastian Feuerstack', 'Sebastian@Feuerstack.org'
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = self.name # TODO this is default value
-  self.extra_deps         = [['dm-rinda-adapter','~> 0.1.0'],
-                             ['MINT-statemachine','~> 1.2.3'],
-                             ['MINT-scxml','~> 1.0.0'],
-                             ['cassowary','~> 1.0.0'],
-                             ["dm-core","~>0.10.2" ],
-                             ["dm-rinda-adapter", "~>0.1.2"],
-                             ["cassowary","~>1.0.0"],
-                             ["eventmachine", "~>0.12.10"],
-                             ["rake","0.9.2.2"],
-                             ["rmagick","~>2.12.2"],
-                             ["json","~>1.5.1"],
-                             ["redis","~>2.2.1"],
-                             ["dm-types","~>0.10.2"]]
-  self.extra_dev_deps   =    [["rspec","1.3.1"],
-                              ["hoe", "~>2.9.6"],
-                              ["newgem","~>1.5.3"],
-                              [ "rdoc","~>3.11"]  ]
+#  self.extra_deps         = [['dm-redis-adapter','~> 0.1.2'],
+#                             ['MINT-statemachine','~> 1.2.3'],
+#                             ['MINT-scxml','~> 1.0.0'],
+#                             ['cassowary','~> 1.0.1'],
+#                             ["dm-core","~>1.2.0" ],
+#                             ["cassowary","~>1.0.1"],
+#                             ["eventmachine", "~>0.12.10"],
+#                             ["rake","0.9.2.2"],
+#                             ["rmagick","~>2.12.2"],
+#                             ["json","~>1.5.1"],
+#                             ["redis","~>2.2.1"],
+#                             ["dm-types","~>1.2.0"],
+#                             ["dm-serializer","~>1.2.0"]]
+#  self.extra_dev_deps   =    [["rspec","1.3.1"],
+#                              ["newgem","~>1.5.3"],
+#                              [ "rdoc","~>3.11"]  ]
 
 
 end

data/bin/mint-aui

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby -d
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'MINT-core'
@@ -20,10 +20,10 @@ a.addMapping(gesture_previous)
 #gesture_narrow= Complementary.new(HandGesture,"narrowed",{ AIO  =>"focused"},:child)
 #a.addMapping(gesture_narrow)
 
-gesture_confirmed= ComplementarySendEvent.new(HandGesture,"confirmed",{ AIINChoose  =>"focused"},:choose)
+gesture_confirmed= ComplementarySendEvent.new(HandGesture,"confirmed",{ AIChoiceElement  =>"focused"},:choose)
 a.addMapping(gesture_confirmed)
 
-mouse_confirmed= ComplementarySendEvent.new(Pointer,"selected",{ AIINChoose  =>"focused"},:choose)
+mouse_confirmed= ComplementarySendEvent.new(Pointer,"selected",{ AIChoiceElement =>"focused"},:choose)
 a.addMapping(mouse_confirmed)
 
 #sync_unhighlight = Synchronize.new(AIO,"presented",CIO, :unhighlight, :displayed)

data/bin/mint-cui-gfx

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/ruby -d
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'MINT-core'
@@ -20,7 +20,7 @@ mapping_cache1 = ExecuteOnStateChange.new(CIO,[:hidden],CUIControl.method(:fill_
 l.addMapping(mapping_cache1)
 
 
-realityframe = ExecuteOnStateChange.new(AIINChoose,["dragging"],l.method(:wait_border_crossing))
+realityframe = ExecuteOnStateChange.new(AIChoiceElement,["dragging"],l.method(:wait_border_crossing))
 l.addMapping(realityframe)
 
 
@@ -45,3 +45,4 @@ l.addMapping(realityframe)
 
 l.run
 
+

data/lib/MINT-core.rb

@@ -2,26 +2,30 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module MINTCore
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
 end
 
 require 'rubygems'
 require "bundler/setup"
 require 'statemachine'
 require "cassowary"
-require 'RMagick'
-require "rinda/tuplespace"
+#require 'RMagick'
 require 'drb/drb'
+require 'redis'
 require 'dm-core'
+require 'dm-serializer'
 require 'dm-types'
 require "MINT-scxml"
+require "eventmachine"
+require 'em-hiredis'
+require 'multi_json'
+require 'oj'
+#MultiJson.engine = :oj
 
+require "MINT-core/connector/redis_connector"
 require "MINT-core/agent/agent"
-require "MINT-core/mapping/mapping"
-require "MINT-core/mapping/on_state_change"
-require "MINT-core/mapping/complementary"
-require "MINT-core/mapping/sequential"
 
+require "MINT-core/model/interactor_helpers"
 require "MINT-core/model/interactor"
 require "MINT-core/model/task"
 require "MINT-core/agent/auicontrol"
@@ -31,12 +35,46 @@ require "MINT-core/agent/cui-gfx"
 require "MINT-core/model/aui/model"
 require "MINT-core/model/cui/gfx/model"
 
-require "MINT-core/model/device/pointer"
-require "MINT-core/model/device/button"
-require "MINT-core/model/device/wheel"
-require "MINT-core/model/device/joypad"
-require "MINT-core/model/device/mouse"
+require "MINT-core/model/ir/ir"
+require "MINT-core/model/ir/irmode"
+require "MINT-core/model/ir/irmedia"
+require "MINT-core/model/ir/screen"
+require "MINT-core/model/ir/browserscreen"
+require "MINT-core/model/ir/pointer"
+
+#require "MINT-core/model/device/button"
+#require "MINT-core/model/device/wheel"
+#require "MINT-core/model/device/joypad"
+#require "MINT-core/model/device/mouse"
+require "MINT-core/model/ir/mouse"
+
+#require "MINT-core/model/body/gesture_button"
+#require "MINT-core/model/body/handgesture"
+require "MINT-core/model/ir/body/body"
+require "MINT-core/model/ir/body/hand"
+require "MINT-core/model/ir/body/fingertip"
+
+require "MINT-core/model/ir/body/pose"
+require "MINT-core/model/ir/body/OneHandPoseNavigation"
+require "MINT-core/model/ir/body/head"
+
+
+require "MINT-core/mapping/mapping"
+require "MINT-core/mapping/sequential"
+require "MINT-core/mapping/complementary_mapping"
+require "MINT-core/mapping/sequential_mapping"
+require "MINT-core/mapping/observation/observation"
+require "MINT-core/mapping/observation/negation_observation"
+require "MINT-core/mapping/action/action"
+require "MINT-core/mapping/action/backend_action"
+require "MINT-core/mapping/action/event_action"
+require "MINT-core/mapping/action/bind_action"
+
+require "MINT-core/manager/mapping_parser"
+require "MINT-core/manager/mapping_manager"
+require "MINT-core/manager/mapping_server"
+require "MINT-core/manager/scxml_server"
+require "MINT-core/manager/scxml_client"
+require "MINT-core/manager/position_updater"
+
 
-require "MINT-core/model/body/gesture_button"
-require "MINT-core/model/body/handgesture"
-require "MINT-core/model/body/head"

data/lib/MINT-core/agent/agent.rb

@@ -3,7 +3,7 @@ module MINT
   class Agent
     attr_reader :running_mappings
 
-    def initialize(connection_options = { :adapter => "rinda", :host =>"localhost",:port=>4000})
+    def initialize(connection_options = { :adapter => "redis", :host =>"localhost",:port=>6379})
       DataMapper.setup(:default, connection_options)
       DRb.start_service
       @running_mappings = []

data/lib/MINT-core/agent/aui.rb

@@ -1,19 +1,5 @@
 
 
-module DataMapper
-  class Collection
-    def each
-      super do |resource|
-        begin
-        # original, resource.collection = resource.collection, self
-          yield resource
-        ensure
-          # resource.collection = original
-        end
-      end
-    end
-  end
-end
 
 class AUIAgent < MINT::Agent
   include AUIControl

data/lib/MINT-core/agent/auicontrol.rb

@@ -1,43 +1,96 @@
 
 module AUIControl
- include MINT
-  
+  include MINT
+
+  # called from AISingleChoice mapping
+  def AUIControl.present_children(aisc)
+    sc = AISingleChoice.first(:name=>aisc['name'])
+    sc.children.each do |aio|
+      aio.process_event :present
+    end
+  end
+
+  def AUIControl.suspend_all
+    aics = AIContainer.all(:parent =>nil)
+    aics.each do |aic|
+      p "Suspend AIC: #{aic.name}"
+      aic.process_event :suspend
+    end
+  end
+
+  def AUIControl.suspend_others(ais)
+    ais = AISinglePresence.first(:name=>ais['name'])
+    ais.children.each do |aio|
+      aio.process_event :suspend if not aio.name.eql? ais.active_child.name
+    end
+  end
+
   # ensures that all prev/next relationships are setup properlyin one complete sequence
-  def AUIControl.organize(aio,parent_aio = nil, layer = 0)
-    
-    if (aio.kind_of? AIC)
-      aio.entry = aio.childs[0]
-      last = aio
-      aio.childs.each do |child|
-        last.next = child
-        child.previous = last
-
-        last = organize(child,aio,layer+1) 
+  def AUIControl.organize_sub(aio,parent_aio = nil, layer = 0)
+
+    last_child = nil
+    if (aio.kind_of? MINT::AIContainer)
+      # aio.entry = aio.children[0]
+      prev = aio
+      aio.children.each do |child|
+        if (child.instance_of? MINT::AIReference) # skip AIReferences for prev/next navigation
+          child.process_event("organize")
+          next
+        end
+        prev.next = child.name
+        prev.process_event("organize") #if not prev.kind_of? MINT::AIContainer
+
+        child.previous = prev.name
+
+        prev = organize_sub(child,aio,layer+1)
+        last_child = child
       end
-      aio.process_event("organize")
-      return last
+
+      #prev.process_event("organize")
+      return prev
     else
-      aio.process_event("organize")
       return aio
     end
   end
- 
+
+  def AUIControl.organize(aio,parent_aio = nil, layer = 0)
+    r= organize_sub(aio,parent_aio, layer )
+    r.process_event("organize")
+  end
+
+  def AUIControl.organize_new (aio,prev = nil, layer = 0)
+    aio.previous=prev.name  if prev
+
+    if (aio.kind_of? MINT::AIContainer)
+      prev_child = aio
+      aio.children.each do |child|
+        organize(child,prev_child)
+        prev_child = child
+      end
+      if aio.children
+        aio.next=aio.children[0].name
+      end
+    end
+    aio.process_event "organize"
+  end
+
+
   # connects all  aios on the same level 
   def AUIControl.organize2(aio,parent_aio = nil, layer = 0)
-   # if layer == 0 
+    # if layer == 0
     #  aio.next = aio
     #  aio.previous = aio
-   # end
- 
-    if (aio.kind_of? AIC)
-      first = aio.childs.first
+    # end
+
+    if (aio.kind_of? MINT::AIContainer)
+      first = aio.children.first
       last = nil
 
-      aio.childs.each do |child|
+      aio.children.each do |child|
         if last
-        last.next = child
+          last.next = child.name
+          child.previous = last.name
         end
-        child.previous = last
         copy = child
         organize2(copy,nil,layer+1)
         last = child
@@ -48,7 +101,7 @@ module AUIControl
     end
     p "organized #{aio.name}"
   end
- 
+
   # Searches for the common root aic that contains all tasks of {elements}.
   # During the search towards the root it activates all relevant containters in the 
   # {Layout}model in case {activate} is set to true. 
@@ -58,11 +111,11 @@ module AUIControl
   # @return [String] name of common root aic
   #
   def AUIControl.find_common_aic(tasks,activate=false, parents ={ })
-    
+
     if tasks.length==1
       return tasks[0]
     end
-    
+
     tasks.each do |e|
       p "processing #{e}"
       aio = AIO.first(:name=>e)
@@ -74,20 +127,20 @@ module AUIControl
       end
       if aio.parent and not parents[aio.parent.name]
         parents[aio.parent.name]=aio.name
-      elsif aio.parent and parents[aio.parent.name]  
+      elsif aio.parent and parents[aio.parent.name]
         # already existing parent, thus all further saved parents of this task needs to be removed
         puts "parents  #{parents.inspect}"
-        parents.each {|k,v| 
+        parents.each {|k,v|
           if (v.eql? parents[aio.parent.name] or v.eql? aio.name)
             parents.delete(k)
-            p "delete key #{k} value #{v}" 
+            p "delete key #{k} value #{v}"
           end
         }
         parents[aio.parent.name]=aio.name
         #        parents.delete(parents.invert[ parents[aio.parent.name]])
       end
     end
-    
+
     p "next step"
     if parents.length>0
       return find_common_aic(parents.keys,activate,parents)
@@ -95,26 +148,26 @@ module AUIControl
       return tasks.first
     end
   end
-  
+
   def AUIControl.find_common(tasks)
-    
+
     if tasks.length==1
       return tasks[0]
     end
-    
+
     parents ={ }
-    
+
     tasks.each do |name|
       t = AIO.first(:name=>name)
       tname = t.name
       parents[tname] = [tname]
-      
+
       while (t.parent)
         parents[tname].push t.parent.name
         t = t.parent
       end
     end
-    
+
     lasttaskname = nil
     while 1==1
       taskname = nil
@@ -123,7 +176,7 @@ module AUIControl
           taskname = parents[k].pop
         else
           comp = parents[k].pop
-          if not comp.eql? taskname 
+          if not comp.eql? taskname
             return lasttaskname
           end
         end

data/lib/MINT-core/agent/cui-gfx.rb

@@ -16,7 +16,7 @@ class LayoutAgent < MINT::Agent
     # }
 
 
-    root_cio = CIO.first(:name=>result.root)
+    root_cio = CIO.first(:name=>result['root'])
 
 
     # p "#{root_le} root:#{root}"
@@ -33,7 +33,7 @@ class LayoutAgent < MINT::Agent
     root_cio.calculate_container(@solver,20)
 
     CUIControl.fill_active_cio_cache
-
+    true
   end
 
 
@@ -129,7 +129,7 @@ class LayoutAgent < MINT::Agent
 
       Redis.new.subscribe("juggernaut") do |on|
         on.message do |c,msg|
-          r = JSON.parse(msg)
+          r = MultiJson.decode msg
           if (r["channels"].include? "pointer")
             if /POS/.match(r["data"])
               z,x,y = /POS-(\d+),(\d+)/.match(r["data"]).to_a.map &:to_i

data/lib/MINT-core/agent/cuicontrol.rb

@@ -1,46 +1,116 @@
 module CUIControl
   include MINT
 
-  @active_cios = nil
-  
+  @active_cios = []
+  @cached_highlighted = nil
+
+  def CUIControl.clearHighlighted
+    @cached_highlighted = nil
+
+  end
+  def CUIControl.retrieveHighlighted
+    if (@cached_highlighted)
+      check = MINT::CIO.get(@cached_highlighted)
+      if (check.is_in? "highlighted")
+        return check
+      end
+    end
+
+    new_highlighted =  MINT::CIO.first(:states=>/highlighted/)
+
+    if new_highlighted
+      @cached_highlighted= new_highlighted.name
+    else
+      @cached_highlighted = nil
+    end
+
+    return new_highlighted
+  end
+
   def CUIControl.find_cio_from_coordinates(result)
-    puts "mouse stopped #{result.inspect}"
-    if result == nil or @active_cios == nil  # we have not finished cui poition calculation, but we already received a mouse stopped event
-      return
+    # puts "mouse stopped #{result.inspect}"
+    if result == nil or @active_cios.length ==0# we have not finished cui poition calculation, but we already received a mouse stopped event
+      return true
+
     end
-    x = result.x
-    y = result.y
+    x = result["x"]
+    y = result["y"]
 
-    highlighted_cio = CIO.first(:abstract_states=>/highlighted/)
+    highlighted_cio = retrieveHighlighted()
 
     if (highlighted_cio!=nil && highlighted_cio.x<=x && highlighted_cio.y<=y && highlighted_cio.x+highlighted_cio.width>=x && highlighted_cio.y+highlighted_cio.height>=y)
-      puts "unchanged"
-      return
+      #  puts "unchanged"
+      return true
     else
+
       found = @active_cios.select{ |e|  e.x <=x && e.y<=y && e.x+e.width>=x && e.y+e.height>=y}
-     
-      puts "found #{found.inspect}"
-      
+
+      #      puts "found #{found.inspect}"
+
       if (highlighted_cio)
-        highlighted_cio.process_event("unhighlight") # old focus
-        puts "unhighlight:"+highlighted_cio.name
+        highlighted_cio.process_event("unhighlight")
+        MINT::AIO.get(highlighted_cio.name).process_event("defocus")
+        # old focus
+        #      puts "unhighlight:"+highlighted_cio.name
         # @highlighted_cio.update(:state=>"calculated") # old focus
       end
-      
+
       if (found.first)
-        highlighted_cio = CIO.first(:name=>found.first.name)
+        highlighted_cio = MINT::CIO.get(found.first.name)
         highlighted_cio.process_event("highlight")
-        puts "highlighted:"+highlighted_cio.name
+        MINT::AIO.get(highlighted_cio.name).process_event("focus")
+        #       puts "highlighted:"+highlighted_cio.name
       else
-        puts "no highlight"
-        return
+        #     puts "no highlight"
+        return  true
       end
     end
+    return true
+  end
+
+  def CUIControl.refresh_all
+    aics = AIO.all(:parent =>nil).map &:name
+    aics.each do |name|
+      cio = CIO.get(name)
+      p "refrehsing #{cio.name}"
+      cio.process_event :refresh
+    end
   end
 
   def CUIControl.fill_active_cio_cache(result=nil)
-    @active_cios = CIO.all.select{ |e| e.is_in?(:presenting) and not e.kind_of? MINT::CIC }
-    puts "CIO cache initialized with #{@active_cios.length} elements"
-  end 
-  
+    @active_cios = CIO.all.select{ |e| e.is_in?(:displaying) and e.highlightable}
+    puts "CIO cache initialized with #{@active_cios.inspect} elements"
+  end
+
+  def CUIControl.add_to_cache(cio)
+    if cio['highlightable'] and not @active_cios.index{|x|x.name==cio["name"]}
+      c =  CIO.get(cio["name"])
+      @active_cios << c
+      puts "Added #{cio['name']} to CIO cache #{c.x}/#{c.y}"
+
+    end
+    return true
+  end
+
+  def CUIControl.update_cache(cio)
+    index = @active_cios.index{|x|x.name==cio["name"]}
+    if index
+      c =  CIO.get(cio["name"])
+      @active_cios[index] = c
+      puts "Updated#{cio['name']} to CIO cache #{c.x}/#{c.y} #{c.width}/#{c.height}"
+
+    end
+    return true
+  end
+
+
+  def CUIControl.remove_from_cache(cio)
+    p "remove cache"
+    if cio['highlightable']
+      @active_cios.delete_if{|x| x.name == cio['name']}
+      puts "Removed #{cio['name']} from CIO cache "
+    end
+    return true
+  end
+
 end