Fixed dataset updates in demos

Jean-PhilippeDESCAMPS · Apr 13, 2016 · cefa901 · cefa901
1 parent 2bff257
commit cefa901
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 23 deletions.
diff --git a/ChartsDemo/Classes/Demos/AnotherBarChartViewController.m b/ChartsDemo/Classes/Demos/AnotherBarChartViewController.m
@@ -109,6 +109,7 @@ - (void)setDataCount:(int)count range:(double)range
  {
  set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
  set1.yVals = yVals;
+ _chartView.data.xValsObjc = xVals;
  [_chartView notifyDataSetChanged];
  }
  else

diff --git a/ChartsDemo/Classes/Demos/BarChartViewController.m b/ChartsDemo/Classes/Demos/BarChartViewController.m
@@ -132,6 +132,7 @@ - (void)setDataCount:(int)count range:(double)range
  {
  set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
  set1.yVals = yVals;
+ _chartView.data.xValsObjc = xVals;
  [_chartView notifyDataSetChanged];
  }
  else

diff --git a/ChartsDemo/Classes/Demos/CubicLineChartViewController.m b/ChartsDemo/Classes/Demos/CubicLineChartViewController.m
@@ -136,6 +136,7 @@ - (void)setDataCount:(int)count range:(double)range
  {
  set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
  set1.yVals = yVals1;
+ _chartView.data.xValsObjc = xVals;
  [_chartView notifyDataSetChanged];
  }
  else

diff --git a/ChartsDemo/Classes/Demos/HorizontalBarChartViewController.m b/ChartsDemo/Classes/Demos/HorizontalBarChartViewController.m
@@ -129,6 +129,7 @@ - (void)setDataCount:(int)count range:(double)range
  {
  set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
  set1.yVals = yVals;
+ _chartView.data.xValsObjc = xVals;
  [_chartView notifyDataSetChanged];
  }
  else

diff --git a/ChartsDemo/Classes/Demos/LineChart1ViewController.m b/ChartsDemo/Classes/Demos/LineChart1ViewController.m
@@ -148,6 +148,7 @@ - (void)setDataCount:(int)count range:(double)range
  {
  set1 = (LineChartDataSet *)_chartView.data.dataSets[0];
  set1.yVals = yVals;
+ _chartView.data.xValsObjc = xVals;
  [_chartView notifyDataSetChanged];
  }
  else

diff --git a/ChartsDemo/Classes/Demos/LineChart2ViewController.m b/ChartsDemo/Classes/Demos/LineChart2ViewController.m
@@ -147,6 +147,7 @@ - (void)setDataCount:(int)count range:(double)range
  set2 = (LineChartDataSet *)_chartView.data.dataSets[1];
  set1.yVals = yVals1;
  set2.yVals = yVals2;
+ _chartView.data.xValsObjc = xVals;
  [_chartView notifyDataSetChanged];
  }
  else

diff --git a/ChartsDemo/Classes/Demos/MultipleBarChartViewController.m b/ChartsDemo/Classes/Demos/MultipleBarChartViewController.m
@@ -133,6 +133,7 @@ - (void)setDataCount:(int)count range:(double)range
  set1.yVals = yVals1;
  set2.yVals = yVals2;
  set3.yVals = yVals3;
+ _chartView.data.xValsObjc = xVals;
  [_chartView notifyDataSetChanged];
  }
  else

diff --git a/ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.m b/ChartsDemo/Classes/Demos/PositiveNegativeBarChartViewController.m
@@ -149,29 +149,19 @@ - (void)setChartData
  }
  }
 
- BarChartDataSet *set = nil;
- if (_chartView.data.dataSetCount > 0)
- {
- set = (BarChartDataSet *)_chartView.data.dataSets[0];
- set.yVals = values;
- [_chartView notifyDataSetChanged];
- }
- else
- {
- set = [[BarChartDataSet alloc] initWithYVals:values label:@"Values"];
- set.barSpace = 0.4f;
- set.colors = colors;
- set.valueColors = colors;
-
- BarChartData *data = [[BarChartData alloc] initWithXVals:dates dataSet:set];
- [data setValueFont:[UIFont systemFontOfSize:13.f]];
-
- NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
- formatter.maximumFractionDigits = 1;
- [data setValueFormatter:formatter];
-
- _chartView.data = data;
- }
+ BarChartDataSet *set = set = [[BarChartDataSet alloc] initWithYVals:values label:@"Values"];
+ set.barSpace = 0.4f;
+ set.colors = colors;
+ set.valueColors = colors;
+
+ BarChartData *data = [[BarChartData alloc] initWithXVals:dates dataSet:set];
+ [data setValueFont:[UIFont systemFontOfSize:13.f]];
+
+ NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
+ formatter.maximumFractionDigits = 1;
+ [data setValueFormatter:formatter];
+
+ _chartView.data = data;
 }
 
 - (void)optionTapped:(NSString *)key

diff --git a/ChartsDemo/Classes/Demos/SinusBarChartViewController.m b/ChartsDemo/Classes/Demos/SinusBarChartViewController.m
@@ -122,6 +122,7 @@ - (void)setDataCount:(int)count
  {
  set = (BarChartDataSet *)_chartView.data.dataSets[0];
  set.yVals = entries;
+ _chartView.data.xValsObjc = xVals;
  [_chartView notifyDataSetChanged];
  }
  else

diff --git a/ChartsDemo/Classes/Demos/StackedBarChartViewController.m b/ChartsDemo/Classes/Demos/StackedBarChartViewController.m
@@ -124,6 +124,7 @@ - (void)setDataCount:(int)count range:(double)range
  {
  set1 = (BarChartDataSet *)_chartView.data.dataSets[0];
  set1.yVals = yVals;
+ _chartView.data.xValsObjc = xVals;
  [_chartView notifyDataSetChanged];
  }
  else