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

Timestamp:

08/22/08 10:54:44 (16 years ago)

Author:

ra33

Message:

Added more import and mail stuff... including text importer

File:

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

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

@@ -5 +5 @@
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.GradientPaint;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.Polygon;
 import java.awt.Rectangle;
+import java.awt.Shape;
 import java.awt.Stroke;
 import java.awt.event.KeyEvent;
@@ -33 +35 @@
 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;
@@ -255 +258 @@
                         invalidateAll();
                 _text = new StringBuffer(text);
-                rebuild(false);
+                rebuild(true);
                 invalidateAll();
         }
@@ -283 +286 @@
          */
         public void prependText(String text) {
+                
                 _text.insert(0, text);
                 rebuild(false);
@@ -295 +299 @@
          */
         public void removeText(String text) {
-
                 if (_text.length() > 0 && _text.indexOf(text) == 0) {
-                        // invalidateAll();
+                        //Need the invalidate all for dateStamp toggling 
+                        invalidateAll();
                         _text.delete(0, text.length());
                 }
@@ -1389 +1393 @@
                 if (getBackgroundColor() != null) {
                         Color bgc = getBackgroundColor();
-                        if (_alpha > 0)
+                        if (_alpha > 0){
                                 bgc = new Color(bgc.getRed(), bgc.getGreen(), bgc.getBlue(),
                                                 _alpha);
+                        }
                         g.setColor(bgc);
-                        g.fill(getPolygon());
-                }
-                
+                        
+                        Color gradientColor = getGradientColor();
+                        if (gradientColor != null) {
+                                // The painting is not efficient enough for gradients...
+                                Shape s = getPolygon();
+                                if (s != null) {
+                                        Rectangle b = s.getBounds();
+                                        GradientPaint gp = new GradientPaint(
+                                                        (int) (b.x + b.width * 0.3), b.y, bgc,
+                                                        (int) (b.x + b.width * 1.3), b.y, gradientColor);
+                                        g.setPaint(gp);
+                                }
+                        }
+                        
+                        g.fillPolygon(getPolygon());
+                }
+
                 if (hasVisibleBorder()) {
                         g.setColor(getPaintBorderColor());
@@ -1402 +1421 @@
                         g.drawPolygon(getPolygon());
                 }
-                
+
                 if (isHighlighted()) {
                         g.setColor(getPaintHighlightColor());
@@ -1567 +1586 @@
                         }
                 }
+                FrameUtils.setLastEdited(this);
                 rebuild(true);
                 DisplayIO.setCursorPosition(newPoint.x, newPoint.y, false);
@@ -1831 +1851 @@
         }
 
-        public void setRightMargin(int i) {
-                setWidth(i - getX() - Item.MARGIN_LEFT);
-        }
-
         @Override
         public void calculate(String formula) {
@@ -1846 +1862 @@
                 String lowercaseFormula = formula.toLowerCase();
                 ExpediteeJEP myParser = new ExpediteeJEP();
+                
+                int nextVarNo = 1;
+                
                 // Add variables from the containing rectangle if the item being
                 // calculated is inside the enclosing rectangle
                 Collection<Item> enclosed = getItemsInSameEnclosure();
                 for (Item i : enclosed) {
-                        if (i instanceof Text) {
+                        if(i == this)
+                                continue;
+                        if (i instanceof Text && !i.isAnnotation()) {
                                 AttributeValuePair pair = new AttributeValuePair(i.getText());
                                 if (pair.hasPair()) {
                                         try {
-                                                myParser.addVariable(pair.getAttribute(), pair
-                                                                .getDoubleValue());
+                                                double value = pair
+                                                .getDoubleValue();
+                                                myParser.addVariable(pair.getAttribute(), value);
+                                                //myParser.addVariable("$" + nextVarNo++, value);
+                                        } catch (NumberFormatException nfe) {
+                                                continue;
+                                        } catch (Exception e) {
+                                                e.printStackTrace();
+                                        }
+                                }else{
+                                        try {
+                                                double value = pair
+                                                .getDoubleValue();
+                                                myParser.addVariable("$" + nextVarNo++, value);
+                                        } catch (NumberFormatException nfe) {
+                                                continue;
                                         } catch (Exception e) {
                                                 e.printStackTrace();
@@ -1898 +1933 @@
 
         /**
-         * Gets items which are in the same enclosure as this item.
-         * TODO: Improve the efficiency of this method
+         * Gets items which are in the same enclosure as this item. TODO: Improve
+         * the efficiency of this method
+         * 
          * @return
          */
@@ -1910 +1946 @@
                         // Go through all the enclosures looking for one that includes this
                         // shape
-                        if (!seen.contains(i) &&  i.isEnclosed()) {
+                        if (!seen.contains(i) && i.isEnclosed()) {
                                 seen.addAll(i.getEnclosingDots());
                                 Collection<Item> enclosed = i.getEnclosedItems();
-                                //Check if we have found an enclosure containing this item
-                                //Check it is smaller than any other enclosure found containing this item
-                                if(enclosed.contains(this) && i.getEnclosedArea() < enclosureArea){
+                                // Check if we have found an enclosure containing this item
+                                // Check it is smaller than any other enclosure found containing
+                                // this item
+                                if (enclosed.contains(this)
+                                                && i.getEnclosedArea() < enclosureArea) {
                                         sameEnclosure = enclosed;
                                 }
@@ -1921 +1959 @@
                 }
 
-                if(sameEnclosure == null)
+                if (sameEnclosure == null)
                         return new LinkedList<Item>();
-                
+
                 return sameEnclosure;
         }
 
         /**
-         * Returns true if this text item should be recalculated when t is modified
+         * Returns true if this text item should be recalculated when it is modified
          */
         public boolean recalculateWhenChanged() {
-                if (!isAnnotation()
-                                && (hasFormula() || getText().contains(":") || isLineEnd()))
+                if (/*!isAnnotation()
+                                && */(hasFormula() || getText().contains(":") || isLineEnd()))
                         return true;
                 try {