diff --git a/deploy/HyperCon.jar.REMOVED.git-id b/deploy/HyperCon.jar.REMOVED.git-id index 08828f0f..8e73cbe8 100644 --- a/deploy/HyperCon.jar.REMOVED.git-id +++ b/deploy/HyperCon.jar.REMOVED.git-id @@ -1 +1 @@ -444584e630a6e3303b8d2828e128a7cad191f5e3 \ No newline at end of file +e81048005035c3bc370c6b2141998c1b379e1a7b \ No newline at end of file diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/LedString.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/LedString.java index a46b99c0..7c343e06 100644 --- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/LedString.java +++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/LedString.java @@ -57,6 +57,9 @@ public class LedString { String ledJson = ledToJsonString(); fw.write(ledJson + ",\n\n"); + String blackBorderJson = mProcessConfig.getBlackborderJson(); + fw.write(blackBorderJson + ",\n\n"); + String miscJson = mMiscConfig.toJsonString(); fw.write(miscJson + "\n"); 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 32a1ca59..18810039 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 @@ -1,5 +1,6 @@ package org.hyperion.hypercon.spec; +import java.util.Locale; import java.util.Observable; import org.hyperion.hypercon.LedFrameFactory; @@ -159,4 +160,18 @@ public class ImageProcessConfig extends Observable { setChanged(); } } + + public String getBlackborderJson() { + StringBuffer strBuf = new StringBuffer(); + + strBuf.append("\t/// The black border configuration, contains the following items: \n"); + strBuf.append("\t/// * enable : true if the detector should be activated\n"); + + strBuf.append("\t\"blackborderdetector\" :\n"); + strBuf.append("\t{\n"); + strBuf.append(String.format(Locale.ROOT, "\t\t\"enable\" : %s\n", mBlackBorderRemoval ? "true" : "false")); + strBuf.append("\t}"); + + return strBuf.toString(); + } }