Feature test jk

.gitignore

@@ -5,3 +5,4 @@ build/
 .project
 .classpath
 .settings/
+*.iml

build.gradle

@@ -4,25 +4,33 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.3'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }
 
-apply plugin: 'android-library'
+apply plugin: 'com.android.library'
 apply plugin: 'eclipse'
 
 repositories {
   mavenCentral()
 }
 
 dependencies {
-  compile fileTree(dir: 'libs', include: '*.jar')
+  //compile fileTree(dir: 'libs', include: '*.jar')
+  compile 'com.android.support:support-v4:21.0.3'
+  compile 'com.dev-smart:devsmart-android:0.1.5'
   compile project(':AndroidEssentials')
 }
 
 android {
-    buildToolsVersion "19.0.0"
-    compileSdkVersion 10
+    compileSdkVersion 19
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 14
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'

res/values/attrs.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="GraphView">
+        <attr name="axisColor" format="color" />
+        <attr name="labelColor" format="color"/>
+
+    </declare-styleable>
+</resources>

src/com/devsmart/plotter/AxisFunction.java

@@ -0,0 +1,21 @@
+package com.devsmart.plotter;
+
+public interface AxisFunction {
+
+	void interpolate(float[] x, float[] y);
+
+	AxisFunction copy();
+
+	/**
+	 * translate screen coord --> graph coord 
+	 * @param x
+	 * @return
+	 */
+	float value(float x);
+
+	/**
+	 * return the inverse function
+	 * @return
+	 */
+	AxisFunction inverse();
+}

src/com/devsmart/plotter/AxisRenderer.java

@@ -1,10 +1,36 @@
 package com.devsmart.plotter;
 
 import android.graphics.Canvas;
+import android.graphics.Rect;
 import android.graphics.RectF;
 
 public interface AxisRenderer {
-
-	void drawAxis(Canvas canvas, RectF viewport, GraphView graphview);
+    /**
+     * Measure the area where the graph data will be drawn. Return a Rect
+     * in screen coordinates.
+     *
+     * @param screenWidth
+     * @param screenHeight
+     * @return
+     */
+    Rect measureGraphArea(int screenWidth, int screenHeight);
 
-}
+    /**
+     * Draw the axis on the canvas.
+     *
+     * @param canvas
+     * @param canvasWidth
+     * @param canvasHeight
+     * @param viewport
+     * @return
+     */
+    void drawAxis(Canvas canvas, int canvasWidth, int canvasHeight, RectF viewport, CoordinateSystem coordSystem);
+
+    void setXAxisLabel(String label);
+
+    void setYAxisLabel(String label);
+
+    void setAxisColor(int color);
+
+    void setLabelColor(int color);
+}

src/com/devsmart/plotter/CoordinateSystem.java

@@ -0,0 +1,95 @@
+package com.devsmart.plotter;
+
+import android.graphics.RectF;
+
+public class CoordinateSystem {
+
+	AxisFunction mXAxisFunction;
+	AxisFunction mYAxisFunction;
+	CoordinateSystem mInverse;
+
+
+
+	public CoordinateSystem copy() {
+		CoordinateSystem retval = new CoordinateSystem();
+		retval.mXAxisFunction = mXAxisFunction.copy();
+		retval.mYAxisFunction = mYAxisFunction.copy();
+
+		return retval;
+	}
+
+	public float xValue(float x) {
+		return mXAxisFunction.value(x);
+	}
+
+	public float yValue(float y) {
+		return mYAxisFunction.value(y);
+	}
+
+	public void mapRect(RectF dest, RectF src) {
+		dest.left = mXAxisFunction.value(src.left);
+		dest.right = mXAxisFunction.value(src.right);
+		dest.bottom = mYAxisFunction.value(src.bottom);
+		dest.top = mYAxisFunction.value(src.top);
+	}
+
+	public void mapRect(RectF rect) {
+		rect.left = mXAxisFunction.value(rect.left);
+		rect.right = mXAxisFunction.value(rect.right);
+		rect.bottom = mYAxisFunction.value(rect.bottom);
+		rect.top = mYAxisFunction.value(rect.top);
+
+	}
+
+	/**
+	 * Apply this system to the array of 2D points, and write the transformed points back into the array
+	 * @param pts
+	 */
+	public void mapPoints(float[] pts) {
+		mapPoints(pts, pts);
+		/*
+		for(int x=0;x<pts.length;x=x+2){
+			pts[x] = mXAxisFunction.value(pts[x]);
+		}
+
+		for(int y=1;y<pts.length;y=y+2){
+			pts[y] = mYAxisFunction.value(pts[y]);
+		}
+		*/
+
+	}
+
+	public void mapPoints(float[] dest, float[] src) {
+		for(int x=0;x<src.length;x=x+2){
+			dest[x] = mXAxisFunction.value(src[x]);
+		}
+
+		for(int y=1;y<src.length;y=y+2){
+			dest[y] = mYAxisFunction.value(src[y]);
+		}
+	}
+
+	public CoordinateSystem getInverse() {
+		if(mInverse == null){
+			mInverse = new CoordinateSystem();
+			mInverse.mXAxisFunction = mXAxisFunction.inverse();
+			mInverse.mYAxisFunction = mYAxisFunction.inverse();
+		}
+		return mInverse;
+	}
+
+	public void interpolate(RectF from, RectF to){
+		mXAxisFunction.interpolate(new float[]{from.left, from.right}, new float[]{to.left, to.right});
+		mYAxisFunction.interpolate(new float[]{from.top, from.bottom}, new float[]{to.top, to.bottom});
+	}
+
+	public static CoordinateSystem createLinearSystem() {
+		CoordinateSystem retval = new CoordinateSystem();
+		retval.mXAxisFunction = new LinearFunction();
+		retval.mYAxisFunction = new LinearFunction();
+
+		return retval;
+	}
+
+
+}

src/com/devsmart/plotter/DataRenderer.java

@@ -0,0 +1,10 @@
+package com.devsmart.plotter;
+
+import android.graphics.Canvas;
+import android.graphics.RectF;
+
+public interface DataRenderer {
+    void draw(Canvas canvas, RectF viewPort, CoordinateSystem coordSystem);
+
+    void setPaintColor(int color);
+}