-
-
+GraphView is a library for Android to programmatically create
+flexible and nice-looking diagrams.
+It is **easy** to understand, to integrate and to customize.
-
+
+
+
+
+
+## Top Features
+
+* Line Chart, Bar Chart, Points
+* Combination of different graph types
+* Scrolling vertical and horizontal
+. You can scroll with a finger touch move gesture.
+* Scaling / Zooming vertical and horizontal
+. With two-fingers touch scale gesture (Multi-touch), the viewport can be changed.
+* Realtime Graph (Live change of data)
+* Second scale axis
* Draw multiple series of data
-Let the diagram show more that one series in a graph. You can set a color and a description for every series.
+. Let the diagram show more that one series in a graph. You can set a color and a description for every series.
* Show legend
-A legend can be displayed inline the chart. You can set the width and the vertical align (top, middle, bottom).
+. A legend can be displayed inline the chart. You can set the width and the vertical align (top, middle, bottom).
* Custom labels
-The labels for the x- and y-axis are generated automatically. But you can set your own labels, Strings are possible.
+. The labels for the x- and y-axis are generated automatically. But you can set your own labels, Strings are possible.
* Handle incomplete data
-It's possible to give the data in different frequency.
+. It's possible to give the data in different frequency.
* Viewport
-You can limit the viewport so that only a part of the data will be displayed.
-* Scrolling
-You can scroll with a finger touch move gesture.
-* Scaling / Zooming
-Since Android 2.3! With two-fingers touch scale gesture (Multi-touch), the viewport can be changed.
-* Background (line graph)
-Optionally draws a light background under the diagram stroke.
+. You can limit the viewport so that only a part of the data will be displayed.
* Manual Y axis limits
-* Realtime Graph (Live)
-* And more
+* And much more... Check out the project page and/or the demo app
+
+## How to use
+
+1) Add gradle dependency:
+```
+implementation 'com.jjoe64:graphview:4.2.2'
+```
+
+2) Add view to layout:
+```xml
+
+Showcase GraphView Demo App + +## More examples and documentation + +Get started at project wiki homepage -
Important
To show you how to integrate the library into an existing project see the GraphView-Demos project! See GraphView-Demos for examples. https://github.com/jjoe64/GraphView-Demos-View GraphView page http://android-graphview.org - +View GraphView wiki page https://github.com/jjoe64/GraphView/wiki diff --git a/README.new-version.md b/README.new-version.md new file mode 100644 index 000000000..8bd815f25 --- /dev/null +++ b/README.new-version.md @@ -0,0 +1,59 @@ +How to create a new version for maven repo +-------------------------------------------- +create sources.jar +- $ jar cvf sources.jar src + +create java doc jar +- $ mkdir javadoc +- $ javadoc -d javadoc -sourcepath src/main/java/ -subpackages com.jjoe64 +- $ jar cvf javadoc.jar javadoc + +change version in gradle.properties + +uncomment part for publishing in build.gradle + +(once) create a gpg file +- gpg --gen-key + +(once) publish key +- gpg --send-keys D8C3B041 +and/or here as ascii +- gpg --export -a D8C3B041 +- http://keyserver.ubuntu.com:11371/ + +=> needs some time + +hardcode gpg key password in maven_push.gradle + +hardcode user/pwd of nexus account in maven_push.gradle + +success gradle task uploadArchives +- ./gradlew --rerun-tasks uploadArchives +- enter gpg info (id:D8C3B041 / path: /Users/jonas/.gnupg/secring.gpg / PWD) + +open https://oss.sonatype.org + +login + +Staging Repositiories + +search: jjoe64 + +Close entry + +Refresh/Wait + +Release entry + +Wait some days + +## update java doc + +$ javadoc -d javadoc -sourcepath src/main/java/ -subpackages com.jjoe64 +$ mv javadoc/ .. +$ git checkout gh-pages +$ rm -rf javadoc +$ mv ../javadoc/ . +$ git add javadoc +$ git commit -a + diff --git a/anim.gif b/anim.gif new file mode 100644 index 000000000..43e2d90f7 Binary files /dev/null and b/anim.gif differ diff --git a/build.gradle b/build.gradle index 8b86123cc..ddd7534ac 100644 --- a/build.gradle +++ b/build.gradle @@ -1,24 +1,67 @@ buildscript { repositories { mavenCentral() + google() + jcenter() } - dependencies { - classpath 'com.android.tools.build:gradle:0.6.+' + classpath 'com.android.tools.build:gradle:3.5.3' } } -apply plugin: 'android-library' +wrapper { + gradleVersion = '5.6' +} + +apply plugin: 'com.android.library' + android { - compileSdkVersion 17 - buildToolsVersion '17.0.0' - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - res.srcDirs = ['res'] + compileSdkVersion 27 + buildToolsVersion '28.0.3' + + defaultConfig { + minSdkVersion 9 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false } } + lintOptions { + abortOnError false + } + +} + +dependencies { + implementation 'androidx.core:core:1.0.0-beta01' +} + + +//this is used to generate .jar files and push to maven repo +// This is the actual solution, as in http://stackoverflow.com/a/19037807/1002054 +task clearJar(type: Delete) { + delete 'build/outputs/myCompiledLibrary.jar' +} + +task makeJar(type: Copy) { + from('build/intermediates/bundles/release/') + into('build/outputs/') + include('classes.jar') + rename ('classes.jar', 'myCompiledLibrary.jar') +} + +makeJar.dependsOn(clearJar, build) + + +apply from: './maven_push.gradle' + +repositories { + google() + mavenCentral() + jcenter() } \ No newline at end of file diff --git a/doc-assets/1059439_1.png b/doc-assets/1059439_1.png new file mode 100644 index 000000000..8be6dde8b Binary files /dev/null and b/doc-assets/1059439_1.png differ diff --git a/doc-assets/4000611_1.png b/doc-assets/4000611_1.png new file mode 100644 index 000000000..a373f0487 Binary files /dev/null and b/doc-assets/4000611_1.png differ diff --git a/doc-assets/469160_orig_1.png b/doc-assets/469160_orig_1.png new file mode 100644 index 000000000..7b96d263a Binary files /dev/null and b/doc-assets/469160_orig_1.png differ diff --git a/doc-assets/5901645_1.png b/doc-assets/5901645_1.png new file mode 100644 index 000000000..962804de9 Binary files /dev/null and b/doc-assets/5901645_1.png differ diff --git a/doc-assets/6316193_orig_1.png b/doc-assets/6316193_orig_1.png new file mode 100644 index 000000000..f4f6e462a Binary files /dev/null and b/doc-assets/6316193_orig_1.png differ diff --git a/doc-assets/9303658_1.png b/doc-assets/9303658_1.png new file mode 100644 index 000000000..bbba36477 Binary files /dev/null and b/doc-assets/9303658_1.png differ diff --git a/doc-assets/Screen_Shot_2016_10_08_at_12_19_56_1.png b/doc-assets/Screen_Shot_2016_10_08_at_12_19_56_1.png new file mode 100644 index 000000000..b5d610643 Binary files /dev/null and b/doc-assets/Screen_Shot_2016_10_08_at_12_19_56_1.png differ diff --git a/doc-assets/Screen_Shot_2016_10_08_at_12_20_56_1.png b/doc-assets/Screen_Shot_2016_10_08_at_12_20_56_1.png new file mode 100644 index 000000000..77780bb31 Binary files /dev/null and b/doc-assets/Screen_Shot_2016_10_08_at_12_20_56_1.png differ diff --git a/doc-assets/Screen_Shot_2016_10_08_at_12_23_38_1.png b/doc-assets/Screen_Shot_2016_10_08_at_12_23_38_1.png new file mode 100644 index 000000000..745fc291c Binary files /dev/null and b/doc-assets/Screen_Shot_2016_10_08_at_12_23_38_1.png differ diff --git a/doc-assets/Screen_Shot_2016_10_08_at_12_24_19_1.png b/doc-assets/Screen_Shot_2016_10_08_at_12_24_19_1.png new file mode 100644 index 000000000..6f4433146 Binary files /dev/null and b/doc-assets/Screen_Shot_2016_10_08_at_12_24_19_1.png differ diff --git a/doc-assets/Screenshot_20161008_122642_1_1.png b/doc-assets/Screenshot_20161008_122642_1_1.png new file mode 100644 index 000000000..8aba95d2f Binary files /dev/null and b/doc-assets/Screenshot_20161008_122642_1_1.png differ diff --git a/doc-assets/Screenshot_20161011_210215_1.png b/doc-assets/Screenshot_20161011_210215_1.png new file mode 100644 index 000000000..0ed502672 Binary files /dev/null and b/doc-assets/Screenshot_20161011_210215_1.png differ diff --git a/doc-assets/Screenshot_20161012_180242_1.png b/doc-assets/Screenshot_20161012_180242_1.png new file mode 100644 index 000000000..acb238f26 Binary files /dev/null and b/doc-assets/Screenshot_20161012_180242_1.png differ diff --git a/doc-assets/Screenshot_20161012_180257_1.png b/doc-assets/Screenshot_20161012_180257_1.png new file mode 100644 index 000000000..dca262fe7 Binary files /dev/null and b/doc-assets/Screenshot_20161012_180257_1.png differ diff --git a/doc-assets/Screenshot_20161012_180325_1.png b/doc-assets/Screenshot_20161012_180325_1.png new file mode 100644 index 000000000..f20b1436c Binary files /dev/null and b/doc-assets/Screenshot_20161012_180325_1.png differ diff --git a/doc-assets/Screenshot_20161012_180336_1.png b/doc-assets/Screenshot_20161012_180336_1.png new file mode 100644 index 000000000..ae45497de Binary files /dev/null and b/doc-assets/Screenshot_20161012_180336_1.png differ diff --git a/doc-assets/Screenshot_20161012_180355_1.png b/doc-assets/Screenshot_20161012_180355_1.png new file mode 100644 index 000000000..f9797826c Binary files /dev/null and b/doc-assets/Screenshot_20161012_180355_1.png differ diff --git a/doc-assets/Screenshot_20161012_180404_1.png b/doc-assets/Screenshot_20161012_180404_1.png new file mode 100644 index 000000000..069978e9d Binary files /dev/null and b/doc-assets/Screenshot_20161012_180404_1.png differ diff --git a/doc-assets/snapshotshare_1.png b/doc-assets/snapshotshare_1.png new file mode 100644 index 000000000..82901109b Binary files /dev/null and b/doc-assets/snapshotshare_1.png differ diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html deleted file mode 100644 index 999a3111e..000000000 --- a/doc/allclasses-frame.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - - -
- -
| GraphView
- -GraphView.GraphViewData - - |
-
- -
| GraphView
- -GraphView.GraphViewData - - |
-
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Class BarGraphView
--java.lang.Object --LinearLayout -
-
-
-
public class BarGraphView
- extends GraphView
-Draws a Bar Chart -
- -
-
-
-
- Author: -
- Muhammad Shahab Hameed -
- -
| -Nested Class Summary | -
|---|
| Nested classes/interfaces inherited from class com.jjoe64.graphview.GraphView | -
|---|
GraphView.GraphViewData, GraphView.LegendAlign |
-
| -Field Summary | -
|---|
| Fields inherited from class com.jjoe64.graphview.GraphView | -
|---|
paint |
-
| -Constructor Summary | -|
|---|---|
BarGraphView(Context context,
- AttributeSet attrs)
-
-- |
-|
BarGraphView(Context context,
- java.lang.String title)
-
-- |
-|
| -Method Summary | -|
|---|---|
- void |
-drawSeries(Canvas canvas,
- GraphViewDataInterface[] values,
- float graphwidth,
- float graphheight,
- float border,
- double minX,
- double minY,
- double diffX,
- double diffY,
- float horstart,
- GraphViewSeries.GraphViewSeriesStyle style)
-
-- |
-
| Methods inherited from class com.jjoe64.graphview.GraphView | -
|---|
addSeries, drawLegend, formatLabel, getCustomLabelFormatter, getGraphViewStyle, getLegendAlign, getLegendWidth, getMaxX, getMaxY, getMinX, getMinY, isDisableTouch, isScrollable, isShowLegend, redrawAll, removeAllSeries, removeSeries, removeSeries, scrollToEnd, setCustomLabelFormatter, setDisableTouch, setGraphViewStyle, setHorizontalLabels, setLegendAlign, setLegendWidth, setManualYAxis, setManualYAxisBounds, setScalable, setScrollable, setShowLegend, setTitle, setVerticalLabels, setViewPort |
-
| Methods inherited from class java.lang.Object | -
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
-
| -Constructor Detail | -
|---|
-BarGraphView
--public BarGraphView(Context context, - AttributeSet attrs)-
-
-
- -
-BarGraphView
--public BarGraphView(Context context, - java.lang.String title)-
-
-
| -Method Detail | -
|---|
-drawSeries
--public void drawSeries(Canvas canvas, - GraphViewDataInterface[] values, - float graphwidth, - float graphheight, - float border, - double minX, - double minY, - double diffX, - double diffY, - float horstart, - GraphViewSeries.GraphViewSeriesStyle style)-
-
-
-
-
- Specified by:
drawSeriesin classGraphView
--
-
-
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/CustomLabelFormatter.html b/doc/com/jjoe64/graphview/CustomLabelFormatter.html deleted file mode 100644 index 1b441c07b..000000000 --- a/doc/com/jjoe64/graphview/CustomLabelFormatter.html +++ /dev/null @@ -1,233 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Interface CustomLabelFormatter
--
-
-
public interface CustomLabelFormatter
-if you want to show different labels,
- you can use this label formatter.
- As Input you get the raw value (x or y) and
- you return a String that will be displayed.
- graphView.setCustomLabelFormatter(new CustomLabelFormatter() {
- public String formatLabel(double value, boolean isValueX) {
- if (isValueX) {
- if (value < 5) {
- return "small";
- } else if (value < 15) {
- return "middle";
- } else {
- return "big";
- }
- }
- return null; // let graphview generate Y-axis label for us
- }
- });
-
-
- -
-
- -
| -Method Summary | -|
|---|---|
- java.lang.String |
-formatLabel(double value,
- boolean isValueX)
-
-- will be called when the labels were generated |
-
| -Method Detail | -
|---|
-formatLabel
--java.lang.String formatLabel(double value, - boolean isValueX)-
-
-
- will be called when the labels were generated
-
-
-
-
- Parameters:
value- the raw input value (x or y)isValueX- true if value is a x-value, false if otherwise -- Returns:
- the string that will be displayed. return null if you want graphview to generate the label for you.
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/GraphView.GraphViewData.html b/doc/com/jjoe64/graphview/GraphView.GraphViewData.html deleted file mode 100644 index b285a7eab..000000000 --- a/doc/com/jjoe64/graphview/GraphView.GraphViewData.html +++ /dev/null @@ -1,343 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Class GraphView.GraphViewData
--java.lang.Object --
-
-
- All Implemented Interfaces:
- GraphViewDataInterface -
-
-
- Enclosing class:
- GraphView -
-
-
-
public static class GraphView.GraphViewData
- extends java.lang.Object
- implements GraphViewDataInterface
- extends java.lang.Object
-one data set for a graph series -
- -
-
- -
| -Field Summary | -|
|---|---|
- double |
-valueX
-
-- |
-
- double |
-valueY
-
-- |
-
| -Constructor Summary | -|
|---|---|
GraphView.GraphViewData(double valueX,
- double valueY)
-
-- |
-|
| -Method Summary | -|
|---|---|
- double |
-getX()
-
-- |
-
- double |
-getY()
-
-- |
-
| Methods inherited from class java.lang.Object | -
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
-
| -Field Detail | -
|---|
-valueX
--public final double valueX-
-
-
-
-
- -
-valueY
--public final double valueY-
-
-
-
-
| -Constructor Detail | -
|---|
-GraphView.GraphViewData
--public GraphView.GraphViewData(double valueX, - double valueY)-
-
-
| -Method Detail | -
|---|
-getX
--public double getX()-
-
-
-
-
- Specified by:
getXin interfaceGraphViewDataInterface
--
-
-
- -
-getY
--public double getY()-
-
-
-
-
- Specified by:
getYin interfaceGraphViewDataInterface
--
-
-
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/GraphView.LegendAlign.html b/doc/com/jjoe64/graphview/GraphView.LegendAlign.html deleted file mode 100644 index 52e284555..000000000 --- a/doc/com/jjoe64/graphview/GraphView.LegendAlign.html +++ /dev/null @@ -1,341 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | ENUM CONSTANTS | FIELD | METHOD | --DETAIL: ENUM CONSTANTS | FIELD | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Enum GraphView.LegendAlign
--java.lang.Object --
-
-
- All Implemented Interfaces:
- java.io.Serializable, java.lang.Comparable<GraphView.LegendAlign> -
-
-
- Enclosing class:
- GraphView -
-
-
-
public static enum GraphView.LegendAlign
- extends java.lang.Enum<GraphView.LegendAlign>
-
- -
| -Enum Constant Summary | -|
|---|---|
BOTTOM
-
-- |
-|
MIDDLE
-
-- |
-|
TOP
-
-- |
-|
| -Method Summary | -|
|---|---|
-static GraphView.LegendAlign |
-valueOf(java.lang.String name)
-
-- Returns the enum constant of this type with the specified name. |
-
-static GraphView.LegendAlign[] |
-values()
-
-- Returns an array containing the constants of this enum type, in -the order they are declared. |
-
| Methods inherited from class java.lang.Enum | -
|---|
clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf |
-
| Methods inherited from class java.lang.Object | -
|---|
getClass, notify, notifyAll, wait, wait, wait |
-
| -Enum Constant Detail | -
|---|
-TOP
--public static final GraphView.LegendAlign TOP-
-
-
-
-
- -
-MIDDLE
--public static final GraphView.LegendAlign MIDDLE-
-
-
-
-
- -
-BOTTOM
--public static final GraphView.LegendAlign BOTTOM-
-
-
-
-
| -Method Detail | -
|---|
-values
--public static GraphView.LegendAlign[] values()-
-
-
- Returns an array containing the constants of this enum type, in
-the order they are declared. This method may be used to iterate
-over the constants as follows:
-
-for (GraphView.LegendAlign c : GraphView.LegendAlign.values()) - System.out.println(c); -
--
-
-
-
- Returns:
- an array containing the constants of this enum type, in -the order they are declared
- -
-valueOf
--public static GraphView.LegendAlign valueOf(java.lang.String name)-
-
-
- Returns the enum constant of this type with the specified name.
-The string must match exactly an identifier used to declare an
-enum constant in this type. (Extraneous whitespace characters are
-not permitted.)
-
-
-
-
- Parameters:
name- the name of the enum constant to be returned. -- Returns:
- the enum constant with the specified name -
- Throws: -
java.lang.IllegalArgumentException- if this enum type has no constant -with the specified name -java.lang.NullPointerException- if the argument is null
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | ENUM CONSTANTS | FIELD | METHOD | --DETAIL: ENUM CONSTANTS | FIELD | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/GraphView.html b/doc/com/jjoe64/graphview/GraphView.html deleted file mode 100644 index 08cad70c6..000000000 --- a/doc/com/jjoe64/graphview/GraphView.html +++ /dev/null @@ -1,1079 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Class GraphView
--java.lang.Object --
-
-
- Direct Known Subclasses:
- BarGraphView, LineGraphView -
-
-
-
public abstract class GraphView
- extends LinearLayout
-GraphView is a Android View for creating zoomable and scrollable graphs.
- This is the abstract base class for all graphs. Extend this class and implement #drawSeries(Canvas, GraphViewDataInterface[], float, float, float, double, double, double, double, float) to display a custom graph.
- Use LineGraphView for creating a line chart.
-
- -
-
-
-
- Author: -
- jjoe64 - jonas gehring - http://www.jjoe64.com - - Copyright (C) 2011 Jonas Gehring - Licensed under the GNU Lesser General Public License (LGPL) - http://www.gnu.org/licenses/lgpl.html -
- -
| -Nested Class Summary | -|
|---|---|
-static class |
-GraphView.GraphViewData
-
-- one data set for a graph series |
-
-static class |
-GraphView.LegendAlign
-
-- |
-
| -Field Summary | -|
|---|---|
-protected Paint |
-paint
-
-- |
-
| -Constructor Summary | -|
|---|---|
GraphView(Context context,
- AttributeSet attrs)
-
-- |
-|
GraphView(Context context,
- java.lang.String title)
-
-- |
-|
| -Method Summary | -|
|---|---|
- void |
-addSeries(GraphViewSeries series)
-
-- add a series of data to the graph |
-
-protected void |
-drawLegend(Canvas canvas,
- float height,
- float width)
-
-- |
-
-protected abstract void |
-drawSeries(Canvas canvas,
- GraphViewDataInterface[] values,
- float graphwidth,
- float graphheight,
- float border,
- double minX,
- double minY,
- double diffX,
- double diffY,
- float horstart,
- GraphViewSeries.GraphViewSeriesStyle style)
-
-- |
-
-protected java.lang.String |
-formatLabel(double value,
- boolean isValueX)
-
-- Deprecated. use setCustomLabelFormatter(CustomLabelFormatter) |
-
- CustomLabelFormatter |
-getCustomLabelFormatter()
-
-- |
-
- GraphViewStyle |
-getGraphViewStyle()
-
-- |
-
- GraphView.LegendAlign |
-getLegendAlign()
-
-- get the position of the legend |
-
- float |
-getLegendWidth()
-
-- |
-
-protected double |
-getMaxX(boolean ignoreViewport)
-
-- returns the maximal X value of the current viewport (if viewport is set) - otherwise maximal X value of all data. |
-
-protected double |
-getMaxY()
-
-- returns the maximal Y value of all data. |
-
-protected double |
-getMinX(boolean ignoreViewport)
-
-- returns the minimal X value of the current viewport (if viewport is set) - otherwise minimal X value of all data. |
-
-protected double |
-getMinY()
-
-- returns the minimal Y value of all data. |
-
- boolean |
-isDisableTouch()
-
-- |
-
- boolean |
-isScrollable()
-
-- |
-
- boolean |
-isShowLegend()
-
-- |
-
- void |
-redrawAll()
-
-- forces graphview to invalide all views and caches. |
-
- void |
-removeAllSeries()
-
-- removes all series |
-
- void |
-removeSeries(GraphViewSeries series)
-
-- removes a series |
-
- void |
-removeSeries(int index)
-
-- removes series |
-
- void |
-scrollToEnd()
-
-- scrolls to the last x-value |
-
- void |
-setCustomLabelFormatter(CustomLabelFormatter customLabelFormatter)
-
-- set a custom label formatter |
-
- void |
-setDisableTouch(boolean disableTouch)
-
-- The user can disable any touch gestures, this is useful if you are using a real time graph, but don't want the user to interact |
-
- void |
-setGraphViewStyle(GraphViewStyle style)
-
-- set custom graphview style |
-
- void |
-setHorizontalLabels(java.lang.String[] horlabels)
-
-- set's static horizontal labels (from left to right) |
-
- void |
-setLegendAlign(GraphView.LegendAlign legendAlign)
-
-- legend position |
-
- void |
-setLegendWidth(float legendWidth)
-
-- legend width |
-
- void |
-setManualYAxis(boolean manualYAxis)
-
-- you have to set the bounds setManualYAxisBounds(double, double). |
-
- void |
-setManualYAxisBounds(double max,
- double min)
-
-- set manual Y axis limit |
-
- void |
-setScalable(boolean scalable)
-
-- this forces scrollable = true |
-
- void |
-setScrollable(boolean scrollable)
-
-- the user can scroll (horizontal) the graph. |
-
- void |
-setShowLegend(boolean showLegend)
-
-- |
-
- void |
-setTitle(java.lang.String title)
-
-- sets the title of graphview |
-
- void |
-setVerticalLabels(java.lang.String[] verlabels)
-
-- set's static vertical labels (from top to bottom) |
-
- void |
-setViewPort(double start,
- double size)
-
-- set's the viewport for the graph. |
-
| Methods inherited from class java.lang.Object | -
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
-
| -Field Detail | -
|---|
-paint
--protected final Paint paint-
-
-
-
-
| -Constructor Detail | -
|---|
-GraphView
--public GraphView(Context context, - AttributeSet attrs)-
-
-
- -
-GraphView
--public GraphView(Context context, - java.lang.String title)-
-
-
- Parameters:
context-title- [optional]
-
-
| -Method Detail | -
|---|
-addSeries
--public void addSeries(GraphViewSeries series)-
-
-
- add a series of data to the graph
-
-
-
-
- Parameters:
series-
- -
-drawLegend
--protected void drawLegend(Canvas canvas, - float height, - float width)-
-
-
-
-
-
- -
-drawSeries
--protected abstract void drawSeries(Canvas canvas, - GraphViewDataInterface[] values, - float graphwidth, - float graphheight, - float border, - double minX, - double minY, - double diffX, - double diffY, - float horstart, - GraphViewSeries.GraphViewSeriesStyle style)-
-
-
-
-
-
- -
-formatLabel
--@Deprecated -protected java.lang.String formatLabel(double value, - boolean isValueX)-
-
-
- Deprecated. use
setCustomLabelFormatter(CustomLabelFormatter)--
- formats the label - use #setCustomLabelFormatter or static labels if you want custom labels -
-
-
-
- Parameters:
value- x and y valuesisValueX- if false, value y wants to be formatted -- Returns:
- value to display
- formats the label - use #setCustomLabelFormatter or static labels if you want custom labels -
- -
-getCustomLabelFormatter
--public CustomLabelFormatter getCustomLabelFormatter()-
-
-
-
-
-
- Returns:
- the custom label formatter, if there is one. otherwise null
-
- -
-getGraphViewStyle
--public GraphViewStyle getGraphViewStyle()-
-
-
-
-
-
- Returns:
- the graphview style. it will never be null.
-
- -
-getLegendAlign
--public GraphView.LegendAlign getLegendAlign()-
-
-
- get the position of the legend
-
-
-
-
-
- Returns:
- -
-getLegendWidth
--public float getLegendWidth()-
-
-
-
-
-
- Returns:
- legend width
-
- -
-getMaxX
--protected double getMaxX(boolean ignoreViewport)-
-
-
- returns the maximal X value of the current viewport (if viewport is set)
- otherwise maximal X value of all data.
-
-
-
-
- Parameters:
ignoreViewport- warning: only override this, if you really know want you're doing!
- -
-getMaxY
--protected double getMaxY()-
-
-
- returns the maximal Y value of all data.
-
- warning: only override this, if you really know want you're doing!
-
-
-
-
- -
-getMinX
--protected double getMinX(boolean ignoreViewport)-
-
-
- returns the minimal X value of the current viewport (if viewport is set)
- otherwise minimal X value of all data.
-
-
-
-
- Parameters:
ignoreViewport- warning: only override this, if you really know want you're doing!
- -
-getMinY
--protected double getMinY()-
-
-
- returns the minimal Y value of all data.
-
- warning: only override this, if you really know want you're doing!
-
-
-
-
- -
-isDisableTouch
--public boolean isDisableTouch()-
-
-
-
-
-
- -
-isScrollable
--public boolean isScrollable()-
-
-
-
-
-
- -
-isShowLegend
--public boolean isShowLegend()-
-
-
-
-
-
- -
-redrawAll
--public void redrawAll()-
-
-
- forces graphview to invalide all views and caches.
- Normally there is no need to call this manually.
-
-
-
-
- -
-removeAllSeries
--public void removeAllSeries()-
-
-
- removes all series
-
-
-
-
- -
-removeSeries
--public void removeSeries(GraphViewSeries series)-
-
-
- removes a series
-
-
-
-
- Parameters:
series- series to remove
- -
-removeSeries
--public void removeSeries(int index)-
-
-
- removes series
-
-
-
-
- Parameters:
index-
- -
-scrollToEnd
--public void scrollToEnd()-
-
-
- scrolls to the last x-value
-
-
-
-
-
- Throws: -
java.lang.IllegalStateException- if scrollable == false
- -
-setCustomLabelFormatter
--public void setCustomLabelFormatter(CustomLabelFormatter customLabelFormatter)-
-
-
- set a custom label formatter
-
-
-
-
- Parameters:
customLabelFormatter-
- -
-setDisableTouch
--public void setDisableTouch(boolean disableTouch)-
-
-
- The user can disable any touch gestures, this is useful if you are using a real time graph, but don't want the user to interact
-
-
-
-
- Parameters:
disableTouch-
- -
-setGraphViewStyle
--public void setGraphViewStyle(GraphViewStyle style)-
-
-
- set custom graphview style
-
-
-
-
- Parameters:
style-
- -
-setHorizontalLabels
--public void setHorizontalLabels(java.lang.String[] horlabels)-
-
-
- set's static horizontal labels (from left to right)
-
-
-
-
- Parameters:
horlabels- if null, labels were generated automatically
- -
-setLegendAlign
--public void setLegendAlign(GraphView.LegendAlign legendAlign)-
-
-
- legend position
-
-
-
-
- Parameters:
legendAlign-
- -
-setLegendWidth
--public void setLegendWidth(float legendWidth)-
-
-
- legend width
-
-
-
-
- Parameters:
legendWidth-
- -
-setManualYAxis
--public void setManualYAxis(boolean manualYAxis)-
-
-
- you have to set the bounds
setManualYAxisBounds(double, double). That automatically enables manualYAxis-flag. - if you want to disable the menual y axis, call this method with false. --
-
-
- Parameters:
manualYAxis-
- -
-setManualYAxisBounds
--public void setManualYAxisBounds(double max, - double min)-
-
-
- set manual Y axis limit
-
-
-
-
- Parameters:
max-min-
- -
-setScalable
--public void setScalable(boolean scalable)-
-
-
- this forces scrollable = true
-
-
-
-
- Parameters:
scalable-
- -
-setScrollable
--public void setScrollable(boolean scrollable)-
-
-
- the user can scroll (horizontal) the graph. This is only useful if you use a viewport
setViewPort(double, double)which doesn't displays all data. --
-
-
- Parameters:
scrollable-
- -
-setShowLegend
--public void setShowLegend(boolean showLegend)-
-
-
-
-
-
- -
-setTitle
--public void setTitle(java.lang.String title)-
-
-
- sets the title of graphview
-
-
-
-
- Parameters:
title-
- -
-setVerticalLabels
--public void setVerticalLabels(java.lang.String[] verlabels)-
-
-
- set's static vertical labels (from top to bottom)
-
-
-
-
- Parameters:
verlabels- if null, labels were generated automatically
- -
-setViewPort
--public void setViewPort(double start, - double size)-
-
-
- set's the viewport for the graph.
-
-
-
-
- Parameters:
start- x-valuesize-- See Also:
to limit the y-viewport
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/GraphViewDataInterface.html b/doc/com/jjoe64/graphview/GraphViewDataInterface.html deleted file mode 100644 index d8d9bf8cc..000000000 --- a/doc/com/jjoe64/graphview/GraphViewDataInterface.html +++ /dev/null @@ -1,234 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Interface GraphViewDataInterface
--
-
- All Known Implementing Classes:
- GraphView.GraphViewData -
-
-
-
public interface GraphViewDataInterface
-the base interface for the graphview data. - you can use your own data models, when they implement - this interface. -
- -
-
- -
| -Method Summary | -|
|---|---|
- double |
-getX()
-
-- |
-
- double |
-getY()
-
-- |
-
| -Method Detail | -
|---|
-getX
--double getX()-
-
-
-
-
-
- -
-getY
--double getY()-
-
-
-
-
-
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/GraphViewSeries.GraphViewSeriesStyle.html b/doc/com/jjoe64/graphview/GraphViewSeries.GraphViewSeriesStyle.html deleted file mode 100644 index 0f471a63d..000000000 --- a/doc/com/jjoe64/graphview/GraphViewSeries.GraphViewSeriesStyle.html +++ /dev/null @@ -1,351 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Class GraphViewSeries.GraphViewSeriesStyle
--java.lang.Object --
-
-
- Enclosing class:
- GraphViewSeries -
-
-
-
public static class GraphViewSeries.GraphViewSeriesStyle
- extends java.lang.Object
-graph series style: color and thickness -
- -
-
- -
| -Field Summary | -|
|---|---|
- int |
-color
-
-- |
-
- int |
-thickness
-
-- |
-
| -Constructor Summary | -|
|---|---|
GraphViewSeries.GraphViewSeriesStyle()
-
-- |
-|
GraphViewSeries.GraphViewSeriesStyle(int color,
- int thickness)
-
-- |
-|
| -Method Summary | -|
|---|---|
- ValueDependentColor |
-getValueDependentColor()
-
-- |
-
- void |
-setValueDependentColor(ValueDependentColor valueDependentColor)
-
-- the color depends on the value of the data. |
-
| Methods inherited from class java.lang.Object | -
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
-
| -Field Detail | -
|---|
-color
--public int color-
-
-
-
-
- -
-thickness
--public int thickness-
-
-
-
-
| -Constructor Detail | -
|---|
-GraphViewSeries.GraphViewSeriesStyle
--public GraphViewSeries.GraphViewSeriesStyle()-
-
-
- -
-GraphViewSeries.GraphViewSeriesStyle
--public GraphViewSeries.GraphViewSeriesStyle(int color, - int thickness)-
-
-
| -Method Detail | -
|---|
-getValueDependentColor
--public ValueDependentColor getValueDependentColor()-
-
-
-
-
-
- -
-setValueDependentColor
--public void setValueDependentColor(ValueDependentColor valueDependentColor)-
-
-
- the color depends on the value of the data.
- only possible in BarGraphView
-
-
-
-
- Parameters:
valueDependentColor-
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/GraphViewSeries.html b/doc/com/jjoe64/graphview/GraphViewSeries.html deleted file mode 100644 index ebcf39402..000000000 --- a/doc/com/jjoe64/graphview/GraphViewSeries.html +++ /dev/null @@ -1,408 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Class GraphViewSeries
--java.lang.Object --
-
-
-
public class GraphViewSeries
- extends java.lang.Object
-a graphview series. - holds the data, description and styles -
- -
-
- -
| -Nested Class Summary | -|
|---|---|
-static class |
-GraphViewSeries.GraphViewSeriesStyle
-
-- graph series style: color and thickness |
-
| -Constructor Summary | -|
|---|---|
GraphViewSeries(GraphViewDataInterface[] values)
-
-- |
-|
GraphViewSeries(java.lang.String description,
- GraphViewSeries.GraphViewSeriesStyle style,
- GraphViewDataInterface[] values)
-
-- |
-|
| -Method Summary | -|
|---|---|
- void |
-addGraphView(GraphView graphView)
-
-- this graphview will be redrawn if data changes |
-
- void |
-appendData(GraphViewDataInterface value,
- boolean scrollToEnd)
-
-- Deprecated. please use appendData(GraphViewDataInterface, boolean, int) to avoid memory overflow |
-
- void |
-appendData(GraphViewDataInterface value,
- boolean scrollToEnd,
- int maxDataCount)
-
-- add one data to current data |
-
- GraphViewSeries.GraphViewSeriesStyle |
-getStyle()
-
-- |
-
- void |
-removeGraphView(GraphView graphView)
-
-- you should use GraphView.removeSeries(GraphViewSeries) |
-
- void |
-resetData(GraphViewDataInterface[] values)
-
-- clears the current data and set the new. |
-
| Methods inherited from class java.lang.Object | -
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
-
| -Constructor Detail | -
|---|
-GraphViewSeries
--public GraphViewSeries(GraphViewDataInterface[] values)-
-
-
- -
-GraphViewSeries
--public GraphViewSeries(java.lang.String description, - GraphViewSeries.GraphViewSeriesStyle style, - GraphViewDataInterface[] values)-
-
-
| -Method Detail | -
|---|
-addGraphView
--public void addGraphView(GraphView graphView)-
-
-
- this graphview will be redrawn if data changes
-
-
-
-
- Parameters:
graphView-
- -
-appendData
--@Deprecated -public void appendData(GraphViewDataInterface value, - boolean scrollToEnd)-
-
-
- Deprecated. please use
appendData(GraphViewDataInterface, boolean, int)to avoid memory overflow --
- add one data to current data -
-
-
-
- Parameters:
value- the new data to appendscrollToEnd- true => graphview will scroll to the end (maxX)
- add one data to current data -
- -
-appendData
--public void appendData(GraphViewDataInterface value, - boolean scrollToEnd, - int maxDataCount)-
-
-
- add one data to current data
-
-
-
-
- Parameters:
value- the new data to appendscrollToEnd- true => graphview will scroll to the end (maxX)maxDataCount- if max data count is reached, the oldest data value will be lost
- -
-getStyle
--public GraphViewSeries.GraphViewSeriesStyle getStyle()-
-
-
-
-
-
- Returns:
- series styles. never null
-
- -
-removeGraphView
--public void removeGraphView(GraphView graphView)-
-
-
- you should use
GraphView.removeSeries(GraphViewSeries)--
-
-
- Parameters:
graphView-
- -
-resetData
--public void resetData(GraphViewDataInterface[] values)-
-
-
- clears the current data and set the new.
- redraws the graphview(s)
-
-
-
-
- Parameters:
values- new data
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/GraphViewStyle.html b/doc/com/jjoe64/graphview/GraphViewStyle.html deleted file mode 100644 index 8f3c7f2df..000000000 --- a/doc/com/jjoe64/graphview/GraphViewStyle.html +++ /dev/null @@ -1,522 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Class GraphViewStyle
--java.lang.Object --
-
-
-
public class GraphViewStyle
- extends java.lang.Object
-Styles for the GraphView - Important: Use GraphViewSeries.GraphViewSeriesStyle for series-specify styling -
- -
-
- -
| -Constructor Summary | -|
|---|---|
GraphViewStyle()
-
-- |
-|
GraphViewStyle(int vLabelsColor,
- int hLabelsColor,
- int gridColor)
-
-- |
-|
| -Method Summary | -|
|---|---|
- int |
-getGridColor()
-
-- |
-
- int |
-getHorizontalLabelsColor()
-
-- |
-
- int |
-getNumHorizontalLabels()
-
-- |
-
- int |
-getNumVerticalLabels()
-
-- |
-
- float |
-getTextSize()
-
-- |
-
- int |
-getVerticalLabelsColor()
-
-- |
-
- int |
-getVerticalLabelsWidth()
-
-- |
-
- void |
-setGridColor(int c)
-
-- |
-
- void |
-setHorizontalLabelsColor(int c)
-
-- |
-
- void |
-setNumHorizontalLabels(int numHorizontalLabels)
-
-- |
-
- void |
-setNumVerticalLabels(int numVerticalLabels)
-
-- |
-
- void |
-setTextSize(float textSize)
-
-- |
-
- void |
-setVerticalLabelsColor(int c)
-
-- |
-
- void |
-setVerticalLabelsWidth(int verticalLabelsWidth)
-
-- |
-
| Methods inherited from class java.lang.Object | -
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
-
| -Constructor Detail | -
|---|
-GraphViewStyle
--public GraphViewStyle()-
-
-
- -
-GraphViewStyle
--public GraphViewStyle(int vLabelsColor, - int hLabelsColor, - int gridColor)-
-
-
| -Method Detail | -
|---|
-getGridColor
--public int getGridColor()-
-
-
-
-
-
- -
-getHorizontalLabelsColor
--public int getHorizontalLabelsColor()-
-
-
-
-
-
- -
-getNumHorizontalLabels
--public int getNumHorizontalLabels()-
-
-
-
-
-
- -
-getNumVerticalLabels
--public int getNumVerticalLabels()-
-
-
-
-
-
- -
-getTextSize
--public float getTextSize()-
-
-
-
-
-
- -
-getVerticalLabelsColor
--public int getVerticalLabelsColor()-
-
-
-
-
-
- -
-getVerticalLabelsWidth
--public int getVerticalLabelsWidth()-
-
-
-
-
-
- -
-setGridColor
--public void setGridColor(int c)-
-
-
-
-
-
- -
-setHorizontalLabelsColor
--public void setHorizontalLabelsColor(int c)-
-
-
-
-
-
- -
-setNumHorizontalLabels
--public void setNumHorizontalLabels(int numHorizontalLabels)-
-
-
-
-
- Parameters:
numHorizontalLabels- 0 = auto
-
- -
-setNumVerticalLabels
--public void setNumVerticalLabels(int numVerticalLabels)-
-
-
-
-
- Parameters:
numVerticalLabels- 0 = auto
-
- -
-setTextSize
--public void setTextSize(float textSize)-
-
-
-
-
-
- -
-setVerticalLabelsColor
--public void setVerticalLabelsColor(int c)-
-
-
-
-
-
- -
-setVerticalLabelsWidth
--public void setVerticalLabelsWidth(int verticalLabelsWidth)-
-
-
-
-
- Parameters:
verticalLabelsWidth- 0 = auto
-
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/LineGraphView.html b/doc/com/jjoe64/graphview/LineGraphView.html deleted file mode 100644 index d18b516b8..000000000 --- a/doc/com/jjoe64/graphview/LineGraphView.html +++ /dev/null @@ -1,421 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Class LineGraphView
--java.lang.Object --
-
-
-
public class LineGraphView
- extends GraphView
-Line Graph View. This draws a line chart. -
- -
-
- -
| -Nested Class Summary | -
|---|
| Nested classes/interfaces inherited from class com.jjoe64.graphview.GraphView | -
|---|
GraphView.GraphViewData, GraphView.LegendAlign |
-
| -Field Summary | -
|---|
| Fields inherited from class com.jjoe64.graphview.GraphView | -
|---|
paint |
-
| -Constructor Summary | -|
|---|---|
LineGraphView(Context context,
- AttributeSet attrs)
-
-- |
-|
LineGraphView(Context context,
- java.lang.String title)
-
-- |
-|
| -Method Summary | -|
|---|---|
- void |
-drawSeries(Canvas canvas,
- GraphViewDataInterface[] values,
- float graphwidth,
- float graphheight,
- float border,
- double minX,
- double minY,
- double diffX,
- double diffY,
- float horstart,
- GraphViewSeries.GraphViewSeriesStyle style)
-
-- |
-
- int |
-getBackgroundColor()
-
-- |
-
- boolean |
-getDrawBackground()
-
-- |
-
- void |
-setBackgroundColor(int color)
-
-- |
-
- void |
-setDrawBackground(boolean drawBackground)
-
-- |
-
| Methods inherited from class com.jjoe64.graphview.GraphView | -
|---|
addSeries, drawLegend, formatLabel, getCustomLabelFormatter, getGraphViewStyle, getLegendAlign, getLegendWidth, getMaxX, getMaxY, getMinX, getMinY, isDisableTouch, isScrollable, isShowLegend, redrawAll, removeAllSeries, removeSeries, removeSeries, scrollToEnd, setCustomLabelFormatter, setDisableTouch, setGraphViewStyle, setHorizontalLabels, setLegendAlign, setLegendWidth, setManualYAxis, setManualYAxisBounds, setScalable, setScrollable, setShowLegend, setTitle, setVerticalLabels, setViewPort |
-
| Methods inherited from class java.lang.Object | -
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
-
| -Constructor Detail | -
|---|
-LineGraphView
--public LineGraphView(Context context, - AttributeSet attrs)-
-
-
- -
-LineGraphView
--public LineGraphView(Context context, - java.lang.String title)-
-
-
| -Method Detail | -
|---|
-drawSeries
--public void drawSeries(Canvas canvas, - GraphViewDataInterface[] values, - float graphwidth, - float graphheight, - float border, - double minX, - double minY, - double diffX, - double diffY, - float horstart, - GraphViewSeries.GraphViewSeriesStyle style)-
-
-
-
-
- Specified by:
drawSeriesin classGraphView
--
-
-
- -
-getBackgroundColor
--public int getBackgroundColor()-
-
-
-
-
-
- -
-getDrawBackground
--public boolean getDrawBackground()-
-
-
-
-
-
- -
-setBackgroundColor
--public void setBackgroundColor(int color)-
-
-
-
-
-
- -
-setDrawBackground
--public void setDrawBackground(boolean drawBackground)-
-
-
-
-
- Parameters:
drawBackground- true for a light blue background under the graph line
-
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/ValueDependentColor.html b/doc/com/jjoe64/graphview/ValueDependentColor.html deleted file mode 100644 index 7c13ec07b..000000000 --- a/doc/com/jjoe64/graphview/ValueDependentColor.html +++ /dev/null @@ -1,211 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview
-
-Interface ValueDependentColor
--
-
-
public interface ValueDependentColor
-you can change the color depending on the value. - takes only effect in BarGraphView -
- -
-
- -
| -Method Summary | -|
|---|---|
- int |
-get(GraphViewDataInterface data)
-
-- |
-
| -Method Detail | -
|---|
-get
--int get(GraphViewDataInterface data)-
-
-
-
-
-
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- - - diff --git a/doc/com/jjoe64/graphview/class-use/GraphView.GraphViewData.html b/doc/com/jjoe64/graphview/class-use/GraphView.GraphViewData.html deleted file mode 100644 index dddb4b9ac..000000000 --- a/doc/com/jjoe64/graphview/class-use/GraphView.GraphViewData.html +++ /dev/null @@ -1,167 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -||||||||
| - PREV - NEXT | -- FRAMES - NO FRAMES - - - - - | -||||||||
-
-Uses of Class
com.jjoe64.graphview.GraphView.GraphViewData
-| -Uses of GraphView.GraphViewData in com.jjoe64.graphview | -
|---|
- -
| Constructors in com.jjoe64.graphview with parameters of type GraphView.GraphViewData | -|
|---|---|
GraphView(Context context,
- GraphView.GraphViewData[] values,
- java.lang.String title,
- java.lang.String[] horlabels,
- java.lang.String[] verlabels)
-
-- |
-|
-
- - - - - -
-
-
|
-- - | -||||||||
| - PREV - NEXT | -- FRAMES - NO FRAMES - - - - - | -||||||||
- - - diff --git a/doc/com/jjoe64/graphview/class-use/GraphView.html b/doc/com/jjoe64/graphview/class-use/GraphView.html deleted file mode 100644 index 51b14782c..000000000 --- a/doc/com/jjoe64/graphview/class-use/GraphView.html +++ /dev/null @@ -1,142 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -||||||||
| - PREV - NEXT | -- FRAMES - NO FRAMES - - - - - | -||||||||
-
-Uses of Class
com.jjoe64.graphview.GraphView
--
- - - - - -
-
-
|
-- - | -||||||||
| - PREV - NEXT | -- FRAMES - NO FRAMES - - - - - | -||||||||
- - - diff --git a/doc/com/jjoe64/graphview/compatible/RealScaleGestureDetector.html b/doc/com/jjoe64/graphview/compatible/RealScaleGestureDetector.html deleted file mode 100644 index 821853340..000000000 --- a/doc/com/jjoe64/graphview/compatible/RealScaleGestureDetector.html +++ /dev/null @@ -1,250 +0,0 @@ - - - - - -
- - - - - -
-
-
|
-- - | -|||||||||
| - PREV CLASS - NEXT CLASS | -- FRAMES - NO FRAMES - - - - - | -|||||||||
| - SUMMARY: NESTED | FIELD | CONSTR | METHOD | --DETAIL: FIELD | CONSTR | METHOD | -|||||||||
- -
-
-com.jjoe64.graphview.compatible
-
-Class RealScaleGestureDetector
--java.lang.Object --com.jjoe64.graphview.compatible.ScaleGestureDetector -
-
-
-
- --
- -- --Nested Class Summary --
- - - - - -- -Nested classes/interfaces inherited from class com.jjoe64.graphview.compatible.ScaleGestureDetector -- -ScaleGestureDetector.SimpleOnScaleGestureListener-
- --Constructor Summary -- RealScaleGestureDetector(Context context, - ScaleGestureDetector fakeScaleGestureDetector, - ScaleGestureDetector.SimpleOnScaleGestureListener fakeListener)- -
- - - - --
- -- --Method Summary --
- -- -Methods inherited from class com.jjoe64.graphview.compatible.ScaleGestureDetector -- -getScaleFactor, isInProgress, onTouchEvent-
- -- -Methods inherited from class java.lang.Object -- -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait-
- -- --Constructor Detail --RealScaleGestureDetector
--public RealScaleGestureDetector(Context context, - ScaleGestureDetector fakeScaleGestureDetector, - ScaleGestureDetector.SimpleOnScaleGestureListener fakeListener)
--
-
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV CLASS - NEXT CLASS -- FRAMES - NO FRAMES - - - - - -- -- SUMMARY: NESTED | FIELD | CONSTR | METHOD --DETAIL: FIELD | CONSTR | METHOD -
- - - diff --git a/doc/com/jjoe64/graphview/compatible/ScaleGestureDetector.SimpleOnScaleGestureListener.html b/doc/com/jjoe64/graphview/compatible/ScaleGestureDetector.SimpleOnScaleGestureListener.html deleted file mode 100644 index 56a153a95..000000000 --- a/doc/com/jjoe64/graphview/compatible/ScaleGestureDetector.SimpleOnScaleGestureListener.html +++ /dev/null @@ -1,209 +0,0 @@ - - - - - --ScaleGestureDetector.SimpleOnScaleGestureListener - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV CLASS - NEXT CLASS -- FRAMES - NO FRAMES - - - - - -- -- SUMMARY: NESTED | FIELD | CONSTR | METHOD --DETAIL: FIELD | CONSTR | METHOD -
- -- -com.jjoe64.graphview.compatible -
-
-Interface ScaleGestureDetector.SimpleOnScaleGestureListener-
-
- Enclosing class:
- ScaleGestureDetector -
--
-
public static interface ScaleGestureDetector.SimpleOnScaleGestureListener
-
- --
- -- --Method Summary -- -- -booleanonScale(ScaleGestureDetector detector)- -
--
- -- --Method Detail --onScale
--boolean onScale(ScaleGestureDetector detector)
--
-
-
-
-
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV CLASS - NEXT CLASS -- FRAMES - NO FRAMES - - - - - -- -- SUMMARY: NESTED | FIELD | CONSTR | METHOD --DETAIL: FIELD | CONSTR | METHOD -
- - - diff --git a/doc/com/jjoe64/graphview/compatible/ScaleGestureDetector.html b/doc/com/jjoe64/graphview/compatible/ScaleGestureDetector.html deleted file mode 100644 index d1fe400bd..000000000 --- a/doc/com/jjoe64/graphview/compatible/ScaleGestureDetector.html +++ /dev/null @@ -1,314 +0,0 @@ - - - - - --ScaleGestureDetector - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV CLASS - NEXT CLASS -- FRAMES - NO FRAMES - - - - - -- -- SUMMARY: NESTED | FIELD | CONSTR | METHOD --DETAIL: FIELD | CONSTR | METHOD -
- -- -com.jjoe64.graphview.compatible -
-
-Class ScaleGestureDetector-java.lang.Object -
-com.jjoe64.graphview.compatible.ScaleGestureDetector
--
-
- Direct Known Subclasses:
- RealScaleGestureDetector -
--
-
public class ScaleGestureDetector
- extends java.lang.Object
-
- --
- - - - -- --Nested Class Summary -- -- -static interfaceScaleGestureDetector.SimpleOnScaleGestureListener- -
--
- - - - -- --Constructor Summary -- -ScaleGestureDetector(Context context, - ScaleGestureDetector.SimpleOnScaleGestureListener simpleOnScaleGestureListener)- -
--
- -- --Method Summary -- -- -doublegetScaleFactor()- -
-- -- -booleanisInProgress()- -
-- -- -voidonTouchEvent(MotionEvent event)- -
--
- -- -Methods inherited from class java.lang.Object -- -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait-
- -- --Constructor Detail --ScaleGestureDetector
--public ScaleGestureDetector(Context context, - ScaleGestureDetector.SimpleOnScaleGestureListener simpleOnScaleGestureListener)
--
-
- Parameters:
context-simpleOnScaleGestureListener-
-
-
-
- -- --Method Detail --getScaleFactor
--public double getScaleFactor()
--
-
-
-
-
- --isInProgress
--public boolean isInProgress()
--
-
-
-
-
- --onTouchEvent
--public void onTouchEvent(MotionEvent event)
--
-
-
-
-
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV CLASS - NEXT CLASS -- FRAMES - NO FRAMES - - - - - -- -- SUMMARY: NESTED | FIELD | CONSTR | METHOD --DETAIL: FIELD | CONSTR | METHOD -
- - - diff --git a/doc/com/jjoe64/graphview/compatible/package-frame.html b/doc/com/jjoe64/graphview/compatible/package-frame.html deleted file mode 100644 index 68eaca084..000000000 --- a/doc/com/jjoe64/graphview/compatible/package-frame.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - --com.jjoe64.graphview.compatible - - - - - - - - - - - -com.jjoe64.graphview.compatible --
- - -- --Interfaces - - -
-ScaleGestureDetector.SimpleOnScaleGestureListener-
- - - - diff --git a/doc/com/jjoe64/graphview/compatible/package-summary.html b/doc/com/jjoe64/graphview/compatible/package-summary.html deleted file mode 100644 index 0b5f6924f..000000000 --- a/doc/com/jjoe64/graphview/compatible/package-summary.html +++ /dev/null @@ -1,165 +0,0 @@ - - - - - -- --Classes - - -
-RealScaleGestureDetector -
-ScaleGestureDetector-com.jjoe64.graphview.compatible - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV PACKAGE - NEXT PACKAGE -- FRAMES - NO FRAMES - - - - - -
--Package com.jjoe64.graphview.compatible -
- --
- - -- --Interface Summary -- -ScaleGestureDetector.SimpleOnScaleGestureListener -- -
-
- --Class Summary -- RealScaleGestureDetector --
-
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV PACKAGE - NEXT PACKAGE -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/com/jjoe64/graphview/compatible/package-tree.html b/doc/com/jjoe64/graphview/compatible/package-tree.html deleted file mode 100644 index 45d66fdc3..000000000 --- a/doc/com/jjoe64/graphview/compatible/package-tree.html +++ /dev/null @@ -1,160 +0,0 @@ - - - - - --com.jjoe64.graphview.compatible Class Hierarchy - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
-- --Hierarchy For Package com.jjoe64.graphview.compatible -
--
-
- Package Hierarchies:
- All Packages
--Class Hierarchy -
--
-
- java.lang.Object
-
-
- com.jjoe64.graphview.compatible.ScaleGestureDetector
-
-
- com.jjoe64.graphview.compatible.RealScaleGestureDetector
- com.jjoe64.graphview.compatible.ScaleGestureDetector
-Interface Hierarchy -
--
-
- com.jjoe64.graphview.compatible.ScaleGestureDetector.SimpleOnScaleGestureListener
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/com/jjoe64/graphview/package-frame.html b/doc/com/jjoe64/graphview/package-frame.html deleted file mode 100644 index e74175d27..000000000 --- a/doc/com/jjoe64/graphview/package-frame.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - --com.jjoe64.graphview - - - - - - - - - - - -com.jjoe64.graphview --
- - -- --Interfaces - - -
-CustomLabelFormatter -
-GraphViewDataInterface -
-ValueDependentColor-
- - -- --Classes - - -
-BarGraphView -
-GraphView -
-GraphView.GraphViewData -
-GraphViewSeries -
-GraphViewSeries.GraphViewSeriesStyle -
-GraphViewStyle -
-LineGraphView-
- - - - diff --git a/doc/com/jjoe64/graphview/package-summary.html b/doc/com/jjoe64/graphview/package-summary.html deleted file mode 100644 index 450f240ad..000000000 --- a/doc/com/jjoe64/graphview/package-summary.html +++ /dev/null @@ -1,219 +0,0 @@ - - - - - -- --Enums - - -
-GraphView.LegendAlign-com.jjoe64.graphview - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV PACKAGE - NEXT PACKAGE -- FRAMES - NO FRAMES - - - - - -
--Package com.jjoe64.graphview -
- --
- - -- --Interface Summary -- -CustomLabelFormatter -if you want to show different labels, - you can use this label formatter. -- -GraphViewDataInterface -the base interface for the graphview data. -- -ValueDependentColor -you can change the color depending on the value. -- -
-
- - -- --Class Summary -- -BarGraphView -Draws a Bar Chart -- -GraphView -GraphView is a Android View for creating zoomable and scrollable graphs. -- -GraphView.GraphViewData -one data set for a graph series -- -GraphViewSeries -a graphview series. -- -GraphViewSeries.GraphViewSeriesStyle -graph series style: color and thickness -- -GraphViewStyle -Styles for the GraphView - Important: Use GraphViewSeries.GraphViewSeriesStyle for series-specify styling -- -LineGraphView -Line Graph View. -- -
-
- - -- --Enum Summary -- -GraphView.LegendAlign --
-
-
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV PACKAGE - NEXT PACKAGE -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/com/jjoe64/graphview/package-tree.html b/doc/com/jjoe64/graphview/package-tree.html deleted file mode 100644 index 204461503..000000000 --- a/doc/com/jjoe64/graphview/package-tree.html +++ /dev/null @@ -1,173 +0,0 @@ - - - - - --com.jjoe64.graphview Class Hierarchy - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
-- --Hierarchy For Package com.jjoe64.graphview -
--
-
- Package Hierarchies:
- All Packages
--Class Hierarchy -
--
-
- java.lang.Object
-
-
- com.jjoe64.graphview.GraphView.GraphViewData (implements com.jjoe64.graphview.GraphViewDataInterface) -
- com.jjoe64.graphview.GraphViewSeries
- com.jjoe64.graphview.GraphViewSeries.GraphViewSeriesStyle
- com.jjoe64.graphview.GraphViewStyle
- LinearLayout
-
-
- com.jjoe64.graphview.GraphView
-
-
- com.jjoe64.graphview.BarGraphView
- com.jjoe64.graphview.LineGraphView
- com.jjoe64.graphview.GraphView
-Interface Hierarchy -
--
-
- com.jjoe64.graphview.CustomLabelFormatter
- com.jjoe64.graphview.GraphViewDataInterface
- com.jjoe64.graphview.ValueDependentColor
-Enum Hierarchy -
--
-
- java.lang.Object
-
-
- java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-
-
-
- com.jjoe64.graphview.GraphView.LegendAlign
- java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
-
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/com/jjoe64/graphview/package-use.html b/doc/com/jjoe64/graphview/package-use.html deleted file mode 100644 index 1b07119e4..000000000 --- a/doc/com/jjoe64/graphview/package-use.html +++ /dev/null @@ -1,155 +0,0 @@ - - - - - --Uses of Package com.jjoe64.graphview - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
-- - --Uses of Package
-
com.jjoe64.graphview-
- -- --Classes in com.jjoe64.graphview used by com.jjoe64.graphview -- -GraphView.GraphViewData - - -
- one data set for the graph-
- - - - - --
- - - -- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/constant-values.html b/doc/constant-values.html deleted file mode 100644 index 5f5525f39..000000000 --- a/doc/constant-values.html +++ /dev/null @@ -1,146 +0,0 @@ - - - - - --Constant Field Values - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
-- --Constant Field Values
-
-Contents-
-
- - - - - --
- - - -- - -- - --
-- -Overview -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/deprecated-list.html b/doc/deprecated-list.html deleted file mode 100644 index 690f8ba6d..000000000 --- a/doc/deprecated-list.html +++ /dev/null @@ -1,144 +0,0 @@ - - - - - --Deprecated List - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
-- --Deprecated API
-
-Contents-
-
- - - - - --
- - - -- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/help-doc.html b/doc/help-doc.html deleted file mode 100644 index e5440693f..000000000 --- a/doc/help-doc.html +++ /dev/null @@ -1,215 +0,0 @@ - - - - - --API Help - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
-- -This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.-How This API Document Is Organized
--Package
-- -
--Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:
-
-
- Interfaces (italic)
- Classes
- Enums
- Exceptions
- Errors
- Annotation Types
-Class/Interface
-- -
- --Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:
-
-
- Class inheritance diagram
- Direct Subclasses
- All Known Subinterfaces
- All Known Implementing Classes
- Class/interface declaration
- Class/interface description
-
-
- Nested Class Summary
- Field Summary
- Constructor Summary
- Method Summary
-
-
- Field Detail
- Constructor Detail
- Method Detail
-Annotation Type
-- -
- --Each annotation type has its own separate page with the following sections:
-
-
- Annotation Type declaration
- Annotation Type description
- Required Element Summary
- Optional Element Summary
- Element Detail
-Enum
-- -
--Each enum has its own separate page with the following sections:
-
-
- Enum declaration
- Enum description
- Enum Constant Summary
- Enum Constant Detail
-Use
--Each documented package, class and interface has its own Use page. This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A. You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.
--Tree (Class Hierarchy)
--There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with
-java.lang.Object. The interfaces do not inherit fromjava.lang.Object.-
-
- When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.
- When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.
-Deprecated API
--The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.
--Index
--The Index contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.
--Prev/Next
-These links take you to the next or previous class, interface, package, or related page.-Frames/No Frames
-These links show and hide the HTML frames. All pages are available with or without frames. --
-Serialized Form
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description. --
-Constant Field Values
-The Constant Field Values page lists the static final fields and their values. -- - -This help file applies to API documentation generated using the standard doclet. - -
-
- - - - - --
- - - -- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/index-files/index-1.html b/doc/index-files/index-1.html deleted file mode 100644 index 9ed722154..000000000 --- a/doc/index-files/index-1.html +++ /dev/null @@ -1,140 +0,0 @@ - - - - - --C-Index - - - - - - - - - - - - -
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
--C
--
-
- com.jjoe64.graphview - package com.jjoe64.graphview
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/index-files/index-2.html b/doc/index-files/index-2.html deleted file mode 100644 index 12a5f37c7..000000000 --- a/doc/index-files/index-2.html +++ /dev/null @@ -1,144 +0,0 @@ - - - - - --F-Index - - - - - - - - - - - - -
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
--F
--
-
- formatLabel(double) - -Method in class com.jjoe64.graphview.GraphView -
- formats the label - can be overwritten -
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/index-files/index-3.html b/doc/index-files/index-3.html deleted file mode 100644 index 6bae1d2d1..000000000 --- a/doc/index-files/index-3.html +++ /dev/null @@ -1,149 +0,0 @@ - - - - - --G-Index - - - - - - - - - - - - -
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
--G
--
-
- getDrawBackground() - -Method in class com.jjoe64.graphview.GraphView -
- -
- GraphView - Class in com.jjoe64.graphview
- GraphView creates a scaled line graph with x and y axis labels.
- GraphView(Context, GraphView.GraphViewData[], String, String[], String[]) - -Constructor for class com.jjoe64.graphview.GraphView -
- -
- GraphView.GraphViewData - Class in com.jjoe64.graphview
- one data set for the graph
- GraphView.GraphViewData(double, double) - -Constructor for class com.jjoe64.graphview.GraphView.GraphViewData -
- -
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/index-files/index-4.html b/doc/index-files/index-4.html deleted file mode 100644 index 18fc6ec4f..000000000 --- a/doc/index-files/index-4.html +++ /dev/null @@ -1,143 +0,0 @@ - - - - - --I-Index - - - - - - - - - - - - -
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
--I
--
-
- isScrollable() - -Method in class com.jjoe64.graphview.GraphView -
- -
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/index-files/index-5.html b/doc/index-files/index-5.html deleted file mode 100644 index 1a4c64dff..000000000 --- a/doc/index-files/index-5.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - --S-Index - - - - - - - - - - - - -
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
--S
--
-
- setDrawBackground(boolean) - -Method in class com.jjoe64.graphview.GraphView -
- -
- setScalable(boolean) - -Method in class com.jjoe64.graphview.GraphView -
- this forces scrollable = true -
- setScrollable(boolean) - -Method in class com.jjoe64.graphview.GraphView -
- the user can scroll (horizontal) the graph. -
- setViewPort(double, double) - -Method in class com.jjoe64.graphview.GraphView -
- set's the viewport for the graph. -
- - - - - --
- - - -C F G I S- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV LETTER - NEXT LETTER -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/index.html b/doc/index.html deleted file mode 100644 index 1c53a8b1a..000000000 --- a/doc/index.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - --Generated Documentation (Untitled) - - - - - - diff --git a/doc/overview-frame.html b/doc/overview-frame.html deleted file mode 100644 index 786d91796..000000000 --- a/doc/overview-frame.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - - --Overview List - - - - - - - - - - - --
- -- -- --
- -- -All Classes - -- -Packages -
-com.jjoe64.graphview -
-com.jjoe64.graphview.compatible -
-- - - diff --git a/doc/overview-tree.html b/doc/overview-tree.html deleted file mode 100644 index 5a08fd4f1..000000000 --- a/doc/overview-tree.html +++ /dev/null @@ -1,152 +0,0 @@ - - - -
- --Class Hierarchy - - - - - - - - - - - - -
- - - - - --
- - - -- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
-- --Hierarchy For All Packages
--
-
- Package Hierarchies:
- com.jjoe64.graphview
--Class Hierarchy -
--
-
- java.lang.Object
-
-
- com.jjoe64.graphview.GraphView.GraphViewData
- LinearLayout
-
-
- com.jjoe64.graphview.GraphView
- - - - - --
- - - -- - -- - --
-- -Package -Class -Use -Tree -Deprecated -Index -Help -- - -- -- PREV - NEXT -- FRAMES - NO FRAMES - - - - - -
- - - diff --git a/doc/package-list b/doc/package-list deleted file mode 100644 index ce425ccc3..000000000 --- a/doc/package-list +++ /dev/null @@ -1,2 +0,0 @@ -com.jjoe64.graphview -com.jjoe64.graphview.compatible diff --git a/doc/resources/inherit.gif b/doc/resources/inherit.gif deleted file mode 100644 index c814867a1..000000000 Binary files a/doc/resources/inherit.gif and /dev/null differ diff --git a/doc/stylesheet.css b/doc/stylesheet.css deleted file mode 100644 index 6ea9e5161..000000000 --- a/doc/stylesheet.css +++ /dev/null @@ -1,29 +0,0 @@ -/* Javadoc style sheet */ - -/* Define colors, fonts and other style attributes here to override the defaults */ - -/* Page background color */ -body { background-color: #FFFFFF; color:#000000 } - -/* Headings */ -h1 { font-size: 145% } - -/* Table colors */ -.TableHeadingColor { background: #CCCCFF; color:#000000 } /* Dark mauve */ -.TableSubHeadingColor { background: #EEEEFF; color:#000000 } /* Light mauve */ -.TableRowColor { background: #FFFFFF; color:#000000 } /* White */ - -/* Font used in left-hand frame lists */ -.FrameTitleFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 } -.FrameHeadingFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 } -.FrameItemFont { font-size: 90%; font-family: Helvetica, Arial, sans-serif; color:#000000 } - -/* Navigation bar fonts and colors */ -.NavBarCell1 { background-color:#EEEEFF; color:#000000} /* Light mauve */ -.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */ -.NavBarFont1 { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;} -.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;} - -.NavBarCell2 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} -.NavBarCell3 { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000} - diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 000000000..42d355a14 Binary files /dev/null and b/favicon.ico differ diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..86a27f74c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +VERSION_NAME=4.2.2 +VERSION_CODE=17 +GROUP=com.jjoe64 + +POM_DESCRIPTION=Android Graph Library for creating zoomable and scrollable charts. +POM_URL=http://android-graphview.org/ +POM_SCM_URL=https://github.com/jjoe64/GraphView +POM_SCM_CONNECTION=scm:git@github.com:jjoe64/GraphView.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:jjoe64/GraphView.git +POM_LICENCE_NAME=Apache License, Version 2.0 +POM_LICENCE_URL=https://github.com/jjoe64/GraphView/blob/master/license.txt +POM_LICENCE_DIST=repo +POM_DEVELOPER_ID=jjoe64 +POM_DEVELOPER_NAME=Jonas Gehring + +POM_NAME=GraphView +POM_ARTIFACT_ID=graphview +POM_PACKAGING=aar diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..01b8bf6b1 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..25f587d12 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..cccdd3d51 --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..e95643d6a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/license.txt b/license.txt index 6f0be0f95..f92a0dc19 100644 --- a/license.txt +++ b/license.txt @@ -1,57 +1,68 @@ -GNU LESSER GENERAL PUBLIC LICENSE +Copyright 2016 Jonas Gehring -Version 3, 29 June 2007 +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at -Copyright © 2007 Free Software Foundation, Inc.graphSeries; - private boolean showLegend = false; - private LegendAlign legendAlign = LegendAlign.MIDDLE; - private boolean manualYAxis; - private boolean manualMaxY; - private boolean manualMinY; - private double manualMaxYValue; - private double manualMinYValue; - protected GraphViewStyle graphViewStyle; - private final GraphViewContentView graphViewContentView; - private CustomLabelFormatter customLabelFormatter; - private Integer labelTextHeight; - private Integer horLabelTextWidth; - private Integer verLabelTextWidth; - private final Rect textBounds = new Rect(); - private boolean staticHorizontalLabels; - private boolean staticVerticalLabels; - private boolean showHorizontalLabels = true; - private boolean showVerticalLabels = true; - - public GraphView(Context context, AttributeSet attrs) { - this(context, attrs.getAttributeValue(null, "title")); - - int width = attrs.getAttributeIntValue("android", "layout_width", LayoutParams.MATCH_PARENT); - int height = attrs.getAttributeIntValue("android", "layout_height", LayoutParams.MATCH_PARENT); - setLayoutParams(new LayoutParams(width, height)); - } - - /** - * @param context - * @param title [optional] - */ - public GraphView(Context context, String title) { - super(context); - setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT)); - - if (title == null) - this.title = ""; - else - this.title = title; - - graphViewStyle = new GraphViewStyle(); - graphViewStyle.useTextColorFromTheme(context); - - paint = new Paint(); - graphSeries = new ArrayList (); - - viewVerLabels = new VerLabelsView(context); - addView(viewVerLabels); - graphViewContentView = new GraphViewContentView(context); - addView(graphViewContentView, new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 1)); - } - - private GraphViewDataInterface[] _values(int idxSeries) { - GraphViewDataInterface[] values = graphSeries.get(idxSeries).values; - synchronized (values) { - if (viewportStart == 0 && viewportSize == 0) { - // all data - return values; - } else { - // viewport - List listData = new ArrayList (); - for (int i=0; i graphViews = new ArrayList (); - - public GraphViewSeries(GraphViewDataInterface[] values) { - description = null; - style = new GraphViewSeriesStyle(); - this.values = values; - } - - public GraphViewSeries(String description, GraphViewSeriesStyle style, GraphViewDataInterface[] values) { - super(); - this.description = description; - if (style == null) { - style = new GraphViewSeriesStyle(); - } - this.style = style; - this.values = values; - } - - /** - * this graphview will be redrawn if data changes - * @param graphView - */ - public void addGraphView(GraphView graphView) { - this.graphViews.add(graphView); - } - - /** - * add one data to current data - * @param value the new data to append - * @param scrollToEnd true => graphview will scroll to the end (maxX) - * @deprecated please use {@link #appendData(GraphViewDataInterface, boolean, int)} to avoid memory overflow - */ - @Deprecated - public void appendData(GraphViewDataInterface value, boolean scrollToEnd) { - GraphViewDataInterface[] newValues = new GraphViewDataInterface[values.length + 1]; - int offset = values.length; - System.arraycopy(values, 0, newValues, 0, offset); - - newValues[values.length] = value; - values = newValues; - for (GraphView g : graphViews) { - if (scrollToEnd) { - g.scrollToEnd(); - } - } - } - - /** - * add one data to current data - * @param value the new data to append - * @param scrollToEnd true => graphview will scroll to the end (maxX) - * @param maxDataCount if max data count is reached, the oldest data value will be lost - */ - public void appendData(GraphViewDataInterface value, boolean scrollToEnd, int maxDataCount) { - synchronized (values) { - int curDataCount = values.length; - GraphViewDataInterface[] newValues; - if (curDataCount < maxDataCount) { - // enough space - newValues = new GraphViewDataInterface[curDataCount + 1]; - System.arraycopy(values, 0, newValues, 0, curDataCount); - // append new data - newValues[curDataCount] = value; - } else { - // we have to trim one data - newValues = new GraphViewDataInterface[maxDataCount]; - System.arraycopy(values, 1, newValues, 0, curDataCount-1); - // append new data - newValues[maxDataCount-1] = value; - } - values = newValues; - } - - // update linked graph views - for (GraphView g : graphViews) { - if (scrollToEnd) { - g.scrollToEnd(); - } - } - } - - /** - * @return series styles. never null - */ - public GraphViewSeriesStyle getStyle() { - return style; - } - - /** - * you should use {@link GraphView#removeSeries(GraphViewSeries)} - * @param graphView - */ - public void removeGraphView(GraphView graphView) { - graphViews.remove(graphView); - } - - /** - * clears the current data and set the new. - * redraws the graphview(s) - * @param values new data - */ - public void resetData(GraphViewDataInterface[] values) { - this.values = values; - for (GraphView g : graphViews) { - g.redrawAll(); - } - } -} diff --git a/src/com/jjoe64/graphview/GraphViewStyle.java b/src/com/jjoe64/graphview/GraphViewStyle.java deleted file mode 100644 index 11d1da55d..000000000 --- a/src/com/jjoe64/graphview/GraphViewStyle.java +++ /dev/null @@ -1,202 +0,0 @@ -/** - * This file is part of GraphView. - * - * GraphView is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * GraphView is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with GraphView. If not, see + + diff --git a/src/main/java/com/jjoe64/graphview/CursorMode.java b/src/main/java/com/jjoe64/graphview/CursorMode.java new file mode 100644 index 000000000..e42369148 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/CursorMode.java @@ -0,0 +1,254 @@ +package com.jjoe64.graphview; + +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Rect; +import android.graphics.RectF; +import android.util.Log; +import android.util.TypedValue; +import android.view.MotionEvent; + +import com.jjoe64.graphview.series.BaseSeries; +import com.jjoe64.graphview.series.DataPointInterface; +import com.jjoe64.graphview.series.Series; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by jonas on 22/02/2017. + */ + +public class CursorMode { + private final static class Styles { + public float textSize; + public int spacing; + public int padding; + public int width; + public int backgroundColor; + public int margin; + public int textColor; + } + + protected final Paint mPaintLine; + protected final GraphView mGraphView; + protected float mPosX; + protected float mPosY; + protected boolean mCursorVisible; + protected final MapmSeries; + + /** + * the renderer for the grid and labels + */ + private GridLabelRenderer mGridLabelRenderer; + + /** + * viewport that holds the current bounds of + * view. + */ + private Viewport mViewport; + + /** + * title of the graph that will be shown above + */ + private String mTitle; + + /** + * wraps the general styles + */ + private Styles mStyles; + + /** + * feature to have a second scale e.g. on the + * right side + */ + protected SecondScale mSecondScale; + + /** + * tap detector + */ + private TapDetector mTapDetector; + + /** + * renderer for the legend + */ + private LegendRenderer mLegendRenderer; + + /** + * paint for the graph title + */ + private Paint mPaintTitle; + + private boolean mIsCursorMode; + + /** + * paint for the preview (in the SDK) + */ + private Paint mPreviewPaint; + + private CursorMode mCursorMode; + + /** + * Initialize the GraphView view + * @param context + */ + public GraphView(Context context) { + super(context); + init(); + } + + /** + * Initialize the GraphView view. + * + * @param context + * @param attrs + */ + public GraphView(Context context, AttributeSet attrs) { + super(context, attrs); + init(); + } + + /** + * Initialize the GraphView view + * + * @param context + * @param attrs + * @param defStyle + */ + public GraphView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + init(); + } + + /** + * initialize the internal objects. + * This method has to be called directly + * in the constructors. + */ + protected void init() { + mPreviewPaint = new Paint(); + mPreviewPaint.setTextAlign(Paint.Align.CENTER); + mPreviewPaint.setColor(Color.BLACK); + mPreviewPaint.setTextSize(50); + + mStyles = new Styles(); + mViewport = new Viewport(this); + mGridLabelRenderer = new GridLabelRenderer(this); + mLegendRenderer = new LegendRenderer(this); + + mSeries = new ArrayList (); + mPaintTitle = new Paint(); + + mTapDetector = new TapDetector(); + + loadStyles(); + } + + /** + * loads the font + */ + protected void loadStyles() { + mStyles.titleColor = mGridLabelRenderer.getHorizontalLabelsColor(); + mStyles.titleTextSize = mGridLabelRenderer.getTextSize(); + } + + /** + * @return the renderer for the grid and labels + */ + public GridLabelRenderer getGridLabelRenderer() { + return mGridLabelRenderer; + } + + /** + * Add a new series to the graph. This will + * automatically redraw the graph. + * @param s the series to be added + */ + public void addSeries(Series s) { + s.onGraphViewAttached(this); + mSeries.add(s); + onDataChanged(false, false); + } + + /** + * important: do not do modifications on the list + * object that will be returned. + * Use {@link #removeSeries(com.jjoe64.graphview.series.Series)} and {@link #addSeries(com.jjoe64.graphview.series.Series)} + * + * @return all series + */ + public List getSeries() { + // TODO immutable array + return mSeries; + } + + /** + * call this to let the graph redraw and + * recalculate the viewport. + * This will be called when a new series + * was added or removed and when data + * was appended via {@link com.jjoe64.graphview.series.BaseSeries#appendData(com.jjoe64.graphview.series.DataPointInterface, boolean, int)} + * or {@link com.jjoe64.graphview.series.BaseSeries#resetData(com.jjoe64.graphview.series.DataPointInterface[])}. + * + * @param keepLabelsSize true if you don't want + * to recalculate the size of + * the labels. It is recommended + * to use "true" because this will + * improve performance and prevent + * a flickering. + * @param keepViewport true if you don't want that + * the viewport will be recalculated. + * It is recommended to use "true" for + * performance. + */ + public void onDataChanged(boolean keepLabelsSize, boolean keepViewport) { + // adjustSteps grid system + mViewport.calcCompleteRange(); + if (mSecondScale != null) { + mSecondScale.calcCompleteRange(); + } + mGridLabelRenderer.invalidate(keepLabelsSize, keepViewport); + postInvalidate(); + } + + /** + * draw all the stuff on canvas + * + * @param canvas + */ + protected void drawGraphElements(Canvas canvas) { + // must be in hardware accelerated mode + if (android.os.Build.VERSION.SDK_INT >= 11 && !canvas.isHardwareAccelerated()) { + // just warn about it, because it is ok when making a snapshot + Log.w("GraphView", "GraphView should be used in hardware accelerated mode." + + "You can use android:hardwareAccelerated=\"true\" on your activity. Read this for more info:" + + "https://developer.android.com/guide/topics/graphics/hardware-accel.html"); + } + + drawTitle(canvas); + mViewport.drawFirst(canvas); + mGridLabelRenderer.draw(canvas); + for (Series s : mSeries) { + s.draw(this, canvas, false); + } + if (mSecondScale != null) { + for (Series s : mSecondScale.getSeries()) { + s.draw(this, canvas, true); + } + } + + if (mCursorMode != null) { + mCursorMode.draw(canvas); + } + + mViewport.draw(canvas); + mLegendRenderer.draw(canvas); + } + + /** + * will be called from Android system. + * + * @param canvas Canvas + */ + @Override + protected void onDraw(Canvas canvas) { + if (isInEditMode()) { + canvas.drawColor(Color.rgb(200, 200, 200)); + canvas.drawText("GraphView: No Preview available", canvas.getWidth()/2, canvas.getHeight()/2, mPreviewPaint); + } else { + drawGraphElements(canvas); + } + } + + /** + * Draws the Graphs title that will be + * shown above the viewport. + * Will be called by GraphView. + * + * @param canvas Canvas + */ + protected void drawTitle(Canvas canvas) { + if (mTitle != null && mTitle.length()>0) { + mPaintTitle.setColor(mStyles.titleColor); + mPaintTitle.setTextSize(mStyles.titleTextSize); + mPaintTitle.setTextAlign(Paint.Align.CENTER); + float x = canvas.getWidth()/2; + float y = mPaintTitle.getTextSize(); + canvas.drawText(mTitle, x, y, mPaintTitle); + } + } + + /** + * Calculates the height of the title. + * + * @return the actual size of the title. + * if there is no title, 0 will be + * returned. + */ + protected int getTitleHeight() { + if (mTitle != null && mTitle.length()>0) { + return (int) mPaintTitle.getTextSize(); + } else { + return 0; + } + } + + /** + * @return the viewport of the Graph. + * @see com.jjoe64.graphview.Viewport + */ + public Viewport getViewport() { + return mViewport; + } + + /** + * Called by Android system if the size + * of the view was changed. Will recalculate + * the viewport and labels. + * + * @param w + * @param h + * @param oldw + * @param oldh + */ + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + onDataChanged(false, false); + } + + /** + * @return the space on the left side of the + * view from the left border to the + * beginning of the graph viewport. + */ + public int getGraphContentLeft() { + int border = getGridLabelRenderer().getStyles().padding; + return border + getGridLabelRenderer().getLabelVerticalWidth() + getGridLabelRenderer().getVerticalAxisTitleWidth(); + } + + /** + * @return the space on the top of the + * view from the top border to the + * beginning of the graph viewport. + */ + public int getGraphContentTop() { + int border = getGridLabelRenderer().getStyles().padding + getTitleHeight(); + return border; + } + + /** + * @return the height of the graph viewport. + */ + public int getGraphContentHeight() { + int border = getGridLabelRenderer().getStyles().padding; + int graphheight = getHeight() - (2 * border) - getGridLabelRenderer().getLabelHorizontalHeight() - getTitleHeight(); + graphheight -= getGridLabelRenderer().getHorizontalAxisTitleHeight(); + return graphheight; + } + + /** + * @return the width of the graph viewport. + */ + public int getGraphContentWidth() { + int border = getGridLabelRenderer().getStyles().padding; + int graphwidth = getWidth() - (2 * border) - getGridLabelRenderer().getLabelVerticalWidth(); + if (mSecondScale != null) { + graphwidth -= getGridLabelRenderer().getLabelVerticalSecondScaleWidth(); + graphwidth -= mSecondScale.getVerticalAxisTitleTextSize(); + } + return graphwidth; + } + + /** + * will be called from Android system. + * + * @param event + * @return + */ + @Override + public boolean onTouchEvent(MotionEvent event) { + boolean b = mViewport.onTouchEvent(event); + boolean a = super.onTouchEvent(event); + + // is it a click? + if (mTapDetector.onTouchEvent(event)) { + for (Series s : mSeries) { + s.onTap(event.getX(), event.getY()); + } + if (mSecondScale != null) { + for (Series s : mSecondScale.getSeries()) { + s.onTap(event.getX(), event.getY()); + } + } + } + + return b || a; + } + + /** + * + */ + @Override + public void computeScroll() { + super.computeScroll(); + mViewport.computeScroll(); + } + + /** + * @return the legend renderer. + * @see com.jjoe64.graphview.LegendRenderer + */ + public LegendRenderer getLegendRenderer() { + return mLegendRenderer; + } + + /** + * use a specific legend renderer + * + * @param mLegendRenderer the new legend renderer + */ + public void setLegendRenderer(LegendRenderer mLegendRenderer) { + this.mLegendRenderer = mLegendRenderer; + } + + /** + * @return the title that will be shown + * above the graph. + */ + public String getTitle() { + return mTitle; + } + + /** + * Set the title of the graph that will + * be shown above the graph's viewport. + * + * @param mTitle the title + * @see #setTitleColor(int) to set the font color + * @see #setTitleTextSize(float) to set the font size + */ + public void setTitle(String mTitle) { + this.mTitle = mTitle; + } + + /** + * @return the title font size + */ + public float getTitleTextSize() { + return mStyles.titleTextSize; + } + + /** + * Set the title's font size + * + * @param titleTextSize font size + * @see #setTitle(String) + */ + public void setTitleTextSize(float titleTextSize) { + mStyles.titleTextSize = titleTextSize; + } + + /** + * @return font color of the title + */ + public int getTitleColor() { + return mStyles.titleColor; + } + + /** + * Set the title's font color + * + * @param titleColor font color of the title + * @see #setTitle(String) + */ + public void setTitleColor(int titleColor) { + mStyles.titleColor = titleColor; + } + + /** + * creates the second scale logic and returns it + * + * @return second scale object + */ + public SecondScale getSecondScale() { + if (mSecondScale == null) { + // this creates the second scale + mSecondScale = new SecondScale(this); + mSecondScale.setVerticalAxisTitleTextSize(mGridLabelRenderer.mStyles.textSize); + } + return mSecondScale; + } + + /** + * clears the second scale + */ + public void clearSecondScale() { + if (mSecondScale != null) { + mSecondScale.removeAllSeries(); + mSecondScale = null; + } + } + + /** + * Removes all series of the graph. + */ + public void removeAllSeries() { + mSeries.clear(); + onDataChanged(false, false); + } + + /** + * Remove a specific series of the graph. + * This will also re-draw the graph, but + * without recalculating the viewport and + * label sizes. + * If you want this, you have to call {@link #onDataChanged(boolean, boolean)} + * manually. + * + * @param series + */ + public void removeSeries(Series series) { + mSeries.remove(series); + onDataChanged(false, false); + } + + /** + * takes a snapshot and return it as bitmap + * + * @return snapshot of graph + */ + public Bitmap takeSnapshot() { + Bitmap bitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(bitmap); + draw(canvas); + return bitmap; + } + + /** + * takes a snapshot, stores it and open the share dialog. + * Notice that you need the permission android.permission.WRITE_EXTERNAL_STORAGE + * + * @param context + * @param imageName + * @param title + */ + public void takeSnapshotAndShare(Context context, String imageName, String title) { + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + Bitmap inImage = takeSnapshot(); + inImage.compress(Bitmap.CompressFormat.JPEG, 100, bytes); + + String path = MediaStore.Images.Media.insertImage(context.getContentResolver(), inImage, imageName, null); + if (path == null) { + // most likely a security problem + throw new SecurityException("Could not get path from MediaStore. Please check permissions."); + } + + Intent i = new Intent(Intent.ACTION_SEND); + i.setType("image/*"); + i.putExtra(Intent.EXTRA_STREAM, Uri.parse(path)); + try { + context.startActivity(Intent.createChooser(i, title)); + } catch (android.content.ActivityNotFoundException ex) { + ex.printStackTrace(); + } + } + + public void setCursorMode(boolean b) { + mIsCursorMode = b; + if (mIsCursorMode) { + if (mCursorMode == null) { + mCursorMode = new CursorMode(this); + } + } else { + mCursorMode = null; + invalidate(); + } + for (Series series : mSeries) { + if (series instanceof BaseSeries) { + ((BaseSeries) series).clearCursorModeCache(); + } + } + } + + public CursorMode getCursorMode() { + return mCursorMode; + } + + public boolean isCursorMode() { + return mIsCursorMode; + } +} diff --git a/src/main/java/com/jjoe64/graphview/GridLabelRenderer.java b/src/main/java/com/jjoe64/graphview/GridLabelRenderer.java new file mode 100644 index 000000000..37210b4e7 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/GridLabelRenderer.java @@ -0,0 +1,1813 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview; + +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Rect; +import android.util.TypedValue; + +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * The default renderer for the grid + * and the labels. + * + * @author jjoe64 + */ +public class GridLabelRenderer { + + /** + * Hoziontal label alignment + */ + public enum VerticalLabelsVAlign { + /** + * Above vertical line + */ + ABOVE, + /** + * Mid vertical line + */ + MID, + /** + * Below vertical line + */ + BELOW + } + + + /** + * wrapper for the styles regarding + * to the grid and the labels + */ + public final class Styles { + /** + * the general text size of the axis titles. + * can be overwritten with #verticalAxisTitleTextSize + * and #horizontalAxisTitleTextSize + */ + public float textSize; + + /** + * the alignment of the vertical labels + */ + public Paint.Align verticalLabelsAlign; + + /** + * the alignment of the labels on the right side + */ + public Paint.Align verticalLabelsSecondScaleAlign; + + /** + * the color of the vertical labels + */ + public int verticalLabelsColor; + + /** + * the color of the labels on the right side + */ + public int verticalLabelsSecondScaleColor; + + /** + * the color of the horizontal labels + */ + public int horizontalLabelsColor; + + /** + * the color of the grid lines + */ + public int gridColor; + + /** + * flag whether the zero-lines (vertical+ + * horizontal) shall be highlighted + */ + public boolean highlightZeroLines; + + /** + * the padding around the graph and labels + */ + public int padding; + + /** + * font size of the vertical axis title + */ + public float verticalAxisTitleTextSize; + + /** + * font color of the vertical axis title + */ + public int verticalAxisTitleColor; + + /** + * font size of the horizontal axis title + */ + public float horizontalAxisTitleTextSize; + + /** + * font color of the horizontal axis title + */ + public int horizontalAxisTitleColor; + + /** + * angle of the horizontal axis label in + * degrees between 0 and 180 + */ + public float horizontalLabelsAngle; + + /** + * flag whether the horizontal labels are + * visible + */ + boolean horizontalLabelsVisible; + + /** + * flag whether the vertical labels are + * visible + */ + boolean verticalLabelsVisible; + + /** + * defines which lines will be drawn in the background + */ + GridStyle gridStyle; + + /** + * the space between the labels text and the graph content + */ + int labelsSpace; + + /** + * vertical labels vertical align (above, below, mid of the grid line) + */ + VerticalLabelsVAlign verticalLabelsVAlign = VerticalLabelsVAlign.MID; + } + + /** + * Definition which lines will be drawn in the background + */ + public enum GridStyle { + /** + * show vertical and horizonal lines + * this is the default + */ + BOTH, + + /** + * show only vertical lines + */ + VERTICAL, + + /** + * show only horizontal lines + */ + HORIZONTAL, + + /** + * dont draw any lines + */ + NONE; + + public boolean drawVertical() { return this == BOTH || this == VERTICAL && this != NONE; } + public boolean drawHorizontal() { return this == BOTH || this == HORIZONTAL && this != NONE; } + } + + /** + * wraps the styles regarding the + * grid and labels + */ + protected Styles mStyles; + + /** + * reference to graphview + */ + private final GraphView mGraphView; + + /** + * cache of the vertical steps + * (horizontal lines and vertical labels) + * Key = Pixel (y) + * Value = y-value + */ + private Map getAllSeries() { + List allSeries = new ArrayList (); + allSeries.addAll(mGraphView.getSeries()); + if (mGraphView.mSecondScale != null) { + allSeries.addAll(mGraphView.getSecondScale().getSeries()); + } + return allSeries; + } + + /** + * draws the legend if it is visible + * + * @param canvas canvas + * @see #setVisible(boolean) + */ + public void draw(Canvas canvas) { + if (!mIsVisible) return; + + mPaint.setTextSize(mStyles.textSize); + + int shapeSize = (int) (mStyles.textSize*0.8d); + + List allSeries = getAllSeries(); + + // width + int legendWidth = mStyles.width; + if (legendWidth == 0) { + // auto + legendWidth = cachedLegendWidth; + + if (legendWidth == 0) { + Rect textBounds = new Rect(); + for (Series s : allSeries) { + if (s.getTitle() != null) { + mPaint.getTextBounds(s.getTitle(), 0, s.getTitle().length(), textBounds); + legendWidth = Math.max(legendWidth, textBounds.width()); + } + } + if (legendWidth == 0) legendWidth = 1; + + // add shape size + legendWidth += shapeSize+mStyles.padding*2 + mStyles.spacing; + cachedLegendWidth = legendWidth; + } + } + + // rect + float legendHeight = (mStyles.textSize+mStyles.spacing)*allSeries.size() -mStyles.spacing; + float lLeft; + float lTop; + if (mStyles.fixedPosition != null) { + // use fied position + lLeft = mGraphView.getGraphContentLeft() + mStyles.margin + mStyles.fixedPosition.x; + lTop = mGraphView.getGraphContentTop() + mStyles.margin + mStyles.fixedPosition.y; + } else { + lLeft = mGraphView.getGraphContentLeft() + mGraphView.getGraphContentWidth() - legendWidth - mStyles.margin; + switch (mStyles.align) { + case TOP: + lTop = mGraphView.getGraphContentTop() + mStyles.margin; + break; + case MIDDLE: + lTop = mGraphView.getHeight() / 2 - legendHeight / 2; + break; + default: + lTop = mGraphView.getGraphContentTop() + mGraphView.getGraphContentHeight() - mStyles.margin - legendHeight - 2*mStyles.padding; + } + } + float lRight = lLeft+legendWidth; + float lBottom = lTop+legendHeight+2*mStyles.padding; + mPaint.setColor(mStyles.backgroundColor); + canvas.drawRoundRect(new RectF(lLeft, lTop, lRight, lBottom), 8, 8, mPaint); + + int i=0; + for (Series series : allSeries) { + mPaint.setColor(series.getColor()); + canvas.drawRect(new RectF(lLeft+mStyles.padding, lTop+mStyles.padding+(i*(mStyles.textSize+mStyles.spacing)), lLeft+mStyles.padding+shapeSize, lTop+mStyles.padding+(i*(mStyles.textSize+mStyles.spacing))+shapeSize), mPaint); + if (series.getTitle() != null) { + mPaint.setColor(mStyles.textColor); + canvas.drawText(series.getTitle(), lLeft+mStyles.padding+shapeSize+mStyles.spacing, lTop+mStyles.padding+mStyles.textSize+(i*(mStyles.textSize+mStyles.spacing)), mPaint); + } + i++; + } + } + + /** + * @return the flag whether the legend will be drawn + */ + public boolean isVisible() { + return mIsVisible; + } + + /** + * set the flag whether the legend will be drawn + * + * @param mIsVisible visible flag + */ + public void setVisible(boolean mIsVisible) { + this.mIsVisible = mIsVisible; + } + + /** + * @return font size + */ + public float getTextSize() { + return mStyles.textSize; + } + + /** + * sets the font size. this will clear + * the internal legend width cache + * + * @param textSize font size + */ + public void setTextSize(float textSize) { + mStyles.textSize = textSize; + cachedLegendWidth = 0; + } + + /** + * @return the spacing between the text lines + */ + public int getSpacing() { + return mStyles.spacing; + } + + /** + * set the spacing between the text lines + * + * @param spacing the spacing between the text lines + */ + public void setSpacing(int spacing) { + mStyles.spacing = spacing; + } + + /** + * padding is the space between the edge of the box + * and the beginning of the text + * + * @return padding from edge to text + */ + public int getPadding() { + return mStyles.padding; + } + + /** + * padding is the space between the edge of the box + * and the beginning of the text + * + * @param padding padding from edge to text + */ + public void setPadding(int padding) { + mStyles.padding = padding; + } + + /** + * the width of the box exclusive padding + * + * @return the width of the box + * 0 => auto + */ + public int getWidth() { + return mStyles.width; + } + + /** + * the width of the box exclusive padding + * @param width the width of the box exclusive padding + * 0 => auto + */ + public void setWidth(int width) { + mStyles.width = width; + } + + /** + * @return background color of the box + * it is recommended to use semi-transparent + * color. + */ + public int getBackgroundColor() { + return mStyles.backgroundColor; + } + + /** + * @param backgroundColor background color of the box + * it is recommended to use semi-transparent + * color. + */ + public void setBackgroundColor(int backgroundColor) { + mStyles.backgroundColor = backgroundColor; + } + + /** + * @return margin from the edge of the box + * to the corner of the graphview + */ + public int getMargin() { + return mStyles.margin; + } + + /** + * @param margin margin from the edge of the box + * to the corner of the graphview + */ + public void setMargin(int margin) { + mStyles.margin = margin; + } + + /** + * @return the vertical alignment of the box + */ + public LegendAlign getAlign() { + return mStyles.align; + } + + /** + * @param align the vertical alignment of the box + */ + public void setAlign(LegendAlign align) { + mStyles.align = align; + } + + /** + * @return font color + */ + public int getTextColor() { + return mStyles.textColor; + } + + /** + * @param textColor font color + */ + public void setTextColor(int textColor) { + mStyles.textColor = textColor; + } + + /** + * Use fixed coordinates to position the legend. + * This will override the align setting. + * + * @param x x coordinates in pixel + * @param y y coordinates in pixel + */ + public void setFixedPosition(int x, int y) { + mStyles.fixedPosition = new Point(x, y); + } +} diff --git a/src/main/java/com/jjoe64/graphview/RectD.java b/src/main/java/com/jjoe64/graphview/RectD.java new file mode 100644 index 000000000..ebd30fb32 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/RectD.java @@ -0,0 +1,55 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview; + +import android.graphics.RectF; + +/** + * Created by jonas on 05.06.16. + */ +public class RectD { + public double left; + public double right; + public double top; + public double bottom; + + public RectD() { + } + + public RectD(double lLeft, double lTop, double lRight, double lBottom) { + set(lLeft, lTop, lRight, lBottom); + } + + public double width() { + return right-left; + } + + public double height() { + return bottom-top; + } + + public void set(double lLeft, double lTop, double lRight, double lBottom) { + left = lLeft; + right = lRight; + top = lTop; + bottom = lBottom; + } + + public RectF toRectF() { + return new RectF((float) left, (float) top, (float) right, (float) bottom); + } +} diff --git a/src/main/java/com/jjoe64/graphview/SecondScale.java b/src/main/java/com/jjoe64/graphview/SecondScale.java new file mode 100644 index 000000000..6dede5ecf --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/SecondScale.java @@ -0,0 +1,322 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview; + +import android.graphics.Canvas; +import android.graphics.Paint; + +import com.jjoe64.graphview.series.Series; + +import java.util.ArrayList; +import java.util.List; + +/** + * To be used to plot a second scale + * on the graph. + * The second scale has always to have + * manual bounds. + * Use {@link #setMinY(double)} and {@link #setMaxY(double)} + * to set them. + * The second scale has it's own array of series. + * + * @author jjoe64 + */ +public class SecondScale { + /** + * reference to the graph + */ + protected final GraphView mGraph; + + /** + * array of series for the second + * scale + */ + protected List mSeries; + + /** + * flag whether the y axis bounds + * are manual. + * For the current version this is always + * true. + */ + private boolean mYAxisBoundsManual = true; + + /** + * + */ + protected RectD mCompleteRange = new RectD(); + + protected RectD mCurrentViewport = new RectD(); + + /** + * label formatter for the y labels + * on the right side + */ + protected LabelFormatter mLabelFormatter; + + protected double mReferenceY = Double.NaN; + + /** + * the paint to draw axis titles + */ + private Paint mPaintAxisTitle; + + /** + * the title of the vertical axis + */ + private String mVerticalAxisTitle; + + /** + * font size of the vertical axis title + */ + public float mVerticalAxisTitleTextSize; + + /** + * font color of the vertical axis title + */ + public int mVerticalAxisTitleColor; + + /** + * creates the second scale. + * normally you do not call this contructor. + * Use {@link com.jjoe64.graphview.GraphView#getSecondScale()} + * in order to get the instance. + */ + SecondScale(GraphView graph) { + mGraph = graph; + mSeries = new ArrayList (); + mLabelFormatter = new DefaultLabelFormatter(); + mLabelFormatter.setViewport(mGraph.getViewport()); + } + + /** + * add a series to the second scale. + * Don't add this series also to the GraphView + * object. + * + * @param s the series + */ + public void addSeries(Series s) { + s.onGraphViewAttached(mGraph); + mSeries.add(s); + mGraph.onDataChanged(false, false); + } + + //public void setYAxisBoundsManual(boolean mYAxisBoundsManual) { + // this.mYAxisBoundsManual = mYAxisBoundsManual; + //} + + /** + * set the min y bounds + * + * @param d min y value + */ + public void setMinY(double d) { + mReferenceY = d; + mCurrentViewport.bottom = d; + } + + /** + * set the max y bounds + * + * @param d max y value + */ + public void setMaxY(double d) { + mCurrentViewport.top = d; + } + + /** + * @return the series of the second scale + */ + public List getSeries() { + return mSeries; + } + + /** + * @return min y bound + */ + public double getMinY(boolean completeRange) { + return completeRange ? mCompleteRange.bottom : mCurrentViewport.bottom; + } + + /** + * @return max y bound + */ + public double getMaxY(boolean completeRange) { + return completeRange ? mCompleteRange.top : mCurrentViewport.top; + } + + /** + * @return always true for the current implementation + */ + public boolean isYAxisBoundsManual() { + return mYAxisBoundsManual; + } + + /** + * @return label formatter for the y labels on the right side + */ + public LabelFormatter getLabelFormatter() { + return mLabelFormatter; + } + + /** + * Set a custom label formatter that is used + * for the y labels on the right side. + * + * @param formatter label formatter for the y labels + */ + public void setLabelFormatter(LabelFormatter formatter) { + mLabelFormatter = formatter; + mLabelFormatter.setViewport(mGraph.getViewport()); + } + + /** + * Removes all series of the graph. + */ + public void removeAllSeries() { + mSeries.clear(); + mGraph.onDataChanged(false, false); + } + + /** + * Remove a specific series of the + * second scale. + * + * @param series + */ + public void removeSeries(Series series) { + mSeries.remove(series); + mGraph.onDataChanged(false, false); + } + + /** + * caches the complete range (minX, maxX, minY, maxY) + * by iterating all series and all datapoints and + * stores it into #mCompleteRange + * + * for the x-range it will respect the series on the + * second scale - not for y-values + */ + public void calcCompleteRange() { + List series = getSeries(); + mCompleteRange.set(0d, 0d, 0d, 0d); + if (!series.isEmpty() && !series.get(0).isEmpty()) { + double d = series.get(0).getLowestValueX(); + for (Series s : series) { + if (!s.isEmpty() && d > s.getLowestValueX()) { + d = s.getLowestValueX(); + } + } + mCompleteRange.left = d; + + d = series.get(0).getHighestValueX(); + for (Series s : series) { + if (!s.isEmpty() && d < s.getHighestValueX()) { + d = s.getHighestValueX(); + } + } + mCompleteRange.right = d; + + if (!series.isEmpty() && !series.get(0).isEmpty()) { + d = series.get(0).getLowestValueY(); + for (Series s : series) { + if (!s.isEmpty() && d > s.getLowestValueY()) { + d = s.getLowestValueY(); + } + } + mCompleteRange.bottom = d; + + d = series.get(0).getHighestValueY(); + for (Series s : series) { + if (!s.isEmpty() && d < s.getHighestValueY()) { + d = s.getHighestValueY(); + } + } + mCompleteRange.top = d; + } + } + } + + /** + * @return the title of the vertical axis + */ + public String getVerticalAxisTitle() { + return mVerticalAxisTitle; + } + + /** + * @param mVerticalAxisTitle the title of the vertical axis + */ + public void setVerticalAxisTitle(String mVerticalAxisTitle) { + if(mPaintAxisTitle==null) { + mPaintAxisTitle = new Paint(); + mPaintAxisTitle.setTextSize(getVerticalAxisTitleTextSize()); + mPaintAxisTitle.setTextAlign(Paint.Align.CENTER); + } + this.mVerticalAxisTitle = mVerticalAxisTitle; + } + + /** + * @return font size of the vertical axis title + */ + public float getVerticalAxisTitleTextSize() { + if (getVerticalAxisTitle() == null || getVerticalAxisTitle().length() == 0) { + return 0; + } + return mVerticalAxisTitleTextSize; + } + + /** + * @param verticalAxisTitleTextSize font size of the vertical axis title + */ + public void setVerticalAxisTitleTextSize(float verticalAxisTitleTextSize) { + mVerticalAxisTitleTextSize = verticalAxisTitleTextSize; + } + + /** + * @return font color of the vertical axis title + */ + public int getVerticalAxisTitleColor() { + return mVerticalAxisTitleColor; + } + + /** + * @param verticalAxisTitleColor font color of the vertical axis title + */ + public void setVerticalAxisTitleColor(int verticalAxisTitleColor) { + mVerticalAxisTitleColor = verticalAxisTitleColor; + } + + /** + * draws the vertical axis title if + * it is set + * @param canvas canvas + */ + protected void drawVerticalAxisTitle(Canvas canvas) { + if (mVerticalAxisTitle != null && mVerticalAxisTitle.length() > 0) { + mPaintAxisTitle.setColor(getVerticalAxisTitleColor()); + mPaintAxisTitle.setTextSize(getVerticalAxisTitleTextSize()); + float x = canvas.getWidth() - getVerticalAxisTitleTextSize()/2; + float y = canvas.getHeight() / 2; + canvas.save(); + canvas.rotate(-90, x, y); + canvas.drawText(mVerticalAxisTitle, x, y, mPaintAxisTitle); + canvas.restore(); + } + } +} diff --git a/src/main/java/com/jjoe64/graphview/UniqueLegendRenderer.java b/src/main/java/com/jjoe64/graphview/UniqueLegendRenderer.java new file mode 100644 index 000000000..d0289bd78 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/UniqueLegendRenderer.java @@ -0,0 +1,36 @@ +package com.jjoe64.graphview; + +import android.util.Pair; + +import com.jjoe64.graphview.series.Series; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * A LegendRenderer that renders items with the same name and color only once in the legend + * Created by poseidon on 27.02.18. + */ +public class UniqueLegendRenderer extends LegendRenderer { + /** + * creates legend renderer + * + * @param graphView regarding graphview + */ + public UniqueLegendRenderer(GraphView graphView) { + super(graphView); + } + + @Override + protected List getAllSeries() { + List originalSeries = super.getAllSeries(); + List distinctSeries = new ArrayList (); + Set { + /** + * this is called when a bar is about to draw + * and the color is be loaded. + * + * @param data the current input value + * @return the color that the bar should be drawn with + * Generate the int via the android.graphics.Color class. + */ + public int get(T data); +} diff --git a/src/main/java/com/jjoe64/graphview/Viewport.java b/src/main/java/com/jjoe64/graphview/Viewport.java new file mode 100644 index 000000000..ce674cce8 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/Viewport.java @@ -0,0 +1,1353 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview; + +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import androidx.core.view.ViewCompat; +import androidx.core.widget.EdgeEffectCompat; +import android.util.Log; +import android.view.GestureDetector; +import android.view.MotionEvent; +import android.view.ScaleGestureDetector; +import android.widget.OverScroller; + +import com.jjoe64.graphview.series.DataPointInterface; +import com.jjoe64.graphview.series.Series; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * This is the default implementation for the viewport. + * This implementation so for a normal viewport + * where there is a horizontal x-axis and a + * vertical y-axis. + * This viewport is compatible with + * - {@link com.jjoe64.graphview.series.BarGraphSeries} + * - {@link com.jjoe64.graphview.series.LineGraphSeries} + * - {@link com.jjoe64.graphview.series.PointsGraphSeries} + * + * @author jjoe64 + */ +public class Viewport { + /** + * this reference value is used to generate the + * vertical labels. It is used when the y axis bounds + * is set manual and humanRoundingY=false. it will be the minValueY value. + */ + protected double referenceY = Double.NaN; + + /** + * this reference value is used to generate the + * horizontal labels. It is used when the x axis bounds + * is set manual and humanRoundingX=false. it will be the minValueX value. + */ + protected double referenceX = Double.NaN; + + /** + * flag whether the vertical scaling is activated + */ + protected boolean scalableY; + + /** + * minimal viewport used for scaling and scrolling. + * this is used if the data that is available is + * less then the viewport that we want to be able to display. + * + * Double.NaN to disable this value + */ + private RectD mMinimalViewport = new RectD(Double.NaN, Double.NaN, Double.NaN, Double.NaN); + + /** + * the reference number to generate the labels + * @return by default 0, only when manual bounds and no human rounding + * is active, the min x value is returned + */ + protected double getReferenceX() { + // if the bounds is manual then we take the + // original manual min y value as reference + if (isXAxisBoundsManual() && !mGraphView.getGridLabelRenderer().isHumanRoundingX()) { + if (Double.isNaN(referenceX)) { + referenceX = getMinX(false); + } + return referenceX; + } else { + // starting from 0 so that the steps have nice numbers + return 0; + } + } + + /** + * listener to notify when x bounds changed after + * scaling or scrolling. + * This can be used to load more detailed data. + */ + public interface OnXAxisBoundsChangedListener { + /** + * Called after scaling or scrolling with + * the new bounds + * @param minX min x value + * @param maxX max x value + */ + void onXAxisBoundsChanged(double minX, double maxX, OnXAxisBoundsChangedListener.Reason reason); + + public enum Reason { + SCROLL, SCALE + } + } + + /** + * listener for the scale gesture + */ + private final ScaleGestureDetector.OnScaleGestureListener mScaleGestureListener + = new ScaleGestureDetector.OnScaleGestureListener() { + /** + * called by android + * @param detector detector + * @return always true + */ + @Override + public boolean onScale(ScaleGestureDetector detector) { + // --- horizontal scaling --- + double viewportWidth = mCurrentViewport.width(); + + if (mMaxXAxisSize != 0) { + if (viewportWidth > mMaxXAxisSize) { + viewportWidth = mMaxXAxisSize; + } + } + + double center = mCurrentViewport.left + viewportWidth / 2; + + float scaleSpanX; + if (android.os.Build.VERSION.SDK_INT >= 11 && scalableY) { + scaleSpanX = detector.getCurrentSpanX()/detector.getPreviousSpanX(); + } else { + scaleSpanX = detector.getScaleFactor(); + } + + viewportWidth /= scaleSpanX; + mCurrentViewport.left = center - viewportWidth / 2; + mCurrentViewport.right = mCurrentViewport.left+viewportWidth; + + // viewportStart must not be < minX + double minX = getMinX(true); + if (!Double.isNaN(mMinimalViewport.left)) { + minX = Math.min(minX, mMinimalViewport.left); + } + if (mCurrentViewport.left < minX) { + mCurrentViewport.left = minX; + mCurrentViewport.right = mCurrentViewport.left+viewportWidth; + } + + // viewportStart + viewportSize must not be > maxX + double maxX = getMaxX(true); + if (!Double.isNaN(mMinimalViewport.right)) { + maxX = Math.max(maxX, mMinimalViewport.right); + } + if (viewportWidth == 0) { + mCurrentViewport.right = maxX; + } + double overlap = mCurrentViewport.left + viewportWidth - maxX; + if (overlap > 0) { + // scroll left + if (mCurrentViewport.left-overlap > minX) { + mCurrentViewport.left -= overlap; + mCurrentViewport.right = mCurrentViewport.left+viewportWidth; + } else { + // maximal scale + mCurrentViewport.left = minX; + mCurrentViewport.right = maxX; + } + } + + + // --- vertical scaling --- + if (scalableY && android.os.Build.VERSION.SDK_INT >= 11 && detector.getCurrentSpanY() != 0f && detector.getPreviousSpanY() != 0f) { + boolean hasSecondScale = mGraphView.mSecondScale != null; + + double viewportHeight = mCurrentViewport.height()*-1; + + if (mMaxYAxisSize != 0) { + if (viewportHeight > mMaxYAxisSize) { + viewportHeight = mMaxYAxisSize; + } + } + + center = mCurrentViewport.bottom + viewportHeight / 2; + + viewportHeight /= detector.getCurrentSpanY()/detector.getPreviousSpanY(); + mCurrentViewport.bottom = center - viewportHeight / 2; + mCurrentViewport.top = mCurrentViewport.bottom+viewportHeight; + + // ignore bounds when second scale + if (!hasSecondScale) { + // viewportStart must not be < minY + double minY = getMinY(true); + if (!Double.isNaN(mMinimalViewport.bottom)) { + minY = Math.min(minY, mMinimalViewport.bottom); + } + if (mCurrentViewport.bottom < minY) { + mCurrentViewport.bottom = minY; + mCurrentViewport.top = mCurrentViewport.bottom+viewportHeight; + } + + // viewportStart + viewportSize must not be > maxY + double maxY = getMaxY(true); + if (!Double.isNaN(mMinimalViewport.top)) { + maxY = Math.max(maxY, mMinimalViewport.top); + } + if (viewportHeight == 0) { + mCurrentViewport.top = maxY; + } + overlap = mCurrentViewport.bottom + viewportHeight - maxY; + if (overlap > 0) { + // scroll left + if (mCurrentViewport.bottom-overlap > minY) { + mCurrentViewport.bottom -= overlap; + mCurrentViewport.top = mCurrentViewport.bottom+viewportHeight; + } else { + // maximal scale + mCurrentViewport.bottom = minY; + mCurrentViewport.top = maxY; + } + } + } else { + // ---- second scale --- + viewportHeight = mGraphView.mSecondScale.mCurrentViewport.height()*-1; + center = mGraphView.mSecondScale.mCurrentViewport.bottom + viewportHeight / 2; + viewportHeight /= detector.getCurrentSpanY()/detector.getPreviousSpanY(); + mGraphView.mSecondScale.mCurrentViewport.bottom = center - viewportHeight / 2; + mGraphView.mSecondScale.mCurrentViewport.top = mGraphView.mSecondScale.mCurrentViewport.bottom+viewportHeight; + } + } + + // adjustSteps viewport, labels, etc. + mGraphView.onDataChanged(true, false); + + ViewCompat.postInvalidateOnAnimation(mGraphView); + + return true; + } + + /** + * called when scaling begins + * + * @param detector detector + * @return true if it is scalable + */ + @Override + public boolean onScaleBegin(ScaleGestureDetector detector) { + // cursor mode + if (mGraphView.isCursorMode()) { + return false; + } + + if (mIsScalable) { + mScalingActive = true; + return true; + } else { + return false; + } + } + + /** + * called when sacling ends + * This will re-adjustSteps the viewport. + * + * @param detector detector + */ + @Override + public void onScaleEnd(ScaleGestureDetector detector) { + mScalingActive = false; + + // notify + if (mOnXAxisBoundsChangedListener != null) { + mOnXAxisBoundsChangedListener.onXAxisBoundsChanged(getMinX(false), getMaxX(false), OnXAxisBoundsChangedListener.Reason.SCALE); + } + + ViewCompat.postInvalidateOnAnimation(mGraphView); + } + }; + + /** + * simple gesture listener to track scroll events + */ + private final GestureDetector.SimpleOnGestureListener mGestureListener + = new GestureDetector.SimpleOnGestureListener() { + @Override + public boolean onDown(MotionEvent e) { + // cursor mode + if (mGraphView.isCursorMode()) { + return true; + } + + if (!mIsScrollable || mScalingActive) return false; + + // Initiates the decay phase of any active edge effects. + releaseEdgeEffects(); + // Aborts any active scroll animations and invalidates. + mScroller.forceFinished(true); + ViewCompat.postInvalidateOnAnimation(mGraphView); + return true; + } + + @Override + public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { + // cursor mode + if (mGraphView.isCursorMode()) { + return true; + } + if (!mIsScrollable || mScalingActive) return false; + + // Scrolling uses math based on the viewport (as opposed to math using pixels). + /** + * Pixel offset is the offset in screen pixels, while viewport offset is the + * offset within the current viewport. For additional information on surface sizes + * and pixel offsets, see the docs for {@link computeScrollSurfaceSize()}. For + * additional information about the viewport, see the comments for + * {@link mCurrentViewport}. + */ + double viewportOffsetX = distanceX * mCurrentViewport.width() / mGraphView.getGraphContentWidth(); + double viewportOffsetY = distanceY * mCurrentViewport.height() / mGraphView.getGraphContentHeight(); + + // respect minimal viewport + double completeRangeLeft = mCompleteRange.left; + if (!Double.isNaN(mMinimalViewport.left)) { + completeRangeLeft = Math.min(completeRangeLeft, mMinimalViewport.left); + } + double completeRangeRight = mCompleteRange.right; + if (!Double.isNaN(mMinimalViewport.right)) { + completeRangeRight = Math.max(completeRangeRight, mMinimalViewport.right); + } + double completeRangeWidth = completeRangeRight - completeRangeLeft; + + double completeRangeBottom = mCompleteRange.bottom; + if (!Double.isNaN(mMinimalViewport.bottom)) { + completeRangeBottom = Math.min(completeRangeBottom, mMinimalViewport.bottom); + } + double completeRangeTop = mCompleteRange.top; + if (!Double.isNaN(mMinimalViewport.top)) { + completeRangeTop = Math.max(completeRangeTop, mMinimalViewport.top); + } + double completeRangeHeight = completeRangeTop - completeRangeBottom; + + int completeWidth = (int)((completeRangeWidth/mCurrentViewport.width()) * (double) mGraphView.getGraphContentWidth()); + int completeHeight = (int)((completeRangeHeight/mCurrentViewport.height()) * (double) mGraphView.getGraphContentHeight()); + + int scrolledX = (int) (completeWidth + * (mCurrentViewport.left + viewportOffsetX - completeRangeLeft) + / completeRangeWidth); + + int scrolledY = (int) (completeHeight + * (mCurrentViewport.bottom + viewportOffsetY - completeRangeBottom) + / completeRangeHeight*-1); + boolean canScrollX = mCurrentViewport.left > completeRangeLeft + || mCurrentViewport.right < completeRangeRight; + boolean canScrollY = mCurrentViewport.bottom > completeRangeBottom + || mCurrentViewport.top < completeRangeTop; + + boolean hasSecondScale = mGraphView.mSecondScale != null; + + // second scale + double viewportOffsetY2 = 0d; + if (hasSecondScale) { + viewportOffsetY2 = distanceY * mGraphView.mSecondScale.mCurrentViewport.height() / mGraphView.getGraphContentHeight(); + canScrollY |= mGraphView.mSecondScale.mCurrentViewport.bottom > mGraphView.mSecondScale.mCompleteRange.bottom + || mGraphView.mSecondScale.mCurrentViewport.top < mGraphView.mSecondScale.mCompleteRange.top; + } + + canScrollY &= scrollableY; + + if (canScrollX) { + if (viewportOffsetX < 0) { + double tooMuch = mCurrentViewport.left+viewportOffsetX - completeRangeLeft; + if (tooMuch < 0) { + viewportOffsetX -= tooMuch; + } + } else { + double tooMuch = mCurrentViewport.right+viewportOffsetX - completeRangeRight; + if (tooMuch > 0) { + viewportOffsetX -= tooMuch; + } + } + + mCurrentViewport.left += viewportOffsetX; + mCurrentViewport.right += viewportOffsetX; + + // notify + if (mOnXAxisBoundsChangedListener != null) { + mOnXAxisBoundsChangedListener.onXAxisBoundsChanged(getMinX(false), getMaxX(false), OnXAxisBoundsChangedListener.Reason.SCROLL); + } + } + if (canScrollY) { + // if we have the second axis we ignore the max/min range + if (!hasSecondScale) { + if (viewportOffsetY < 0) { + double tooMuch = mCurrentViewport.bottom+viewportOffsetY - completeRangeBottom; + if (tooMuch < 0) { + viewportOffsetY -= tooMuch; + } + } else { + double tooMuch = mCurrentViewport.top+viewportOffsetY - completeRangeTop; + if (tooMuch > 0) { + viewportOffsetY -= tooMuch; + } + } + } + + mCurrentViewport.top += viewportOffsetY; + mCurrentViewport.bottom += viewportOffsetY; + + // second scale + if (hasSecondScale) { + mGraphView.mSecondScale.mCurrentViewport.top += viewportOffsetY2; + mGraphView.mSecondScale.mCurrentViewport.bottom += viewportOffsetY2; + } + } + + if (canScrollX && scrolledX < 0) { + mEdgeEffectLeft.onPull(scrolledX / (float) mGraphView.getGraphContentWidth()); + } + if (!hasSecondScale && canScrollY && scrolledY < 0) { + mEdgeEffectBottom.onPull(scrolledY / (float) mGraphView.getGraphContentHeight()); + } + if (canScrollX && scrolledX > completeWidth - mGraphView.getGraphContentWidth()) { + mEdgeEffectRight.onPull((scrolledX - completeWidth + mGraphView.getGraphContentWidth()) + / (float) mGraphView.getGraphContentWidth()); + } + if (!hasSecondScale && canScrollY && scrolledY > completeHeight - mGraphView.getGraphContentHeight()) { + mEdgeEffectTop.onPull((scrolledY - completeHeight + mGraphView.getGraphContentHeight()) + / (float) mGraphView.getGraphContentHeight()); + } + + // adjustSteps viewport, labels, etc. + mGraphView.onDataChanged(true, false); + + ViewCompat.postInvalidateOnAnimation(mGraphView); + return true; + } + + @Override + public boolean onFling(MotionEvent e1, MotionEvent e2, + float velocityX, float velocityY) { + //fling((int) -velocityX, (int) -velocityY); + return true; + } + }; + + /** + * the state of the axis bounds + */ + public enum AxisBoundsStatus { + /** + * initial means that the bounds gets + * auto adjusted if they are not manual. + * After adjusting the status comes to + * #AUTO_ADJUSTED. + */ + INITIAL, + + /** + * after the bounds got auto-adjusted, + * this status will set. + */ + AUTO_ADJUSTED, + + /** + * means that the bounds are fix (manually) and + * are not to be auto-adjusted. + */ + FIX + } + + /** + * paint to draw background + */ + private Paint mPaint; + + /** + * reference to the graphview + */ + private final GraphView mGraphView; + + /** + * this holds the current visible viewport + * left = minX, right = maxX + * bottom = minY, top = maxY + */ + protected RectD mCurrentViewport = new RectD(); + + /** + * maximum allowed viewport size (horizontal) + * 0 means use the bounds of the actual data that is + * available + */ + protected double mMaxXAxisSize = 0; + + /** + * maximum allowed viewport size (vertical) + * 0 means use the bounds of the actual data that is + * available + */ + protected double mMaxYAxisSize = 0; + + /** + * this holds the whole range of the data + * left = minX, right = maxX + * bottom = minY, top = maxY + */ + protected RectD mCompleteRange = new RectD(); + + /** + * flag whether scaling is currently active + */ + protected boolean mScalingActive; + + /** + * flag whether the viewport is scrollable + */ + private boolean mIsScrollable; + + /** + * flag whether the viewport is scalable + */ + private boolean mIsScalable; + + /** + * flag whether the viewport is scalable + * on the Y axis + */ + private boolean scrollableY; + + /** + * gesture detector to detect scrolling + */ + protected GestureDetector mGestureDetector; + + /** + * detect scaling + */ + protected ScaleGestureDetector mScaleGestureDetector; + + /** + * not used - for fling + */ + protected OverScroller mScroller; + + /** + * not used + */ + private EdgeEffectCompat mEdgeEffectTop; + + /** + * not used + */ + private EdgeEffectCompat mEdgeEffectBottom; + + /** + * glow effect when scrolling left + */ + private EdgeEffectCompat mEdgeEffectLeft; + + /** + * glow effect when scrolling right + */ + private EdgeEffectCompat mEdgeEffectRight; + + /** + * state of the x axis + */ + protected AxisBoundsStatus mXAxisBoundsStatus; + + /** + * state of the y axis + */ + protected AxisBoundsStatus mYAxisBoundsStatus; + + /** + * flag whether the x axis bounds are manual + */ + private boolean mXAxisBoundsManual; + + /** + * flag whether the y axis bounds are manual + */ + private boolean mYAxisBoundsManual; + + /** + * background color of the viewport area + * it is recommended to use a semi-transparent color + */ + private int mBackgroundColor; + + /** + * listener to notify when x bounds changed after + * scaling or scrolling. + * This can be used to load more detailed data. + */ + protected OnXAxisBoundsChangedListener mOnXAxisBoundsChangedListener; + + /** + * optional draw a border between the labels + * and the viewport + */ + private boolean mDrawBorder; + + /** + * color of the border + * @see #setDrawBorder(boolean) + */ + private Integer mBorderColor; + + /** + * custom paint to use for the border + * @see #setDrawBorder(boolean) + */ + private Paint mBorderPaint; + + /** + * creates the viewport + * + * @param graphView graphview + */ + Viewport(GraphView graphView) { + mScroller = new OverScroller(graphView.getContext()); + mEdgeEffectTop = new EdgeEffectCompat(graphView.getContext()); + mEdgeEffectBottom = new EdgeEffectCompat(graphView.getContext()); + mEdgeEffectLeft = new EdgeEffectCompat(graphView.getContext()); + mEdgeEffectRight = new EdgeEffectCompat(graphView.getContext()); + mGestureDetector = new GestureDetector(graphView.getContext(), mGestureListener); + mScaleGestureDetector = new ScaleGestureDetector(graphView.getContext(), mScaleGestureListener); + + mGraphView = graphView; + mXAxisBoundsStatus = AxisBoundsStatus.INITIAL; + mYAxisBoundsStatus = AxisBoundsStatus.INITIAL; + mBackgroundColor = Color.TRANSPARENT; + mPaint = new Paint(); + } + + /** + * will be called on a touch event. + * needed to use scaling and scrolling + * + * @param event + * @return true if it was consumed + */ + public boolean onTouchEvent(MotionEvent event) { + boolean b = mScaleGestureDetector.onTouchEvent(event); + b |= mGestureDetector.onTouchEvent(event); + if (mGraphView.isCursorMode()) { + if (event.getAction() == MotionEvent.ACTION_DOWN) { + mGraphView.getCursorMode().onDown(event); + b |= true; + } + if (event.getAction() == MotionEvent.ACTION_MOVE) { + mGraphView.getCursorMode().onMove(event); + b |= true; + } + if (event.getAction() == MotionEvent.ACTION_UP) { + b |= mGraphView.getCursorMode().onUp(event); + } + } + return b; + } + + /** + * change the state of the x axis. + * normally you do not call this method. + * If you want to set manual axis use + * {@link #setXAxisBoundsManual(boolean)} and {@link #setYAxisBoundsManual(boolean)} + * + * @param s state + */ + public void setXAxisBoundsStatus(AxisBoundsStatus s) { + mXAxisBoundsStatus = s; + } + + /** + * change the state of the y axis. + * normally you do not call this method. + * If you want to set manual axis use + * {@link #setXAxisBoundsManual(boolean)} and {@link #setYAxisBoundsManual(boolean)} + * + * @param s state + */ + public void setYAxisBoundsStatus(AxisBoundsStatus s) { + mYAxisBoundsStatus = s; + } + + /** + * @return whether the viewport is scrollable + */ + public boolean isScrollable() { + return mIsScrollable; + } + + /** + * @param mIsScrollable whether is viewport is scrollable + */ + public void setScrollable(boolean mIsScrollable) { + this.mIsScrollable = mIsScrollable; + } + + /** + * @return the x axis state + */ + public AxisBoundsStatus getXAxisBoundsStatus() { + return mXAxisBoundsStatus; + } + + /** + * @return the y axis state + */ + public AxisBoundsStatus getYAxisBoundsStatus() { + return mYAxisBoundsStatus; + } + + /** + * caches the complete range (minX, maxX, minY, maxY) + * by iterating all series and all datapoints and + * stores it into #mCompleteRange + * + * for the x-range it will respect the series on the + * second scale - not for y-values + */ + public void calcCompleteRange() { + List series = mGraphView.getSeries(); + List seriesInclusiveSecondScale = new ArrayList<>(mGraphView.getSeries()); + if (mGraphView.mSecondScale != null) { + seriesInclusiveSecondScale.addAll(mGraphView.mSecondScale.getSeries()); + } + mCompleteRange.set(0d, 0d, 0d, 0d); + if (!seriesInclusiveSecondScale.isEmpty() && !seriesInclusiveSecondScale.get(0).isEmpty()) { + double d = seriesInclusiveSecondScale.get(0).getLowestValueX(); + for (Series s : seriesInclusiveSecondScale) { + if (!s.isEmpty() && d > s.getLowestValueX()) { + d = s.getLowestValueX(); + } + } + mCompleteRange.left = d; + + d = seriesInclusiveSecondScale.get(0).getHighestValueX(); + for (Series s : seriesInclusiveSecondScale) { + if (!s.isEmpty() && d < s.getHighestValueX()) { + d = s.getHighestValueX(); + } + } + mCompleteRange.right = d; + + if (!series.isEmpty() && !series.get(0).isEmpty()) { + d = series.get(0).getLowestValueY(); + for (Series s : series) { + if (!s.isEmpty() && d > s.getLowestValueY()) { + d = s.getLowestValueY(); + } + } + mCompleteRange.bottom = d; + + d = series.get(0).getHighestValueY(); + for (Series s : series) { + if (!s.isEmpty() && d < s.getHighestValueY()) { + d = s.getHighestValueY(); + } + } + mCompleteRange.top = d; + } + } + + // calc current viewport bounds + if (mYAxisBoundsStatus == AxisBoundsStatus.AUTO_ADJUSTED) { + mYAxisBoundsStatus = AxisBoundsStatus.INITIAL; + } + if (mYAxisBoundsStatus == AxisBoundsStatus.INITIAL) { + mCurrentViewport.top = mCompleteRange.top; + mCurrentViewport.bottom = mCompleteRange.bottom; + } + + if (mXAxisBoundsStatus == AxisBoundsStatus.AUTO_ADJUSTED) { + mXAxisBoundsStatus = AxisBoundsStatus.INITIAL; + } + if (mXAxisBoundsStatus == AxisBoundsStatus.INITIAL) { + mCurrentViewport.left = mCompleteRange.left; + mCurrentViewport.right = mCompleteRange.right; + } else if (mXAxisBoundsManual && !mYAxisBoundsManual && mCompleteRange.width() != 0) { + // get highest/lowest of current viewport + // lowest + double d = Double.MAX_VALUE; + for (Series s : series) { + Iterator values = s.getValues(mCurrentViewport.left, mCurrentViewport.right); + while (values.hasNext()) { + double v = values.next().getY(); + if (d > v) { + d = v; + } + } + } + + if (d != Double.MAX_VALUE) { + mCurrentViewport.bottom = d; + } + + // highest + d = Double.MIN_VALUE; + for (Series s : series) { + Iterator values = s.getValues(mCurrentViewport.left, mCurrentViewport.right); + while (values.hasNext()) { + double v = values.next().getY(); + if (d < v) { + d = v; + } + } + } + + if (d != Double.MIN_VALUE) { + mCurrentViewport.top = d; + } + } + + // fixes blank screen when range is zero + if (mCurrentViewport.left == mCurrentViewport.right) mCurrentViewport.right++; + if (mCurrentViewport.top == mCurrentViewport.bottom) mCurrentViewport.top++; + } + + /** + * @param completeRange if true => minX of the complete range of all series + * if false => minX of the current visible viewport + * @return the min x value + */ + public double getMinX(boolean completeRange) { + if (completeRange) { + return mCompleteRange.left; + } else { + return mCurrentViewport.left; + } + } + + /** + * @param completeRange if true => maxX of the complete range of all series + * if false => maxX of the current visible viewport + * @return the max x value + */ + public double getMaxX(boolean completeRange) { + if (completeRange) { + return mCompleteRange.right; + } else { + return mCurrentViewport.right; + } + } + + /** + * @param completeRange if true => minY of the complete range of all series + * if false => minY of the current visible viewport + * @return the min y value + */ + public double getMinY(boolean completeRange) { + if (completeRange) { + return mCompleteRange.bottom; + } else { + return mCurrentViewport.bottom; + } + } + + /** + * @param completeRange if true => maxY of the complete range of all series + * if false => maxY of the current visible viewport + * @return the max y value + */ + public double getMaxY(boolean completeRange) { + if (completeRange) { + return mCompleteRange.top; + } else { + return mCurrentViewport.top; + } + } + + /** + * set the maximal y value for the current viewport. + * Make sure to set the y bounds to manual via + * {@link #setYAxisBoundsManual(boolean)} + * @param y max / highest value + */ + public void setMaxY(double y) { + mCurrentViewport.top = y; + } + + /** + * set the minimal y value for the current viewport. + * Make sure to set the y bounds to manual via + * {@link #setYAxisBoundsManual(boolean)} + * @param y min / lowest value + */ + public void setMinY(double y) { + mCurrentViewport.bottom = y; + } + + /** + * set the maximal x value for the current viewport. + * Make sure to set the x bounds to manual via + * {@link #setXAxisBoundsManual(boolean)} + * @param x max / highest value + */ + public void setMaxX(double x) { + mCurrentViewport.right = x; + } + + /** + * set the minimal x value for the current viewport. + * Make sure to set the x bounds to manual via + * {@link #setXAxisBoundsManual(boolean)} + * @param x min / lowest value + */ + public void setMinX(double x) { + mCurrentViewport.left = x; + } + + /** + * release the glowing effects + */ + private void releaseEdgeEffects() { + mEdgeEffectLeft.onRelease(); + mEdgeEffectRight.onRelease(); + mEdgeEffectTop.onRelease(); + mEdgeEffectBottom.onRelease(); + } + + /** + * not used currently + * + * @param velocityX + * @param velocityY + */ + private void fling(int velocityX, int velocityY) { + velocityY = 0; + releaseEdgeEffects(); + // Flings use math in pixels (as opposed to math based on the viewport). + int maxX = (int)((mCurrentViewport.width()/mCompleteRange.width())*(float)mGraphView.getGraphContentWidth()) - mGraphView.getGraphContentWidth(); + int maxY = (int)((mCurrentViewport.height()/mCompleteRange.height())*(float)mGraphView.getGraphContentHeight()) - mGraphView.getGraphContentHeight(); + int startX = (int)((mCurrentViewport.left - mCompleteRange.left)/mCompleteRange.width())*maxX; + int startY = (int)((mCurrentViewport.top - mCompleteRange.top)/mCompleteRange.height())*maxY; + mScroller.forceFinished(true); + mScroller.fling( + startX, + startY, + velocityX, + velocityY, + 0, maxX, + 0, maxY, + mGraphView.getGraphContentWidth() / 2, + mGraphView.getGraphContentHeight() / 2); + ViewCompat.postInvalidateOnAnimation(mGraphView); + } + + /** + * not used currently + */ + public void computeScroll() { + } + + /** + * Draws the overscroll "glow" at the four edges of the chart region, if necessary. + * + * @see EdgeEffectCompat + */ + private void drawEdgeEffectsUnclipped(Canvas canvas) { + // The methods below rotate and translate the canvas as needed before drawing the glow, + // since EdgeEffectCompat always draws a top-glow at 0,0. + + boolean needsInvalidate = false; + + if (!mEdgeEffectTop.isFinished()) { + final int restoreCount = canvas.save(); + canvas.translate(mGraphView.getGraphContentLeft(), mGraphView.getGraphContentTop()); + mEdgeEffectTop.setSize(mGraphView.getGraphContentWidth(), mGraphView.getGraphContentHeight()); + if (mEdgeEffectTop.draw(canvas)) { + needsInvalidate = true; + } + canvas.restoreToCount(restoreCount); + } + + if (!mEdgeEffectBottom.isFinished()) { + final int restoreCount = canvas.save(); + canvas.translate(mGraphView.getGraphContentLeft(), mGraphView.getGraphContentTop()+mGraphView.getGraphContentHeight()); + canvas.rotate(180, mGraphView.getGraphContentWidth()/2, 0); + mEdgeEffectBottom.setSize(mGraphView.getGraphContentWidth(), mGraphView.getGraphContentHeight()); + if (mEdgeEffectBottom.draw(canvas)) { + needsInvalidate = true; + } + canvas.restoreToCount(restoreCount); + } + + if (!mEdgeEffectLeft.isFinished()) { + final int restoreCount = canvas.save(); + canvas.translate(mGraphView.getGraphContentLeft(), mGraphView.getGraphContentTop()+ mGraphView.getGraphContentHeight()); + canvas.rotate(-90, 0, 0); + mEdgeEffectLeft.setSize(mGraphView.getGraphContentHeight(), mGraphView.getGraphContentWidth()); + if (mEdgeEffectLeft.draw(canvas)) { + needsInvalidate = true; + } + canvas.restoreToCount(restoreCount); + } + + if (!mEdgeEffectRight.isFinished()) { + final int restoreCount = canvas.save(); + canvas.translate(mGraphView.getGraphContentLeft()+ mGraphView.getGraphContentWidth(), mGraphView.getGraphContentTop()); + canvas.rotate(90, 0, 0); + mEdgeEffectRight.setSize(mGraphView.getGraphContentHeight(), mGraphView.getGraphContentWidth()); + if (mEdgeEffectRight.draw(canvas)) { + needsInvalidate = true; + } + canvas.restoreToCount(restoreCount); + } + + if (needsInvalidate) { + ViewCompat.postInvalidateOnAnimation(mGraphView); + } + } + + /** + * will be first called in order to draw + * the canvas + * Used to draw the background + * + * @param c canvas. + */ + public void drawFirst(Canvas c) { + // draw background + if (mBackgroundColor != Color.TRANSPARENT) { + mPaint.setColor(mBackgroundColor); + c.drawRect( + mGraphView.getGraphContentLeft(), + mGraphView.getGraphContentTop(), + mGraphView.getGraphContentLeft()+mGraphView.getGraphContentWidth(), + mGraphView.getGraphContentTop()+mGraphView.getGraphContentHeight(), + mPaint + ); + } + if (mDrawBorder) { + Paint p; + if (mBorderPaint != null) { + p = mBorderPaint; + } else { + p = mPaint; + p.setColor(getBorderColor()); + } + c.drawLine( + mGraphView.getGraphContentLeft(), + mGraphView.getGraphContentTop(), + mGraphView.getGraphContentLeft(), + mGraphView.getGraphContentTop()+mGraphView.getGraphContentHeight(), + p + ); + c.drawLine( + mGraphView.getGraphContentLeft(), + mGraphView.getGraphContentTop()+mGraphView.getGraphContentHeight(), + mGraphView.getGraphContentLeft()+mGraphView.getGraphContentWidth(), + mGraphView.getGraphContentTop()+mGraphView.getGraphContentHeight(), + p + ); + // on the right side if we have second scale + if (mGraphView.mSecondScale != null) { + c.drawLine( + mGraphView.getGraphContentLeft()+mGraphView.getGraphContentWidth(), + mGraphView.getGraphContentTop(), + mGraphView.getGraphContentLeft()+mGraphView.getGraphContentWidth(), + mGraphView.getGraphContentTop()+mGraphView.getGraphContentHeight(), + p + ); + } + } + } + + /** + * draws the glowing edge effect + * + * @param c canvas + */ + public void draw(Canvas c) { + drawEdgeEffectsUnclipped(c); + } + + /** + * @return background of the viewport area + */ + public int getBackgroundColor() { + return mBackgroundColor; + } + + /** + * @param mBackgroundColor background of the viewport area + * use transparent to have no background + */ + public void setBackgroundColor(int mBackgroundColor) { + this.mBackgroundColor = mBackgroundColor; + } + + /** + * @return whether the viewport is scalable + */ + public boolean isScalable() { + return mIsScalable; + } + + /** + * active the scaling/zooming feature + * notice: sets the x axis bounds to manual + * + * @param mIsScalable whether the viewport is scalable + */ + public void setScalable(boolean mIsScalable) { + this.mIsScalable = mIsScalable; + if (mIsScalable) { + mIsScrollable = true; + + // set viewport to manual + setXAxisBoundsManual(true); + } + + } + + /** + * @return whether the x axis bounds are manual. + * @see #setMinX(double) + * @see #setMaxX(double) + */ + public boolean isXAxisBoundsManual() { + return mXAxisBoundsManual; + } + + /** + * @param mXAxisBoundsManual whether the x axis bounds are manual. + * @see #setMinX(double) + * @see #setMaxX(double) + */ + public void setXAxisBoundsManual(boolean mXAxisBoundsManual) { + this.mXAxisBoundsManual = mXAxisBoundsManual; + if (mXAxisBoundsManual) { + mXAxisBoundsStatus = AxisBoundsStatus.FIX; + } + } + + /** + * @return whether the y axis bound are manual + */ + public boolean isYAxisBoundsManual() { + return mYAxisBoundsManual; + } + + /** + * @param mYAxisBoundsManual whether the y axis bounds are manual + * @see #setMaxY(double) + * @see #setMinY(double) + */ + public void setYAxisBoundsManual(boolean mYAxisBoundsManual) { + this.mYAxisBoundsManual = mYAxisBoundsManual; + if (mYAxisBoundsManual) { + mYAxisBoundsStatus = AxisBoundsStatus.FIX; + } + } + + /** + * forces the viewport to scroll to the end + * of the range by keeping the current viewport size. + * + * Important: Only takes effect if x axis bounds are manual. + * + * @see #setXAxisBoundsManual(boolean) + */ + public void scrollToEnd() { + if (mXAxisBoundsManual) { + double size = mCurrentViewport.width(); + mCurrentViewport.right = mCompleteRange.right; + mCurrentViewport.left = mCompleteRange.right - size; + mGraphView.onDataChanged(true, false); + } else { + Log.w("GraphView", "scrollToEnd works only with manual x axis bounds"); + } + } + + /** + * @return the listener when there is one registered. + */ + public OnXAxisBoundsChangedListener getOnXAxisBoundsChangedListener() { + return mOnXAxisBoundsChangedListener; + } + + /** + * set a listener to notify when x bounds changed after + * scaling or scrolling. + * This can be used to load more detailed data. + * + * @param l the listener to use + */ + public void setOnXAxisBoundsChangedListener(OnXAxisBoundsChangedListener l) { + mOnXAxisBoundsChangedListener = l; + } + + /** + * optional draw a border between the labels + * and the viewport + * + * @param drawBorder true to draw the border + */ + public void setDrawBorder(boolean drawBorder) { + this.mDrawBorder = drawBorder; + } + + /** + * the border color used. will be ignored when + * a custom paint is set. + * + * @see #setDrawBorder(boolean) + * @return border color. by default the grid color is used + */ + public int getBorderColor() { + if (mBorderColor != null) { + return mBorderColor; + } + return mGraphView.getGridLabelRenderer().getGridColor(); + } + + /** + * the border color used. will be ignored when + * a custom paint is set. + * + * @param borderColor null to reset + */ + public void setBorderColor(Integer borderColor) { + this.mBorderColor = borderColor; + } + + /** + * custom paint to use for the border. border color + * will be ignored + * + * @see #setDrawBorder(boolean) + * @param borderPaint + */ + public void setBorderPaint(Paint borderPaint) { + this.mBorderPaint = borderPaint; + } + + /** + * activate/deactivate the vertical scrolling + * + * @param scrollableY true to activate + */ + public void setScrollableY(boolean scrollableY) { + this.scrollableY = scrollableY; + } + + /** + * the reference number to generate the labels + * @return by default 0, only when manual bounds and no human rounding + * is active, the min y value is returned + */ + protected double getReferenceY() { + // if the bounds is manual then we take the + // original manual min y value as reference + if (isYAxisBoundsManual() && !mGraphView.getGridLabelRenderer().isHumanRoundingY()) { + if (Double.isNaN(referenceY)) { + referenceY = getMinY(false); + } + return referenceY; + } else { + // starting from 0 so that the steps have nice numbers + return 0; + } + } + + /** + * activate or deactivate the vertical zooming/scaling functionallity. + * This will automatically activate the vertical scrolling and the + * horizontal scaling/scrolling feature. + * + * @param scalableY true to activate + */ + public void setScalableY(boolean scalableY) { + if (scalableY) { + this.scrollableY = true; + setScalable(true); + + if (android.os.Build.VERSION.SDK_INT < 11) { + Log.w("GraphView", "Vertical scaling requires minimum Android 3.0 (API Level 11)"); + } + } + this.scalableY = scalableY; + } + + /** + * maximum allowed viewport size (horizontal) + * 0 means use the bounds of the actual data that is + * available + */ + public double getMaxXAxisSize() { + return mMaxXAxisSize; + } + + /** + * maximum allowed viewport size (vertical) + * 0 means use the bounds of the actual data that is + * available + */ + public double getMaxYAxisSize() { + return mMaxYAxisSize; + } + + /** + * Set the max viewport size (horizontal) + * This can prevent the user from zooming out too much. E.g. with a 24 hours graph, it + * could force the user to only be able to see 2 hours of data at a time. + * Default value is 0 (disabled) + * + * @param mMaxXAxisViewportSize maximum size of viewport + */ + public void setMaxXAxisSize(double mMaxXAxisViewportSize) { + this.mMaxXAxisSize = mMaxXAxisViewportSize; + } + + /** + * Set the max viewport size (vertical) + * This can prevent the user from zooming out too much. E.g. with a 24 hours graph, it + * could force the user to only be able to see 2 hours of data at a time. + * Default value is 0 (disabled) + * + * @param mMaxYAxisViewportSize maximum size of viewport + */ + public void setMaxYAxisSize(double mMaxYAxisViewportSize) { + this.mMaxYAxisSize = mMaxYAxisViewportSize; + } + + /** + * minimal viewport used for scaling and scrolling. + * this is used if the data that is available is + * less then the viewport that we want to be able to display. + * + * if Double.NaN is used, then this value is ignored + * + * @param minX + * @param maxX + * @param minY + * @param maxY + */ + public void setMinimalViewport(double minX, double maxX, double minY, double maxY) { + mMinimalViewport.set(minX, maxY, maxX, minY); + } +} diff --git a/src/main/java/com/jjoe64/graphview/compat/OverScrollerCompat.java b/src/main/java/com/jjoe64/graphview/compat/OverScrollerCompat.java new file mode 100644 index 000000000..b0e73b6da --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/compat/OverScrollerCompat.java @@ -0,0 +1,43 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.compat; + +import android.annotation.TargetApi; +import android.os.Build; +import android.widget.OverScroller; + +/** + * A utility class for using {@link android.widget.OverScroller} in a backward-compatible fashion. + */ +public class OverScrollerCompat { + /** + * Disallow instantiation. + */ + private OverScrollerCompat() { + } + /** + * @see android.view.ScaleGestureDetector#getCurrentSpanY() + */ + @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) + public static float getCurrVelocity(OverScroller overScroller) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { + return overScroller.getCurrVelocity(); + } else { + return 0; + } + } +} \ No newline at end of file diff --git a/src/main/java/com/jjoe64/graphview/helper/DateAsXAxisLabelFormatter.java b/src/main/java/com/jjoe64/graphview/helper/DateAsXAxisLabelFormatter.java new file mode 100644 index 000000000..f429c6cbb --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/helper/DateAsXAxisLabelFormatter.java @@ -0,0 +1,91 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.helper; + +import android.content.Context; + +import com.jjoe64.graphview.DefaultLabelFormatter; + +import java.text.DateFormat; +import java.util.Calendar; +import java.util.Date; + +/** + * Helper class to use date objects as x-values. + * This will use your own Date Format or by default + * the Android default date format to convert + * the x-values (that has to be millis from + * 01-01-1970) into a formatted date string. + * + * See the DateAsXAxis example in the GraphView-Demos project + * to see a working example. + * + * @author jjoe64 + */ +public class DateAsXAxisLabelFormatter extends DefaultLabelFormatter { + /** + * the date format that will convert + * the unix timestamp to string + */ + protected final DateFormat mDateFormat; + + /** + * calendar to avoid creating new date objects + */ + protected final Calendar mCalendar; + + /** + * create the formatter with the Android default date format to convert + * the x-values. + * + * @param context the application context + */ + public DateAsXAxisLabelFormatter(Context context) { + mDateFormat = android.text.format.DateFormat.getDateFormat(context); + mCalendar = Calendar.getInstance(); + } + + /** + * create the formatter with your own custom + * date format to convert the x-values. + * + * @param context the application context + * @param dateFormat custom date format + */ + public DateAsXAxisLabelFormatter(Context context, DateFormat dateFormat) { + mDateFormat = dateFormat; + mCalendar = Calendar.getInstance(); + } + + /** + * formats the x-values as date string. + * + * @param value raw value + * @param isValueX true if it's a x value, otherwise false + * @return value converted to string + */ + @Override + public String formatLabel(double value, boolean isValueX) { + if (isValueX) { + // format as date + mCalendar.setTimeInMillis((long) value); + return mDateFormat.format(mCalendar.getTimeInMillis()); + } else { + return super.formatLabel(value, isValueX); + } + } +} diff --git a/src/main/java/com/jjoe64/graphview/helper/GraphViewXML.java b/src/main/java/com/jjoe64/graphview/helper/GraphViewXML.java new file mode 100644 index 000000000..ba6c8f664 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/helper/GraphViewXML.java @@ -0,0 +1,134 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.helper; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Color; +import android.util.AttributeSet; +import android.util.Log; + +import com.jjoe64.graphview.GraphView; +import com.jjoe64.graphview.R; +import com.jjoe64.graphview.series.BarGraphSeries; +import com.jjoe64.graphview.series.BaseSeries; +import com.jjoe64.graphview.series.DataPoint; +import com.jjoe64.graphview.series.DataPointInterface; +import com.jjoe64.graphview.series.LineGraphSeries; +import com.jjoe64.graphview.series.PointsGraphSeries; +import com.jjoe64.graphview.series.Series; + +/** + * helper class to use GraphView directly + * in a XML layout file. + * + * You can set the data via attribute app:seriesData + * in the format: "X=Y;X=Y;..." e.g. "0=5.0;1=5;2=4;3=9" + * + * Other styling options: + * - app:seriesType="line|bar|points"
+ *- app:seriesColor="#ff0000"
+ *- app:seriesTitle="foobar" - if this is set, the legend will be drawn
+ *- android:title="foobar"
+ * + * Example: + *+ * {@code + *+ * + * @author jjoe64 + */ +public class GraphViewXML extends GraphView { + /** + * creates the graphview object with data and + * other options from xml attributes. + * + * @param context + * @param attrs + */ + public GraphViewXML(Context context, AttributeSet attrs) { + super(context, attrs); + + // get attributes + TypedArray a=context.obtainStyledAttributes( + attrs, + R.styleable.GraphViewXML); + + String dataStr = a.getString(R.styleable.GraphViewXML_seriesData); + int color = a.getColor(R.styleable.GraphViewXML_seriesColor, Color.TRANSPARENT); + String type = a.getString(R.styleable.GraphViewXML_seriesType); + String seriesTitle = a.getString(R.styleable.GraphViewXML_seriesTitle); + String title = a.getString(R.styleable.GraphViewXML_android_title); + + a.recycle(); + + // decode data + DataPoint[] data; + if (dataStr == null || dataStr.isEmpty()) { + throw new IllegalArgumentException("Attribute seriesData is required in the format: 0=5.0;1=5;2=4;3=9"); + } else { + String[] d = dataStr.split(";"); + try { + data = new DataPoint[d.length]; + int i = 0; + for (String dd : d) { + String[] xy = dd.split("="); + data[i] = new DataPoint(Double.parseDouble(xy[0]), Double.parseDouble(xy[1])); + i++; + } + } catch (Exception e) { + Log.e("GraphViewXML", e.toString()); + throw new IllegalArgumentException("Attribute seriesData is broken. Use this format: 0=5.0;1=5;2=4;3=9"); + } + } + + // create series + BaseSeries+ * } + * series; + if (type == null || type.isEmpty()) { + type = "line"; + } + if (type.equals("line")) { + series = new LineGraphSeries (data); + } else if (type.equals("bar")) { + series = new BarGraphSeries (data); + } else if (type.equals("points")) { + series = new PointsGraphSeries (data); + } else { + throw new IllegalArgumentException("unknown graph type: "+type+". Possible is line|bar|points"); + } + if (color != Color.TRANSPARENT) { + series.setColor(color); + } + addSeries(series); + + if (seriesTitle != null && !seriesTitle.isEmpty()) { + series.setTitle(seriesTitle); + getLegendRenderer().setVisible(true); + } + + if (title != null && !title.isEmpty()) { + setTitle(title); + } + } +} diff --git a/src/main/java/com/jjoe64/graphview/helper/StaticLabelsFormatter.java b/src/main/java/com/jjoe64/graphview/helper/StaticLabelsFormatter.java new file mode 100644 index 000000000..3bb4156ca --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/helper/StaticLabelsFormatter.java @@ -0,0 +1,225 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.helper; + +import com.jjoe64.graphview.DefaultLabelFormatter; +import com.jjoe64.graphview.GraphView; +import com.jjoe64.graphview.LabelFormatter; +import com.jjoe64.graphview.Viewport; + +/** + * Use this label formatter to show static labels. + * Static labels are not bound to the data. It is typical used + * for show text like "low", "middle", "high". + * + * You can set the static labels for vertical or horizontal + * individually and you can define a label formatter that + * is to be used if you don't define static labels. + * + * For example if you only use static labels for horizontal labels, + * graphview will use the dynamicLabelFormatter for the vertical labels. + */ +public class StaticLabelsFormatter implements LabelFormatter { + /** + * reference to the viewport + */ + protected Viewport mViewport; + + /** + * the vertical labels, ordered from bottom to the top + * if it is null, the labels will be generated via the #dynamicLabelFormatter + */ + protected String[] mVerticalLabels; + + /** + * the horizontal labels, ordered form the left to the right + * if it is null, the labels will be generated via the #dynamicLabelFormatter + */ + protected String[] mHorizontalLabels; + + /** + * the label formatter that will format the labels + * for that there are no static labels defined. + */ + protected LabelFormatter mDynamicLabelFormatter; + + /** + * reference to the graphview + */ + protected final GraphView mGraphView; + + /** + * creates the formatter without any static labels + * define your static labels via {@link #setHorizontalLabels(String[])} and {@link #setVerticalLabels(String[])} + * + * @param graphView reference to the graphview + */ + public StaticLabelsFormatter(GraphView graphView) { + mGraphView = graphView; + init(null, null, null); + } + + /** + * creates the formatter without any static labels. + * define your static labels via {@link #setHorizontalLabels(String[])} and {@link #setVerticalLabels(String[])} + * + * @param graphView reference to the graphview + * @param dynamicLabelFormatter the label formatter that will format the labels + * for that there are no static labels defined. + */ + public StaticLabelsFormatter(GraphView graphView, LabelFormatter dynamicLabelFormatter) { + mGraphView = graphView; + init(null, null, dynamicLabelFormatter); + } + + /** + * creates the formatter with static labels defined. + * + * @param graphView reference to the graphview + * @param horizontalLabels the horizontal labels, ordered form the left to the right + * if it is null, the labels will be generated via the #dynamicLabelFormatter + * @param verticalLabels the vertical labels, ordered from bottom to the top + * if it is null, the labels will be generated via the #dynamicLabelFormatter + */ + public StaticLabelsFormatter(GraphView graphView, String[] horizontalLabels, String[] verticalLabels) { + mGraphView = graphView; + init(horizontalLabels, verticalLabels, null); + } + + /** + * creates the formatter with static labels defined. + * + * @param graphView reference to the graphview + * @param horizontalLabels the horizontal labels, ordered form the left to the right + * if it is null, the labels will be generated via the #dynamicLabelFormatter + * @param verticalLabels the vertical labels, ordered from bottom to the top + * if it is null, the labels will be generated via the #dynamicLabelFormatter + * @param dynamicLabelFormatter the label formatter that will format the labels + * for that there are no static labels defined. + */ + public StaticLabelsFormatter(GraphView graphView, String[] horizontalLabels, String[] verticalLabels, LabelFormatter dynamicLabelFormatter) { + mGraphView = graphView; + init(horizontalLabels, verticalLabels, dynamicLabelFormatter); + } + + /** + * @param horizontalLabels the horizontal labels, ordered form the left to the right + * if it is null, the labels will be generated via the #dynamicLabelFormatter + * @param verticalLabels the vertical labels, ordered from bottom to the top + * if it is null, the labels will be generated via the #dynamicLabelFormatter + * @param dynamicLabelFormatter the label formatter that will format the labels + * for that there are no static labels defined. + */ + protected void init(String[] horizontalLabels, String[] verticalLabels, LabelFormatter dynamicLabelFormatter) { + mDynamicLabelFormatter = dynamicLabelFormatter; + if (mDynamicLabelFormatter == null) { + mDynamicLabelFormatter = new DefaultLabelFormatter(); + } + + mHorizontalLabels = horizontalLabels; + mVerticalLabels = verticalLabels; + } + + /** + * Set a label formatter that will be used for the labels + * that don't have static labels. + * + * For example if you only use static labels for horizontal labels, + * graphview will use the dynamicLabelFormatter for the vertical labels. + * + * @param dynamicLabelFormatter the label formatter that will format the labels + * for that there are no static labels defined. + */ + public void setDynamicLabelFormatter(LabelFormatter dynamicLabelFormatter) { + this.mDynamicLabelFormatter = dynamicLabelFormatter; + adjust(); + } + + /** + * @param horizontalLabels the horizontal labels, ordered form the left to the right + * if it is null, the labels will be generated via the #dynamicLabelFormatter + */ + public void setHorizontalLabels(String[] horizontalLabels) { + this.mHorizontalLabels = horizontalLabels; + adjust(); + } + + /** + * @param verticalLabels the vertical labels, ordered from bottom to the top + * if it is null, the labels will be generated via the #dynamicLabelFormatter + */ + public void setVerticalLabels(String[] verticalLabels) { + this.mVerticalLabels = verticalLabels; + adjust(); + } + + /** + * + * @param value raw input number + * @param isValueX true if it is a value for the x axis + * false if it is a value for the y axis + * @return + */ + @Override + public String formatLabel(double value, boolean isValueX) { + if (isValueX && mHorizontalLabels != null) { + double minX = mViewport.getMinX(false); + double maxX = mViewport.getMaxX(false); + double range = maxX - minX; + value = value-minX; + int idx = (int)((value/range) * (mHorizontalLabels.length-1)); + return mHorizontalLabels[idx]; + } else if (!isValueX && mVerticalLabels != null) { + double minY = mViewport.getMinY(false); + double maxY = mViewport.getMaxY(false); + double range = maxY - minY; + value = value-minY; + int idx = (int)((value/range) * (mVerticalLabels.length-1)); + return mVerticalLabels[idx]; + } else { + return mDynamicLabelFormatter.formatLabel(value, isValueX); + } + } + + /** + * @param viewport the used viewport + */ + @Override + public void setViewport(Viewport viewport) { + mViewport = viewport; + adjust(); + } + + /** + * adjusts the number of vertical/horizontal labels + */ + protected void adjust() { + mDynamicLabelFormatter.setViewport(mViewport); + if (mVerticalLabels != null) { + if (mVerticalLabels.length < 2) { + throw new IllegalStateException("You need at least 2 vertical labels if you use static label formatter."); + } + mGraphView.getGridLabelRenderer().setNumVerticalLabels(mVerticalLabels.length); + } + if (mHorizontalLabels != null) { + if (mHorizontalLabels.length < 2) { + throw new IllegalStateException("You need at least 2 horizontal labels if you use static label formatter."); + } + mGraphView.getGridLabelRenderer().setNumHorizontalLabels(mHorizontalLabels.length); + } + } +} diff --git a/src/main/java/com/jjoe64/graphview/series/BarGraphSeries.java b/src/main/java/com/jjoe64/graphview/series/BarGraphSeries.java new file mode 100644 index 000000000..d8ab9ca13 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/series/BarGraphSeries.java @@ -0,0 +1,526 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.series; + +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.RectF; +import androidx.core.view.ViewCompat; +import android.util.Log; +import android.view.animation.AccelerateInterpolator; + +import com.jjoe64.graphview.GraphView; +import com.jjoe64.graphview.RectD; +import com.jjoe64.graphview.ValueDependentColor; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.SortedSet; +import java.util.TreeSet; + +/** + * Series with Bars to visualize the data. + * The Bars are always vertical. + * + * @author jjoe64 + */ +public class BarGraphSeries extends BaseSeries { + private static final long ANIMATION_DURATION = 333; + + /** + * paint to do drawing on canvas + */ + private Paint mPaint; + + /** + * custom paint that can be used. + * this will ignore the value dependent color. + */ + private Paint mCustomPaint; + + /** + * spacing between the bars in percentage. + * 0 => no spacing + * 100 => the space between the bars is as big as the bars itself + */ + private int mSpacing; + + /** + * width of a data point + * 0 => no prior knowledge of sampling period, interval between bars will be calculated automatically + * >0 => value is the total distance from one bar to another + */ + private double mDataWidth; + + /** + * callback to generate value-dependent colors + * of the bars + */ + private ValueDependentColor mValueDependentColor; + + /** + * flag whether the values should drawn + * above the bars as text + */ + private boolean mDrawValuesOnTop; + + /** + * color of the text above the bars. + * + * @see #mDrawValuesOnTop + */ + private int mValuesOnTopColor; + + /** + * font size of the text above the bars. + * + * @see #mDrawValuesOnTop + */ + private float mValuesOnTopSize; + + /** + * stores the coordinates of the bars to + * trigger tap on series events. + */ + private Map xVals = new TreeSet (); + for(Series inspectedSeries: graphView.getSeries()) { + if(inspectedSeries instanceof BarGraphSeries) { + isCurrentSeries = (inspectedSeries == this); + if(isCurrentSeries) { + currentSeriesOrder = numBarSeries; + } + numBarSeries++; + + // calculate the number of slots for bars based on the minimum distance between + // x coordinates in the series. This is divided into the range to find + // the placement and width of bar slots + // (sections of the x axis for each bar or set of bars) + // TODO: Move this somewhere more general and cache it, so we don't recalculate it for each series + Iterator curValues = inspectedSeries.getValues(minX, maxX); + if (curValues.hasNext()) { + xVals.add(curValues.next().getX()); + if(isCurrentSeries) { numValues++; } + while (curValues.hasNext()) { + xVals.add(curValues.next().getX()); + if(isCurrentSeries) { numValues++; } + } + } + } + } + if (numValues == 0) { + return; + } + + double minGap = 0; + + if(mDataWidth > 0.0) { + minGap = mDataWidth; + } else { + Double lastVal = null; + + for(Double curVal: xVals) { + if(lastVal != null) { + double curGap = Math.abs(curVal - lastVal); + if (minGap == 0 || (curGap > 0 && curGap < minGap)) { + minGap = curGap; + } + } + lastVal = curVal; + } + } + + int numBarSlots = (minGap == 0) ? 1 : (int)Math.round((maxX - minX)/minGap) + 1; + + Iterator values = getValues(minX, maxX); + + // Calculate the overall bar slot width - this includes all bars across + // all series, and any spacing between sets of bars + int barSlotWidth = numBarSlots == 1 + ? graphView.getGraphContentWidth() + : graphView.getGraphContentWidth() / (numBarSlots-1); + + // Total spacing (both sides) between sets of bars + double spacing = Math.min(barSlotWidth*mSpacing/100, barSlotWidth*0.98f); + // Width of an individual bar + double barWidth = (barSlotWidth - spacing) / numBarSeries; + // Offset from the center of a given bar to start drawing + double offset = barSlotWidth/2; + + double diffY = maxY - minY; + double diffX = maxX - minX; + double contentHeight = graphView.getGraphContentHeight(); + double contentWidth = graphView.getGraphContentWidth(); + double contentLeft = graphView.getGraphContentLeft(); + double contentTop = graphView.getGraphContentTop(); + + // draw data + int i=0; + while (values.hasNext()) { + E value = values.next(); + + double valY = value.getY() - minY; + double ratY = valY / diffY; + double y = contentHeight * ratY; + + double valY0 = 0 - minY; + double ratY0 = valY0 / diffY; + double y0 = contentHeight * ratY0; + + double valueX = value.getX(); + double valX = valueX - minX; + double ratX = valX / diffX; + double x = contentWidth * ratX; + + // hook for value dependent color + if (getValueDependentColor() != null) { + mPaint.setColor(getValueDependentColor().get(value)); + } else { + mPaint.setColor(getColor()); + } + + double left = x + contentLeft - offset + spacing/2 + currentSeriesOrder*barWidth; + double right = left + barWidth; + if (left > contentLeft + contentWidth || right < contentLeft) { + continue; + } + double top = (contentTop - y) + contentHeight; + double bottom = (contentTop - y0) + contentHeight - (graphView.getGridLabelRenderer().isHighlightZeroLines()?4:1); + + boolean reverse = top > bottom; + + if (mAnimated) { + if ((Double.isNaN(mLastAnimatedValue) || mLastAnimatedValue < valueX)) { + long currentTime = System.currentTimeMillis(); + if (mAnimationStart == 0) { + // start animation + mAnimationStart = currentTime; + mAnimationStartFrameNo = 0; + } else { + // anti-lag: wait a few frames + if (mAnimationStartFrameNo < 15) { + // second time + mAnimationStart = currentTime; + mAnimationStartFrameNo++; + } + } + float timeFactor = (float) (currentTime-mAnimationStart) / ANIMATION_DURATION; + float factor = mAnimationInterpolator.getInterpolation(timeFactor); + if (timeFactor <= 1.0) { + double barHeight = bottom - top; + barHeight = barHeight * factor; + top = bottom-barHeight; + ViewCompat.postInvalidateOnAnimation(graphView); + } else { + // animation finished + mLastAnimatedValue = valueX; + } + } + } + + if (reverse) { + double tmp = top; + top = bottom + (graphView.getGridLabelRenderer().isHighlightZeroLines()?4:1); + bottom = tmp; + } + + // overdraw + left = Math.max(left, contentLeft); + right = Math.min(right, contentLeft+contentWidth); + bottom = Math.min(bottom, contentTop+contentHeight); + top = Math.max(top, contentTop); + + mDataPoints.put(new RectD(left, top, right, bottom), value); + + Paint p; + if (mCustomPaint != null) { + p = mCustomPaint; + } else { + p = mPaint; + } + canvas.drawRect((float)left, (float)top, (float)right, (float)bottom, p); + + // set values on top of graph + if (mDrawValuesOnTop) { + if (reverse) { + top = bottom + mValuesOnTopSize + 4; + if (top > contentTop+contentHeight) top = contentTop + contentHeight; + } else { + top -= 4; + if (top<=contentTop) top+=contentTop+4; + } + + mPaint.setColor(mValuesOnTopColor); + canvas.drawText( + graphView.getGridLabelRenderer().getLabelFormatter().formatLabel(value.getY(), false) + , (float) (left+right)/2, (float) top, mPaint); + } + + i++; + } + } + + /** + * @return the hook to generate value-dependent color. default null + */ + public ValueDependentColor getValueDependentColor() { + return mValueDependentColor; + } + + /** + * set a hook to make the color of the bars depending + * on the actually value/data. + * + * @param mValueDependentColor hook + * null to disable + */ + public void setValueDependentColor(ValueDependentColor mValueDependentColor) { + this.mValueDependentColor = mValueDependentColor; + } + + /** + * @return the spacing between the bars in percentage + */ + public int getSpacing() { + return mSpacing; + } + + /** + * @param mSpacing spacing between the bars in percentage. + * 0 => no spacing + * 100 => the space between the bars is as big as the bars itself + */ + public void setSpacing(int mSpacing) { + this.mSpacing = mSpacing; + } + + /** + * @return the interval between data points + */ + public double getDataWidth() { + return mDataWidth; + } + + /** + * @param mDataWidth width of a data point (sampling period) + * 0 => no prior knowledge of sampling period, interval between bars will be calculated automatically + * >0 => value is the total distance from one bar to another + */ + public void setDataWidth(double mDataWidth) { + this.mDataWidth = mDataWidth; + } + + /** + * @return whether the values should be drawn above the bars + */ + public boolean isDrawValuesOnTop() { + return mDrawValuesOnTop; + } + + /** + * @param mDrawValuesOnTop flag whether the values should drawn + * above the bars as text + */ + public void setDrawValuesOnTop(boolean mDrawValuesOnTop) { + this.mDrawValuesOnTop = mDrawValuesOnTop; + } + + /** + * @return font color of the values on top of the bars + * @see #setDrawValuesOnTop(boolean) + */ + public int getValuesOnTopColor() { + return mValuesOnTopColor; + } + + /** + * @param mValuesOnTopColor the font color of the values on top of the bars + * @see #setDrawValuesOnTop(boolean) + */ + public void setValuesOnTopColor(int mValuesOnTopColor) { + this.mValuesOnTopColor = mValuesOnTopColor; + } + + /** + * @return font size of the values above the bars + * @see #setDrawValuesOnTop(boolean) + */ + public float getValuesOnTopSize() { + return mValuesOnTopSize; + } + + /** + * @param mValuesOnTopSize font size of the values above the bars + * @see #setDrawValuesOnTop(boolean) + */ + public void setValuesOnTopSize(float mValuesOnTopSize) { + this.mValuesOnTopSize = mValuesOnTopSize; + } + + /** + * resets the cached coordinates of the bars + */ + @Override + protected void resetDataPoints() { + mDataPoints.clear(); + } + + /** + * find the corresponding data point by + * coordinates. + * + * @param x pixels + * @param y pixels + * @return datapoint or null + */ + @Override + protected E findDataPoint(float x, float y) { + for (Map.Entry implements Series { + /** + * holds the data + */ + final private List mData = new ArrayList (); + + /** + * stores the used coordinates to find the + * corresponding data point on a tap + * + * Key => x/y pixel + * Value => Plotted Datapoint + * + * will be filled while drawing via {@link #registerDataPoint(float, float, DataPointInterface)} + */ + private Map getValues(final double from, final double until) { + if (from <= getLowestValueX() && until >= getHighestValueX()) { + return mData.iterator(); + } else { + return new Iterator () { + Iterator org = mData.iterator(); + E nextValue = null; + E nextNextValue = null; + boolean plusOne = true; + + { + // go to first + boolean found = false; + E prevValue = null; + if (org.hasNext()) { + prevValue = org.next(); + } + if (prevValue != null) { + if (prevValue.getX() >= from) { + nextValue = prevValue; + found = true; + } else { + while (org.hasNext()) { + nextValue = org.next(); + if (nextValue.getX() >= from) { + found = true; + nextNextValue = nextValue; + nextValue = prevValue; + break; + } + prevValue = nextValue; + } + } + } + if (!found) { + nextValue = null; + } + } + + @Override + public void remove() { + throw new UnsupportedOperationException(); + } + + @Override + public E next() { + if (hasNext()) { + E r = nextValue; + if (r.getX() > until) { + plusOne = false; + } + if (nextNextValue != null) { + nextValue = nextNextValue; + nextNextValue = null; + } else if (org.hasNext()) nextValue = org.next(); + else nextValue = null; + return r; + } else { + throw new NoSuchElementException(); + } + } + + @Override + public boolean hasNext() { + return nextValue != null && (nextValue.getX() <= until || plusOne); + } + }; + } + } + + /** + * @return the title of the series + */ + public String getTitle() { + return mTitle; + } + + /** + * set the title of the series. This will be used in + * the legend. + * + * @param mTitle title of the series + */ + public void setTitle(String mTitle) { + this.mTitle = mTitle; + } + + /** + * @return color of the series + */ + public int getColor() { + return mColor; + } + + /** + * set the color of the series. This will be used in + * plotting (depends on the series implementation) and + * is used in the legend. + * + * @param mColor + */ + public void setColor(int mColor) { + this.mColor = mColor; + } + + /** + * set a listener for tap on a data point. + * + * @param l listener + */ + public void setOnDataPointTapListener(OnDataPointTapListener l) { + this.mOnDataPointTapListener = l; + } + + /** + * called by the tap detector in order to trigger + * the on tap on datapoint event. + * + * @param x pixel + * @param y pixel + */ + @Override + public void onTap(float x, float y) { + if (mOnDataPointTapListener != null) { + E p = findDataPoint(x, y); + if (p != null) { + mOnDataPointTapListener.onTap(this, p); + } + } + } + + /** + * find the data point which is next to the + * coordinates + * + * @param x pixel + * @param y pixel + * @return the data point or null if nothing was found + */ + protected E findDataPoint(float x, float y) { + float shortestDistance = Float.NaN; + E shortest = null; + for (Map.Entry graphView : mGraphViews) { + if (graphView != null && graphView.get() != null && graphView.get().isCursorMode()) { + return mIsCursorModeCache = true; + } + } + return mIsCursorModeCache = false; + } + + /** + * clears the cached data point coordinates + */ + protected void resetDataPoints() { + mDataPoints.clear(); + } + + /** + * clears the data of this series and sets new. + * will redraw the graph + * + * @param data the values must be in the correct order! + * x-value has to be ASC. First the lowest x value and at least the highest x value. + */ + public void resetData(E[] data) { + mData.clear(); + for (E d : data) { + mData.add(d); + } + checkValueOrder(null); + + mHighestYCache = mLowestYCache = Double.NaN; + + // update graphview + for (WeakReference gv : mGraphViews) { + if (gv != null && gv.get() != null) { + gv.get().onDataChanged(true, false); + } + } + } + + /** + * stores the reference of the used graph + * + * @param graphView graphview + */ + @Override + public void onGraphViewAttached(GraphView graphView) { + mGraphViews.add(new WeakReference<>(graphView)); + } + + /** + * + * @param dataPoint values the values must be in the correct order! + * x-value has to be ASC. First the lowest x value and at least the highest x value. + * @param scrollToEnd true => graphview will scroll to the end (maxX) + * @param maxDataPoints if max data count is reached, the oldest data + * value will be lost to avoid memory leaks + * @param silent set true to avoid rerender the graph + */ + public void appendData(E dataPoint, boolean scrollToEnd, int maxDataPoints, boolean silent) { + checkValueOrder(dataPoint); + + if (!mData.isEmpty() && dataPoint.getX() < mData.get(mData.size()-1).getX()) { + throw new IllegalArgumentException("new x-value must be greater then the last value. x-values has to be ordered in ASC."); + } + synchronized (mData) { + int curDataCount = mData.size(); + if (curDataCount < maxDataPoints) { + // enough space + mData.add(dataPoint); + } else { + // we have to trim one data + mData.remove(0); + mData.add(dataPoint); + } + + // update lowest/highest cache + double dataPointY = dataPoint.getY(); + if (!Double.isNaN(mHighestYCache)) { + if (dataPointY > mHighestYCache) { + mHighestYCache = dataPointY; + } + } + if (!Double.isNaN(mLowestYCache)) { + if (dataPointY < mLowestYCache) { + mLowestYCache = dataPointY; + } + } + + } + + if (!silent) { + // recalc the labels when it was the first data + boolean keepLabels = mData.size() != 1; + + // update linked graph views + // update graphview + for (WeakReference gv : mGraphViews) { + if (gv != null && gv.get() != null) { + if (scrollToEnd) { + gv.get().getViewport().scrollToEnd(); + } else { + gv.get().onDataChanged(keepLabels, scrollToEnd); + } + } + } + } + } + + /** + * + * @param dataPoint values the values must be in the correct order! + * x-value has to be ASC. First the lowest x value and at least the highest x value. + * @param scrollToEnd true => graphview will scroll to the end (maxX) + * @param maxDataPoints if max data count is reached, the oldest data + * value will be lost to avoid memory leaks + */ + public void appendData(E dataPoint, boolean scrollToEnd, int maxDataPoints) { + appendData(dataPoint, scrollToEnd, maxDataPoints, false); + } + + /** + * @return whether there are data points + */ + @Override + public boolean isEmpty() { + return mData.isEmpty(); + } + + /** + * checks that the data is in the correct order + * + * @param onlyLast if not null, it will only check that this + * datapoint is after the last point. + */ + protected void checkValueOrder(DataPointInterface onlyLast) { + if (mData.size()>1) { + if (onlyLast != null) { + // only check last + if (onlyLast.getX() < mData.get(mData.size()-1).getX()) { + throw new IllegalArgumentException("new x-value must be greater then the last value. x-values has to be ordered in ASC."); + } + } else { + double lx = mData.get(0).getX(); + + for (int i = 1; i < mData.size(); i++) { + if (mData.get(i).getX() != Double.NaN) { + if (lx > mData.get(i).getX()) { + throw new IllegalArgumentException("The order of the values is not correct. X-Values have to be ordered ASC. First the lowest x value and at least the highest x value."); + } + lx = mData.get(i).getX(); + } + } + } + } + } + + public abstract void drawSelection(GraphView mGraphView, Canvas canvas, boolean b, DataPointInterface value); + + public void clearCursorModeCache() { + mIsCursorModeCache = null; + } + + @Override + public void clearReference(GraphView graphView) { + // find and remove + for (WeakReference view : mGraphViews) { + if (view != null && view.get() != null && view.get() == graphView) { + mGraphViews.remove(view); + break; + } + } + } +} diff --git a/src/main/java/com/jjoe64/graphview/series/DataPoint.java b/src/main/java/com/jjoe64/graphview/series/DataPoint.java new file mode 100644 index 000000000..097a29c02 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/series/DataPoint.java @@ -0,0 +1,60 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.series; + +import android.provider.ContactsContract; + +import java.io.Serializable; +import java.util.Date; + +/** + * default data point implementation. + * This stores the x and y values. + * + * @author jjoe64 + */ +public class DataPoint implements DataPointInterface, Serializable { + private static final long serialVersionUID=1428263322645L; + + private double x; + private double y; + + public DataPoint(double x, double y) { + this.x=x; + this.y=y; + } + + public DataPoint(Date x, double y) { + this.x = x.getTime(); + this.y = y; + } + + @Override + public double getX() { + return x; + } + + @Override + public double getY() { + return y; + } + + @Override + public String toString() { + return "["+x+"/"+y+"]"; + } +} diff --git a/src/main/java/com/jjoe64/graphview/series/DataPointInterface.java b/src/main/java/com/jjoe64/graphview/series/DataPointInterface.java new file mode 100644 index 000000000..5d641f7d0 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/series/DataPointInterface.java @@ -0,0 +1,38 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.series; + +/** + * interface of data points. Implement this in order + * to use your class in {@link com.jjoe64.graphview.series.Series}. + * + * You can also use the default implementation {@link com.jjoe64.graphview.series.DataPoint} so + * you do not have to implement it for yourself. + * + * @author jjoe64 + */ +public interface DataPointInterface { + /** + * @return the x value + */ + public double getX(); + + /** + * @return the y value + */ + public double getY(); +} diff --git a/src/main/java/com/jjoe64/graphview/series/LineGraphSeries.java b/src/main/java/com/jjoe64/graphview/series/LineGraphSeries.java new file mode 100644 index 000000000..3d56125dd --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/series/LineGraphSeries.java @@ -0,0 +1,714 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + *
+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.series; + +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Path; +import androidx.core.view.ViewCompat; +import android.view.animation.AccelerateInterpolator; + +import com.jjoe64.graphview.GraphView; + +import java.util.Iterator; + +/** + * Series to plot the data as line. + * The line can be styled with many options. + * + * @author jjoe64 + */ +public class LineGraphSeries
extends BaseSeries { + private static final long ANIMATION_DURATION = 333; + + /** + * wrapped styles regarding the line + */ + private final class Styles { + /** + * the thickness of the line. + * This option will be ignored if you are + * using a custom paint via {@link #setCustomPaint(android.graphics.Paint)} + */ + private int thickness = 5; + + /** + * flag whether the area under the line to the bottom + * of the viewport will be filled with a + * specific background color. + * + * @see #backgroundColor + */ + private boolean drawBackground = false; + + /** + * flag whether the data points are highlighted as + * a visible point. + * + * @see #dataPointsRadius + */ + private boolean drawDataPoints = false; + + /** + * the radius for the data points. + * + * @see #drawDataPoints + */ + private float dataPointsRadius = 10f; + + /** + * the background color for the filling under + * the line. + * + * @see #drawBackground + */ + private int backgroundColor = Color.argb(100, 172, 218, 255); + } + + /** + * wrapped styles + */ + private Styles mStyles; + + private Paint mSelectionPaint; + + /** + * internal paint object + */ + private Paint mPaint; + + /** + * paint for the background + */ + private Paint mPaintBackground; + + /** + * path for the background filling + */ + private Path mPathBackground; + + /** + * path to the line + */ + private Path mPath; + + /** + * custom paint that can be used. + * this will ignore the thickness and color styles. + */ + private Paint mCustomPaint; + + /** + * rendering is animated + */ + private boolean mAnimated; + + /** + * last animated value + */ + private double mLastAnimatedValue = Double.NaN; + + /** + * time of animation start + */ + private long mAnimationStart; + + /** + * animation interpolator + */ + private AccelerateInterpolator mAnimationInterpolator; + + /** + * number of animation frame to avoid lagging + */ + private int mAnimationStartFrameNo; + + /** + * flag whether the line should be drawn as a path + * or with single drawLine commands (more performance) + * By default we use drawLine because it has much more peformance. + * For some styling reasons it can make sense to draw as path. + */ + private boolean mDrawAsPath = false; + + /** + * creates a series without data + */ + public LineGraphSeries() { + init(); + } + + /** + * creates a series with data + * + * @param data data points + * important: array has to be sorted from lowest x-value to the highest + */ + public LineGraphSeries(E[] data) { + super(data); + init(); + } + + /** + * do the initialization + * creates internal objects + */ + protected void init() { + mStyles = new Styles(); + mPaint = new Paint(); + mPaint.setStrokeCap(Paint.Cap.ROUND); + mPaint.setStyle(Paint.Style.STROKE); + mPaintBackground = new Paint(); + + mSelectionPaint = new Paint(); + mSelectionPaint.setColor(Color.argb(80, 0, 0, 0)); + mSelectionPaint.setStyle(Paint.Style.FILL); + + mPathBackground = new Path(); + mPath = new Path(); + + mAnimationInterpolator = new AccelerateInterpolator(2f); + } + + /** + * plots the series + * draws the line and the background + * + * @param graphView graphview + * @param canvas canvas + * @param isSecondScale flag if it is the second scale + */ + @Override + public void draw(GraphView graphView, Canvas canvas, boolean isSecondScale) { + resetDataPoints(); + + // get data + double maxX = graphView.getViewport().getMaxX(false); + double minX = graphView.getViewport().getMinX(false); + + double maxY; + double minY; + if (isSecondScale) { + maxY = graphView.getSecondScale().getMaxY(false); + minY = graphView.getSecondScale().getMinY(false); + } else { + maxY = graphView.getViewport().getMaxY(false); + minY = graphView.getViewport().getMinY(false); + } + + Iterator values = getValues(minX, maxX); + + // draw background + double lastEndY = 0; + double lastEndX = 0; + + // draw data + mPaint.setStrokeWidth(mStyles.thickness); + mPaint.setColor(getColor()); + mPaintBackground.setColor(mStyles.backgroundColor); + + Paint paint; + if (mCustomPaint != null) { + paint = mCustomPaint; + } else { + paint = mPaint; + } + + mPath.reset(); + + if (mStyles.drawBackground) { + mPathBackground.reset(); + } + + double diffY = maxY - minY; + double diffX = maxX - minX; + + float graphHeight = graphView.getGraphContentHeight(); + float graphWidth = graphView.getGraphContentWidth(); + float graphLeft = graphView.getGraphContentLeft(); + float graphTop = graphView.getGraphContentTop(); + + lastEndY = 0; + lastEndX = 0; + + // needed to end the path for background + double lastUsedEndX = 0; + double lastUsedEndY = 0; + float firstX = -1; + float firstY = -1; + float lastRenderedX = Float.NaN; + int i = 0; + float lastAnimationReferenceX = graphLeft; + + boolean sameXSkip = false; + float minYOnSameX = 0f; + float maxYOnSameX = 0f; + + while (values.hasNext()) { + E value = values.next(); + + double valY = value.getY() - minY; + double ratY = valY / diffY; + double y = graphHeight * ratY; + + double valueX = value.getX(); + double valX = valueX - minX; + double ratX = valX / diffX; + double x = graphWidth * ratX; + + double orgX = x; + double orgY = y; + + if (i > 0) { + // overdraw + boolean isOverdrawY = false; + boolean isOverdrawEndPoint = false; + boolean skipDraw = false; + + if (x > graphWidth) { // end right + double b = ((graphWidth - lastEndX) * (y - lastEndY) / (x - lastEndX)); + y = lastEndY + b; + x = graphWidth; + isOverdrawEndPoint = true; + } + if (y < 0) { // end bottom + // skip when previous and this point is out of bound + if (lastEndY < 0) { + skipDraw = true; + } else { + double b = ((0 - lastEndY) * (x - lastEndX) / (y - lastEndY)); + x = lastEndX + b; + } + y = 0; + isOverdrawY = isOverdrawEndPoint = true; + } + if (y > graphHeight) { // end top + // skip when previous and this point is out of bound + if (lastEndY > graphHeight) { + skipDraw = true; + } else { + double b = ((graphHeight - lastEndY) * (x - lastEndX) / (y - lastEndY)); + x = lastEndX + b; + } + y = graphHeight; + isOverdrawY = isOverdrawEndPoint = true; + } + if (lastEndX < 0) { // start left + double b = ((0 - x) * (y - lastEndY) / (lastEndX - x)); + lastEndY = y - b; + lastEndX = 0; + } + + // we need to save the X before it will be corrected when overdraw y + float orgStartX = (float) lastEndX + (graphLeft + 1); + + if (lastEndY < 0) { // start bottom + if (!skipDraw) { + double b = ((0 - y) * (x - lastEndX) / (lastEndY - y)); + lastEndX = x - b; + } + lastEndY = 0; + isOverdrawY = true; + } + if (lastEndY > graphHeight) { // start top + // skip when previous and this point is out of bound + if (!skipDraw) { + double b = ((graphHeight - y) * (x - lastEndX) / (lastEndY - y)); + lastEndX = x - b; + } + lastEndY = graphHeight; + isOverdrawY = true; + } + + float startX = (float) lastEndX + (graphLeft + 1); + float startY = (float) (graphTop - lastEndY) + graphHeight; + float endX = (float) x + (graphLeft + 1); + float endY = (float) (graphTop - y) + graphHeight; + float startXAnimated = startX; + float endXAnimated = endX; + + if (endX < startX) { + // dont draw from right to left + skipDraw = true; + } + + // NaN can happen when previous and current value is out of y bounds + if (!skipDraw && !Float.isNaN(startY) && !Float.isNaN(endY)) { + // animation + if (mAnimated) { + if ((Double.isNaN(mLastAnimatedValue) || mLastAnimatedValue < valueX)) { + long currentTime = System.currentTimeMillis(); + if (mAnimationStart == 0) { + // start animation + mAnimationStart = currentTime; + mAnimationStartFrameNo = 0; + } else { + // anti-lag: wait a few frames + if (mAnimationStartFrameNo < 15) { + // second time + mAnimationStart = currentTime; + mAnimationStartFrameNo++; + } + } + float timeFactor = (float) (currentTime - mAnimationStart) / ANIMATION_DURATION; + float factor = mAnimationInterpolator.getInterpolation(timeFactor); + if (timeFactor <= 1.0) { + startXAnimated = (startX - lastAnimationReferenceX) * factor + lastAnimationReferenceX; + startXAnimated = Math.max(startXAnimated, lastAnimationReferenceX); + endXAnimated = (endX - lastAnimationReferenceX) * factor + lastAnimationReferenceX; + ViewCompat.postInvalidateOnAnimation(graphView); + } else { + // animation finished + mLastAnimatedValue = valueX; + } + } else { + lastAnimationReferenceX = endX; + } + } + + // draw data point + if (!isOverdrawEndPoint) { + if (mStyles.drawDataPoints) { + // draw first datapoint + Paint.Style prevStyle = paint.getStyle(); + paint.setStyle(Paint.Style.FILL); + canvas.drawCircle(endXAnimated, endY, mStyles.dataPointsRadius, paint); + paint.setStyle(prevStyle); + } + registerDataPoint(endX, endY, value); + } + + if (mDrawAsPath) { + mPath.moveTo(startXAnimated, startY); + } + // performance opt. + if (Float.isNaN(lastRenderedX) || Math.abs(endX - lastRenderedX) > .3f) { + if (mDrawAsPath) { + mPath.lineTo(endXAnimated, endY); + } else { + // draw vertical lines that were skipped + if (sameXSkip) { + sameXSkip = false; + renderLine(canvas, new float[]{lastRenderedX, minYOnSameX, lastRenderedX, maxYOnSameX}, paint); + } + renderLine(canvas, new float[]{startXAnimated, startY, endXAnimated, endY}, paint); + } + lastRenderedX = endX; + } else { + // rendering on same x position + // save min+max y position and draw it as line + if (sameXSkip) { + minYOnSameX = Math.min(minYOnSameX, endY); + maxYOnSameX = Math.max(maxYOnSameX, endY); + } else { + // first + sameXSkip = true; + minYOnSameX = Math.min(startY, endY); + maxYOnSameX = Math.max(startY, endY); + } + } + + } + + if (mStyles.drawBackground) { + if (isOverdrawY) { + // start draw original x + if (firstX == -1) { + firstX = orgStartX; + firstY = startY; + mPathBackground.moveTo(orgStartX, startY); + } + // from original start to new start + mPathBackground.lineTo(startXAnimated, startY); + } + if (firstX == -1) { + firstX = startXAnimated; + firstY = startY; + mPathBackground.moveTo(startXAnimated, startY); + } + mPathBackground.lineTo(startXAnimated, startY); + mPathBackground.lineTo(endXAnimated, endY); + } + + lastUsedEndX = endXAnimated; + lastUsedEndY = endY; + } else if (mStyles.drawDataPoints) { + //fix: last value not drawn as datapoint. Draw first point here, and then on every step the end values (above) + float first_X = (float) x + (graphLeft + 1); + float first_Y = (float) (graphTop - y) + graphHeight; + + if (first_X >= graphLeft && first_Y <= (graphTop + graphHeight)) { + if (mAnimated && (Double.isNaN(mLastAnimatedValue) || mLastAnimatedValue < valueX)) { + long currentTime = System.currentTimeMillis(); + if (mAnimationStart == 0) { + // start animation + mAnimationStart = currentTime; + } + float timeFactor = (float) (currentTime - mAnimationStart) / ANIMATION_DURATION; + float factor = mAnimationInterpolator.getInterpolation(timeFactor); + if (timeFactor <= 1.0) { + first_X = (first_X - lastAnimationReferenceX) * factor + lastAnimationReferenceX; + ViewCompat.postInvalidateOnAnimation(graphView); + } else { + // animation finished + mLastAnimatedValue = valueX; + } + } + + + Paint.Style prevStyle = paint.getStyle(); + paint.setStyle(Paint.Style.FILL); + canvas.drawCircle(first_X, first_Y, mStyles.dataPointsRadius, paint); + paint.setStyle(prevStyle); + registerDataPoint(first_X, first_Y, value); + } + } + lastEndY = orgY; + lastEndX = orgX; + i++; + } + + if (mDrawAsPath) { + // draw at the end + canvas.drawPath(mPath, paint); + } + + if (mStyles.drawBackground && firstX != -1) { + // end / close path + if (lastUsedEndY != graphHeight + graphTop) { + // dont draw line to same point, otherwise the path is completely broken + mPathBackground.lineTo((float) lastUsedEndX, graphHeight + graphTop); + } + mPathBackground.lineTo(firstX, graphHeight + graphTop); + if (firstY != graphHeight + graphTop) { + // dont draw line to same point, otherwise the path is completely broken + mPathBackground.lineTo(firstX, firstY); + } + //mPathBackground.close(); + canvas.drawPath(mPathBackground, mPaintBackground); + } + } + + /** + * just a wrapper to draw lines on canvas + * + * @param canvas + * @param pts + * @param paint + */ + private void renderLine(Canvas canvas, float[] pts, Paint paint) { + if (pts.length == 4 && pts[0] == pts[2] && pts[1] == pts[3]) { + // avoid zero length lines, to makes troubles on some devices + // see https://github.com/appsthatmatter/GraphView/issues/499 + return; + } + canvas.drawLines(pts, paint); + } + + /** + * the thickness of the line. + * This option will be ignored if you are + * using a custom paint via {@link #setCustomPaint(android.graphics.Paint)} + * + * @return the thickness of the line + */ + public int getThickness() { + return mStyles.thickness; + } + + /** + * the thickness of the line. + * This option will be ignored if you are + * using a custom paint via {@link #setCustomPaint(android.graphics.Paint)} + * + * @param thickness thickness of the line + */ + public void setThickness(int thickness) { + mStyles.thickness = thickness; + } + + /** + * flag whether the area under the line to the bottom + * of the viewport will be filled with a + * specific background color. + * + * @return whether the background will be drawn + * @see #getBackgroundColor() + */ + public boolean isDrawBackground() { + return mStyles.drawBackground; + } + + /** + * flag whether the area under the line to the bottom + * of the viewport will be filled with a + * specific background color. + * + * @param drawBackground whether the background will be drawn + * @see #setBackgroundColor(int) + */ + public void setDrawBackground(boolean drawBackground) { + mStyles.drawBackground = drawBackground; + } + + /** + * flag whether the data points are highlighted as + * a visible point. + * + * @return flag whether the data points are highlighted + * @see #setDataPointsRadius(float) + */ + public boolean isDrawDataPoints() { + return mStyles.drawDataPoints; + } + + /** + * flag whether the data points are highlighted as + * a visible point. + * + * @param drawDataPoints flag whether the data points are highlighted + * @see #setDataPointsRadius(float) + */ + public void setDrawDataPoints(boolean drawDataPoints) { + mStyles.drawDataPoints = drawDataPoints; + } + + /** + * @return the radius for the data points. + * @see #setDrawDataPoints(boolean) + */ + public float getDataPointsRadius() { + return mStyles.dataPointsRadius; + } + + /** + * @param dataPointsRadius the radius for the data points. + * @see #setDrawDataPoints(boolean) + */ + public void setDataPointsRadius(float dataPointsRadius) { + mStyles.dataPointsRadius = dataPointsRadius; + } + + /** + * @return the background color for the filling under + * the line. + * @see #setDrawBackground(boolean) + */ + public int getBackgroundColor() { + return mStyles.backgroundColor; + } + + /** + * @param backgroundColor the background color for the filling under + * the line. + * @see #setDrawBackground(boolean) + */ + public void setBackgroundColor(int backgroundColor) { + mStyles.backgroundColor = backgroundColor; + } + + /** + * custom paint that can be used. + * this will ignore the thickness and color styles. + * + * @param customPaint the custom paint to be used for rendering the line + */ + public void setCustomPaint(Paint customPaint) { + this.mCustomPaint = customPaint; + } + + /** + * @param animated activate the animated rendering + */ + public void setAnimated(boolean animated) { + this.mAnimated = animated; + } + + /** + * flag whether the line should be drawn as a path + * or with single drawLine commands (more performance) + * By default we use drawLine because it has much more peformance. + * For some styling reasons it can make sense to draw as path. + */ + public boolean isDrawAsPath() { + return mDrawAsPath; + } + + /** + * flag whether the line should be drawn as a path + * or with single drawLine commands (more performance) + * By default we use drawLine because it has much more peformance. + * For some styling reasons it can make sense to draw as path. + * + * @param mDrawAsPath true to draw as path + */ + public void setDrawAsPath(boolean mDrawAsPath) { + this.mDrawAsPath = mDrawAsPath; + } + + /** + * + * @param dataPoint values the values must be in the correct order! + * x-value has to be ASC. First the lowest x value and at least the highest x value. + * @param scrollToEnd true => graphview will scroll to the end (maxX) + * @param maxDataPoints if max data count is reached, the oldest data + * value will be lost to avoid memory leaks + * @param silent set true to avoid rerender the graph + */ + public void appendData(E dataPoint, boolean scrollToEnd, int maxDataPoints, boolean silent) { + if (!isAnimationActive()) { + mAnimationStart = 0; + } + super.appendData(dataPoint, scrollToEnd, maxDataPoints, silent); + } + + /** + * @return currently animation is active + */ + private boolean isAnimationActive() { + if (mAnimated) { + long curr = System.currentTimeMillis(); + return curr - mAnimationStart <= ANIMATION_DURATION; + } + return false; + } + + @Override + public void drawSelection(GraphView graphView, Canvas canvas, boolean b, DataPointInterface value) { + double spanX = graphView.getViewport().getMaxX(false) - graphView.getViewport().getMinX(false); + double spanXPixel = graphView.getGraphContentWidth(); + + double spanY = graphView.getViewport().getMaxY(false) - graphView.getViewport().getMinY(false); + double spanYPixel = graphView.getGraphContentHeight(); + + double pointX = (value.getX() - graphView.getViewport().getMinX(false)) * spanXPixel / spanX; + pointX += graphView.getGraphContentLeft(); + + double pointY = (value.getY() - graphView.getViewport().getMinY(false)) * spanYPixel / spanY; + pointY = graphView.getGraphContentTop() + spanYPixel - pointY; + + // border + canvas.drawCircle((float) pointX, (float) pointY, 30f, mSelectionPaint); + + // fill + Paint.Style prevStyle = mPaint.getStyle(); + mPaint.setStyle(Paint.Style.FILL); + canvas.drawCircle((float) pointX, (float) pointY, 23f, mPaint); + mPaint.setStyle(prevStyle); + } +} diff --git a/src/main/java/com/jjoe64/graphview/series/OnDataPointTapListener.java b/src/main/java/com/jjoe64/graphview/series/OnDataPointTapListener.java new file mode 100644 index 000000000..e846e329e --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/series/OnDataPointTapListener.java @@ -0,0 +1,35 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.series; + +/** + * Listener for the tap event which will be + * triggered when the user touches on a datapoint. + * + * Use this in {@link com.jjoe64.graphview.series.BaseSeries#setOnDataPointTapListener(OnDataPointTapListener)} + * + * @author jjoe64 + */ +public interface OnDataPointTapListener { + /** + * gets called when the user touches on a datapoint. + * + * @param series the corresponding series + * @param dataPoint the data point that was tapped on + */ + void onTap(Series series, DataPointInterface dataPoint); +} diff --git a/src/main/java/com/jjoe64/graphview/series/PointsGraphSeries.java b/src/main/java/com/jjoe64/graphview/series/PointsGraphSeries.java new file mode 100644 index 000000000..2ec74a526 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/series/PointsGraphSeries.java @@ -0,0 +1,318 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.series; + +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Path; +import android.graphics.Point; + +import com.jjoe64.graphview.GraphView; + +import java.util.Iterator; + +/** + * Series that plots the data as points. + * The points can be different shapes or a + * complete custom drawing. + * + * @author jjoe64 + */ +public class PointsGraphSeries extends BaseSeries { + /** + * interface to implement a custom + * drawing for the data points. + */ + public static interface CustomShape { + /** + * called when drawing a single data point. + * use the x and y coordinates to draw your + * drawing at this point. + * + * @param canvas canvas to draw on + * @param paint internal paint object. this has the correct color. + * But you can use your own paint. + * @param x x-coordinate the point has to be drawn to + * @param y y-coordinate the point has to be drawn to + * @param dataPoint the related data point + */ + void draw(Canvas canvas, Paint paint, float x, float y, DataPointInterface dataPoint); + } + + /** + * choose a predefined shape to draw for + * each data point. + * You can also draw a custom drawing via {@link com.jjoe64.graphview.series.PointsGraphSeries.CustomShape} + */ + public enum Shape { + /** + * draws a point / circle + */ + POINT, + + /** + * draws a triangle + */ + TRIANGLE, + + /** + * draws a rectangle + */ + RECTANGLE + } + + /** + * wrapped styles for this series + */ + private final class Styles { + /** + * this is used for the size of the shape that + * will be drawn. + * This is useless if you are using a custom shape. + */ + float size; + + /** + * the shape that will be drawn for each point. + */ + Shape shape; + } + + /** + * wrapped styles + */ + private Styles mStyles; + + /** + * internal paint object + */ + private Paint mPaint; + + /** + * handler to use a custom drawing + */ + private CustomShape mCustomShape; + + /** + * creates the series without data + */ + public PointsGraphSeries() { + init(); + } + + /** + * creates the series with data + * + * @param data datapoints + */ + public PointsGraphSeries(E[] data) { + super(data); + init(); + } + + /** + * inits the internal objects + * set the defaults + */ + protected void init() { + mStyles = new Styles(); + mStyles.size = 20f; + mPaint = new Paint(); + mPaint.setStrokeCap(Paint.Cap.ROUND); + setShape(Shape.POINT); + } + + /** + * plot the data to the viewport + * + * @param graphView graphview + * @param canvas canvas to draw on + * @param isSecondScale whether it is the second scale + */ + @Override + public void draw(GraphView graphView, Canvas canvas, boolean isSecondScale) { + resetDataPoints(); + + // get data + double maxX = graphView.getViewport().getMaxX(false); + double minX = graphView.getViewport().getMinX(false); + + double maxY; + double minY; + if (isSecondScale) { + maxY = graphView.getSecondScale().getMaxY(false); + minY = graphView.getSecondScale().getMinY(false); + } else { + maxY = graphView.getViewport().getMaxY(false); + minY = graphView.getViewport().getMinY(false); + } + + Iterator values = getValues(minX, maxX); + + // draw background + double lastEndY = 0; + double lastEndX = 0; + + // draw data + mPaint.setColor(getColor()); + + double diffY = maxY - minY; + double diffX = maxX - minX; + + float graphHeight = graphView.getGraphContentHeight(); + float graphWidth = graphView.getGraphContentWidth(); + float graphLeft = graphView.getGraphContentLeft(); + float graphTop = graphView.getGraphContentTop(); + + lastEndY = 0; + lastEndX = 0; + float firstX = 0; + int i=0; + while (values.hasNext()) { + E value = values.next(); + + double valY = value.getY() - minY; + double ratY = valY / diffY; + double y = graphHeight * ratY; + + double valX = value.getX() - minX; + double ratX = valX / diffX; + double x = graphWidth * ratX; + + double orgX = x; + double orgY = y; + + // overdraw + boolean overdraw = false; + if (x > graphWidth) { // end right + overdraw = true; + } + if (y < 0) { // end bottom + overdraw = true; + } + if (y > graphHeight) { // end top + overdraw = true; + } + /* Fix a bug that continue to show the DOT after Y axis */ + if(x < 0) { + overdraw = true; + } + + float endX = (float) x + (graphLeft + 1); + float endY = (float) (graphTop - y) + graphHeight; + registerDataPoint(endX, endY, value); + + // draw data point + if (!overdraw) { + if (mCustomShape != null) { + mCustomShape.draw(canvas, mPaint, endX, endY, value); + } else if (mStyles.shape == Shape.POINT) { + canvas.drawCircle(endX, endY, mStyles.size, mPaint); + } else if (mStyles.shape == Shape.RECTANGLE) { + canvas.drawRect(endX-mStyles.size, endY-mStyles.size, endX+mStyles.size, endY+mStyles.size, mPaint); + } else if (mStyles.shape == Shape.TRIANGLE) { + Point[] points = new Point[3]; + points[0] = new Point((int)endX, (int)(endY-getSize())); + points[1] = new Point((int)(endX+getSize()), (int)(endY+getSize()*0.67)); + points[2] = new Point((int)(endX-getSize()), (int)(endY+getSize()*0.67)); + drawArrows(points, canvas, mPaint); + } + } + + i++; + } + + } + + /** + * helper to draw triangle + * + * @param point array with 3 coordinates + * @param canvas canvas to draw on + * @param paint paint object + */ + private void drawArrows(Point[] point, Canvas canvas, Paint paint) { + float [] points = new float[8]; + points[0] = point[0].x; + points[1] = point[0].y; + points[2] = point[1].x; + points[3] = point[1].y; + points[4] = point[2].x; + points[5] = point[2].y; + points[6] = point[0].x; + points[7] = point[0].y; + + canvas.drawVertices(Canvas.VertexMode.TRIANGLES, 8, points, 0, null, 0, null, 0, null, 0, 0, paint); + Path path = new Path(); + path.moveTo(point[0].x , point[0].y); + path.lineTo(point[1].x,point[1].y); + path.lineTo(point[2].x,point[2].y); + canvas.drawPath(path,paint); + } + + /** + * This is used for the size of the shape that + * will be drawn. + * This is useless if you are using a custom shape. + * + * @return the size of the shape + */ + public float getSize() { + return mStyles.size; + } + + /** + * This is used for the size of the shape that + * will be drawn. + * This is useless if you are using a custom shape. + * + * @param radius the size of the shape + */ + public void setSize(float radius) { + mStyles.size = radius; + } + + /** + * @return the shape that will be drawn for each point + */ + public Shape getShape() { + return mStyles.shape; + } + + /** + * @param s the shape that will be drawn for each point + */ + public void setShape(Shape s) { + mStyles.shape = s; + } + + /** + * Use a custom handler to draw your own + * drawing for each data point. + * + * @param shape handler to use a custom drawing + */ + public void setCustomShape(CustomShape shape) { + mCustomShape = shape; + } + + @Override + public void drawSelection(GraphView mGraphView, Canvas canvas, boolean b, DataPointInterface value) { + // TODO + } +} diff --git a/src/main/java/com/jjoe64/graphview/series/Series.java b/src/main/java/com/jjoe64/graphview/series/Series.java new file mode 100644 index 000000000..95e82a7e1 --- /dev/null +++ b/src/main/java/com/jjoe64/graphview/series/Series.java @@ -0,0 +1,129 @@ +/** + * GraphView + * Copyright 2016 Jonas Gehring + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jjoe64.graphview.series; + +import android.graphics.Canvas; + +import com.jjoe64.graphview.GraphView; + +import java.util.Iterator; + +/** + * Basis interface for series that can be plotted + * on the graph. + * You can implement this in order to create a completely + * custom series type. + * But it is recommended to extend {@link com.jjoe64.graphview.series.BaseSeries} or another + * implemented Series class to save time. + * Anyway this interface can make sense if you want to implement + * a custom data provider, because BaseSeries uses a internal Array to store + * the data. + * + * @author jjoe64 + */ +public interface Series { + /** + * @return the lowest x-value of the data + */ + public double getLowestValueX(); + + /** + * @return the highest x-value of the data + */ + public double getHighestValueX(); + + /** + * @return the lowest y-value of the data + */ + public double getLowestValueY(); + + /** + * @return the highest y-value of the data + */ + public double getHighestValueY(); + + /** + * get the values for a specific range. It is + * important that the data comes in the sorted order + * (from lowest to highest x-value). + * + * @param from the minimal x-value + * @param until the maximal x-value + * @return all datapoints between the from and until x-value + * including the from and until data points. + */ + public Iterator getValues(double from, double until); + + /** + * Plots the series to the viewport. + * You have to care about overdrawing. + * This method may be called 2 times: one for + * the default scale and one time for the + * second scale. + * + * @param graphView corresponding graphview + * @param canvas canvas to draw on + * @param isSecondScale true if the drawing is for the second scale + */ + public void draw(GraphView graphView, Canvas canvas, boolean isSecondScale); + + /** + * @return the title of the series. Used in the legend + */ + public String getTitle(); + + /** + * @return the color of the series. Used in the legend and should + * be used for the plotted points or lines. + */ + public int getColor(); + + /** + * set a listener for tap on a data point. + * + * @param l listener + */ + public void setOnDataPointTapListener(OnDataPointTapListener l); + + /** + * called by the tap detector in order to trigger + * the on tap on datapoint event. + * + * @param x pixel + * @param y pixel + */ + void onTap(float x, float y); + + /** + * called when the series was added to a graph + * + * @param graphView graphview + */ + void onGraphViewAttached(GraphView graphView); + + /** + * @return whether there are data points + */ + boolean isEmpty(); + + /** + * clear reference to view and activity + * + * @param graphView + */ + void clearReference(GraphView graphView); +} diff --git a/src/main/res/values/attr.xml b/src/main/res/values/attr.xml new file mode 100644 index 000000000..8b7383860 --- /dev/null +++ b/src/main/res/values/attr.xml @@ -0,0 +1,10 @@ + + + diff --git a/zooming.gif b/zooming.gif new file mode 100644 index 000000000..2b3dc215c Binary files /dev/null and b/zooming.gif differ+ ++ + + + +