MINT-core 1.0.1 → 2.0.0

data/lib/MINT-core/model/aui/aisinglepresence.scxml

@@ -1,4 +1,4 @@
-<scxml initial="initialized" name="AISinglePresence" version="0.9" xmlns="http://www.w3.org/2005/07/scxml"><!--   node-size-and-position x=0.0 y=0.0 w=370.0 h=420.0  -->
+<scxml initial="initialized" name="AISinglePresence" version="0.9" xmlns="http://www.w3.org/2005/07/scxml"><!--   node-size-and-position x=0.0 y=0.0 w=470.0 h=480.0  -->
  <state id="initialized"><!--   node-size-and-position x=10.0 y=30.0 w=100.0 h=30.0  -->
   <transition event="organize" target="organized"></transition>
  </state>
@@ -7,42 +7,27 @@
   <transition event="suspend" target="suspended"></transition>
  </state>
  <state id="suspended"><!--   node-size-and-position x=230.0 y=30.0 w=100.0 h=30.0  -->
-  <onentry>
-   <invoke src="sync_cio_to_hidden" type="x-mint"></invoke>
-  </onentry>
   <transition event="present" target="presenting"><!--   edge-path [presenting]  x=220.0 y=90.0 pointx=0.0 pointy=-5.0 offsetx=0.0 offsety=0.0  --></transition>
   <transition event="organize" target="organized"><!--   edge-path [organized]  x=150.0 y=60.0  --></transition>
  </state>
- <state id="presenting" initial="defocused"><!--   node-size-and-position x=130.0 y=120.0 w=230.0 h=290.0  -->
-  <onentry>
-   <invoke src="present_first_child" type="x-mint"></invoke>
-  </onentry>
-  <onexit>
-   <invoke src="hide_children" type="x-mint"></invoke>
-  </onexit>
+ <state id="presenting" initial="wait_for_children"><!--   node-size-and-position x=130.0 y=120.0 w=330.0 h=350.0  -->
   <transition event="suspend" target="suspended"><!--   edge-path [suspended]  x=330.0 y=90.0  --></transition>
-  <state id="defocused"><!--   node-size-and-position x=10.0 y=30.0 w=100.0 h=30.0  -->
-   <onentry>
-    <invoke src="sync_cio_to_displayed" type="x-mint"></invoke>
-   </onentry>
-   <transition event="focus" target="focused"><!--   edge-path [focused]  x=20.0 y=90.0  --></transition>
+  <state id="defocused"><!--   node-size-and-position x=120.0 y=90.0 w=100.0 h=30.0  -->
+   <transition event="focus" target="focused"><!--   edge-path [focused]  x=130.0 y=150.0  --></transition>
   </state>
-  <state id="focused" initial="waiting"><!--   node-size-and-position x=10.0 y=120.0 w=180.0 h=160.0  -->
-   <transition event="defocus" target="defocused"><!--   edge-path [defocused]  x=93.0 y=93.0  --></transition>
+  <state id="focused" initial="waiting"><!--   node-size-and-position x=120.0 y=180.0 w=180.0 h=160.0  -->
+   <transition event="defocus" target="defocused"><!--   edge-path [defocused]  x=203.0 y=153.0  --></transition>
    <state id="waiting"><!--   node-size-and-position x=10.0 y=30.0 w=100.0 h=30.0  -->
-    <onentry>
-     <invoke src="sync_cio_to_highlighted" type="x-mint"></invoke>
-    </onentry>
     <transition event="enter" target="entered"><!--   edge-path [entered]  x=20.0 y=90.0  --></transition>
     <transition cond="exists_next" event="next" target="defocused">
      <invoke src="focus_next" type="x-mint"></invoke>
-<!--   edge-path [defocused]  x=150.0 y=170.0 x=150.0 y=40.0  --></transition>
+<!--   edge-path [defocused]  x=260.0 y=230.0 x=260.0 y=100.0  --></transition>
     <transition cond="exists_prev" event="prev" target="defocused">
      <invoke src="focus_previous" type="x-mint"></invoke>
-<!--   edge-path [defocused]  x=180.0 y=170.0 x=180.0 y=40.0  --></transition>
+<!--   edge-path [defocused]  x=290.0 y=230.0 x=290.0 y=100.0  --></transition>
     <transition event="parent" target="defocused">
      <invoke src="focus_parent" type="x-mint"></invoke>
-<!--   edge-path [defocused]  x=210.0 y=170.0 x=210.0 y=40.0  --></transition>
+<!--   edge-path [defocused]  x=320.0 y=230.0 x=320.0 y=100.0  --></transition>
    </state>
    <state id="entered"><!--   node-size-and-position x=10.0 y=110.0 w=100.0 h=30.0  -->
     <transition event="leave" target="waiting"><!--   edge-path [waiting]  x=100.0 y=90.0  --></transition>
@@ -54,5 +39,11 @@
 <!--   edge-path [entered]  x=150.0 y=40.0  --></transition>
    </state>
   </state>
+  <state id="wait_for_children"><!--   node-size-and-position x=10.0 y=30.0 w=100.0 h=40.0  -->
+   <transition event="children_finished" target="children_finished"></transition>
+  </state>
+  <state id="children_finished"><!--   node-size-and-position x=200.0 y=30.0 w=100.0 h=40.0  -->
+   <transition target="defocused"></transition>
+  </state>
  </state>
 </scxml>

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

@@ -1,50 +1,27 @@
 # AUI MODEL
-module MINT
-
-
-
   require "MINT-core/model/aui/AIO"
 
-  class AIIN < AIO
-  end
-
-  class AIINContinous < AIIN
-  end
-
-  class AIINDiscrete <AIIN
-  end
-
-  class AIINReference < AIINDiscrete
-  end
-
-  class AICommand <AIINDiscrete
-  end
-
-
- require "MINT-core/model/aui/AIINChoose"
-
-  class AIOUT <AIO
-  end
+  require "MINT-core/model/aui/AIIN"
+  require "MINT-core/model/aui/AIINDiscrete"
 
-  require "MINT-core/model/aui/AIOUTDiscrete"
+  require "MINT-core/model/aui/AIReference"
 
-  class AIOUTContext < AIOUTDiscrete
-    property :text, String
-  end
+  require "MINT-core/model/aui/AICommand"
 
-  class AIOUTContinous < AIOUT
-  end
+  require "MINT-core/model/aui/AIOUT"
+  require "MINT-core/model/aui/AIContext"
 
-  require "MINT-core/model/aui/AIC"
+  require "MINT-core/model/aui/AIContainer"
 
-end
+  require "MINT-core/model/aui/AIOUTContinuous"
+  require "MINT-core/model/aui/AIINContinuous"
 
-require "MINT-core/model/aui/AIChoice"
+  require "MINT-core/model/aui/AIChoiceElement"
 
-require "MINT-core/model/aui/AISingleChoiceElement"
-require "MINT-core/model/aui/AISingleChoice"
+  require "MINT-core/model/aui/AISingleChoiceElement"
+  require "MINT-core/model/aui/AISingleChoice"
 
-require "MINT-core/model/aui/AIMultiChoiceElement"
-require "MINT-core/model/aui/AIMultiChoice"
+  require "MINT-core/model/aui/AIMultiChoiceElement"
+  require "MINT-core/model/aui/AIMultiChoice"
 
-require "MINT-core/model/aui/AISinglePresence"
+  require "MINT-core/model/aui/AISinglePresence"

data/lib/MINT-core/model/cui/gfx/CIC.rb

@@ -3,18 +3,39 @@ module MINT
     property :rows, Integer
     property :cols, Integer
 
+    def getSCXML
+             "#{File.dirname(__FILE__)}/cic.scxml"
+       end
+    def getChildren
+      aio = getAIO()
+      children = aio.children.map &:name
+      cios = []
+      children.each do |name|
+        cios << CIO.get(CIO.getModel(),name)
+      end
+      cios
+    end
+
+    def refresh_children
+      p "i refresh children"
+      getChildren.each do |cio|
+        p "refreshing #{cio.name}"
+        cio.process_event :refresh
+      end
+    end
+
     def calculate_position(parent_cic,elements,solver,i,b,layer=0)
       p "container #{self.name} #{b}"
-      aic = AIC.first(:name=>self.name)
+      aic = AIContainer.first(:name=>self.name)
       elements = []
 
 
-      if aic.childs && aic.childs.length>0
+      if aic.children && aic.children.length>0
 
-        calculateColsAndRows(aic.childs.length)
+        calculateColsAndRows(aic.children.length)
         grid_hash= mda(self.rows,self.cols)
 
-        aic.childs.each_with_index do |e,i|
+        aic.children.each_with_index do |e,i|
           cio = CIO.first(:name=>e.name)
           elements << cio
           if (not cio)
@@ -82,9 +103,9 @@ module MINT
       if self.process_event!("position")
      #   p "in positionion #{self.name}"
         self.layer = layer
-        aic = AIC.first(:name=>self.name)
+        aic = AIContainer.first(:name=>self.name)
 
-        elements_count = aic.childs.length
+        elements_count = aic.children.length
 
         calculateColsAndRows(elements_count)
 
@@ -95,10 +116,12 @@ module MINT
         grid_hash= mda(self.rows,self.cols)
         #       p "hash #{ self.name} rows #{self.rows} cols #{self.cols}"
 
-        ai_childs =  aic.childs.all(:abstract_states=> /#{Regexp.quote("organized")}/)
+        ai_childs =  aic.children
         #      p aic.name
         elements=[]
         ai_childs.each_with_index do |e,i|
+          if e.states == [:organized]
+
           cio = CIO.first(:name=>e.name)
 
           if (not cio)
@@ -131,6 +154,7 @@ module MINT
           if (cio.kind_of? MINT::CIC)
             cio.calculate_container(solver,b,layer+1)
           end
+          end
 
         end
 
@@ -163,16 +187,16 @@ module MINT
         }
         self.process_event("calculated")
       else
-        aic = AIC.first(:name=>name)
+        aic = AIContainer.first(:name=>name)
         elements = []
-        aic.childs.each_with_index do |e,i|
+        aic.children.each_with_index do |e,i|
           cio = CIO.first(:name=>e.name)
           elements << cio
           if (not cio)
             cio = CIO.createCIOfromAIO(e,layer)
           end
 
-          calculateColsAndRows(aic.childs.length)
+          calculateColsAndRows(aic.children.length)
 
           # Save the actual row,column, and  layer to the element
           cio.col =  i % self.cols

data/lib/MINT-core/model/cui/gfx/CIO.rb

@@ -1,37 +1,11 @@
 module MINT
-  class CIO_sync_callback
-    def sync_aio_to_focused
-      true
-    end
-
-    def sync_aio_to_presented
-      true
-    end
-    def sync_aio_to_defocus
-      true
-    end
-
-    def sync_aio_to_suspended
-          true
-        end
-
-  end
 
-  class CIO < Element
+  class CIO < Interactor
     include Cassowary
 
-    has 1, :up, self,
-        :parent_key => [ :id ],       # in the remote model (Blog)
-        :child_key  => [ :up_id ]  # local to this model (Post)
-    has 1,  :down, self,
-        :parent_key => [ :id ],       # in the remote model (Blog)
-        :child_key  => [ :down_id ]  # local to this model (Post)
-    has 1, :left, self,
-        :parent_key => [ :id ],       # in the remote model (Blog)
-        :child_key  => [ :left_id ]  # local to this model (Post)
-    has 1,  :right, self,
-        :parent_key => [ :id ],       # in the remote model (Blog)
-        :child_key  => [ :right_id ]  # local to this model (Post)
+    def self.getModel
+      "cui-gfx"
+    end
 
     property :text,     Text,   :lazy => false
     property :fontname,     String, :default  => "Helvetica"
@@ -48,6 +22,17 @@ module MINT
     property :row, Integer
     property :col,Integer
 
+    # TODO navigation does not user DataMapper because of problems with cycles and self referencing
+    property :left, String
+    property :right, String
+    property :up, String
+    property :down, String
+
+    # Dependencies to otehr CIO elements that need to be shown/instantiated before this one
+    property :depends, String
+
+    property :highlightable, Boolean, :default => false
+
 
 #    before :create, :recover_statemachine
 
@@ -58,6 +43,51 @@ module MINT
 
     before :update!, :initialize_points
     public
+
+
+    PUBLISH_ATTRIBUTES += [:x,:y,:width,:height,:highlightable,:depends]
+
+    def getAIO
+      AIO.get(AIO.getModel(),name)
+    end
+
+    def left
+      p = super
+      if p
+        CIO.get(CIO.getModel,p)
+      else
+        nil
+      end
+    end
+
+    def right
+      p = super
+      if p
+        CIO.get(CIO.getModel,p)
+      else
+        nil
+      end
+    end
+
+    def up
+      p = super
+      if p
+        CIO.get(CIO.getModel,p)
+      else
+        nil
+      end
+    end
+
+    def down
+      p = super
+      if p
+        CIO.get(CIO.getModel,p)
+      else
+        nil
+      end
+    end
+
+
     def initialize_points
       @pos = Cassowary::ClPoint.new()
       if (self.x and self.y)
@@ -97,7 +127,7 @@ module MINT
 
     def size(width=-1,height=-1)
       if (width > -1 and height> -1)
-        @size = Cassowary::ClPoint.new(with,height)
+        @size = Cassowary::ClPoint.new(width,height)
       elsif not @size
         #if not @size
         @size = Cassowary::ClPoint.new
@@ -222,10 +252,10 @@ module MINT
     def CIO.createCIOfromAIO(e,layer)
       p "creating CIO for #{e.class}"
       case e.class.name
-        when "MINT::AIC","MINT::AISinglePresence"
-          aic = AIC.first(:name=>e.name)           # TODO: if its not retrieved again, childs.length returns 0!
+        when "MINT::AIContainer","MINT::AISinglePresence"
+          aic = AIContainer.first(:name=>e.name)           # TODO: if its not retrieved again, childs.length returns 0!
 
-          elements_count = aic.childs.length
+          elements_count = aic.children.length
           elements_count = 1 if elements_count== 0
           cio = CIC.create(:name=>e.name,:cols=>1,:rows=>elements_count,:layer =>layer+1)
 
@@ -253,56 +283,12 @@ module MINT
       return cio
     end
 
-    def initialize_statemachine
-      if @statemachine.blank?
-
-        @statemachine = Statemachine.build do
-
-          superstate :CIO do
-            trans :initialized,:position,:positioning
-            trans :positioning,:calculated,:positioned, :store_calculated_values_in_model
-            trans :positioned, :display, :presenting
-            trans :disabled, :hide, :hidden
-            trans :hidden,:display, :presenting
 
-            state :hidden do
-              on_entry :sync_aio_to_suspended
-            end
-
-            superstate :presenting do
-              on_entry :sync_aio_to_presented
-
-              state :displayed do
-                on_entry :sync_aio_to_defocus
-              end
-
-              state :highlighted  do
-                on_entry :sync_aio_to_focused
-              end
-
-              trans :displayed, :highlight, :highlighted
-              #trans :displayed, :display, :displayed # a display request can be issued several times even if the object is already displayed (in case of refresh or multimple presentations
-              #trans :highlighted, :display, :highlighted # this is because display requests should not change the highlighting
-              trans :highlighted,:unhighlight, :displayed
-              trans :highlighted, :up, :displayed, :highlight_up
-              trans :highlighted, :down, :displayed, :highlight_down
-              trans :highlighted, :left, :displayed, :highlight_left
-              trans :highlighted, :right, :displayed, :highlight_right
-
-              event :disable, :disabled
-              event :hide, :hidden
-
-            end
-          end
-        end
-      end
+    def getSCXML
+          "#{File.dirname(__FILE__)}/cio.scxml"
     end
 
 
-     def sync_event(event)
-      process_event(event, CIO_sync_callback.new)
-     end
-
     # callbacks
 
     def  highlight_up
@@ -338,41 +324,6 @@ module MINT
     end
 
 
-    def sync_aio_to_presented
-      aio =  MINT::AIO.first(:name=>self.name)
-       if (aio and not aio.is_in? :presenting)
-        aio.sync_event(:present)
-       end
-      true
-    end
-
-
-    def sync_aio_to_defocus
-      aio =  MINT::AIO.first(:name=>self.name)
-       if (aio and not aio.is_in? :defocused)
-         aio.sync_event(:defocus)
-       end
-      true
-    end
-
-    def sync_aio_to_focused
-      aio =  MINT::AIO.first(:name=>self.name)
-       if (aio and not aio.is_in? :focused)
-        aio.sync_event(:focus)
-       end
-      true
-    end
-
-    def sync_aio_to_suspended
-          aio =  MINT::AIO.first(:name=>self.name)
-           if (aio and not aio.is_in? :suspended)
-            aio.sync_event(:suspend)
-           end
-          true
-        end
-
-
-
     def print
       puts "\"#{self.name}\",#{pos.Xvalue}, #{pos.Yvalue}, #{size.Xvalue}, #{size.Yvalue}"
     end