Toggle navigation
Toggle navigation
This project
Loading...
Sign in
iOS
/
PNChart
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
Kevin
2014-12-25 11:25:30 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
4970047752bafe8853c248fa7f001f598b90fd43
49700477
2 parents
6649bca2
4924d660
Merge pull request #134 from onevcat/feature/ib-support
Feature/ib support
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
31 deletions
PNChart/PNBarChart.m
PNChart/PNLineChart.m
PNChart/PNLineChartData.m
PNChart/PNScatterChart.m
PNChart/PNScatterChartData.m
PNChart/PNBarChart.m
View file @
4970047
...
...
@@ -22,33 +22,47 @@
@implementation
PNBarChart
-
(
id
)
initWithCoder
:(
NSCoder
*
)
aDecoder
{
self
=
[
super
initWithCoder
:
aDecoder
];
if
(
self
)
{
[
self
setupDefaultValues
];
}
return
self
;
}
-
(
id
)
initWithFrame
:(
CGRect
)
frame
{
self
=
[
super
initWithFrame
:
frame
];
if
(
self
)
{
self
.
backgroundColor
=
[
UIColor
whiteColor
];
self
.
clipsToBounds
=
YES
;
_showLabel
=
YES
;
_barBackgroundColor
=
PNLightGrey
;
_labelTextColor
=
[
UIColor
grayColor
];
_labelFont
=
[
UIFont
systemFontOfSize
:
11
.
0
f
];
_xChartLabels
=
[
NSMutableArray
array
];
_yChartLabels
=
[
NSMutableArray
array
];
_bars
=
[
NSMutableArray
array
];
_xLabelSkip
=
1
;
_yLabelSum
=
4
;
_labelMarginTop
=
0
;
_chartMargin
=
15
.
0
;
_barRadius
=
2
.
0
;
_showChartBorder
=
NO
;
_yChartLabelWidth
=
18
;
_rotateForXAxisText
=
false
;
[
self
setupDefaultValues
];
}
return
self
;
}
-
(
void
)
setupDefaultValues
{
self
.
backgroundColor
=
[
UIColor
whiteColor
];
self
.
clipsToBounds
=
YES
;
_showLabel
=
YES
;
_barBackgroundColor
=
PNLightGrey
;
_labelTextColor
=
[
UIColor
grayColor
];
_labelFont
=
[
UIFont
systemFontOfSize
:
11
.
0
f
];
_xChartLabels
=
[
NSMutableArray
array
];
_yChartLabels
=
[
NSMutableArray
array
];
_bars
=
[
NSMutableArray
array
];
_xLabelSkip
=
1
;
_yLabelSum
=
4
;
_labelMarginTop
=
0
;
_chartMargin
=
15
.
0
;
_barRadius
=
2
.
0
;
_showChartBorder
=
NO
;
_yChartLabelWidth
=
18
;
_rotateForXAxisText
=
false
;
}
-
(
void
)
setYValues
:
(
NSArray
*
)
yValues
{
...
...
PNChart/PNLineChart.m
View file @
4970047
...
...
@@ -20,8 +20,6 @@
@property
(
nonatomic
)
NSMutableArray
*
chartPath
;
// Array of line path, one for each line.
@property
(
nonatomic
)
NSMutableArray
*
pointPath
;
// Array of point path, one for each line
-
(
void
)
setDefaultValues
;
@end
@implementation
PNLineChart
...
...
@@ -33,7 +31,7 @@
self
=
[
super
initWithCoder
:
coder
];
if
(
self
)
{
[
self
setDefaultValues
];
[
self
set
up
DefaultValues
];
}
return
self
;
...
...
@@ -44,7 +42,7 @@
self
=
[
super
initWithFrame
:
frame
];
if
(
self
)
{
[
self
setDefaultValues
];
[
self
set
up
DefaultValues
];
}
return
self
;
...
...
@@ -646,7 +644,7 @@
#pragma mark private methods
-
(
void
)
setDefaultValues
-
(
void
)
set
up
DefaultValues
{
// Initialization code
self
.
backgroundColor
=
[
UIColor
whiteColor
];
...
...
PNChart/PNLineChartData.m
View file @
4970047
...
...
@@ -11,13 +11,13 @@
{
self
=
[
super
init
];
if
(
self
)
{
[
self
setDefaultValues
];
[
self
set
up
DefaultValues
];
}
return
self
;
}
-
(
void
)
setDefaultValues
-
(
void
)
set
up
DefaultValues
{
_inflexionPointStyle
=
PNLineChartPointStyleNone
;
_inflexionPointWidth
=
6
.
f
;
...
...
PNChart/PNScatterChart.m
View file @
4970047
...
...
@@ -46,8 +46,6 @@
@property
(
nonatomic
)
BOOL
isForUpdate
;
-
(
void
)
setDefaultValues
;
@end
...
...
@@ -60,7 +58,7 @@
self
=
[
super
initWithCoder
:
coder
];
if
(
self
)
{
[
self
setDefaultValues
];
[
self
set
up
DefaultValues
];
}
return
self
;
}
...
...
@@ -70,7 +68,7 @@
self
=
[
super
initWithFrame
:
frame
];
if
(
self
)
{
[
self
setDefaultValues
];
[
self
set
up
DefaultValues
];
}
return
self
;
}
...
...
@@ -81,7 +79,7 @@
[
self
vectorYSetup
];
}
-
(
void
)
setDefaultValues
-
(
void
)
set
up
DefaultValues
{
// Initialization code
self
.
backgroundColor
=
[
UIColor
whiteColor
];
...
...
PNChart/PNScatterChartData.m
View file @
4970047
...
...
@@ -14,13 +14,13 @@
{
self
=
[
super
init
];
if
(
self
)
{
[
self
setDefaultValues
];
[
self
set
up
DefaultValues
];
}
return
self
;
}
-
(
void
)
setDefaultValues
-
(
void
)
set
up
DefaultValues
{
_inflexionPointStyle
=
PNScatterChartPointStyleCircle
;
_fillColor
=
[
UIColor
grayColor
];
...
...
Please
register
or
login
to post a comment