GitHub/ChartView
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Syntax corrections (#105)

Browse Source 
* Movie PieChartFile

* Variable renaming
This commit is contained in:
nicolas
2020-05-28 04:54:06 -04:00
committed by GitHub
parent 4963ec54ed
commit f2866ae281
14 changed files with 66 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/SwiftUICharts/Base/Chart/ChartType.swift
+1 -1
View File
@@ -2,7 +2,7 @@ import SwiftUI
@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
public protocol ChartType {
associatedtype Body : View
associatedtype Body: View
func makeChart(configuration: Self.Configuration, style: Self.Style) -> Self.Body
Sources/SwiftUICharts/Base/Extensions/CGPoint+Extension.swift
+1 -1
View File
@@ -23,7 +23,7 @@ extension CGPoint {
return .zero
}
if let min = min, let max = max, min != max {
if (min <= 0) {
if min <= 0 {
stepHeight = (frame.size.height - padding) / CGFloat(max - min)
} else {
stepHeight = (frame.size.height - padding) / CGFloat(max + min)
Sources/SwiftUICharts/Base/Extensions/Path+QuadCurve.swift
+53 -48
View File
@@ -108,76 +108,80 @@ extension Path {
return ret
}
static func quadCurvedPathWithPoints(points:[Double], step:CGPoint, globalOffset: Double? = nil) -> Path {
static func quadCurvedPathWithPoints(points: [Double], step: CGPoint, globalOffset: Double? = nil) -> Path {
var path = Path()
if (points.count < 2){
if points.count < 2 {
return path
}
let offset = globalOffset ?? points.min()!
// guard let offset = points.min() else { return path }
var p1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y)
path.move(to: p1)
var point1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y)
path.move(to: point1)
for pointIndex in 1..<points.count {
let p2 = CGPoint(x: step.x * CGFloat(pointIndex), y: step.y*CGFloat(points[pointIndex]-offset))
let midPoint = CGPoint.midPointForPoints(p1: p1, p2: p2)
path.addQuadCurve(to: midPoint, control: CGPoint.controlPointForPoints(p1: midPoint, p2: p1))
path.addQuadCurve(to: p2, control: CGPoint.controlPointForPoints(p1: midPoint, p2: p2))
p1 = p2
let point2 = CGPoint(x: step.x * CGFloat(pointIndex), y: step.y*CGFloat(points[pointIndex]-offset))
let midPoint = CGPoint.midPointForPoints(firstPoint: point1, secondPoint: point2)
path.addQuadCurve(to: midPoint, control: CGPoint.controlPointForPoints(firstPoint: midPoint, secondPoint: point1))
path.addQuadCurve(to: point2, control: CGPoint.controlPointForPoints(firstPoint: midPoint, secondPoint: point2))
point1 = point2
}
return path
}
static func quadClosedCurvedPathWithPoints(points:[Double], step:CGPoint, globalOffset: Double? = nil) -> Path {
static func quadClosedCurvedPathWithPoints(points: [Double], step: CGPoint, globalOffset: Double? = nil) -> Path {
var path = Path()
if (points.count < 2){
if points.count < 2 {
return path
}
let offset = globalOffset ?? points.min()!
// guard let offset = points.min() else { return path }
path.move(to: .zero)
var p1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y)
path.addLine(to: p1)
var point1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y)
path.addLine(to: point1)
for pointIndex in 1..<points.count {
let p2 = CGPoint(x: step.x * CGFloat(pointIndex), y: step.y*CGFloat(points[pointIndex]-offset))
let midPoint = CGPoint.midPointForPoints(p1: p1, p2: p2)
path.addQuadCurve(to: midPoint, control: CGPoint.controlPointForPoints(p1: midPoint, p2: p1))
path.addQuadCurve(to: p2, control: CGPoint.controlPointForPoints(p1: midPoint, p2: p2))
p1 = p2
let point2 = CGPoint(x: step.x * CGFloat(pointIndex), y: step.y*CGFloat(points[pointIndex]-offset))
let midPoint = CGPoint.midPointForPoints(firstPoint: point1, secondPoint: point2)
path.addQuadCurve(to: midPoint, control: CGPoint.controlPointForPoints(firstPoint: midPoint, secondPoint: point1))
path.addQuadCurve(to: point2, control: CGPoint.controlPointForPoints(firstPoint: midPoint, secondPoint: point2))
point1 = point2
}
path.addLine(to: CGPoint(x: p1.x, y: 0))
path.addLine(to: CGPoint(x: point1.x, y: 0))
path.closeSubpath()
return path
}
static func linePathWithPoints(points:[Double], step:CGPoint) -> Path {
static func linePathWithPoints(points: [Double], step: CGPoint) -> Path {
var path = Path()
if (points.count < 2){
if points.count < 2 {
return path
}
guard let offset = points.min() else { return path }
let p1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y)
path.move(to: p1)
guard let offset = points.min() else {
return path
}
let point1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y)
path.move(to: point1)
for pointIndex in 1..<points.count {
let p2 = CGPoint(x: step.x * CGFloat(pointIndex), y: step.y*CGFloat(points[pointIndex]-offset))
path.addLine(to: p2)
let point2 = CGPoint(x: step.x * CGFloat(pointIndex), y: step.y*CGFloat(points[pointIndex]-offset))
path.addLine(to: point2)
}
return path
}
static func closedLinePathWithPoints(points:[Double], step:CGPoint) -> Path {
static func closedLinePathWithPoints(points: [Double], step: CGPoint) -> Path {
var path = Path()
if (points.count < 2){
if points.count < 2 {
return path
}
guard let offset = points.min() else { return path }
var p1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y)
path.move(to: p1)
for pointIndex in 1..<points.count {
p1 = CGPoint(x: step.x * CGFloat(pointIndex), y: step.y*CGFloat(points[pointIndex]-offset))
path.addLine(to: p1)
guard let offset = points.min() else {
return path
}
path.addLine(to: CGPoint(x: p1.x, y: 0))
var point1 = CGPoint(x: 0, y: CGFloat(points[0]-offset)*step.y)
path.move(to: point1)
for pointIndex in 1..<points.count {
point1 = CGPoint(x: step.x * CGFloat(pointIndex), y: step.y*CGFloat(points[pointIndex]-offset))
path.addLine(to: point1)
}
path.addLine(to: CGPoint(x: point1.x, y: 0))
path.closeSubpath()
return path
}
@@ -291,8 +295,8 @@ extension CGPoint {
}
func point(to: CGPoint, t: CGFloat, control1: CGPoint, control2: CGPoint) -> CGPoint {
let x = CGPoint.value(x: self.x, y: to.x, t: t, c1: control1.x, c2: control2.x)
let y = CGPoint.value(x: self.y, y: to.y, t: t, c1: control1.y, c2: control2.x)
let x = CGPoint.value(x: self.x, y: to.x, t: t, control1: control1.x, control2: control2.x)
let y = CGPoint.value(x: self.y, y: to.y, t: t, control1: control1.y, control2: control2.x)
return CGPoint(x: x, y: y)
}
@@ -306,12 +310,12 @@ extension CGPoint {
return value
}
static func value(x: CGFloat, y: CGFloat, t: CGFloat, c1: CGFloat, c2: CGFloat) -> CGFloat {
static func value(x: CGFloat, y: CGFloat, t: CGFloat, control1: CGFloat, control2: CGFloat) -> CGFloat {
var value: CGFloat = 0.0
// (1-t)^3 * p0 + 3 * (1-t)^2 * t * c1 + 3 * (1-t) * t^2 * c2 + t^3 * p1
value += pow(1-t, 3) * x
value += 3 * pow(1-t, 2) * t * c1
value += 3 * (1-t) * pow(t, 2) * c2
value += 3 * pow(1-t, 2) * t * control1
value += 3 * (1-t) * pow(t, 2) * control2
value += pow(t, 3) * y
return value
}
@@ -327,20 +331,21 @@ extension CGPoint {
return sqrt((pow(self.x - to.x, 2) + pow(self.y - to.y, 2)))
}
static func midPointForPoints(p1:CGPoint, p2:CGPoint) -> CGPoint {
return CGPoint(x:(p1.x + p2.x) / 2,y: (p1.y + p2.y) / 2)
static func midPointForPoints(firstPoint: CGPoint, secondPoint: CGPoint) -> CGPoint {
return CGPoint(
x: (firstPoint.x + secondPoint.x) / 2,
y: (firstPoint.y + secondPoint.y) / 2)
}
static func controlPointForPoints(p1:CGPoint, p2:CGPoint) -> CGPoint {
var controlPoint = CGPoint.midPointForPoints(p1:p1, p2:p2)
let diffY = abs(p2.y - controlPoint.y)
static func controlPointForPoints(firstPoint: CGPoint, secondPoint: CGPoint) -> CGPoint {
var controlPoint = CGPoint.midPointForPoints(firstPoint: firstPoint, secondPoint: secondPoint)
let diffY = abs(secondPoint.y - controlPoint.y)
if (p1.y < p2.y){
if firstPoint.y < secondPoint.y {
controlPoint.y += diffY
} else if (p1.y > p2.y) {
} else if firstPoint.y > secondPoint.y {
controlPoint.y -= diffY
}
return controlPoint
}
}
Sources/SwiftUICharts/Base/Extensions/View+Extension.swift
+1 -1
View File
@@ -1,7 +1,7 @@
import SwiftUI
extension View {
public func type<S>(_ type: S) -> some View where S : ChartType {
public func type<S>(_ type: S) -> some View where S: ChartType {
self.environment(\.chartType, AnyChartType(type))
}
Sources/SwiftUICharts/Base/Label/ChartLabel.swift
+1 -1
View File
@@ -3,7 +3,7 @@ import SwiftUI
@available(iOS 13.0, OSX 10.15, tvOS 13.0, watchOS 6.0, *)
public protocol ChartLabel {
associatedtype Body : View
associatedtype Body: View
func makeLabel(configuration: Self.Configuration) -> Self.Body
Sources/SwiftUICharts/Base/Style/Colors.swift
+2 -2
View File
@@ -5,6 +5,6 @@ public enum ChartColors {
static let orangeBright = Color(hexString: "#FF782C")
static let orangeDark = Color(hexString: "#EC2301")
static let LegendColor:Color = Color(hexString: "#E8E7EA")
static let IndicatorKnob:Color = Color(hexString: "#FF57A6")
static let legendColor: Color = Color(hexString: "#E8E7EA")
static let indicatorKnob: Color = Color(hexString: "#FF57A6")
}
Sources/SwiftUICharts/Charts/LineChart/IndicatorPoint.swift
+3 -3
View File
@@ -10,14 +10,14 @@ import SwiftUI
struct IndicatorPoint: View {
var body: some View {
ZStack{
ZStack {
Circle()
.fill(ChartColors.IndicatorKnob)
.fill(ChartColors.indicatorKnob)
Circle()
.stroke(Color.white, style: StrokeStyle(lineWidth: 4))
}
.frame(width: 14, height: 14)
.shadow(color: ChartColors.LegendColor, radius: 6, x: 0, y: 6)
.shadow(color: ChartColors.legendColor, radius: 6, x: 0, y: 6)
}
}
Sources/SwiftUICharts/Charts/LineChart/Line.swift
+2 -2
View File
@@ -45,14 +45,14 @@ public struct Line: View {
self.getBackgroundPathView()
}
self.getLinePathView()
if(self.showIndicator) {
if self.showIndicator {
IndicatorPoint()
.position(self.getClosestPointOnPath(touchLocation: self.touchLocation))
.rotationEffect(.degrees(180), anchor: .center)
.rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
}
}
.onAppear() {
.onAppear {
self.frame = geometry.frame(in: .local)
}
.gesture(DragGesture()
Sources/SwiftUICharts/PieChart/PieChart.swift → Sources/SwiftUICharts/Charts/PieChart/PieChart.swift
View File
Sources/SwiftUICharts/PieChart/PieChartCell.swift → Sources/SwiftUICharts/Charts/PieChart/PieChartCell.swift
View File
Sources/SwiftUICharts/PieChart/PieChartRow.swift → Sources/SwiftUICharts/Charts/PieChart/PieChartRow.swift
View File
Tests/SwiftUIChartsTests/ArrayExtensionTests.swift
-1
View File
@@ -42,4 +42,3 @@ class ArrayExtensionTests: XCTestCase {
}
}
Tests/SwiftUIChartsTests/SwiftUIChartsTests.swift
+1 -1
View File
@@ -9,6 +9,6 @@ final class SwiftUIChartsTests: XCTestCase {
}
static var allTests = [
("testExample", testExample),
("testExample", testExample)
]
}
Tests/SwiftUIChartsTests/XCTestManifests.swift
+1 -1
View File
@@ -3,7 +3,7 @@ import XCTest
#if !canImport(ObjectiveC)
public func allTests() -> [XCTestCaseEntry] {
return [
testCase(SwiftUIChartsTests.allTests),
testCase(SwiftUIChartsTests.allTests)
]
}
#endif