Merge pull request #2 from AAChartModel/master

Update
AAChartModel · Mar 8, 2018 · d0ec13b · d0ec13b
2 parents 5480778 + aced620
commit d0ec13b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/AAChartKitLib/AAChartConfiger/AAChartModel.h b/AAChartKitLib/AAChartConfiger/AAChartModel.h
@@ -80,6 +80,7 @@ typedef NSString *AAChartStackingType;
 typedef NSString *AAChartSymbolType;
 typedef NSString *AAChartSymbolStyleType;
 typedef NSString *AAChartFontWeightType;
+typedef NSString *AACrosshairDashStyleType;
 
 UIKIT_EXTERN AAChartType const AAChartTypeStrange;
 UIKIT_EXTERN AAChartType const AAChartTypeColumn;

diff --git a/AAChartKitLib/AAChartConfiger/AAChartModel.m b/AAChartKitLib/AAChartConfiger/AAChartModel.m
@@ -131,6 +131,15 @@ - (instancetype)init {
         self.yAxisLabelsFontColor   = @"#778899";//浅石板灰色字体
         self.yAxisLabelsFontWeight  = AAChartFontWeightTypeThin;//细体字
         self.yAxisAlternateGridColor= @"#ffffff";//backcolor of every other grid line area
+
+        self.xAxisCrosshairWidth    = @2;
+        self.xAxisCrosshairColor    = @"#00bfff";
+        self.xAxisCrosshairDashStyleType = AACrosshairDashStyleTypeLongDashDot;
+        self.yAxisCrosshairWidth    = @2;
+        self.yAxisCrosshairColor    = @"#00bfff";
+        self.yAxisCrosshairDashStyleType = AACrosshairDashStyleTypeLongDashDot;
+
+
     }
     return self;
 }

diff --git a/AAChartKitLib/AAOptionsModel/AACrosshair.h b/AAChartKitLib/AAOptionsModel/AACrosshair.h
@@ -35,9 +35,9 @@
 
 @interface AACrosshair : NSObject
 
-AAPropStatementAndFuncStatement(copy, AACrosshair, AACrosshairDashStyleType, dashStyle); //准星线样式
-AAPropStatementAndFuncStatement(copy, AACrosshair, NSString*, color); //准星线颜色
-AAPropStatementAndFuncStatement(strong, AACrosshair, NSNumber*, width); //准星线宽度
+AAPropStatementAndFuncStatement(copy, AACrosshair, NSString *, dashStyle); //准星线样式
+AAPropStatementAndFuncStatement(copy, AACrosshair, NSString *, color); //准星线颜色
+AAPropStatementAndFuncStatement(strong, AACrosshair, NSNumber *, width); //准星线宽度
 
 
 @end

diff --git a/AAChartKitLib/AAOptionsModel/AACrosshair.m b/AAChartKitLib/AAOptionsModel/AACrosshair.m
@@ -34,8 +34,8 @@
 
 @implementation AACrosshair
 
-AAPropSetFuncImplementation(AACrosshair, NSString*, dashStyle); //准星线样式
-AAPropSetFuncImplementation(AACrosshair, NSString*, color); //准星线颜色
-AAPropSetFuncImplementation(AACrosshair, NSNumber*, width); //准星线宽度
+AAPropSetFuncImplementation(AACrosshair, NSString *, dashStyle); //准星线样式
+AAPropSetFuncImplementation(AACrosshair, NSString *, color); //准星线颜色
+AAPropSetFuncImplementation(AACrosshair, NSNumber *, width); //准星线宽度
 
 @end