BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-11 01:32:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Renumber function sometimes doesn't work as expected

Browse Source
This commit is contained in:
bancika
2011-09-03 19:19:07 +00:00
parent 0df3bc37a0
commit 84d0da6308
2 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/presenter/Presenter.java
+36 -25
View File
@@ -1078,34 +1078,45 @@ public class Presenter implements IPlugInPort {
@Override
public int compare(IDIYComponent<?> o1, IDIYComponent<?> o2) {
Area area1 = drawingManager.getComponentArea(o1);
Area area2 = drawingManager.getComponentArea(o2);
if (area1 != null && area2 != null) {
Point point1 = area1.getBounds().getLocation();
Point point2 = area2.getBounds().getLocation();
if (xAxisFirst) {
if (point1.y < point2.y) {
return -1;
} else if (point1.y > point2.y) {
return 1;
} else {
if (point1.x < point1.x) {
return -1;
} else if (point1.x > point1.x) {
return 1;
}
}
int sumX1 = 0;
int sumY1 = 0;
int sumX2 = 0;
int sumY2 = 0;
for (int i = 0; i < o1.getControlPointCount(); i++) {
sumX1 += o1.getControlPoint(i).getX();
sumY1 += o1.getControlPoint(i).getY();
}
for (int i = 0; i < o2.getControlPointCount(); i++) {
sumX2 += o2.getControlPoint(i).getX();
sumY2 += o2.getControlPoint(i).getY();
}
sumX1 /= o1.getControlPointCount();
sumY1 /= o1.getControlPointCount();
sumX2 /= o2.getControlPointCount();
sumY2 /= o2.getControlPointCount();
if (xAxisFirst) {
if (sumY1 < sumY2) {
return -1;
} else if (sumY1 > sumY2) {
return 1;
} else {
if (point1.x < point2.x) {
if (sumX1 < sumX2) {
return -1;
} else if (point1.x > point2.x) {
} else if (sumX1 > sumX2) {
return 1;
}
}
} else {
if (sumX1 < sumX2) {
return -1;
} else if (sumX1 > sumX2) {
return 1;
} else {
if (sumY1 < sumY2) {
return -1;
} else if (sumY1 > sumY2) {
return 1;
} else {
if (point1.y < point1.y) {
return -1;
} else if (point1.y > point1.y) {
return 1;
}
}
}
}
diy-layout-creator --username bancika@gmail.com/diylc-swing/update.xml
+4
View File
@@ -378,6 +378,10 @@
<releaseDate>2011-08-28 20:00:00.000 CET</releaseDate>
<name></name>
<changes>
<com.diyfever.gui.update.Change>
<changeType>BUG_FIX</changeType>
<description>Renumber function sometimes doesn't work as expected</description>
</com.diyfever.gui.update.Change>
<com.diyfever.gui.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Increased PNG export resolution to 300dpi</description>