Dolda2000 GitWeb
/
kaka
/
cakelight.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added gamma correction
[kaka/cakelight.git]
/
src
/
kaka
/
cakelight
/
Configuration.java
diff --git
a/src/kaka/cakelight/Configuration.java
b/src/kaka/cakelight/Configuration.java
index
94c5ddd
..
86ade8e
100644
(file)
--- a/
src/kaka/cakelight/Configuration.java
+++ b/
src/kaka/cakelight/Configuration.java
@@
-12,10
+12,12
@@
public class Configuration {
private List<Map.Entry<String, String>> settings = new ArrayList<>();
public VideoConfiguration video;
public LedConfiguration leds;
private List<Map.Entry<String, String>> settings = new ArrayList<>();
public VideoConfiguration video;
public LedConfiguration leds;
+ public double gamma;
private Configuration(Properties prop) {
video = new VideoConfiguration(prop);
leds = new LedConfiguration(prop);
private Configuration(Properties prop) {
video = new VideoConfiguration(prop);
leds = new LedConfiguration(prop);
+ gamma = Double.parseDouble(get(prop,"gamma", "1"));
}
public static Configuration from(String propertiesFile) {
}
public static Configuration from(String propertiesFile) {
@@
-70,13
+72,13
@@
public class Configuration {
bpp = Integer.parseInt(get(prop, "video.bpp", "2"));
switch (get(prop, "video.format", "").toUpperCase()) {
case "YUYV":
bpp = Integer.parseInt(get(prop, "video.bpp", "2"));
switch (get(prop, "video.format", "").toUpperCase()) {
case "YUYV":
- format = Imgproc.COLOR_YUV2
RGB
_YUYV;
+ format = Imgproc.COLOR_YUV2
BGR
_YUYV;
break;
case "YVYU":
break;
case "YVYU":
- format = Imgproc.COLOR_YUV2
RGB
_YVYU;
+ format = Imgproc.COLOR_YUV2
BGR
_YVYU;
break;
default:
break;
default:
- format = Imgproc.COLOR_YUV2
RGB
_UYVY;
+ format = Imgproc.COLOR_YUV2
BGR
_UYVY;
}
crop = new CropConfiguration(prop);
}
}
crop = new CropConfiguration(prop);
}
@@
-101,5
+103,9
@@
public class Configuration {
cols = Integer.parseInt(get(prop, "leds.cols"));
rows = Integer.parseInt(get(prop, "leds.rows"));
}
cols = Integer.parseInt(get(prop, "leds.cols"));
rows = Integer.parseInt(get(prop, "leds.rows"));
}
+
+ public int getCount() {
+ return cols * 2 + rows * 2;
+ }
}
}
}
}