Changeset 2110

Timestamp:

07/12/10 20:17:02 (19 months ago)

Author:

tolteque

Message:

o LOMEFC2

• TriggerRules? with indentation TODO: sanity check

Location:

trunk/lomefc2

Files:

• me_predicates.lua (modified) (3 diffs)
• me_trigrules.lua (modified) (6 diffs)

trunk/lomefc2/me_predicates.lua

@@ -1096 +1096 @@
 
 -- add rules to the list
-function rulesToList(list, rules, cdata)
+function rulesToList(list, rules, cdata, idx)
+  local itemToMonit = nil
   list:clear()
+  
   if rules then
+      local color
+      local level  = 0
+      local curIdx = 1
       for _tmp, v in ipairs(rules) do
-          local item = U.addListBoxItem(list, getRuleAsText(v, cdata), nil, v)
-          local color
+          if  v.decoration == ")" then
+              if level ~= 0 then
+                  level = level - 1
+              end
+          end
+          
+          local itemIndent = string.rep("  ", level)
+          local item = U.addListBoxItem(list, itemIndent .. getRuleAsText(v, cdata), nil, v)
+          item.indent = itemIndent
+          
           if v.decoration then
-              if v.decoration == "(" or v.decoration == ")" then
+              if v.decoration == "(" then
+                  color = Color.red
+                  level = level + 1
+              elseif v.decoration == ")" then
                   color = Color.red
               else
@@ -1113 +1129 @@
               item:setTheme(theme)  
           end
-
+          if idx and ( curIdx == idx) then
+              itemToMonit = item
+              list:selectItem( item)
+          end
+          curIdx = curIdx + 1
       end
   end
-  list:onChange(nil)
+  list:onChange( itemToMonit)
 end
 
@@ -1168 +1188 @@
 -- update row in list
 function updateListRow(list, displayFunc)
+    base.print("updateListRow()")
     local item = list:getSelectedItem()
     if item then
         local struct = item.itemId
-        item:setText(displayFunc(struct))
+        if not item.indent then
+            item.indent = ""
+        end
+        item:setText( item.indent .. displayFunc(struct))
+        
     end
 end

trunk/lomefc2/me_trigrules.lua

@@ -864 +864 @@
             predicates.rulesToList(window.rulesList, trigger.rules, cdata)
             window.triggerTypeCombo.selectedItem = trigger
-            window.triggerTypeCombo:setText(predicates.getPredicateName(trigger.predicate, 
-                        cdata))
+            window.triggerTypeCombo:setText(predicates.getPredicateName(trigger.predicate, cdata))
             createTriggerArgumentsWidgets(window, trigger, cdata)
         else
@@ -986 +985 @@
     function window.newRuleBtn:onChange()
 --        base.print('newRuleBtn:onChange())')
-        op_and = { name       = "op_and",
-                   fields     = {},
-                   decoration = true
-                 }
         local currentGoal = window.triggersList:getSelectedItem()
         local goal = currentGoal.itemId
@@ -1004 +999 @@
             local rule = predicates.createRule(rulesDescr[1])
             base.table.insert(currentGoal.itemId.rules, idx, rule)
-            local item = U.addListBoxItem( window.rulesList
-                                         , predicates.getRuleAsText( rule, cdata)
-                                         , nil
-                                         , rule
-                                         , idx
-                                         )
-            window.rulesList:selectItem(item)
-            window.rulesList:onChange(item)
+
+            predicates.rulesToList(window.rulesList, currentGoal.itemId.rules, cdata, idx)
+
         end
     end
@@ -1029 +1019 @@
                 idx = idx - 1
             end
-            item = window.rulesList:getChildren()[idx]
-            window.rulesList:selectItem(item)
-            window.rulesList:onChange(item)
+
+            predicates.rulesToList( window.rulesList, currentGoal.itemId.rules, cdata, idx)
+
+--            item = window.rulesList:getChildren()[idx]
+--            window.rulesList:selectItem(item)
+--            window.rulesList:onChange(item)
         end
     end
@@ -1075 +1068 @@
             local rule = predicates.createRule( decoRuleDesc)
             base.table.insert(currentGoal.itemId.rules, idx, rule)
-            local item = U.addListBoxItem( window.rulesList
-                                         , predicates.getRuleAsText( rule, cdata)
-                                         , nil
-                                         , rule
-                                         , idx
-                                         )
-                                         
-            -- Set color for this decoration
-            local theme = item:getTheme()
-            local color
-            if rule.predicate.decoration == "(" or rule.predicate.decoration == ")" then
-                color = Color.red
-            else
-                color = Color.blue
-            end
-            theme.normalTheme.text.color = color
-            theme.selectedTheme.text.color = color
-            item:setTheme(theme)  
             
-            window.rulesList:selectItem(item)
-            window.rulesList:onChange(item)
+            predicates.rulesToList(window.rulesList, currentGoal.itemId.rules, cdata, idx)
+
         end
     end
@@ -1101 +1076 @@
     -- if predicate type was changed 
     function window.ruleTypeCombo:onChange(item)
-                --base.print('ruleTypeCombo:onChange(item)')
+--                  base.print('ruleTypeCombo:onChange(item)')
         self.selectedItem = item.itemId
         local selectedItem = window.rulesList:getSelectedItem()