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

Timestamp:

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

Author:

ra33

Message:

 

File:

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

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

@@ -477 +477 @@
                                 if (i instanceof XRayable) {
                                         results.addAll(i.getConnected());
-                                } else {
+                                        //Dont add circle centers
+                                        //TODO change this to be isCircle center
+                                }else if (! i.hasEnclosures()) {
                                         results.add(i);
                                 }
@@ -1025 +1027 @@
                 }
 
-                // Make sure the items are sorted
-                Collections.sort(toCheck);
-
                 List<Text> column = new ArrayList<Text>();
-
-                // Create a list of items consisting of the item 'from' and all the
-                // items below it which are also in the same column as it
-                for (int i = toCheck.indexOf(from); i < toCheck.size(); i++) {
-                        Text item = toCheck.get(i);
-                        if (FrameUtils.inSameColumn(from, item))
-                                column.add(item);
+                if (toCheck.size() > 0) {
+
+                        // Make sure the items are sorted
+                        Collections.sort(toCheck);
+
+                        // Create a list of items consisting of the item 'from' and all the
+                        // items below it which are also in the same column as it
+                        for (int i = toCheck.indexOf(from); i < toCheck.size(); i++) {
+                                Text item = toCheck.get(i);
+                                if (FrameUtils.inSameColumn(from, item))
+                                        column.add(item);
+                        }
                 }
 
@@ -1334 +1338 @@
                 change();
 
-                if (!keepAnnotations)
+                if (!keepAnnotations && _annotations != null)
                         _annotations.clear();
         }
@@ -1895 +1899 @@
                 return textItems;
         }
+
+        public Text getAnnotation(String annotation) {
+                if (_annotations == null)
+                        refreshAnnotationList();
+
+                return _annotations.get(annotation.toLowerCase());
+        }
+        
+        public void recalculate() {
+                for (Item i : getItems()) {
+                        if(i.hasFormula() && !i.isAnnotation()){
+                                i.calculate(i.getFormula());
+                        }
+                }
+        }
 }