@@ -143,6 +143,10 @@ protected void init() {
143143 mGridBackgroundPaint .setColor (Color .rgb (240 , 240 , 240 )); // light
144144 // grey
145145 }
146+
147+ // for performance tracking
148+ private long totalTime = 0 ;
149+ private long drawCycles = 0 ;
146150
147151 @ Override
148152 protected void onDraw (Canvas canvas ) {
@@ -169,59 +173,70 @@ protected void onDraw(Canvas canvas) {
169173 calcModulus ();
170174
171175 // execute all drawing commands
172- drawGridBackground ();
176+ drawGridBackground (canvas );
173177
174178 mAxisRendererLeft .computeAxis (mAxisLeft .mAxisMinimum , mAxisLeft .mAxisMaximum );
175179 mAxisRendererRight .computeAxis (mAxisRight .mAxisMinimum , mAxisRight .mAxisMaximum );
176180
177181 // make sure the graph values and grid cannot be drawn outside the
178182 // content-rect
179- int clipRestoreCount = mDrawCanvas .save ();
180- mDrawCanvas .clipRect (mViewPortHandler .getContentRect ());
183+ int clipRestoreCount = canvas .save ();
184+ canvas .clipRect (mViewPortHandler .getContentRect ());
181185
182- mXAxisRenderer .renderGridLines (mDrawCanvas );
183- mAxisRendererLeft .renderGridLines (mDrawCanvas );
184- mAxisRendererRight .renderGridLines (mDrawCanvas );
186+ mXAxisRenderer .renderGridLines (canvas );
187+ mAxisRendererLeft .renderGridLines (canvas );
188+ mAxisRendererRight .renderGridLines (canvas );
185189
186- mAxisRendererLeft . renderLimitLines ( mDrawCanvas );
187- mAxisRendererRight . renderLimitLines ( mDrawCanvas );
188-
189- mRenderer . drawData ( mDrawCanvas );
190+ mRenderer . drawData ( canvas );
191+
192+ mAxisRendererLeft . renderLimitLines ( canvas );
193+ mAxisRendererRight . renderLimitLines ( canvas );
190194
191195 // if highlighting is enabled
192196 if (mHighlightEnabled && mHighLightIndicatorEnabled && valuesToHighlight ())
193- mRenderer .drawHighlighted (mDrawCanvas , mIndicesToHightlight );
197+ mRenderer .drawHighlighted (canvas , mIndicesToHightlight );
194198
195199 // Removes clipping rectangle
196- mDrawCanvas .restoreToCount (clipRestoreCount );
200+ canvas .restoreToCount (clipRestoreCount );
197201
198- mRenderer .drawExtras (mDrawCanvas );
202+ mRenderer .drawExtras (canvas );
199203
200- mXAxisRenderer .renderAxisLabels (mDrawCanvas );
201- mXAxisRenderer .renderAxisLine (mDrawCanvas );
204+ mXAxisRenderer .renderAxisLabels (canvas );
205+ mXAxisRenderer .renderAxisLine (canvas );
202206
203- mAxisRendererLeft .renderAxisLabels (mDrawCanvas );
204- mAxisRendererLeft .renderAxisLine (mDrawCanvas );
207+ mAxisRendererLeft .renderAxisLabels (canvas );
208+ mAxisRendererLeft .renderAxisLine (canvas );
205209
206- mAxisRendererRight .renderAxisLabels (mDrawCanvas );
207- mAxisRendererRight .renderAxisLine (mDrawCanvas );
210+ mAxisRendererRight .renderAxisLabels (canvas );
211+ mAxisRendererRight .renderAxisLine (canvas );
208212
209- mRenderer .drawValues (mDrawCanvas );
213+ mRenderer .drawValues (canvas );
210214
211- mLegendRenderer .renderLegend (mDrawCanvas , mLegend );
215+ mLegendRenderer .renderLegend (canvas , mLegend );
212216 // drawLegend();
213217
214- drawMarkers ();
218+ drawMarkers (canvas );
215219
216- drawDescription ();
220+ drawDescription (canvas );
217221
218- canvas .drawBitmap (mDrawBitmap , 0 , 0 , mDrawPaint );
222+ // canvas.drawBitmap(mDrawBitmap, 0, 0, mDrawPaint);
219223
220- if (mLogEnabled ) {
224+ if (true ) {
221225 long drawtime = (System .currentTimeMillis () - starttime );
222- Log .i (LOG_TAG , "DrawTime: " + drawtime + " ms" );
226+ totalTime += drawtime ;
227+ drawCycles += 1 ;
228+ long average = totalTime / drawCycles ;
229+ Log .i (LOG_TAG , "Drawtime: " + drawtime + " ms, average: " + average + " ms, cycles: " + drawCycles );
223230 }
224231 }
232+
233+ /**
234+ * RESET PERFORMANCE TRACKING FIELDS
235+ */
236+ public void resetTracking () {
237+ totalTime = 0 ;
238+ drawCycles = 0 ;
239+ }
225240
226241 protected void prepareValuePxMatrix () {
227242
@@ -252,6 +267,8 @@ public void notifyDataSetChanged() {
252267 if (mLogEnabled )
253268 Log .i (LOG_TAG , "Preparing..." );
254269 }
270+
271+ mRenderer .initBuffers ();
255272
256273 calcMinMax ();
257274
@@ -429,13 +446,13 @@ protected float[] getMarkerPosition(Entry e, int dataSetIndex) {
429446 /**
430447 * draws the grid background
431448 */
432- protected void drawGridBackground () {
449+ protected void drawGridBackground (Canvas c ) {
433450
434451 if (!mDrawGridBackground )
435452 return ;
436453
437454 // draw the grid background
438- mDrawCanvas .drawRect (mViewPortHandler .getContentRect (), mGridBackgroundPaint );
455+ c .drawRect (mViewPortHandler .getContentRect (), mGridBackgroundPaint );
439456 }
440457
441458 /**
0 commit comments