Skip to content

Commit a3c80c2

Browse files
committed
Merged in jmpascal/holographlibrary (pull request Androguide#14)
Create a new parameter for BarChart : Show/Hide Axis.
2 parents 12ca106 + 35f5033 commit a3c80c2

1 file changed

Lines changed: 18 additions & 10 deletions

File tree

HoloGraphLibrary/src/com/echo/holographlibrary/BarGraph.java

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public class BarGraph extends View {
4949
private Paint mPaint = new Paint();
5050
private Rect mRectangle = null;
5151
private boolean mShowBarText = true;
52+
private boolean mShowAxis = true;
5253
private int mIndexSelected = -1;
5354
private OnBarClickedListener mListener;
5455
private Bitmap mFullImage;
@@ -70,6 +71,10 @@ public void setShowBarText(boolean show){
7071
mShowBarText = show;
7172
}
7273

74+
public void setShowAxis(boolean show){
75+
mShowAxis = show;
76+
}
77+
7378
public void setBars(ArrayList<Bar> points){
7479
this.mBars = points;
7580
mShouldUpdate = true;
@@ -104,12 +109,13 @@ public void onDraw(Canvas ca) {
104109
}
105110

106111
// Draw x-axis line
107-
mPaint.setColor(Color.BLACK);
108-
mPaint.setStrokeWidth(2 * mContext.getResources().getDisplayMetrics().density);
109-
mPaint.setAlpha(50);
110-
mPaint.setAntiAlias(true);
111-
canvas.drawLine(0, getHeight()-bottomPadding+10* mContext.getResources().getDisplayMetrics().density, getWidth(), getHeight()-bottomPadding+10* mContext.getResources().getDisplayMetrics().density, mPaint);
112-
112+
if (mShowAxis){
113+
mPaint.setColor(Color.BLACK);
114+
mPaint.setStrokeWidth(2 * mContext.getResources().getDisplayMetrics().density);
115+
mPaint.setAlpha(50);
116+
mPaint.setAntiAlias(true);
117+
canvas.drawLine(0, getHeight()-bottomPadding+10* mContext.getResources().getDisplayMetrics().density, getWidth(), getHeight()-bottomPadding+10* mContext.getResources().getDisplayMetrics().density, mPaint);
118+
}
113119
float barWidth = (getWidth() - (padding*2)*mBars.size())/mBars.size();
114120

115121
// Maximum y value = sum of all values.
@@ -142,10 +148,12 @@ public void onDraw(Canvas ca) {
142148
bar.setRegion(new Region(mRectangle.left-selectPadding, mRectangle.top-selectPadding, mRectangle.right+selectPadding, mRectangle.bottom+selectPadding));
143149

144150
// Draw x-axis label text
145-
this.mPaint.setTextSize(AXIS_LABEL_FONT_SIZE * mContext.getResources().getDisplayMetrics().scaledDensity);
146-
int x = (int)(((mRectangle.left+mRectangle.right)/2)-(this.mPaint.measureText(bar.getName())/2));
147-
int y = (int) (getHeight()-3 * mContext.getResources().getDisplayMetrics().scaledDensity);
148-
canvas.drawText(bar.getName(), x, y, this.mPaint);
151+
if (mShowAxis){
152+
this.mPaint.setTextSize(AXIS_LABEL_FONT_SIZE * mContext.getResources().getDisplayMetrics().scaledDensity);
153+
int x = (int)(((mRectangle.left+mRectangle.right)/2)-(this.mPaint.measureText(bar.getName())/2));
154+
int y = (int) (getHeight()-3 * mContext.getResources().getDisplayMetrics().scaledDensity);
155+
canvas.drawText(bar.getName(), x, y, this.mPaint);
156+
}
149157

150158
// Draw value text
151159
if (mShowBarText){

0 commit comments

Comments
 (0)