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

Timestamp:

07/30/08 14:53:21 (16 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -27 +27 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
+import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.simple.ExpediteeJEP;
+import org.nfunk.jep.Node;
 
 /**
@@ -242 +245 @@
          *            The String to display on the screen when drawing this Item.
          */
+        @Override
         public void setText(String text) {
                 if (_text != null && text.length() < _text.length())
@@ -430 +434 @@
         }
 
-        public void setSelectionStart(int mouseX, int mouseY) {
+        public void setSelectionStart(float mouseX, float mouseY) {
                 // determine what line is being pointed to
                 int line = getLinePosition(mouseY);
@@ -440 +444 @@
         }
 
-        public void setSelectionEnd(int mouseX, int mouseY) {
+        public void setSelectionEnd(float mouseX, float mouseY) {
                 // determine what line is being pointed to
                 int line = getLinePosition(mouseY);
@@ -700 +704 @@
         }
 
-        public Point2D.Float moveCursor(int direction, float mouseX, float mouseY) {
+        public Point2D.Float moveCursor(int direction, float mouseX, float mouseY,
+                        boolean setSelection) {
+                if (setSelection) {
+                        if (getSelectionSize() <= 0) {
+                                setSelectionStart(mouseX, mouseY);
+                        }
+                }
+
+                Point2D.Float resultPos = null;
+
                 // check for home or end keys
                 switch (direction) {
                 case HOME:
-                        return getParagraphStartPosition();
+                        resultPos = getParagraphStartPosition();
+                        break;
                 case END:
-                        return getParagraphEndPosition();
+                        resultPos = getParagraphEndPosition();
+                        break;
                 case LINE_HOME:
-                        return getLineStartPosition(mouseY);
+                        resultPos = getLineStartPosition(mouseY);
+                        break;
                 case LINE_END:
-                        return getLineEndPosition(mouseY);
-                }
-
-                TextHitInfo hit;
-                TextLayout current;
-                int line;
-
-                // if there is no text yet
-                if (_text == null || _text.length() == 0) {
-                        return new Point2D.Float(mouseX, mouseY);
-                        // otherwise, move the cursor
-                } else {
-                        // determine the line of text to check
-                        line = getLinePosition(mouseY);
-                        if (line < 0)
-                                line = _textLayouts.size() - 1;
-
-                        // if the cursor is moving up or down, change the line
-                        if (direction == UP)
-                                line = Math.max(line - 1, 0);
-                        else if (direction == DOWN)
-                                line = Math.min(line + 1, _textLayouts.size() - 1);
-
-                        hit = getCharPosition(line, mouseX);
-
-                        if (direction == LEFT) {
-                                if (hit.getInsertionIndex() > 0) {
-                                        hit = _textLayouts.get(line).getNextLeftHit(hit);
-                                        // This takes care of the case where the user has put a hard
-                                        // line break in
-                                        if (line > 0
-                                                        && _text.charAt(hit.getInsertionIndex()
-                                                                        + _lineOffsets.get(line)) == '\n') {
+                        resultPos = getLineEndPosition(mouseY);
+                        break;
+                default:
+                        TextHitInfo hit;
+                        TextLayout current;
+                        int line;
+
+                        // if there is no text yet
+                        if (_text == null || _text.length() == 0) {
+                                return new Point2D.Float(mouseX, mouseY);
+                                // otherwise, move the cursor
+                        } else {
+                                // determine the line of text to check
+                                line = getLinePosition(mouseY);
+                                if (line < 0)
+                                        line = _textLayouts.size() - 1;
+
+                                // if the cursor is moving up or down, change the line
+                                if (direction == UP)
+                                        line = Math.max(line - 1, 0);
+                                else if (direction == DOWN)
+                                        line = Math.min(line + 1, _textLayouts.size() - 1);
+
+                                hit = getCharPosition(line, mouseX);
+
+                                if (direction == LEFT) {
+                                        if (hit.getInsertionIndex() > 0) {
+                                                hit = _textLayouts.get(line).getNextLeftHit(hit);
+                                                // This takes care of the case where the user has put a
+                                                // hard
+                                                // line break in
+                                                if (line > 0
+                                                                && _text.charAt(hit.getInsertionIndex()
+                                                                                + _lineOffsets.get(line)) == '\n') {
+                                                        line--;
+                                                        hit = _textLayouts.get(line)
+                                                                        .getNextRightHit(
+                                                                                        _textLayouts.get(line)
+                                                                                                        .getCharacterCount() - 1);
+                                                }
+                                                // This takes care of soft line breaks.
+                                        } else if (line > 0) {
                                                 line--;
                                                 hit = _textLayouts.get(line).getNextRightHit(
                                                                 _textLayouts.get(line).getCharacterCount() - 1);
+                                                while (hit.getCharIndex() > 0
+                                                                && _text.charAt(_lineOffsets.get(line)
+                                                                                + hit.getCharIndex() - 1) == ' ') {
+                                                        hit = _textLayouts.get(line).getNextLeftHit(hit);
+                                                }
                                         }
-                                        // This takes care of soft line breaks.
-                                } else if (line > 0) {
-                                        line--;
-                                        hit = _textLayouts.get(line).getNextRightHit(
-                                                        _textLayouts.get(line).getCharacterCount() - 1);
-                                        while (hit.getCharIndex() > 0
-                                                        && _text.charAt(_lineOffsets.get(line)
-                                                                        + hit.getCharIndex() - 1) == ' ') {
-                                                hit = _textLayouts.get(line).getNextLeftHit(hit);
+                                } else if (direction == RIGHT) {
+                                        if (hit.getInsertionIndex() < _textLayouts.get(line)
+                                                        .getCharacterCount()) {
+                                                hit = _textLayouts.get(line).getNextRightHit(hit);
+                                                while (hit.getCharIndex() > 0
+                                                                && hit.getCharIndex() < _textLayouts.get(line)
+                                                                                .getCharacterCount()
+                                                                && _text.charAt(_lineOffsets.get(line)
+                                                                                + hit.getCharIndex() - 1) == '\t')
+                                                        hit = _textLayouts.get(line).getNextRightHit(hit);
+                                        } else if (line < _textLayouts.size() - 1) {
+                                                line++;
+                                                hit = _textLayouts.get(line).getNextLeftHit(1);
                                         }
                                 }
-                        } else if (direction == RIGHT) {
-                                if (hit.getInsertionIndex() < _textLayouts.get(line)
-                                                .getCharacterCount()) {
-                                        hit = _textLayouts.get(line).getNextRightHit(hit);
-                                        while (hit.getCharIndex() > 0
-                                                        && hit.getCharIndex() < _textLayouts.get(line)
-                                                                        .getCharacterCount()
-                                                        && _text.charAt(_lineOffsets.get(line)
-                                                                        + hit.getCharIndex() - 1) == '\t')
-                                                hit = _textLayouts.get(line).getNextRightHit(hit);
-                                } else if (line < _textLayouts.size() - 1) {
-                                        line++;
-                                        hit = _textLayouts.get(line).getNextLeftHit(1);
-                                }
-                        }
-
-                        current = _textLayouts.get(line);
-                }
-
-                // move the cursor to the new location
-                float[] caret = current.getCaretInfo(hit);
-                float y = getLineDrop(current) * line;
-
-                return new Point2D.Float(getX() + caret[0] + getJustOffset(current),
-                                getY() + y + caret[1]);
+                                current = _textLayouts.get(line);
+                        }
+
+                        // move the cursor to the new location
+                        float[] caret = current.getCaretInfo(hit);
+                        float y = getLineDrop(current) * line;
+
+                        resultPos = new Point2D.Float(getX() + caret[0]
+                                        + getJustOffset(current), getY() + y + caret[1]);
+                        break;
+                }
+                if (setSelection)
+                        setSelectionEnd(resultPos.x, resultPos.y);
+                return resultPos;
         }
 
@@ -1170 +1193 @@
                 if (isAnnotation()) {
                         Frame parent = getParent();
-                        //parent can be null when running tests
+                        // parent can be null when running tests
                         if (parent != null) {
                                 parent.clearAnnotations();
@@ -1836 +1859 @@
 
         public void setRightMargin(int i) {
-                setWidth(i - getX() - Item.MARGIN_RIGHT);
+                setWidth(i - getX() - Item.MARGIN_LEFT);
+        }
+        
+        @Override
+        public void calculate(String formula) {
+                super.calculate(formula);
+                if(formula == null || formula.length() == 0){
+                        return;
+                }
+                
+                ExpediteeJEP myParser = new ExpediteeJEP();
+                myParser.addVariables(this.getParentOrCurrentFrame());
+                String linkedFrame = getAbsoluteLink();
+                if (linkedFrame != null) {
+                        myParser.addVariables(FrameIO.LoadFrame(linkedFrame));
+                }
+                myParser.resetObserver();
+                Node node = myParser.parseExpression(formula);
+                if (node != null) {
+                        String result = myParser.getResult();
+                        if (result != null) {
+                                this.setText(result);
+                        }
+                }
         }
 }