Changeset 78 for trunk/src/org/expeditee/items/Dot.java

Timestamp:

05/26/08 09:11:05 (16 years ago)

Author:

ra33

Message:

Added @b and @v...
Also changed @f... so that images can be displayed with transparent backgrounds.
Did a bunch of refactoring in the process to remove duplicated code and simplify managing @i, @f and @b.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/org/expeditee/items/Dot.java (modified) (2 diffs)

trunk

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt

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

@@ -219 +219 @@
                                 // remove lines that are in common
                                 if (getLines().contains(line)) {
-                                        this.setThickness(getThickness() + dot.getThickness());
                                         dot.removeLine(line);
                                         removeLine(line);
@@ -294 +293 @@
         @Override
         public void anchor() {
+                Frame current = getParentOrCurrentFrame();
+                //This is to make lines anchored across frames be on one frame
+                for(Line l: getLines()) {
+                        Frame parent = l.getOppositeEnd(this).getParent();
+                        if (parent != null && parent != current) {
+                                this.setParent(parent);
+                                if(DisplayIO.getCurrentSide() == 0)
+                                        this.setX(this.getX() - DisplayIO.getMiddle());
+                                else
+                                        this.setX(this.getX() + DisplayIO.getMiddle());
+                        }
+                        break;
+                }
+                
                 super.anchor();
-                Frame current = getParentOrCurrentFrame();
+                
+                //TODO is the code below needed... what for?
                 for (Line line : getLines()) {
                         if (line.getID() < 0 && !current.getItems().contains(line)) {

@@ -8 +8 @@
 testdummyaudio
 tests_apollos
+*.txt