Skip to content

Commit

Permalink
添加定制TY的Mark
Browse files Browse the repository at this point in the history
  • Loading branch information
FreddyZeng committed Jan 20, 2018
1 parent 710195e commit 85ae518
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 25 deletions.
45 changes: 45 additions & 0 deletions Charts.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,18 @@
BEFD9518F3A74ACF8FA33308 /* Charts.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F9922F0641F7955DC6CD324 /* Charts.h */; settings = {ATTRIBUTES = (Public, ); }; };
C04D269AD4A373FD2B621C43 /* LineChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C978F31F23C7D21197DC2A1 /* LineChartData.swift */; };
C09E91F67A4AC43C277E7D82 /* BubbleChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD8ED233775EEC31243A6919 /* BubbleChartDataEntry.swift */; };
C20349BB201344430076234B /* RadarMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B5201344430076234B /* RadarMarkerView.swift */; };
C20349BC201344430076234B /* RadarMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B5201344430076234B /* RadarMarkerView.swift */; };
C20349BD201344430076234B /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B6201344430076234B /* BalloonMarker.swift */; };
C20349BE201344430076234B /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B6201344430076234B /* BalloonMarker.swift */; };
C20349BF201344430076234B /* RadarMarkerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C20349B7201344430076234B /* RadarMarkerView.xib */; };
C20349C0201344430076234B /* RadarMarkerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C20349B7201344430076234B /* RadarMarkerView.xib */; };
C20349C1201344430076234B /* TYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B8201344430076234B /* TYMarkerView.swift */; };
C20349C2201344430076234B /* TYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B8201344430076234B /* TYMarkerView.swift */; };
C20349C3201344430076234B /* XYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B9201344430076234B /* XYMarkerView.swift */; };
C20349C4201344430076234B /* XYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B9201344430076234B /* XYMarkerView.swift */; };
C20349C5201344430076234B /* YMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349BA201344430076234B /* YMarkerView.swift */; };
C20349C6201344430076234B /* YMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349BA201344430076234B /* YMarkerView.swift */; };
C20A62D8CB9120523D5FB650 /* LegendEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E7C673B9ED4340F550A9283 /* LegendEntry.swift */; };
C2EFB4EC8C97FA9987F1B50D /* RadarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91EEEDE2AB8F2DA3AFCF0733 /* RadarChartDataEntry.swift */; };
C33E1AF5471A60BA42DAF52E /* RadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F368CF209744D8F3B85B1028 /* RadarHighlighter.swift */; };
Expand Down Expand Up @@ -276,6 +288,12 @@
BD02157CF8CEE1189BF681DA /* PieChartDataEntry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieChartDataEntry.swift; path = Source/Charts/Data/Implementations/Standard/PieChartDataEntry.swift; sourceTree = "<group>"; };
BD5C6D20243EC2F19069AACD /* CandleStickChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleStickChartRenderer.swift; path = Source/Charts/Renderers/CandleStickChartRenderer.swift; sourceTree = "<group>"; };
BFABD027DAF6851088F002AC /* LineChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartDataProvider.swift; path = Source/Charts/Interfaces/LineChartDataProvider.swift; sourceTree = "<group>"; };
C20349B5201344430076234B /* RadarMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarMarkerView.swift; sourceTree = "<group>"; };
C20349B6201344430076234B /* BalloonMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BalloonMarker.swift; sourceTree = "<group>"; };
C20349B7201344430076234B /* RadarMarkerView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RadarMarkerView.xib; sourceTree = "<group>"; };
C20349B8201344430076234B /* TYMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TYMarkerView.swift; sourceTree = "<group>"; };
C20349B9201344430076234B /* XYMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XYMarkerView.swift; sourceTree = "<group>"; };
C20349BA201344430076234B /* YMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YMarkerView.swift; sourceTree = "<group>"; };
C31AA65EA27776F8C653C7E8 /* BarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift; sourceTree = "<group>"; };
C52E8344160B5E689DA3C25C /* ChevronDownShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChevronDownShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/ChevronDownShapeRenderer.swift; sourceTree = "<group>"; };
C574E1BC7E12D937A5471EF8 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Tests/Supporting Files/Info.plist"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -375,6 +393,7 @@
2647844720BC6574A544A337 /* Charts */ = {
isa = PBXGroup;
children = (
C20349B42013440F0076234B /* Mark */,
A49C1F0F9CCD6E5C143C29F4 /* Animation */,
8C531E3F3C3DE5843C93C3DA /* Charts */,
51EF1986C9884C25EED1C2CB /* Components */,
Expand Down Expand Up @@ -574,6 +593,20 @@
name = "Supporting Files";
sourceTree = "<group>";
};
C20349B42013440F0076234B /* Mark */ = {
isa = PBXGroup;
children = (
C20349B6201344430076234B /* BalloonMarker.swift */,
C20349B5201344430076234B /* RadarMarkerView.swift */,
C20349B7201344430076234B /* RadarMarkerView.xib */,
C20349B8201344430076234B /* TYMarkerView.swift */,
C20349B9201344430076234B /* XYMarkerView.swift */,
C20349BA201344430076234B /* YMarkerView.swift */,
);
name = Mark;
path = Source/Charts/Mark;
sourceTree = "<group>";
};
D047819AB7170595896D6FE8 /* Utils */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -762,13 +795,15 @@
buildActionMask = 2147483647;
files = (
00B8BF5901C2D220357B0B2A /* Media.xcassets in Resources */,
C20349C0201344430076234B /* RadarMarkerView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
E257C254E738A8AE047C6FB6 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C20349BF201344430076234B /* RadarMarkerView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -874,6 +909,8 @@
146EE16342C2BADC92E45BF2 /* ILineScatterCandleRadarChartDataSet.swift in Sources */,
FAAD9FF6565DED2652188584 /* IPieChartDataSet.swift in Sources */,
83BBAF3EDC31FD452F8BF1DB /* IRadarChartDataSet.swift in Sources */,
C20349BD201344430076234B /* BalloonMarker.swift in Sources */,
C20349C3201344430076234B /* XYMarkerView.swift in Sources */,
50476F8E6662CAFC1EFE0723 /* IScatterChartDataSet.swift in Sources */,
97E033CC0ABEF0F448DAFA8E /* DataApproximator.swift in Sources */,
779B46E9F13A087BFA47D539 /* DefaultAxisValueFormatter.swift in Sources */,
Expand All @@ -895,6 +932,7 @@
9C91C151608E2D6E19B1EAD1 /* Range.swift in Sources */,
00BC23EF0E04E17188344403 /* BarChartDataProvider.swift in Sources */,
28FEE609C5B22FD64C7E5D10 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */,
C20349C1201344430076234B /* TYMarkerView.swift in Sources */,
4272DA5D44AF7DA05A5A8287 /* BubbleChartDataProvider.swift in Sources */,
30DCC4BAA5601B154ABADA13 /* CandleChartDataProvider.swift in Sources */,
FD37AAC0270F390FFC470A65 /* ChartDataProvider.swift in Sources */,
Expand Down Expand Up @@ -928,6 +966,8 @@
0529DD51622C8769C1121F90 /* CrossShapeRenderer.swift in Sources */,
8A9FF54E2075A9047CC8E953 /* IShapeRenderer.swift in Sources */,
8EF7B3FBE37F72CC030CD865 /* SquareShapeRenderer.swift in Sources */,
C20349C5201344430076234B /* YMarkerView.swift in Sources */,
C20349BB201344430076234B /* RadarMarkerView.swift in Sources */,
8F4B1A9060472764073DFA0B /* TriangleShapeRenderer.swift in Sources */,
93A94E1FF55041A6032891FE /* XShapeRenderer.swift in Sources */,
5DC9BC1B6C128B2C9995AB84 /* ScatterChartRenderer.swift in Sources */,
Expand All @@ -951,12 +991,17 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C20349C6201344430076234B /* YMarkerView.swift in Sources */,
C20349C2201344430076234B /* TYMarkerView.swift in Sources */,
3B11556EB7DC034E2FC958E4 /* BarChartTests.swift in Sources */,
C20349BC201344430076234B /* RadarMarkerView.swift in Sources */,
8E1192F7A7152E9DA92C56A9 /* ChartUtilsTests.swift in Sources */,
B6BF9A561F91993A00E62A5D /* CombinedChartTests.swift in Sources */,
2BF85BEA981B359A65E9BF67 /* LineChartTests.swift in Sources */,
064989461F5C99C7006E8BB3 /* Snapshot.swift in Sources */,
C20349C4201344430076234B /* XYMarkerView.swift in Sources */,
224EFF991FBAAC4700CF9B3B /* EquatableTests.swift in Sources */,
C20349BE201344430076234B /* BalloonMarker.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
20 changes: 0 additions & 20 deletions ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,13 @@
5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB71A9B26AA0036A6CC /* AppDelegate.m */; };
5B57BBBB1A9B26AA0036A6CC /* DemoListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBBA1A9B26AA0036A6CC /* DemoListViewController.m */; };
5B613DA41D526AD5000F1E98 /* radar_marker@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B613DA31D526AD5000F1E98 /* radar_marker@3x.png */; };
5B613DB31D526DED000F1E98 /* RadarMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613DB21D526DED000F1E98 /* RadarMarkerView.swift */; };
5B613DB51D526EA8000F1E98 /* RadarMarkerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B613DB41D526EA8000F1E98 /* RadarMarkerView.xib */; };
5B613DF01D5A50B6000F1E98 /* XYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613DEF1D5A50B6000F1E98 /* XYMarkerView.swift */; };
5B613DF21D5A60DF000F1E98 /* LargeValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613DF11D5A60DF000F1E98 /* LargeValueFormatter.swift */; };
5B8EAF241AB3271B009697AA /* DemoListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF231AB3271B009697AA /* DemoListViewController.xib */; };
5B8EAF281AB32CF5009697AA /* DemoBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B8EAF261AB32CF5009697AA /* DemoBaseViewController.m */; };
5B8EAF301AB32E15009697AA /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF2F1AB32E15009697AA /* Images.xcassets */; };
5B9624411B38608C007763E2 /* NegativeStackedBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */; };
5B9624421B38608C007763E2 /* NegativeStackedBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */; };
5BD47E5B1ABB0263008FCEC6 /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */; };
5BD47E601ABB3C91008FCEC6 /* LineChart2ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */; };
5BD47E611ABB3C91008FCEC6 /* LineChart2ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BD47E5F1ABB3C91008FCEC6 /* LineChart2ViewController.xib */; };
5BD47E651ABB424E008FCEC6 /* BarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E631ABB424E008FCEC6 /* BarChartViewController.m */; };
Expand Down Expand Up @@ -248,9 +245,7 @@
5B57BBB91A9B26AA0036A6CC /* DemoListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemoListViewController.h; sourceTree = "<group>"; };
5B57BBBA1A9B26AA0036A6CC /* DemoListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemoListViewController.m; sourceTree = "<group>"; };
5B613DA31D526AD5000F1E98 /* radar_marker@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "radar_marker@3x.png"; sourceTree = "<group>"; };
5B613DB21D526DED000F1E98 /* RadarMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarMarkerView.swift; sourceTree = "<group>"; };
5B613DB41D526EA8000F1E98 /* RadarMarkerView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RadarMarkerView.xib; sourceTree = "<group>"; };
5B613DEF1D5A50B6000F1E98 /* XYMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XYMarkerView.swift; sourceTree = "<group>"; };
5B613DF11D5A60DF000F1E98 /* LargeValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LargeValueFormatter.swift; sourceTree = "<group>"; };
5B8EAF231AB3271B009697AA /* DemoListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoListViewController.xib; sourceTree = "<group>"; };
5B8EAF251AB32CF5009697AA /* DemoBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoBaseViewController.h; sourceTree = "<group>"; };
Expand All @@ -259,7 +254,6 @@
5B96243E1B38608C007763E2 /* NegativeStackedBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NegativeStackedBarChartViewController.h; sourceTree = "<group>"; };
5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NegativeStackedBarChartViewController.m; sourceTree = "<group>"; };
5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NegativeStackedBarChartViewController.xib; sourceTree = "<group>"; };
5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BalloonMarker.swift; sourceTree = "<group>"; };
5BD47E5C1ABB0273008FCEC6 /* ChartsDemo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ChartsDemo-Bridging-Header.h"; sourceTree = "<group>"; };
5BD47E5D1ABB3C91008FCEC6 /* LineChart2ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineChart2ViewController.h; sourceTree = "<group>"; };
5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LineChart2ViewController.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -493,7 +487,6 @@
5B8EAF251AB32CF5009697AA /* DemoBaseViewController.h */,
5B8EAF261AB32CF5009697AA /* DemoBaseViewController.m */,
5BE377D41D42511A006EB34F /* Formatters */,
5BD47E541ABB0177008FCEC6 /* Components */,
5BD8F06F1AB89C7100566E05 /* Demos */,
);
path = "Objective-C";
Expand Down Expand Up @@ -527,16 +520,6 @@
path = Resources;
sourceTree = "<group>";
};
5BD47E541ABB0177008FCEC6 /* Components */ = {
isa = PBXGroup;
children = (
5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */,
5B613DB21D526DED000F1E98 /* RadarMarkerView.swift */,
5B613DEF1D5A50B6000F1E98 /* XYMarkerView.swift */,
);
path = Components;
sourceTree = "<group>";
};
5BD8F06F1AB89C7100566E05 /* Demos */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -840,19 +823,16 @@
5BE377DE1D425151006EB34F /* DayAxisValueFormatter.m in Sources */,
5BEAED401ABC1AC60013F194 /* SinusBarChartViewController.m in Sources */,
5BE7E7621C693098000A0377 /* PositiveNegativeBarChartViewController.m in Sources */,
5B613DB31D526DED000F1E98 /* RadarMarkerView.swift in Sources */,
5BEAED251ABC0BE20013F194 /* MultipleBarChartViewController.m in Sources */,
5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */,
55E356511ADC638F00A57971 /* BubbleChartViewController.m in Sources */,
5BD47E5B1ABB0263008FCEC6 /* BalloonMarker.swift in Sources */,
5BEAED2C1ABC160F0013F194 /* CandleStickChartViewController.m in Sources */,
5BEAED271ABC0BE20013F194 /* MultipleLinesChartViewController.m in Sources */,
5BE6739A1D5BAD7E00A87BA2 /* DateValueFormatter.m in Sources */,
5BE673801D5B496500A87BA2 /* HalfPieChartViewController.m in Sources */,
5BE673921D5B4E0900A87BA2 /* LineChartFilledViewController.m in Sources */,
5B8EAF281AB32CF5009697AA /* DemoBaseViewController.m in Sources */,
5BE673941D5B4E0900A87BA2 /* LineChartTimeViewController.m in Sources */,
5B613DF01D5A50B6000F1E98 /* XYMarkerView.swift in Sources */,
5BEAED3B1ABC199F0013F194 /* ColoredLineChartViewController.m in Sources */,
5BDEDC411ABB7F73007D3A60 /* HorizontalBarChartViewController.m in Sources */,
5BEAED121ABBFB2B0013F194 /* AnotherBarChartViewController.m in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
//

import Foundation
import Charts


open class BalloonMarker: MarkerImage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
//

import Foundation
import Charts

open class RadarMarkerView: MarkerView
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
//

import Foundation
import Charts


@objc protocol TYMarkerViewDelegate {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//

import Foundation
import Charts

open class XYMarkerView: BalloonMarker
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
//

import Foundation
import Charts

open class YMarkerView: BalloonMarker
{
Expand Down

0 comments on commit 85ae518

Please sign in to comment.