Dolda2000 GitWeb
/
kaka
/
cakelight.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move ListPosition inside VideoFrame
[kaka/cakelight.git]
/
src
/
kaka
/
cakelight
/
GuiTest.java
diff --git
a/src/kaka/cakelight/GuiTest.java
b/src/kaka/cakelight/GuiTest.java
index
c72519a
..
8c1516c
100644
(file)
--- a/
src/kaka/cakelight/GuiTest.java
+++ b/
src/kaka/cakelight/GuiTest.java
@@
-9,6
+9,7
@@
import javafx.scene.layout.Pane;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
import javafx.stage.Stage;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
import javafx.stage.Stage;
+import kaka.cakelight.mode.AmbientMode;
import org.opencv.core.Core;
import org.opencv.core.Mat;
import org.opencv.core.Core;
import org.opencv.core.Mat;
@@
-68,7
+69,7
@@
public class GuiTest extends Application {
return javafx.scene.paint.Color.rgb(c.r(), c.g(), c.b());
}
return javafx.scene.paint.Color.rgb(c.r(), c.g(), c.b());
}
- private void drawFrame(GraphicsContext gc, Frame frame) {
+ private void drawFrame(GraphicsContext gc,
Video
Frame frame) {
if (paused) return;
System.out.println("Drawing a frame");
drawCols(gc, frame);
if (paused) return;
System.out.println("Drawing a frame");
drawCols(gc, frame);
@@
-100,7
+101,7
@@
public class GuiTest extends Application {
}
}
}
}
- private void drawVideo(GraphicsContext gc, Frame frame) {
+ private void drawVideo(GraphicsContext gc,
Video
Frame frame) {
byte[] rgb = new byte[3];
Mat img = frame.getConvertedImage();
float colSize = 16 * BLOCK / (float)img.cols();
byte[] rgb = new byte[3];
Mat img = frame.getConvertedImage();
float colSize = 16 * BLOCK / (float)img.cols();
@@
-114,7
+115,7
@@
public class GuiTest extends Application {
}
}
}
}
- private void drawCols(GraphicsContext gc, Frame frame) {
+ private void drawCols(GraphicsContext gc,
Video
Frame frame) {
byte[] rgb = new byte[3];
for (int x = 0; x < config.leds.cols; x++) {
for (int y = 0; y < 9; y++) {
byte[] rgb = new byte[3];
for (int x = 0; x < config.leds.cols; x++) {
for (int y = 0; y < 9; y++) {
@@
-124,7
+125,7
@@
public class GuiTest extends Application {
}
}
}
}
- private void drawRows(GraphicsContext gc, Frame frame) {
+ private void drawRows(GraphicsContext gc,
Video
Frame frame) {
byte[] rgb = new byte[3];
for (int y = 0; y < config.leds.rows; y++) {
for (int x = 0; x < 16; x++) {
byte[] rgb = new byte[3];
for (int y = 0; y < config.leds.rows; y++) {
for (int x = 0; x < 16; x++) {