Fix #519

Author: AAChartModel

AAChartKitDemo/ChartsDemo/CustomStyleChartVC.m

@@ -109,6 +109,7 @@ - (AAChartModel *)setUpAAChartModelWithIndex:(NSUInteger)index {
         case 22: return [self configureQuadrangleRadarChart];
         case 23: return [self configurePentagonRadarChart];
         case 24: return [self configureHexagonRadarChart];
+        case 25: return [self adjustYAxisMaxAndMinValues];
 
         default:
             return nil;
@@ -856,6 +857,52 @@ - (AAChartModel *)configureHexagonRadarChart {
                  ]);
 }
 
+- (AAChartModel *)adjustYAxisMaxAndMinValues {
+   NSArray *categoriesArr = @[
+       AAChartTypeColumn,
+       AAChartTypeBar,
+       AAChartTypeArea,
+       AAChartTypeAreaspline,
+       AAChartTypeLine,
+       AAChartTypeSpline,
+       AAChartTypeScatter,
+       AAChartTypePie,
+       AAChartTypeBubble,
+       AAChartTypePyramid,
+       AAChartTypeFunnel,
+       AAChartTypeColumnrange,
+       AAChartTypeArearange,
+       AAChartTypeAreasplinerange,
+       AAChartTypeBoxplot,
+       AAChartTypeWaterfall,
+       AAChartTypePolygon,
+   ];
+    
+    return AAChartModel.new
+    .chartTypeSet(AAChartTypeAreaspline)
+    .titleSet(@"")
+    .subtitleSet(@"")
+    .legendEnabledSet(false)
+    .yAxisVisibleSet(true)
+    .easyGradientColorsSet(true)
+    .zoomTypeSet(AAChartZoomTypeXY)
+    .tooltipValueSuffixSet(@"kg")
+    .categoriesSet(categoriesArr)
+    .yAxisTitleSet(@"")
+    .yAxisMinSet(@2.0)
+    .yAxisMaxSet(@45.4)
+    .xAxisTickIntervalSet(@2)
+    .seriesSet(@[
+        AASeriesElement.new
+        .nameSet(@"体重")
+        .colorSet(@"#2494F3")
+        .dataSet(@[@7.0, @6.9, @2.5, @14.5, @18.2, @21.5, @5.2, @26.5, @23.3, @45.3, @13.9, @9.6])
+    ])
+    ;
+}
+
+
+
 
 @end
 

AAChartKitDemo/ChartsDemo/FirstViewController.m

@@ -317,7 +317,8 @@ - (NSArray *)chartTypeNameArr {
                                 @"Triangle Radar Chart---三角形雷达图",
                                 @"Quadrangle Radar Chart---四角形雷达图",
                                 @"Pentagon Radar Chart---五角形雷达图",
-                                @"Hexagon Radar Chart----六角形雷达图"
+                                @"Hexagon Radar Chart----六角形雷达图",
+                                @"adjustYAxisMaxAndMinValues----调整 X 轴和 Y 轴最大值"
                                 ],
                               /*混合类型图表*/
                               @[@"Arearange Mixed Line---面积范围均线图",

AAChartKitLib/AAOptionsModel/AAXAxis.h

@@ -55,6 +55,7 @@ AAPropStatementAndPropSetFuncStatement(strong, AAXAxis, AALabels *, labels) //
 AAPropStatementAndPropSetFuncStatement(assign, AAXAxis, BOOL ,      visible) //用于设置 x 轴以及 x 轴文字是否显示
 AAPropStatementAndPropSetFuncStatement(assign, AAXAxis, BOOL,       opposite) //是否将坐标轴显示在对立面，默认情况下 x 轴是在图表的下方显示，y 轴是在左方，坐标轴显示在对立面后，x 轴是在上方显示，y 轴是在右方显示（即坐标轴会显示在对立面）。该配置一般是用于多坐标轴区分展示，另外在 Highstock 中，y 轴默认是在对立面显示的。 默认是：false.
 AAPropStatementAndPropSetFuncStatement(assign, AAXAxis, BOOL ,      startOnTick) //Whether to force the axis to start on a tick. Use this option with the minPadding option to control the axis start. 默认是：false.
+AAPropStatementAndPropSetFuncStatement(assign, AAXAxis, BOOL ,      endOnTick) //是否强制将坐标轴结束于刻度线，可以通过本属性及 maxPadding 来控制坐标轴的结束位置。 默认是：false.
 AAPropStatementAndPropSetFuncStatement(strong, AAXAxis, AACrosshair *, crosshair)  //准星线样式设置
 AAPropStatementAndPropSetFuncStatement(copy,   AAXAxis, NSString *, tickColor) //x轴轴线下方刻度线颜色
 AAPropStatementAndPropSetFuncStatement(strong, AAXAxis, NSNumber *, tickInterval) //x轴刻度点间隔数(设置每隔几个点显示一个 X轴的内容)

AAChartKitLib/AAOptionsModel/AAXAxis.m

@@ -59,6 +59,7 @@ - (instancetype)init {
 AAPropSetFuncImplementation(AAXAxis, BOOL ,      visible)
 AAPropSetFuncImplementation(AAXAxis, BOOL,       opposite) //是否将坐标轴显示在对立面，默认情况下 x 轴是在图表的下方显示，y 轴是在左方，坐标轴显示在对立面后，x 轴是在上方显示，y 轴是在右方显示（即坐标轴会显示在对立面）。该配置一般是用于多坐标轴区分展示，另外在 Highstock 中，y 轴默认是在对立面显示的。 默认是：false.
 AAPropSetFuncImplementation(AAXAxis, BOOL ,      startOnTick) //Whether to force the axis to start on a tick. Use this option with the minPadding option to control the axis start. 默认是：false.
+AAPropSetFuncImplementation(AAXAxis, BOOL ,      endOnTick) //是否强制将坐标轴结束于刻度线，可以通过本属性及 maxPadding 来控制坐标轴的结束位置。 默认是：false.
 AAPropSetFuncImplementation(AAXAxis, AACrosshair*, crosshair)  //准星线样式设置
 AAPropSetFuncImplementation(AAXAxis, NSString *, tickColor) //x轴轴线下方刻度线颜色
 AAPropSetFuncImplementation(AAXAxis, NSNumber *, tickInterval) //x轴刻度点间隔数(设置每隔几个点显示一个 X轴的内容)

AAChartKitLib/AAOptionsModel/AAYAxis.h

@@ -40,7 +40,6 @@ static AAYAxisGridLineInterpolation const AAYAxisGridLineInterpolationPolygon =
 
 @interface AAYAxis : NSObject
 
-//AAPropStatementAndPropSetFuncStatement(assign, AAYAxis, BOOL,       min) 
 AAPropStatementAndPropSetFuncStatement(strong, AAYAxis, AAAxisTitle  *, title)
 AAPropStatementAndPropSetFuncStatement(strong, AAYAxis, NSArray  *, plotBands)
 AAPropStatementAndPropSetFuncStatement(strong, AAYAxis, NSArray  *, plotLines)
@@ -63,6 +62,8 @@ AAPropStatementAndPropSetFuncStatement(assign, AAYAxis, NSNumber *, min)  //y轴
 
 AAPropStatementAndPropSetFuncStatement(assign, AAYAxis, BOOL,       visible)  //y轴是否允许显示
 AAPropStatementAndPropSetFuncStatement(assign, AAYAxis, BOOL,       opposite) //是否将坐标轴显示在对立面，默认情况下 x 轴是在图表的下方显示，y 轴是在左方，坐标轴显示在对立面后，x 轴是在上方显示，y 轴是在右方显示（即坐标轴会显示在对立面）。该配置一般是用于多坐标轴区分展示，另外在 Highstock 中，y 轴默认是在对立面显示的。 默认是：false.
+AAPropStatementAndPropSetFuncStatement(assign, AAYAxis, BOOL ,      startOnTick) //Whether to force the axis to start on a tick. Use this option with the minPadding option to control the axis start. 默认是：false.
+AAPropStatementAndPropSetFuncStatement(assign, AAYAxis, BOOL ,      endOnTick) //是否强制将坐标轴结束于刻度线，可以通过本属性及 maxPadding 来控制坐标轴的结束位置。 默认是：false.
 AAPropStatementAndPropSetFuncStatement(strong, AAYAxis, AACrosshair*, crosshair)  //准星线样式设置
 AAPropStatementAndPropSetFuncStatement(strong, AAYAxis, AALabels *, stackLabels)
 AAPropStatementAndPropSetFuncStatement(strong, AAYAxis, NSNumber *, tickAmount)//刻度总数

AAChartKitLib/AAOptionsModel/AAYAxis.m

@@ -42,7 +42,6 @@ - (instancetype)init {
     return self;
 }
 
-//AAPropSetFuncImplementation(AAYAxis, BOOL,       min) tickWidth
 AAPropSetFuncImplementation(AAYAxis, AAAxisTitle  *, title)
 AAPropSetFuncImplementation(AAYAxis, NSArray  *, plotBands)
 AAPropSetFuncImplementation(AAYAxis, NSArray  *, plotLines)
@@ -64,6 +63,8 @@ - (instancetype)init {
 //AAPropSetFuncImplementation(AAYAxis, NSNumber *, minPadding)  //Padding of the min value relative to the length of the axis. A padding of 0.05 will make a 100px axis 5px longer. This is useful when you don't want the lowest data value to appear on the edge of the plot area. 默认是：0.05.
 AAPropSetFuncImplementation(AAYAxis, BOOL,       visible)  //y轴是否允许显示
 AAPropSetFuncImplementation(AAYAxis, BOOL,       opposite) //是否将坐标轴显示在对立面，默认情况下 x 轴是在图表的下方显示，y 轴是在左方，坐标轴显示在对立面后，x 轴是在上方显示，y 轴是在右方显示（即坐标轴会显示在对立面）。该配置一般是用于多坐标轴区分展示，另外在 Highstock 中，y 轴默认是在对立面显示的。 默认是：false.
+AAPropSetFuncImplementation(AAYAxis, BOOL ,      startOnTick) //Whether to force the axis to start on a tick. Use this option with the minPadding option to control the axis start. 默认是：false.
+AAPropSetFuncImplementation(AAYAxis, BOOL ,      endOnTick) //是否强制将坐标轴结束于刻度线，可以通过本属性及 maxPadding 来控制坐标轴的结束位置。 默认是：false.
 AAPropSetFuncImplementation(AAYAxis, AACrosshair*, crosshair)  //准星线样式设置
 AAPropSetFuncImplementation(AAYAxis, AALabels *, stackLabels)
 AAPropSetFuncImplementation(AAYAxis, NSNumber *, tickAmount)//刻度总数