Changeset 196 for trunk/src/org/expeditee/math

Timestamp:

08/07/08 11:44:58 (16 years ago)

Author:

ra33

Message:

Added Frame and Box variables to the Math calculations

File:

• trunk/src/org/expeditee/math/ExpediteeJEP.java (modified) (1 diff)

trunk/src/org/expeditee/math/ExpediteeJEP.java

@@ -87 +87 @@
                                 Collection<Item> enclosed = FrameUtils.getItemsEnclosedBy(
                                                 frame, t.getEnclosedShape());
-                                Collection<Double> vector = new LinkedList<Double>();
-                                for (Item i : enclosed) {
-                                        if (i instanceof Text && !i.isLineEnd()) {
-                                                Double value = AttributeUtils.getDoubleValue(i
-                                                                .getText());
-                                                if (value != null) {
-                                                        vector.add(value);
-                                                }
-                                        }
-                                }
-                                if (vector.size() > 0)
-                                        addVariable(t.getText().toLowerCase(), MVector
-                                                        .getInstance(vector.toArray()));
+                                String variableName = t.getText().toLowerCase();
+                                
+                                addVectorVariable(enclosed, variableName);
                         }
                 }
+        }
+
+        /**
+         * @param textItems
+         * @param variableName
+         */
+        public void addVectorVariable(Collection<Item> items, String variableName) {
+                Collection<Double> vector = new LinkedList<Double>();
+                for (Item i : items) {
+                        if (i instanceof Text && !i.isLineEnd()) {
+                                Double value = AttributeUtils.getDoubleValue(i
+                                                .getText());
+                                if (value != null) {
+                                        vector.add(value);
+                                }
+                        }
+                }
+                if (vector.size() > 0)
+                        addVariable(variableName, MVector
+                                        .getInstance(vector.toArray()));
         }