Changeset 190 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

08/07/08 10:23:55 (16 years ago)

Author:

ra33

Message:

Added some math stuff... able to group numbers inside a rectangle

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (7 diffs)

trunk/src/org/expeditee/gui/Frame.java

@@ -477 +477 @@
                                 if (i instanceof XRayable) {
                                         results.addAll(i.getConnected());
-                                        //Dont add circle centers
-                                        //TODO change this to be isCircle center
-                                }else if (! i.hasEnclosures()) {
+                                        // Dont add circle centers
+                                        // TODO change this to be isCircle center
+                                } else if (!i.hasEnclosures()) {
                                         results.add(i);
                                 }
@@ -662 +662 @@
                 item.setParent(this);
                 item.setFloating(false); // esnure that it is anchored
-                
+
                 item.invalidateCommonTrait(ItemAppearence.Added);
 
@@ -685 +685 @@
                 item.onParentStateChanged(new ItemParentStateChangedEvent(this,
                                 ItemParentStateChangedEvent.EVENT_TYPE_ADDED));
+                if (item.recalculateWhenChanged())
+                        recalculate();
 
                 change();
@@ -722 +724 @@
                         if (i.isAnnotation())
                                 i.getParentOrCurrentFrame().clearAnnotations();
+                        // TODO Improve efficiency when addAll is called
                         addItem(i);
                 }
@@ -751 +754 @@
                                 item.invalidateCommonTrait(ItemAppearence.Removed);
                         }
-
+                        // TODO Improve efficiency when removeAll is called
+                        if (item.recalculateWhenChanged())
+                                recalculate();
                 }
         }
@@ -1553 +1558 @@
                                 if (t.getText().toLowerCase().startsWith("@start")
                                                 || t.getText().toLowerCase().equals("@start:")) {
-                                        //Used to allow users the option of putting an initial bullet after the @start
-                                        //This was replaced by width
-                                        //t.stripFirstWord();
+                                        // Used to allow users the option of putting an initial
+                                        // bullet after the @start
+                                        // This was replaced by width
+                                        // t.stripFirstWord();
                                         t.setText("");
 
@@ -1909 +1915 @@
                 return _annotations.get(annotation.toLowerCase());
         }
-        
+
         public void recalculate() {
                 for (Item i : getItems()) {
-                        if(i.hasFormula() && !i.isAnnotation()){
+                        if (i.hasFormula() && !i.isAnnotation()) {
                                 i.calculate(i.getFormula());
                         }