xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup: canvas Paint

Browse Source
This commit is contained in:
Hannes Janetzek 2014-06-10 19:44:42 +02:00
parent 7cd5084777
commit 225613ec28
6 changed files with 0 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vtm-android-gdx/src/org/oscim/android/canvas/AndroidPaint.java
View File

@ -19,14 +19,7 @@ package org.oscim.android.canvas;
import org.oscim.backend.canvas.Paint; import org.oscim.backend.canvas.Paint;
import android.graphics.Bitmap.Config;
import android.graphics.BitmapShader;
import android.graphics.DashPathEffect;
import android.graphics.Paint.FontMetrics; import android.graphics.Paint.FontMetrics;
import android.graphics.PathEffect;
import android.graphics.Rect;
import android.graphics.Shader;
import android.graphics.Shader.TileMode;
import android.graphics.Typeface; import android.graphics.Typeface;
class AndroidPaint implements Paint { class AndroidPaint implements Paint {
@ -73,45 +66,11 @@ class AndroidPaint implements Paint {
return mPaint.getColor(); return mPaint.getColor();
} }
@Override
public int getTextHeight(String text) {
Rect rect = new Rect();
mPaint.getTextBounds(text, 0, text.length(), rect);
return rect.height();
}
@Override
public int getTextWidth(String text) {
Rect rect = new Rect();
mPaint.getTextBounds(text, 0, text.length(), rect);
return rect.width();
}
@Override
public void setBitmapShader(org.oscim.backend.canvas.Bitmap bitmap) {
if (bitmap == null) {
return;
}
android.graphics.Bitmap androidBitmap = android.graphics.Bitmap
.createBitmap(bitmap.getPixels(), bitmap.getWidth(),
bitmap.getHeight(), Config.ARGB_8888);
Shader shader = new BitmapShader(androidBitmap, TileMode.REPEAT,
TileMode.REPEAT);
mPaint.setShader(shader);
}
@Override @Override
public void setColor(int color) { public void setColor(int color) {
mPaint.setColor(color); mPaint.setColor(color);
} }
@Override
public void setDashPathEffect(float[] strokeDasharray) {
PathEffect pathEffect = new DashPathEffect(strokeDasharray, 0);
mPaint.setPathEffect(pathEffect);
}
@Override @Override
public void setStrokeCap(Cap cap) { public void setStrokeCap(Cap cap) {
android.graphics.Paint.Cap androidCap = android.graphics.Paint.Cap android.graphics.Paint.Cap androidCap = android.graphics.Paint.Cap

43
vtm-android/src/org/oscim/android/canvas/AndroidPaint.java
View File

@ -18,14 +18,7 @@ package org.oscim.android.canvas;
import org.oscim.backend.canvas.Paint; import org.oscim.backend.canvas.Paint;
import android.graphics.Bitmap.Config;
import android.graphics.BitmapShader;
import android.graphics.DashPathEffect;
import android.graphics.Paint.FontMetrics; import android.graphics.Paint.FontMetrics;
import android.graphics.PathEffect;
import android.graphics.Rect;
import android.graphics.Shader;
import android.graphics.Shader.TileMode;
import android.graphics.Typeface; import android.graphics.Typeface;
class AndroidPaint implements Paint { class AndroidPaint implements Paint {
@ -73,47 +66,11 @@ class AndroidPaint implements Paint {
return mPaint.getColor(); return mPaint.getColor();
} }
@Override
public int getTextHeight(String text) {
Rect rect = new Rect();
mPaint.getTextBounds(text, 0, text.length(), rect);
return rect.height();
}
@Override
public int getTextWidth(String text) {
Rect rect = new Rect();
mPaint.getTextBounds(text, 0, text.length(), rect);
return rect.width();
}
@Override
public void setBitmapShader(org.oscim.backend.canvas.Bitmap bitmap) {
if (bitmap == null) {
return;
}
android.graphics.Bitmap androidBitmap = android.graphics.Bitmap
.createBitmap(bitmap.getPixels(),
bitmap.getWidth(),
bitmap.getHeight(),
Config.ARGB_8888);
Shader shader = new BitmapShader(androidBitmap, TileMode.REPEAT,
TileMode.REPEAT);
mPaint.setShader(shader);
}
@Override @Override
public void setColor(int color) { public void setColor(int color) {
mPaint.setColor(color); mPaint.setColor(color);
} }
@Override
public void setDashPathEffect(float[] strokeDasharray) {
PathEffect pathEffect = new DashPathEffect(strokeDasharray, 0);
mPaint.setPathEffect(pathEffect);
}
@Override @Override
public void setStrokeCap(Cap cap) { public void setStrokeCap(Cap cap) {
android.graphics.Paint.Cap androidCap = android.graphics.Paint.Cap android.graphics.Paint.Cap androidCap = android.graphics.Paint.Cap

21
vtm-desktop/src/org/oscim/awt/AwtPaint.java
View File

@ -27,7 +27,6 @@ import java.text.AttributedCharacterIterator.Attribute;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Paint; import org.oscim.backend.canvas.Paint;
public class AwtPaint implements Paint { public class AwtPaint implements Paint {
@ -70,20 +69,6 @@ public class AwtPaint implements Paint {
return 0; return 0;
} }
@Override
public int getTextHeight(String text) {
return 0;
}
@Override
public int getTextWidth(String text) {
return 0;
}
@Override
public void setBitmapShader(Bitmap bitmap) {
}
@Override @Override
public void setColor(int c) { public void setColor(int c) {
color = new Color(((c >> 16) & 0xff) / 255f, color = new Color(((c >> 16) & 0xff) / 255f,
@ -92,12 +77,6 @@ public class AwtPaint implements Paint {
((c >> 24) & 0xff) / 255f); ((c >> 24) & 0xff) / 255f);
} }
@Override
public void setDashPathEffect(float[] strokeDasharray) {
// TODO Auto-generated method stub
}
@Override @Override
public void setStrokeCap(Cap cap) { public void setStrokeCap(Cap cap) {
this.cap = getCap(cap); this.cap = getCap(cap);

19
vtm-ios/src/org/oscim/ios/backend/IosPaint.java
View File

@ -1,6 +1,5 @@
package org.oscim.ios.backend; package org.oscim.ios.backend;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Paint; import org.oscim.backend.canvas.Paint;
public class IosPaint implements Paint { public class IosPaint implements Paint {
@ -10,28 +9,10 @@ public class IosPaint implements Paint {
return 0; return 0;
} }
@Override
public int getTextHeight(String text) {
return 0;
}
@Override
public int getTextWidth(String text) {
return 0;
}
@Override
public void setBitmapShader(Bitmap bitmap) {
}
@Override @Override
public void setColor(int color) { public void setColor(int color) {
} }
@Override
public void setDashPathEffect(float[] strokeDasharray) {
}
@Override @Override
public void setStrokeCap(Cap cap) { public void setStrokeCap(Cap cap) {
} }

19
vtm-web/src/org/oscim/gdx/client/GwtPaint.java
View File

@ -16,7 +16,6 @@
*/ */
package org.oscim.gdx.client; package org.oscim.gdx.client;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Paint; import org.oscim.backend.canvas.Paint;
import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap;
@ -44,20 +43,6 @@ public class GwtPaint implements Paint {
return 0; return 0;
} }
@Override
public int getTextHeight(String text) {
return 0;
}
@Override
public int getTextWidth(String text) {
return 0;
}
@Override
public void setBitmapShader(Bitmap bitmap) {
}
@Override @Override
public void setColor(int color) { public void setColor(int color) {
float a = ((color >>> 24) & 0xff) / 255f; float a = ((color >>> 24) & 0xff) / 255f;
@ -68,10 +53,6 @@ public class GwtPaint implements Paint {
this.color = Pixmap.make(r, g, b, a); this.color = Pixmap.make(r, g, b, a);
} }
@Override
public void setDashPathEffect(float[] strokeDasharray) {
}
@Override @Override
public void setStrokeCap(Cap cap) { public void setStrokeCap(Cap cap) {
stroke = true; stroke = true;

8
vtm/src/org/oscim/backend/canvas/Paint.java
View File

@ -44,16 +44,8 @@ public interface Paint {
int getColor(); int getColor();
int getTextHeight(String text);
int getTextWidth(String text);
void setBitmapShader(Bitmap bitmap);
void setColor(int color); void setColor(int color);
void setDashPathEffect(float[] strokeDasharray);
void setStrokeCap(Cap cap); void setStrokeCap(Cap cap);
void setStrokeWidth(float width); void setStrokeWidth(float width);