Commit cdb7c8ea authored by Thomas Krex's avatar Thomas Krex

annotations color korrigiert

parent 95655791
...@@ -530,7 +530,7 @@ public class Recording extends MessageProducerAdapter implements Runnable { ...@@ -530,7 +530,7 @@ public class Recording extends MessageProducerAdapter implements Runnable {
public void setTime(int time, boolean refresh) { public void setTime(int time, boolean refresh) {
// refresh determine if display is updated or not // refresh determine if display is updated or not
setAdjusting(true); // setAdjusting(true);
time = sync(time); time = sync(time);
...@@ -545,7 +545,7 @@ public class Recording extends MessageProducerAdapter implements Runnable { ...@@ -545,7 +545,7 @@ public class Recording extends MessageProducerAdapter implements Runnable {
setAudioPlayerTime(time); setAudioPlayerTime(time);
} }
setAdjusting(false); // setAdjusting(false);
} }
......
...@@ -31,7 +31,6 @@ import tttclient.core.Constants; ...@@ -31,7 +31,6 @@ import tttclient.core.Constants;
import tttclient.shapes.StrokedPath; import tttclient.shapes.StrokedPath;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint.Cap; import android.graphics.Paint.Cap;
import android.graphics.Paint.Join; import android.graphics.Paint.Join;
import android.graphics.Paint.Style; import android.graphics.Paint.Style;
...@@ -113,9 +112,7 @@ public class FreehandAnnotation extends Annotation { ...@@ -113,9 +112,7 @@ public class FreehandAnnotation extends Annotation {
@Override @Override
public void paint(Canvas canvas) { public void paint(Canvas canvas) {
// paint.setColor(annotationColors[color]); strokedPath.setColor(annotationColors[color]);
// TODO just for testing
strokedPath.setColor(Color.RED);
strokedPath.setStyle(Style.STROKE); strokedPath.setStyle(Style.STROKE);
strokedPath.paint(canvas); strokedPath.paint(canvas);
......
...@@ -31,7 +31,6 @@ import tttclient.core.Constants; ...@@ -31,7 +31,6 @@ import tttclient.core.Constants;
import tttclient.shapes.StrokedRect; import tttclient.shapes.StrokedRect;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint.Cap; import android.graphics.Paint.Cap;
import android.graphics.Paint.Join; import android.graphics.Paint.Join;
import android.graphics.Paint.Style; import android.graphics.Paint.Style;
...@@ -124,8 +123,8 @@ public class RectangleAnnotation extends SimpleAnnotation { ...@@ -124,8 +123,8 @@ public class RectangleAnnotation extends SimpleAnnotation {
// graphics.setColor(annotationColors[color]); // graphics.setColor(annotationColors[color]);
// graphics.fill(shape); // graphics.fill(shape);
// TODO rot als Test // TODO rot als Test
rect.setColor(Color.RED); rect.setColor(annotationColors[color]);
rect.setStyle(Style.FILL); rect.setStyle(Style.STROKE);
rect.paint(canvas); rect.paint(canvas);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment