organicmaps/MPAndroidChart
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Separate neutralColor in candlestick chart

Browse source
This commit is contained in:
Daniel Cohen Gindi 2016-02-11 10:33:35 +02:00
parent 83ebea7fd2
commit 45a8960251
6 changed files with 62 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MPChartExample/src/com/xxmassdeveloper/mpchartexample/CandleStickChartActivity.java
View file

@ -204,6 +204,7 @@ public class CandleStickChartActivity extends DemoBase implements OnSeekBarChang
set1.setDecreasingPaintStyle(Paint.Style.FILL);
set1.setIncreasingColor(Color.rgb(122, 242, 84));
set1.setIncreasingPaintStyle(Paint.Style.STROKE);
set1.setNeutralColor(Color.BLUE);
//set1.setHighlightLineWidth(1f);
CandleData data = new CandleData(xVals, set1);

1
MPChartExample/src/com/xxmassdeveloper/mpchartexample/realm/RealmDatabaseActivityCandle.java
View file

@ -61,6 +61,7 @@ public class RealmDatabaseActivityCandle extends RealmBaseActivity {
set.setDecreasingPaintStyle(Paint.Style.FILL);
set.setIncreasingColor(Color.rgb(122, 242, 84));
set.setIncreasingPaintStyle(Paint.Style.STROKE);
set.setNeutralColor(Color.BLUE);
ArrayList<ICandleDataSet> dataSets = new ArrayList<ICandleDataSet>();
dataSets.add(set); // add the dataset

22
MPChartLib/src/com/github/mikephil/charting/data/CandleDataSet.java
View file

@ -45,7 +45,12 @@ public class CandleDataSet extends LineScatterCandleRadarDataSet<CandleEntry> im
protected Paint.Style mDecreasingPaintStyle = Paint.Style.FILL;
/**
* color for open <= close
* color for open == close
*/
protected int mNeutralColor = ColorTemplate.COLOR_NONE;
/**
* color for open < close
*/
protected int mIncreasingColor = ColorTemplate.COLOR_NONE;
@ -164,6 +169,21 @@ public class CandleDataSet extends LineScatterCandleRadarDataSet<CandleEntry> im
/** BELOW THIS COLOR HANDLING */
/**
* Sets the one and ONLY color that should be used for this DataSet when
* open == close.
*
* @param color
*/
public void setNeutralColor(int color) {
mNeutralColor = color;
}
@Override
public int getNeutralColor() {
return mNeutralColor;
}
/**
* Sets the one and ONLY color that should be used for this DataSet when
* open > close.

24
MPChartLib/src/com/github/mikephil/charting/data/realm/implementation/RealmCandleDataSet.java
View file

@ -50,7 +50,12 @@ public class RealmCandleDataSet<T extends RealmObject> extends RealmLineScatterC
protected Paint.Style mDecreasingPaintStyle = Paint.Style.FILL;
/**
* color for open <= close
* color for open == close
*/
protected int mNeutralColor = ColorTemplate.COLOR_NONE;
/**
* color for open < close
*/
protected int mIncreasingColor = ColorTemplate.COLOR_NONE;
@ -200,6 +205,21 @@ public class RealmCandleDataSet<T extends RealmObject> extends RealmLineScatterC
/** BELOW THIS COLOR HANDLING */
/**
* Sets the one and ONLY color that should be used for this DataSet when
* open == close.
*
* @param color
*/
public void setNeutralColor(int color) {
mNeutralColor = color;
}
@Override
public int getNeutralColor() {
return mNeutralColor;
}
/**
* Sets the one and ONLY color that should be used for this DataSet when
* open > close.
@ -217,7 +237,7 @@ public class RealmCandleDataSet<T extends RealmObject> extends RealmLineScatterC
/**
* Sets the one and ONLY color that should be used for this DataSet when
* open <= close.
* open < close.
*
* @param color
*/

13
MPChartLib/src/com/github/mikephil/charting/interfaces/datasets/ICandleDataSet.java
View file

@ -29,17 +29,24 @@ public interface ICandleDataSet extends ILineScatterCandleRadarDataSet<CandleEnt
*
* @return
*/
public int getShadowColor();
int getShadowColor();
/**
* Returns the decreasing color.
* Returns the neutral color (for open == close)
*
* @return
*/
int getNeutralColor();
/**
* Returns the decreasing color (for open > close).
*
* @return
*/
int getDecreasingColor();
/**
* Returns the increasing color.
* Returns the increasing color (for open < close).
*
* @return
*/

10
MPChartLib/src/com/github/mikephil/charting/renderer/CandleStickChartRenderer.java
View file

@ -129,9 +129,9 @@ public class CandleStickChartRenderer extends LineScatterCandleRadarRenderer {
else
mRenderPaint.setColor(
dataSet.getShadowColor() == ColorTemplate.COLOR_NONE ?
dataSet.getNeutralColor() == ColorTemplate.COLOR_NONE ?
dataSet.getColor(j) :
dataSet.getShadowColor()
dataSet.getNeutralColor()
);
} else {
@ -187,7 +187,11 @@ public class CandleStickChartRenderer extends LineScatterCandleRadarRenderer {
mRenderPaint);
} else { // equal values
mRenderPaint.setColor(dataSet.getShadowColor());
if (dataSet.getNeutralColor() == ColorTemplate.COLOR_NONE) {
mRenderPaint.setColor(dataSet.getColor(j / 4 + minx));
} else {
mRenderPaint.setColor(dataSet.getNeutralColor());
}
c.drawLine(
mBodyBuffers[0], mBodyBuffers[1],