diff --git a/deploy/HyperCon.jar.REMOVED.git-id b/deploy/HyperCon.jar.REMOVED.git-id new file mode 100644 index 00000000..8e0da122 --- /dev/null +++ b/deploy/HyperCon.jar.REMOVED.git-id @@ -0,0 +1 @@ +c8654fba4777ea4222897a55d1d24517cc636482 \ No newline at end of file diff --git a/src/config-tool/ConfigTool/build.xml b/src/config-tool/ConfigTool/build.xml index 7256686b..084c4766 100644 --- a/src/config-tool/ConfigTool/build.xml +++ b/src/config-tool/ConfigTool/build.xml @@ -1,6 +1,6 @@ - + @@ -15,10 +15,6 @@ - - - - diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/LedFrameFactory.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/LedFrameFactory.java index ff997ddf..a3c2409e 100644 --- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/LedFrameFactory.java +++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/LedFrameFactory.java @@ -2,6 +2,8 @@ package org.hyperion.hypercon; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import java.util.Collections; +import java.util.Comparator; import java.util.Vector; import org.hyperion.hypercon.spec.BorderSide; @@ -153,6 +155,12 @@ public class LedFrameFactory { } } + Collections.sort(mLeds, new Comparator() { + @Override + public int compare(Led o1, Led o2) { + return Integer.compare(o1.mLedSeqNr, o2.mLedSeqNr); + } + }); return mLeds; } diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ImageProcessConfig.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ImageProcessConfig.java index 9ec4e68c..ff7685e7 100644 --- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ImageProcessConfig.java +++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ImageProcessConfig.java @@ -12,7 +12,7 @@ import org.hyperion.hypercon.LedFrameFactory; public class ImageProcessConfig extends Observable { /** The 'integration depth' of the leds along the horizontal axis of the tv */ - private double mHorizontalDepth = 0.05; + private double mHorizontalDepth = 0.08; /** The 'integration depth' of the leds along the vertical axis of the tv */ private double mVerticalDepth = 0.05;