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

Timestamp:

08/08/08 10:33:15 (16 years ago)

Author:

ra33

Message:

Added functionality allowing users to do PieCharts, also charts now listen for changes on the dataFrame and refresh when needed

File:

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

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

@@ -216 +216 @@
         public void setJustification(Justification just) {
                 _justification = just;
-                rejustify();
+                rebuild(true);
         }
 
@@ -663 +663 @@
 
                         // if a rebuild is required
-                        if (_lineBreaker == null)
-                                rebuild(true);
-                        else
-                                rejustify();
+                        rebuild(true, false);
 
                         // determine the new position the cursor should have
@@ -1194 +1191 @@
         // This needs to be fixed!!
         private void rebuild(boolean limitWidth) {
+                rebuild(limitWidth, true);
+        }
+
+        /**
+         * 
+         * @param limitWidth
+         * @param newLinebreakerAlways
+         *            true if a new line breaker should always be created.
+         */
+        private void rebuild(boolean limitWidth, boolean newLinebreakerAlways) {
                 // TODO make this more efficient so it only clears annotation list when
                 // it really has to
@@ -1212 +1219 @@
                 }
 
-                AttributedString paragraphText = new AttributedString(_text.toString());
-                paragraphText.addAttribute(TextAttribute.FONT, getPaintFont());
-                _lineBreaker = new LineBreakMeasurer(paragraphText.getIterator(),
-                                new FontRenderContext(null, true, true));
+                if (_lineBreaker == null || newLinebreakerAlways) {
+                        AttributedString paragraphText = new AttributedString(_text
+                                        .toString());
+                        paragraphText.addAttribute(TextAttribute.FONT, getPaintFont());
+                        _lineBreaker = new LineBreakMeasurer(paragraphText.getIterator(),
+                                        new FontRenderContext(null, true, true));
+                }
 
                 float width = Float.MAX_VALUE;
@@ -1261 +1271 @@
                 updatePolygon();
 
-        }
-
-        private void rejustify() {
-                // if there is no text, there is nothing to do
-                if (_text == null || _text.length() == 0)
-                        return;
-
-                // only recreate linebreaker if necessary
-                if (_lineBreaker == null) {
-                        rebuild(true);
-                        return;
-
-                        /*
-                         * AttributedString paragraphText = new
-                         * AttributedString(_text.toString());
-                         * paragraphText.addAttribute(TextAttribute.FONT, getPaintFont());
-                         * _lineBreaker = new LineBreakMeasurer(paragraphText.getIterator(),
-                         * new FontRenderContext(null, true, true));
-                         */
-                }
-
-                float width = Float.MAX_VALUE;
-                if (getWidth() > 0)
-                        width = getWidth();
-                // else if (getMaxWidth()>0)
-                // width = Math.max(50, getMaxWidth() - getX()
-                // - Item.MARGIN_RIGHT);
-
-                _textLayouts.clear();
-                _lineOffsets.clear();
-                // the first line always has a 0 offset
-                _lineOffsets.add(0);
-
-                TextLayout layout;
-                _lineBreaker.setPosition(0);
-
-                // --- Get the output of the LineBreakMeasurer and store it in a
-                while ((layout = _lineBreaker.nextLayout(width)) != null) {
-                        // for some reason lineBreaker will not break on newline
-                        // characters
-                        // so they have to be check manually
-                        int start = _lineOffsets.get(_lineOffsets.size() - 1);
-
-                        // check through the current line for newline characters
-                        for (int i = start + 1; i < _text.length(); i++) {
-                                if (_text.charAt(i) == '\n') {// || c == '\t'){
-                                        _lineBreaker.setPosition(start);
-                                        layout = _lineBreaker.nextLayout(width, i, false);
-                                        break;
-                                }
-                        }
-
-                        _lineOffsets.add(_lineBreaker.getPosition());
-
-                        if (getWidth() > 0 && getJustification() == Justification.full
-                                        && _lineBreaker.getPosition() < _text.length())
-                                layout = layout.getJustifiedLayout(width);
-
-                        _textLayouts.add(layout);
-                }
-
-                updatePolygon();
         }
 
@@ -1871 +1819 @@
         @Override
         public void calculate(String formula) {
+                if (FrameGraphics.isXRayMode())
+                        return;
+
                 super.calculate(formula);
                 if (formula == null || formula.length() == 0) {
@@ -1879 +1830 @@
                 myParser.addVariables(this.getParentOrCurrentFrame());
                 String linkedFrame = getAbsoluteLink();
-                //Add the relative frame variable if the item is linked
+                // Add the relative frame variable if the item is linked
                 if (linkedFrame != null) {
                         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());
+                        // 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");
                         }
@@ -1907 +1859 @@
                 } catch (Throwable e) {
                         this.setText(getFormula());
-                        //this.setFormula(null);
-                } 
-        }
-
+                        // this.setFormula(null);
+                }
+        }
+
+        /**
+         * Returns true if this text item should be recalculated when t is modified
+         */
         public boolean recalculateWhenChanged() {
-                if (!isAnnotation() && (hasFormula() || getText().contains(":") || isLineEnd()))
+                if (!isAnnotation()
+                                && (hasFormula() || getText().contains(":") || isLineEnd()))
                         return true;
                 try {