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

Timestamp:

11/17/08 15:43:36 (16 years ago)

Author:

ra33

Message:

Added auto colour wheel... when drawing rectangles...
Fixed computeTree bug
Added TDFC for rectangles.

File:

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

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

@@ -131 +131 @@
         private Collection<Item> _vectorItems = new LinkedHashSet<Item>();
 
+        private Text _dotTemplate = UserSettings.DotTemplate.copy();
+
         /**
          * Default constructor, nothing is set.
          */
         public Frame() {
+        }
+
+        public void reset() {
+                refreshItemPermissions(Permission.full);
+
+                resetDot();
+        }
+        
+        private void resetDot() {
+                _dotTemplate.setColor(Item.COLOR_WHEEL[1]);
+                _dotTemplate.setFillColor(Item.FILL_COLOR_WHEEL[0]);
+        }
+
+        public void nextDot() {
+                _dotTemplate.setFillColor(ColorUtils.getNextColor(_dotTemplate
+                                .getFillColor(), Item.FILL_COLOR_WHEEL, null));
+                _dotTemplate.setColor(ColorUtils.getNextColor(_dotTemplate.getColor(),
+                                Item.COLOR_WHEEL, null));
+                
+                if(_dotTemplate.getColor().equals(Color.white)){
+                        resetDot();
+                }
         }
 
@@ -219 +243 @@
         }
 
-        //private static int updateCount = 0;
+        // private static int updateCount = 0;
 
         /**
@@ -229 +253 @@
          */
         public void notifyObservers(boolean bRecalculate) {
-                if(bRecalculate){
+                if (bRecalculate) {
                         recalculate();
                 }
@@ -241 +265 @@
                 Collection<FrameObserver> observersCopy = new LinkedList<FrameObserver>(
                                 _observers);
-                //System.out.println(++updateCount + " update");
+                // System.out.println(++updateCount + " update");
 
                 for (FrameObserver fl : observersCopy) {
@@ -1508 +1532 @@
                                 getNextItemID());
 
-                Item template = getTemplate(UserSettings.DotTemplate,
-                                ItemUtils.TAG_DOT_TEMPLATE);
+                Item template = getTemplate(_dotTemplate, ItemUtils.TAG_DOT_TEMPLATE);
                 float thickness = template.getThickness();
                 if (thickness > 0)