From 6097a9987d676d6dadf371838ccd306c10642818 Mon Sep 17 00:00:00 2001
From: poljvd <poljvd@gmail.com>
Date: Wed, 16 Oct 2013 17:53:41 +0200
Subject: [PATCH] Fix bug in config generation (missing quotes)

Former-commit-id: 75371b32e4335022a7add5c890aca6eecd292606
---
 config/hyperion.config.json                   | 28 +++++++++----------
 deploy/HyperCon.jar.REMOVED.git-id            |  2 +-
 .../hyperion/hypercon/spec/ColorConfig.java   | 28 +++++++++----------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/config/hyperion.config.json b/config/hyperion.config.json
index 6ac31f47..1241d3bd 100644
--- a/config/hyperion.config.json
+++ b/config/hyperion.config.json
@@ -30,29 +30,29 @@
 	{
 		"hsv" :
 		{
-			saturationGain : 1.0000,
-			valuGain       : 1.5000
+			"saturationGain" : 1.0000,
+			"valuGain"       : 1.5000
 		},
 		"red" :
 		{
-			threshold  : 0.1000,
-			gamma      : 2.0000,
-			blacklevel : 0.0000,
-			whitelevel : 0.8000
+			"threshold"  : 0.1000,
+			"gamma"      : 2.0000,
+			"blacklevel" : 0.0000,
+			"whitelevel" : 0.8000
 		},
 		"green" :
 		{
-			threshold  : 0.1000,
-			gamma      : 2.0000,
-			blacklevel : 0.0000,
-			whitelevel : 1.0000
+			"threshold"  : 0.1000,
+			"gamma"      : 2.0000,
+			"blacklevel" : 0.0000,
+			"whitelevel" : 1.0000
 		},
 		"blue" :
 		{
-			threshold  : 0.1000,
-			gamma      : 2.0000,
-			blacklevel : 0.0000,
-			whitelevel : 1.0000
+			"threshold"  : 0.1000,
+			"gamma"      : 2.0000,
+			"blacklevel" : 0.0000,
+			"whitelevel" : 1.0000
 		}
 	},
 
diff --git a/deploy/HyperCon.jar.REMOVED.git-id b/deploy/HyperCon.jar.REMOVED.git-id
index 900b7072..2168765a 100644
--- a/deploy/HyperCon.jar.REMOVED.git-id
+++ b/deploy/HyperCon.jar.REMOVED.git-id
@@ -1 +1 @@
-34c1dea63242566ecea3eeaff08e35d5ec008425
\ No newline at end of file
+58c9b56f08a3ea76161730b0f8b8f102e8d70143
\ No newline at end of file
diff --git a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorConfig.java b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorConfig.java
index 17083314..ec445a77 100644
--- a/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorConfig.java
+++ b/src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorConfig.java
@@ -75,8 +75,8 @@ public class ColorConfig {
 		StringBuffer strBuf = new StringBuffer();
 		strBuf.append("\t\t\"hsv\" :\n");
 		strBuf.append("\t\t{\n");
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tsaturationGain : %.4f,\n", mSaturationGain));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tvaluGain       : %.4f\n", mValueGain));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"saturationGain\" : %.4f,\n", mSaturationGain));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"valuGain\"       : %.4f\n", mValueGain));
 		
 		strBuf.append("\t\t}");
 		return strBuf.toString();
@@ -92,26 +92,26 @@ public class ColorConfig {
 		
 		strBuf.append("\t\t\"red\" :\n");
 		strBuf.append("\t\t{\n");
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tthreshold  : %.4f,\n", mRedThreshold));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tgamma      : %.4f,\n", mRedGamma));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tblacklevel : %.4f,\n", mRedBlacklevel));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\twhitelevel : %.4f\n",  mRedWhitelevel));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"threshold\"  : %.4f,\n", mRedThreshold));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"gamma\"      : %.4f,\n", mRedGamma));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"blacklevel\" : %.4f,\n", mRedBlacklevel));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"whitelevel\" : %.4f\n",  mRedWhitelevel));
 		strBuf.append("\t\t},\n");
 
 		strBuf.append("\t\t\"green\" :\n");
 		strBuf.append("\t\t{\n");
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tthreshold  : %.4f,\n", mGreenThreshold));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tgamma      : %.4f,\n", mGreenGamma));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tblacklevel : %.4f,\n", mGreenBlacklevel));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\twhitelevel : %.4f\n",  mGreenWhitelevel));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"threshold\"  : %.4f,\n", mGreenThreshold));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"gamma\"      : %.4f,\n", mGreenGamma));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"blacklevel\" : %.4f,\n", mGreenBlacklevel));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"whitelevel\" : %.4f\n",  mGreenWhitelevel));
 		strBuf.append("\t\t},\n");
 
 		strBuf.append("\t\t\"blue\" :\n");
 		strBuf.append("\t\t{\n");
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tthreshold  : %.4f,\n", mBlueThreshold));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tgamma      : %.4f,\n", mBlueGamma));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\tblacklevel : %.4f,\n", mBlueBlacklevel));
-		strBuf.append(String.format(Locale.ROOT, "\t\t\twhitelevel : %.4f\n",  mBlueWhitelevel));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"threshold\"  : %.4f,\n", mBlueThreshold));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"gamma\"      : %.4f,\n", mBlueGamma));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"blacklevel\" : %.4f,\n", mBlueBlacklevel));
+		strBuf.append(String.format(Locale.ROOT, "\t\t\t\"whitelevel\" : %.4f\n",  mBlueWhitelevel));
 		strBuf.append("\t\t}");
 		
 		return strBuf.toString();