Changeset 196 for trunk/src/org/expeditee/items/Text.java

Timestamp:

08/07/08 11:44:58 (16 years ago)

Author:

ra33

Message:

Added Frame and Box variables to the Math calculations

File:

• trunk/src/org/expeditee/items/Text.java (modified) (4 diffs)

trunk/src/org/expeditee/items/Text.java

@@ -21 +21 @@
 import java.awt.geom.Rectangle2D;
 import java.text.AttributedString;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -30 +31 @@
 import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.math.ExpediteeJEP;
 import org.nfunk.jep.Node;
@@ -569 +571 @@
                         // otherwise, we are inserting text
                 } else {
-                        _processedText = null;
+                        setProcessedText(null);
+                        setFormula(null);
                         // determine what line is being pointed to
                         line = getLinePosition(mouseY);
@@ -1872 +1875 @@
                         return;
                 }
-
+                String lowercaseFormula = formula.toLowerCase();
                 ExpediteeJEP myParser = new ExpediteeJEP();
                 myParser.addVariables(this.getParentOrCurrentFrame());
                 String linkedFrame = getAbsoluteLink();
+                //Add the relative frame variable if the item is linked
                 if (linkedFrame != null) {
-                        myParser.addVariables(FrameIO.LoadFrame(linkedFrame));
+                        Frame frame = FrameIO.LoadFrame(linkedFrame);
+                        myParser.addVariables(frame);
+                        //If the frame is linked add vector variable for the frame
+                        if(lowercaseFormula.contains("$frame")){
+                                myParser.addVectorVariable(frame.getNonAnnotationItems(true), "$frame");
+                        }
+                }
+                //Add the relative box variable if this item is a line end
+                if (this.isLineEnd()){
+                        //if its a line end add the enclosed stuff as an @variable
+                        if(lowercaseFormula.contains("$box")){
+                                Collection<Item> enclosed = FrameUtils.getItemsEnclosedBy(
+                                                this.getParentOrCurrentFrame(), this.getEnclosedShape());
+                                myParser.addVectorVariable(enclosed, "$box");
+                        }
                 }
                 myParser.resetObserver();
                 try {
-                        Node node = myParser.parse(formula.toLowerCase());
+                        Node node = myParser.parse(lowercaseFormula);
                         String result = myParser.evaluate(node);
                         if (result != null) {
                                 this.setText(result);
-                        }
-                } catch (Exception e) {
+                                this.setFormula(formula);
+                        }
+                } catch (Throwable e) {
                         this.setText(getFormula());
-                }
-
+                        //this.setFormula(null);
+                } 
         }