Merge branch 'feature/dynamic_value_update' into develop
Showing
3 changed files
with
20 additions
and
8 deletions
| @@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
| 33 | CGFloat endAngle = clockwise ? -90.01f : 270.01f; | 33 | CGFloat endAngle = clockwise ? -90.01f : 270.01f; |
| 34 | 34 | ||
| 35 | _lineWidth = @8.0f; | 35 | _lineWidth = @8.0f; |
| 36 | - UIBezierPath *circlePath = [UIBezierPath bezierPathWithArcCenter:CGPointMake(self.frame.size.width/2, self.frame.size.height/2) | 36 | + UIBezierPath *circlePath = [UIBezierPath bezierPathWithArcCenter:CGPointMake(self.center.x, self.center.y) |
| 37 | radius:(self.frame.size.height * 0.5) - [_lineWidth floatValue] | 37 | radius:(self.frame.size.height * 0.5) - [_lineWidth floatValue] |
| 38 | startAngle:DEGREES_TO_RADIANS(startAngle) | 38 | startAngle:DEGREES_TO_RADIANS(startAngle) |
| 39 | endAngle:DEGREES_TO_RADIANS(endAngle) | 39 | endAngle:DEGREES_TO_RADIANS(endAngle) |
| 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 2 | -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13C1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="9Rt-UT-IxH"> | 2 | +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14B25" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="9Rt-UT-IxH"> |
| 3 | <dependencies> | 3 | <dependencies> |
| 4 | - <deployment defaultVersion="1536" identifier="iOS"/> | 4 | + <deployment identifier="iOS"/> |
| 5 | - <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/> | 5 | + <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/> |
| 6 | </dependencies> | 6 | </dependencies> |
| 7 | <scenes> | 7 | <scenes> |
| 8 | - <!--Chart View Controller - PNChart--> | 8 | + <!--PNChart--> |
| 9 | <scene sceneID="lC9-iu-Smd"> | 9 | <scene sceneID="lC9-iu-Smd"> |
| 10 | <objects> | 10 | <objects> |
| 11 | <viewController id="Tha-Wr-sPW" customClass="PCChartViewController" sceneMemberID="viewController"> | 11 | <viewController id="Tha-Wr-sPW" customClass="PCChartViewController" sceneMemberID="viewController"> |
| @@ -16,7 +16,19 @@ | @@ -16,7 +16,19 @@ | ||
| 16 | <view key="view" contentMode="scaleToFill" id="PPb-b8-nBo"> | 16 | <view key="view" contentMode="scaleToFill" id="PPb-b8-nBo"> |
| 17 | <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> | 17 | <rect key="frame" x="0.0" y="0.0" width="320" height="568"/> |
| 18 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | 18 | <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> |
| 19 | + <subviews> | ||
| 20 | + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="L3F-13-Wf5"> | ||
| 21 | + <rect key="frame" x="113" y="364" width="95" height="30"/> | ||
| 22 | + <state key="normal" title="Change Value"> | ||
| 23 | + <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/> | ||
| 24 | + </state> | ||
| 25 | + </button> | ||
| 26 | + </subviews> | ||
| 19 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> | 27 | <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> |
| 28 | + <constraints> | ||
| 29 | + <constraint firstItem="L3F-13-Wf5" firstAttribute="top" secondItem="znr-YO-4a4" secondAttribute="bottom" constant="300" id="ewm-kv-p8k"/> | ||
| 30 | + <constraint firstAttribute="centerX" secondItem="L3F-13-Wf5" secondAttribute="centerX" id="zXw-WV-mro"/> | ||
| 31 | + </constraints> | ||
| 20 | </view> | 32 | </view> |
| 21 | <navigationItem key="navigationItem" title="PNChart" id="Ukg-Sg-E2z"/> | 33 | <navigationItem key="navigationItem" title="PNChart" id="Ukg-Sg-E2z"/> |
| 22 | </viewController> | 34 | </viewController> |
| @@ -24,7 +36,7 @@ | @@ -24,7 +36,7 @@ | ||
| 24 | </objects> | 36 | </objects> |
| 25 | <point key="canvasLocation" x="536" y="31"/> | 37 | <point key="canvasLocation" x="536" y="31"/> |
| 26 | </scene> | 38 | </scene> |
| 27 | - <!--Charts Table View Controller - PNChart--> | 39 | + <!--PNChart--> |
| 28 | <scene sceneID="pBo-qW-N8B"> | 40 | <scene sceneID="pBo-qW-N8B"> |
| 29 | <objects> | 41 | <objects> |
| 30 | <tableViewController id="cc5-BF-Ga2" customClass="PCChartsTableViewController" sceneMemberID="viewController"> | 42 | <tableViewController id="cc5-BF-Ga2" customClass="PCChartsTableViewController" sceneMemberID="viewController"> |
| @@ -136,9 +136,9 @@ | @@ -136,9 +136,9 @@ | ||
| 136 | [PNPieChartDataItem dataItemWithValue:40 color:PNDeepGreen description:@"GOOG I/O"], | 136 | [PNPieChartDataItem dataItemWithValue:40 color:PNDeepGreen description:@"GOOG I/O"], |
| 137 | ]; | 137 | ]; |
| 138 | 138 | ||
| 139 | - PNPieChart *pieChart = [[PNPieChart alloc] initWithFrame:CGRectMake(40.0, 155.0, 240.0, 240.0) items:items]; | 139 | + PNPieChart *pieChart = [[PNPieChart alloc] initWithFrame:CGRectMake(SCREEN_WIDTH /2.0 - 100, 135, 200.0, 200.0) items:items]; |
| 140 | pieChart.descriptionTextColor = [UIColor whiteColor]; | 140 | pieChart.descriptionTextColor = [UIColor whiteColor]; |
| 141 | - pieChart.descriptionTextFont = [UIFont fontWithName:@"Avenir-Medium" size:14.0]; | 141 | + pieChart.descriptionTextFont = [UIFont fontWithName:@"Avenir-Medium" size:11.0]; |
| 142 | pieChart.descriptionTextShadowColor = [UIColor clearColor]; | 142 | pieChart.descriptionTextShadowColor = [UIColor clearColor]; |
| 143 | [pieChart strokeChart]; | 143 | [pieChart strokeChart]; |
| 144 | 144 |
-
Please register or login to post a comment