Add xAxisLables and showOrigin option#77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
L1cardo wants to merge 1 commit into from
Closed

Add xAxisLables and showOrigin option #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 32 additions & 29 deletions Sources/SwiftUICharts/LineChart/Legend.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,87 +13,90 @@ struct Legend: View {
@Binding var frame: CGRect
@Binding var hideHorizontalLines: Bool
@Environment(\.colorScheme) var colorScheme: ColorScheme
let padding:CGFloat = 3

var showOrigin: Bool?
let padding: CGFloat = 3

var stepWidth: CGFloat {
if data.points.count < 2 {
return 0
}
return frame.size.width / CGFloat(data.points.count-1)
return frame.size.width / CGFloat(data.points.count - 1)
}

var stepHeight: CGFloat {
let points = self.data.onlyPoints()
let points = data.onlyPoints()
if let min = points.min(), let max = points.max(), min != max {
if (min < 0){
return (frame.size.height-padding) / CGFloat(max - min)
}else{
return (frame.size.height-padding) / CGFloat(max + min)
if min < 0{
return (frame.size.height - padding) / CGFloat(max - min)
}else{
return (frame.size.height - padding) / CGFloat(max + min)
}
}
return 0
}

var min: CGFloat {
let points = self.data.onlyPoints()
let points = data.onlyPoints()
return CGFloat(points.min() ?? 0)
}

var body: some View {
ZStack(alignment: .topLeading){
ForEach((0...4), id: \.self) { height in
HStack(alignment: .center){
Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")").offset(x: 0, y: self.getYposition(height: height) )
ZStack(alignment: .bottomLeading) {
ForEach(showOrigin == true ? 0...5 : 0...4, id: \.self) { height in
HStack(alignment: .center) {
Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")")
.offset(x: 0, y: self.getYposition(height: height))
.foregroundColor(Colors.LegendText)
.font(.caption)
self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width)
.stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width - 32)
.stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
.opacity((self.hideHorizontalLines && height != 0) ? 0 : 1)
.rotationEffect(.degrees(180), anchor: .center)
.rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
.animation(.easeOut(duration: 0.2))
.clipped()
}

}

}
}

func getYLegendSafe(height:Int)->CGFloat{

func getYLegendSafe(height: Int) -> CGFloat {
if let legend = getYLegend() {
return CGFloat(legend[height])
}
return 0
}

func getYposition(height: Int)-> CGFloat {
func getYposition(height: Int)-> CGFloat {
if let legend = getYLegend() {
return (self.frame.height-((CGFloat(legend[height]) - min)*self.stepHeight))-(self.frame.height/2)
return (frame.height - ((CGFloat(legend[height]) - min) * stepHeight)) - (frame.height / 2)
}
return 0

}

func line(atHeight: CGFloat, width: CGFloat) -> Path {
var hLine = Path()
hLine.move(to: CGPoint(x:5, y: (atHeight-min)*stepHeight))
hLine.addLine(to: CGPoint(x: width, y: (atHeight-min)*stepHeight))
hLine.move(to: CGPoint(x:5, y: (atHeight - min) * stepHeight))
hLine.addLine(to: CGPoint(x: width, y: (atHeight - min) * stepHeight))
return hLine
}

func getYLegend() -> [Double]? {
let points = self.data.onlyPoints()
let points = data.onlyPoints()
guard let max = points.max() else { return nil }
guard let min = points.min() else { return nil }
let step = Double(max - min)/4
return [min+step * 0, min+step * 1, min+step * 2, min+step * 3, min+step * 4]
let step = Double(max - min) / 4
guard showOrigin == true else {
return [min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
}
return [0.00, min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
}
}

struct Legend_Previews: PreviewProvider {
static var previews: some View {
GeometryReader{ geometry in
Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false))
GeometryReader{ geometry in
Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false), showOrigin: true)
}.frame(width: 320, height: 200)
}
}
3 changes: 1 addition & 2 deletions Sources/SwiftUICharts/LineChart/LineChartView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,6 @@ public struct LineChartView: View {
Spacer()
Text("\(self.currentValue, specifier: self.valueSpecifier)")
.font(.system(size: 41, weight: .bold, design: .default))
.offset(x: 0, y: 30)
Spacer()
}
.transition(.scale)
Expand All@@ -109,7 +108,7 @@ public struct LineChartView: View {
}
.frame(width: frame.width, height: frame.height + 30)
.clipShape(RoundedRectangle(cornerRadius: 20))
.offset(x: 0, y: 0)
.offset(x: 0, y: -30)
}.frame(width: self.formSize.width, height: self.formSize.height)
}
.gesture(DragGesture()
Expand Down
95 changes: 56 additions & 39 deletions Sources/SwiftUICharts/LineChart/LineView.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,117 +10,134 @@ import SwiftUI

public struct LineView: View {
@ObservedObject var data: ChartData
public var xAxisLables: [String]?
public var title: String?
public var legend: String?
public var showOrigin: Bool?
public var style: ChartStyle
public var darkModeStyle: ChartStyle
public var valueSpecifier:String
public var valueSpecifier:String

@Environment(\.colorScheme) var colorScheme: ColorScheme
@State private var showLegend = false
@State private var dragLocation:CGPoint = .zero
@State private var indicatorLocation:CGPoint = .zero
@State private var dragLocation:CGPoint = .zero
@State private var indicatorLocation:CGPoint = .zero
@State private var closestPoint: CGPoint = .zero
@State private var opacity:Double = 0
@State private var opacity:Double = 0
@State private var currentDataNumber: Double = 0
@State private var currentDataLabel: String = ""
@State private var hideHorizontalLines: Bool = false

public init(data: [Double],
xAxisLables: [String]? = [],
title: String? = nil,
legend: String? = nil,
showOrigin: Bool? = true,
style: ChartStyle = Styles.lineChartStyleOne,
valueSpecifier: String? = "%.1f") {

self.data = ChartData(points: data)
self.xAxisLables = xAxisLables
self.title = title
self.legend = legend
self.showOrigin = showOrigin
self.style = style
self.valueSpecifier = valueSpecifier!
self.darkModeStyle = style.darkModeStyle != nil ? style.darkModeStyle! : Styles.lineViewDarkMode
}

public var body: some View {
GeometryReader{ geometry in
GeometryReader{ geometry in
VStack(alignment: .leading, spacing: 8) {
Group{
if (self.title != nil){
Group{
if self.title != nil{
Text(self.title!)
.font(.title)
.bold().foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.textColor : self.style.textColor)
}
if (self.legend != nil){
if self.legend != nil{
Text(self.legend!)
.font(.callout)
.foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.legendTextColor : self.style.legendTextColor)
}
}.offset(x: 0, y: 20)
ZStack{
GeometryReader{ reader in
}
ZStack{
GeometryReader{ reader in
Rectangle()
.foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.backgroundColor : self.style.backgroundColor)
if(self.showLegend){
ifself.showLegend{
Legend(data: self.data,
frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines)
frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines, showOrigin: self.showOrigin)
.transition(.opacity)
.animation(Animation.easeOut(duration: 1).delay(1))
}
Line(data: self.data,
frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 30, height: reader.frame(in: .local).height)),
frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 32, height: reader.frame(in: .local).height)),
touchLocation: self.$indicatorLocation,
showIndicator: self.$hideHorizontalLines,
minDataValue: .constant(nil),
maxDataValue: .constant(nil),
showBackground: false
)
.offset(x: 30, y: 0)
.onAppear(){
self.showLegend = true
showBackground: false)
.offset(x: 32, y: 0)
.onAppear {
self.showLegend = true
}
.onDisappear(){
.onDisappear{
self.showLegend = false
}
}
.frame(width: geometry.frame(in: .local).size.width, height: 240)
.offset(x: 0, y: 40 )
MagnifierRect(currentNumber: self.$currentDataNumber, valueSpecifier: self.valueSpecifier)
MagnifierRect(currentNumber: self.$currentDataNumber, currentDataLabel: self.$currentDataLabel, valueSpecifier: self.valueSpecifier)
.opacity(self.opacity)
.offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width/2, y: 36)
.offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width / 2, y: 32)
}
.frame(width: geometry.frame(in: .local).size.width, height: 240)
.gesture(DragGesture()
.onChanged({ value in
.onChanged{ value in
self.dragLocation = value.location
self.indicatorLocation = CGPoint(x: max(value.location.x-30,0), y: 32)
self.indicatorLocation = CGPoint(x: max(value.location.x - 30,0), y: 32)
self.opacity = 1
self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width-30, height: 240)
self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width - 30, height: 240)
self.hideHorizontalLines = true
})
.onEnded({ value in
self.opacity = 0
self.hideHorizontalLines = false
})
}
.onEnded { _ in
self.opacity = 0
self.hideHorizontalLines = false
}
)
if self.xAxisLables != nil {
HStack{
ForEach(self.xAxisLables!, id: \.self) { xAxisLable in
Text(xAxisLable)
.foregroundColor(Colors.LegendText)
.font(.caption)
}
}
.padding(.trailing, 32)
.offset(x: 32, y: self.showOrigin == true ? 26 : 0)
}
}
}
}

func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
let points = self.data.onlyPoints()
let stepWidth: CGFloat = width / CGFloat(points.count-1)
let stepWidth: CGFloat = width / CGFloat(points.count - 1)
let stepHeight: CGFloat = height / CGFloat(points.max()! + points.min()!)

let index:Int = Int(floor((toPoint.x-15)/stepWidth))
if (index >= 0 && index < points.count){
let index: Int = Int(floor((toPoint.x - 15) / stepWidth))
if let xAxisLables = xAxisLables, index >= 0 && index < xAxisLables.count {
self.currentDataLabel = xAxisLables[index]
}
if index >= 0 && index < points.count {
self.currentDataNumber = points[index]
return CGPoint(x: CGFloat(index)*stepWidth, y: CGFloat(points[index])*stepHeight)
return CGPoint(x: CGFloat(index) * stepWidth, y: CGFloat(points[index]) * stepHeight)
}
return .zero
}
}

struct LineView_Previews: PreviewProvider {
static var previews: some View {
LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne)
LineView(data: [8,23,54,32,12,37, 7, 23,43], xAxisLables: [], title: "Full chart", legend: "Full chart", showOrigin: true, style: Styles.lineChartStyleOne)
}
}

9 changes: 8 additions & 1 deletion Sources/SwiftUICharts/LineChart/MagnifierRect.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,21 @@ import SwiftUI

public struct MagnifierRect: View {
@Binding var currentNumber: Double
@Binding var currentDataLabel: String
var valueSpecifier:String
@Environment(\.colorScheme) var colorScheme: ColorScheme
public var body: some View {
ZStack{
Text("\(self.currentNumber, specifier: valueSpecifier)")
VStack {
Text("\(self.currentNumber, specifier: valueSpecifier)")
.font(.system(size: 18, weight: .bold))
.offset(x: 0, y:-110)
.foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
Text(currentDataLabel)
.font(.system(size: 18, weight: .bold))
.offset(x: 0, y:-110)
.foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
}
if (self.colorScheme == .dark ){
RoundedRectangle(cornerRadius: 16)
.stroke(Color.white, lineWidth: self.colorScheme == .dark ? 2 : 0)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add xAxisLables and showOrigin option#77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

L1cardo
wants to merge
1
commit into

from

 Closed


Add xAxisLables and showOrigin option
#77
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 32 additions & 29 deletions
Sources/SwiftUICharts/LineChart/Legend.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,87 +13,90 @@ struct Legend: View {
 @Binding var frame: CGRect
 @Binding var hideHorizontalLines: Bool
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 let padding:CGFloat = 3

 var showOrigin: Bool?
 let padding: CGFloat = 3

 var stepWidth: CGFloat {
 if data.points.count < 2 {
 return 0
 }
 return frame.size.width / CGFloat(data.points.count-1)
 return frame.size.width / CGFloat(data.points.count - 1)
 }

 var stepHeight: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 if let min = points.min(), let max = points.max(), min != max {
 if (min < 0){
 return (frame.size.height-padding) / CGFloat(max - min)
 }else{
 return (frame.size.height-padding) / CGFloat(max + min)
 if min < 0{
 return (frame.size.height - padding) / CGFloat(max - min)
 }else{
 return (frame.size.height - padding) / CGFloat(max + min)
 }
 }
 return 0
 }

 var min: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 return CGFloat(points.min() ?? 0)
 }

 var body: some View {
 ZStack(alignment: .topLeading){
 ForEach((0...4), id: \.self) { height in
 HStack(alignment: .center){
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")").offset(x: 0, y: self.getYposition(height: height) )
 ZStack(alignment: .bottomLeading) {
 ForEach(showOrigin == true ? 0...5 : 0...4, id: \.self) { height in
 HStack(alignment: .center) {
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")")
 .offset(x: 0, y: self.getYposition(height: height))
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width - 32)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 .opacity((self.hideHorizontalLines && height != 0) ? 0 : 1)
 .rotationEffect(.degrees(180), anchor: .center)
 .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
 .animation(.easeOut(duration: 0.2))
 .clipped()
 }

 }

 }
 }

 func getYLegendSafe(height:Int)->CGFloat{

 func getYLegendSafe(height: Int) -> CGFloat {
 if let legend = getYLegend() {
 return CGFloat(legend[height])
 }
 return 0
 }

 func getYposition(height: Int)-> CGFloat {
 func getYposition(height: Int)-> CGFloat {
 if let legend = getYLegend() {
 return (self.frame.height-((CGFloat(legend[height]) - min)*self.stepHeight))-(self.frame.height/2)
 return (frame.height - ((CGFloat(legend[height]) - min) * stepHeight)) - (frame.height / 2)
 }
 return 0

 }

 func line(atHeight: CGFloat, width: CGFloat) -> Path {
 var hLine = Path()
 hLine.move(to: CGPoint(x:5, y: (atHeight-min)*stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight-min)*stepHeight))
 hLine.move(to: CGPoint(x:5, y: (atHeight - min) * stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight - min) * stepHeight))
 return hLine
 }

 func getYLegend() -> [Double]? {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 guard let max = points.max() else { return nil }
 guard let min = points.min() else { return nil }
 let step = Double(max - min)/4
 return [min+step * 0, min+step * 1, min+step * 2, min+step * 3, min+step * 4]
 let step = Double(max - min) / 4
 guard showOrigin == true else {
 return [min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
 return [0.00, min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
}

struct Legend_Previews: PreviewProvider {
 static var previews: some View {
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false))
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false), showOrigin: true)
 }.frame(width: 320, height: 200)
 }
}

3 changes: 1 addition & 2 deletions
Sources/SwiftUICharts/LineChart/LineChartView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,6 @@ public struct LineChartView: View {
 Spacer()
 Text("\(self.currentValue, specifier: self.valueSpecifier)")
 .font(.system(size: 41, weight: .bold, design: .default))
 .offset(x: 0, y: 30)
 Spacer()
 }
 .transition(.scale)
Expand All@@ -109,7 +108,7 @@ public struct LineChartView: View {
 }
 .frame(width: frame.width, height: frame.height + 30)
 .clipShape(RoundedRectangle(cornerRadius: 20))
 .offset(x: 0, y: 0)
 .offset(x: 0, y: -30)
 }.frame(width: self.formSize.width, height: self.formSize.height)
 }
 .gesture(DragGesture()
Expand Down

95 changes: 56 additions & 39 deletions
Sources/SwiftUICharts/LineChart/LineView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,117 +10,134 @@ import SwiftUI

public struct LineView: View {
 @ObservedObject var data: ChartData
 public var xAxisLables: [String]?
 public var title: String?
 public var legend: String?
 public var showOrigin: Bool?
 public var style: ChartStyle
 public var darkModeStyle: ChartStyle
 public var valueSpecifier:String
 public var valueSpecifier:String

 @Environment(\.colorScheme) var colorScheme: ColorScheme
 @State private var showLegend = false
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var closestPoint: CGPoint = .zero
 @State private var opacity:Double = 0
 @State private var opacity:Double = 0
 @State private var currentDataNumber: Double = 0
 @State private var currentDataLabel: String = ""
 @State private var hideHorizontalLines: Bool = false

 public init(data: [Double],
 xAxisLables: [String]? = [],
 title: String? = nil,
 legend: String? = nil,
 showOrigin: Bool? = true,
 style: ChartStyle = Styles.lineChartStyleOne,
 valueSpecifier: String? = "%.1f") {

 self.data = ChartData(points: data)
 self.xAxisLables = xAxisLables
 self.title = title
 self.legend = legend
 self.showOrigin = showOrigin
 self.style = style
 self.valueSpecifier = valueSpecifier!
 self.darkModeStyle = style.darkModeStyle != nil ? style.darkModeStyle! : Styles.lineViewDarkMode
 }

 public var body: some View {
 GeometryReader{ geometry in
 GeometryReader{ geometry in
 VStack(alignment: .leading, spacing: 8) {
 Group{
 if (self.title != nil){
 Group{
 if self.title != nil{
 Text(self.title!)
 .font(.title)
 .bold().foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.textColor : self.style.textColor)
 }
 if (self.legend != nil){
 if self.legend != nil{
 Text(self.legend!)
 .font(.callout)
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.legendTextColor : self.style.legendTextColor)
 }
 }.offset(x: 0, y: 20)
 ZStack{
 GeometryReader{ reader in
 }
 ZStack{
 GeometryReader{ reader in
 Rectangle()
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.backgroundColor : self.style.backgroundColor)
 if(self.showLegend){
 ifself.showLegend{
 Legend(data: self.data,
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines)
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines, showOrigin: self.showOrigin)
 .transition(.opacity)
 .animation(Animation.easeOut(duration: 1).delay(1))
 }
 Line(data: self.data,
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 30, height: reader.frame(in: .local).height)),
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 32, height: reader.frame(in: .local).height)),
 touchLocation: self.$indicatorLocation,
 showIndicator: self.$hideHorizontalLines,
 minDataValue: .constant(nil),
 maxDataValue: .constant(nil),
 showBackground: false
 )
 .offset(x: 30, y: 0)
 .onAppear(){
 self.showLegend = true
 showBackground: false)
 .offset(x: 32, y: 0)
 .onAppear {
 self.showLegend = true
 }
 .onDisappear(){
 .onDisappear{
 self.showLegend = false
 }
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .offset(x: 0, y: 40 )
 MagnifierRect(currentNumber: self.$currentDataNumber, valueSpecifier: self.valueSpecifier)
 MagnifierRect(currentNumber: self.$currentDataNumber, currentDataLabel: self.$currentDataLabel, valueSpecifier: self.valueSpecifier)
 .opacity(self.opacity)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width/2, y: 36)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width / 2, y: 32)
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .gesture(DragGesture()
 .onChanged({ value in
 .onChanged{ value in
 self.dragLocation = value.location
 self.indicatorLocation = CGPoint(x: max(value.location.x-30,0), y: 32)
 self.indicatorLocation = CGPoint(x: max(value.location.x - 30,0), y: 32)
 self.opacity = 1
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width-30, height: 240)
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width - 30, height: 240)
 self.hideHorizontalLines = true
 })
.onEnded({ value in
self.opacity = 0
self.hideHorizontalLines = false
 })
 }
 .onEnded { _ in
 self.opacity = 0
 self.hideHorizontalLines = false
 }
 )
 if self.xAxisLables != nil {
 HStack{
 ForEach(self.xAxisLables!, id: \.self) { xAxisLable in
 Text(xAxisLable)
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 }
 }
 .padding(.trailing, 32)
 .offset(x: 32, y: self.showOrigin == true ? 26 : 0)
 }
 }
 }
 }

 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 let points = self.data.onlyPoints()
 let stepWidth: CGFloat = width / CGFloat(points.count-1)
 let stepWidth: CGFloat = width / CGFloat(points.count - 1)
 let stepHeight: CGFloat = height / CGFloat(points.max()! + points.min()!)

 let index:Int = Int(floor((toPoint.x-15)/stepWidth))
 if (index >= 0 && index < points.count){
 let index: Int = Int(floor((toPoint.x - 15) / stepWidth))
 if let xAxisLables = xAxisLables, index >= 0 && index < xAxisLables.count {
 self.currentDataLabel = xAxisLables[index]
 }
 if index >= 0 && index < points.count {
 self.currentDataNumber = points[index]
 return CGPoint(x: CGFloat(index)*stepWidth, y: CGFloat(points[index])*stepHeight)
 return CGPoint(x: CGFloat(index) * stepWidth, y: CGFloat(points[index]) * stepHeight)
 }
 return .zero
 }
}

struct LineView_Previews: PreviewProvider {
 static var previews: some View {
 LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne)
 LineView(data: [8,23,54,32,12,37, 7, 23,43], xAxisLables: [], title: "Full chart", legend: "Full chart", showOrigin: true, style: Styles.lineChartStyleOne)
 }
}


9 changes: 8 additions & 1 deletion
Sources/SwiftUICharts/LineChart/MagnifierRect.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,21 @@ import SwiftUI

public struct MagnifierRect: View {
 @Binding var currentNumber: Double
 @Binding var currentDataLabel: String
 var valueSpecifier:String
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 public var body: some View {
 ZStack{
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 VStack {
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 Text(currentDataLabel)
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 }
 if (self.colorScheme == .dark ){
 RoundedRectangle(cornerRadius: 16)
 .stroke(Color.white, lineWidth: self.colorScheme == .dark ? 2 : 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add xAxisLables and showOrigin option#77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

L1cardo
wants to merge
1
commit into

from

 Closed


Add xAxisLables and showOrigin option
#77
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 32 additions & 29 deletions
Sources/SwiftUICharts/LineChart/Legend.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,87 +13,90 @@ struct Legend: View {
 @Binding var frame: CGRect
 @Binding var hideHorizontalLines: Bool
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 let padding:CGFloat = 3

 var showOrigin: Bool?
 let padding: CGFloat = 3

 var stepWidth: CGFloat {
 if data.points.count < 2 {
 return 0
 }
 return frame.size.width / CGFloat(data.points.count-1)
 return frame.size.width / CGFloat(data.points.count - 1)
 }

 var stepHeight: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 if let min = points.min(), let max = points.max(), min != max {
 if (min < 0){
 return (frame.size.height-padding) / CGFloat(max - min)
 }else{
 return (frame.size.height-padding) / CGFloat(max + min)
 if min < 0{
 return (frame.size.height - padding) / CGFloat(max - min)
 }else{
 return (frame.size.height - padding) / CGFloat(max + min)
 }
 }
 return 0
 }

 var min: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 return CGFloat(points.min() ?? 0)
 }

 var body: some View {
 ZStack(alignment: .topLeading){
 ForEach((0...4), id: \.self) { height in
 HStack(alignment: .center){
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")").offset(x: 0, y: self.getYposition(height: height) )
 ZStack(alignment: .bottomLeading) {
 ForEach(showOrigin == true ? 0...5 : 0...4, id: \.self) { height in
 HStack(alignment: .center) {
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")")
 .offset(x: 0, y: self.getYposition(height: height))
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width - 32)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 .opacity((self.hideHorizontalLines && height != 0) ? 0 : 1)
 .rotationEffect(.degrees(180), anchor: .center)
 .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
 .animation(.easeOut(duration: 0.2))
 .clipped()
 }

 }

 }
 }

 func getYLegendSafe(height:Int)->CGFloat{

 func getYLegendSafe(height: Int) -> CGFloat {
 if let legend = getYLegend() {
 return CGFloat(legend[height])
 }
 return 0
 }

 func getYposition(height: Int)-> CGFloat {
 func getYposition(height: Int)-> CGFloat {
 if let legend = getYLegend() {
 return (self.frame.height-((CGFloat(legend[height]) - min)*self.stepHeight))-(self.frame.height/2)
 return (frame.height - ((CGFloat(legend[height]) - min) * stepHeight)) - (frame.height / 2)
 }
 return 0

 }

 func line(atHeight: CGFloat, width: CGFloat) -> Path {
 var hLine = Path()
 hLine.move(to: CGPoint(x:5, y: (atHeight-min)*stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight-min)*stepHeight))
 hLine.move(to: CGPoint(x:5, y: (atHeight - min) * stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight - min) * stepHeight))
 return hLine
 }

 func getYLegend() -> [Double]? {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 guard let max = points.max() else { return nil }
 guard let min = points.min() else { return nil }
 let step = Double(max - min)/4
 return [min+step * 0, min+step * 1, min+step * 2, min+step * 3, min+step * 4]
 let step = Double(max - min) / 4
 guard showOrigin == true else {
 return [min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
 return [0.00, min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
}

struct Legend_Previews: PreviewProvider {
 static var previews: some View {
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false))
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false), showOrigin: true)
 }.frame(width: 320, height: 200)
 }
}

3 changes: 1 addition & 2 deletions
Sources/SwiftUICharts/LineChart/LineChartView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,6 @@ public struct LineChartView: View {
 Spacer()
 Text("\(self.currentValue, specifier: self.valueSpecifier)")
 .font(.system(size: 41, weight: .bold, design: .default))
 .offset(x: 0, y: 30)
 Spacer()
 }
 .transition(.scale)
Expand All@@ -109,7 +108,7 @@ public struct LineChartView: View {
 }
 .frame(width: frame.width, height: frame.height + 30)
 .clipShape(RoundedRectangle(cornerRadius: 20))
 .offset(x: 0, y: 0)
 .offset(x: 0, y: -30)
 }.frame(width: self.formSize.width, height: self.formSize.height)
 }
 .gesture(DragGesture()
Expand Down

95 changes: 56 additions & 39 deletions
Sources/SwiftUICharts/LineChart/LineView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,117 +10,134 @@ import SwiftUI

public struct LineView: View {
 @ObservedObject var data: ChartData
 public var xAxisLables: [String]?
 public var title: String?
 public var legend: String?
 public var showOrigin: Bool?
 public var style: ChartStyle
 public var darkModeStyle: ChartStyle
 public var valueSpecifier:String
 public var valueSpecifier:String

 @Environment(\.colorScheme) var colorScheme: ColorScheme
 @State private var showLegend = false
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var closestPoint: CGPoint = .zero
 @State private var opacity:Double = 0
 @State private var opacity:Double = 0
 @State private var currentDataNumber: Double = 0
 @State private var currentDataLabel: String = ""
 @State private var hideHorizontalLines: Bool = false

 public init(data: [Double],
 xAxisLables: [String]? = [],
 title: String? = nil,
 legend: String? = nil,
 showOrigin: Bool? = true,
 style: ChartStyle = Styles.lineChartStyleOne,
 valueSpecifier: String? = "%.1f") {

 self.data = ChartData(points: data)
 self.xAxisLables = xAxisLables
 self.title = title
 self.legend = legend
 self.showOrigin = showOrigin
 self.style = style
 self.valueSpecifier = valueSpecifier!
 self.darkModeStyle = style.darkModeStyle != nil ? style.darkModeStyle! : Styles.lineViewDarkMode
 }

 public var body: some View {
 GeometryReader{ geometry in
 GeometryReader{ geometry in
 VStack(alignment: .leading, spacing: 8) {
 Group{
 if (self.title != nil){
 Group{
 if self.title != nil{
 Text(self.title!)
 .font(.title)
 .bold().foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.textColor : self.style.textColor)
 }
 if (self.legend != nil){
 if self.legend != nil{
 Text(self.legend!)
 .font(.callout)
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.legendTextColor : self.style.legendTextColor)
 }
 }.offset(x: 0, y: 20)
 ZStack{
 GeometryReader{ reader in
 }
 ZStack{
 GeometryReader{ reader in
 Rectangle()
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.backgroundColor : self.style.backgroundColor)
 if(self.showLegend){
 ifself.showLegend{
 Legend(data: self.data,
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines)
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines, showOrigin: self.showOrigin)
 .transition(.opacity)
 .animation(Animation.easeOut(duration: 1).delay(1))
 }
 Line(data: self.data,
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 30, height: reader.frame(in: .local).height)),
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 32, height: reader.frame(in: .local).height)),
 touchLocation: self.$indicatorLocation,
 showIndicator: self.$hideHorizontalLines,
 minDataValue: .constant(nil),
 maxDataValue: .constant(nil),
 showBackground: false
 )
 .offset(x: 30, y: 0)
 .onAppear(){
 self.showLegend = true
 showBackground: false)
 .offset(x: 32, y: 0)
 .onAppear {
 self.showLegend = true
 }
 .onDisappear(){
 .onDisappear{
 self.showLegend = false
 }
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .offset(x: 0, y: 40 )
 MagnifierRect(currentNumber: self.$currentDataNumber, valueSpecifier: self.valueSpecifier)
 MagnifierRect(currentNumber: self.$currentDataNumber, currentDataLabel: self.$currentDataLabel, valueSpecifier: self.valueSpecifier)
 .opacity(self.opacity)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width/2, y: 36)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width / 2, y: 32)
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .gesture(DragGesture()
 .onChanged({ value in
 .onChanged{ value in
 self.dragLocation = value.location
 self.indicatorLocation = CGPoint(x: max(value.location.x-30,0), y: 32)
 self.indicatorLocation = CGPoint(x: max(value.location.x - 30,0), y: 32)
 self.opacity = 1
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width-30, height: 240)
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width - 30, height: 240)
 self.hideHorizontalLines = true
 })
.onEnded({ value in
self.opacity = 0
self.hideHorizontalLines = false
 })
 }
 .onEnded { _ in
 self.opacity = 0
 self.hideHorizontalLines = false
 }
 )
 if self.xAxisLables != nil {
 HStack{
 ForEach(self.xAxisLables!, id: \.self) { xAxisLable in
 Text(xAxisLable)
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 }
 }
 .padding(.trailing, 32)
 .offset(x: 32, y: self.showOrigin == true ? 26 : 0)
 }
 }
 }
 }

 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 let points = self.data.onlyPoints()
 let stepWidth: CGFloat = width / CGFloat(points.count-1)
 let stepWidth: CGFloat = width / CGFloat(points.count - 1)
 let stepHeight: CGFloat = height / CGFloat(points.max()! + points.min()!)

 let index:Int = Int(floor((toPoint.x-15)/stepWidth))
 if (index >= 0 && index < points.count){
 let index: Int = Int(floor((toPoint.x - 15) / stepWidth))
 if let xAxisLables = xAxisLables, index >= 0 && index < xAxisLables.count {
 self.currentDataLabel = xAxisLables[index]
 }
 if index >= 0 && index < points.count {
 self.currentDataNumber = points[index]
 return CGPoint(x: CGFloat(index)*stepWidth, y: CGFloat(points[index])*stepHeight)
 return CGPoint(x: CGFloat(index) * stepWidth, y: CGFloat(points[index]) * stepHeight)
 }
 return .zero
 }
}

struct LineView_Previews: PreviewProvider {
 static var previews: some View {
 LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne)
 LineView(data: [8,23,54,32,12,37, 7, 23,43], xAxisLables: [], title: "Full chart", legend: "Full chart", showOrigin: true, style: Styles.lineChartStyleOne)
 }
}


9 changes: 8 additions & 1 deletion
Sources/SwiftUICharts/LineChart/MagnifierRect.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,21 @@ import SwiftUI

public struct MagnifierRect: View {
 @Binding var currentNumber: Double
 @Binding var currentDataLabel: String
 var valueSpecifier:String
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 public var body: some View {
 ZStack{
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 VStack {
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 Text(currentDataLabel)
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 }
 if (self.colorScheme == .dark ){
 RoundedRectangle(cornerRadius: 16)
 .stroke(Color.white, lineWidth: self.colorScheme == .dark ? 2 : 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add xAxisLables and showOrigin option#77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

L1cardo
wants to merge
1
commit into

from

 Closed


Add xAxisLables and showOrigin option
#77
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 32 additions & 29 deletions
Sources/SwiftUICharts/LineChart/Legend.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,87 +13,90 @@ struct Legend: View {
 @Binding var frame: CGRect
 @Binding var hideHorizontalLines: Bool
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 let padding:CGFloat = 3

 var showOrigin: Bool?
 let padding: CGFloat = 3

 var stepWidth: CGFloat {
 if data.points.count < 2 {
 return 0
 }
 return frame.size.width / CGFloat(data.points.count-1)
 return frame.size.width / CGFloat(data.points.count - 1)
 }

 var stepHeight: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 if let min = points.min(), let max = points.max(), min != max {
 if (min < 0){
 return (frame.size.height-padding) / CGFloat(max - min)
 }else{
 return (frame.size.height-padding) / CGFloat(max + min)
 if min < 0{
 return (frame.size.height - padding) / CGFloat(max - min)
 }else{
 return (frame.size.height - padding) / CGFloat(max + min)
 }
 }
 return 0
 }

 var min: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 return CGFloat(points.min() ?? 0)
 }

 var body: some View {
 ZStack(alignment: .topLeading){
 ForEach((0...4), id: \.self) { height in
 HStack(alignment: .center){
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")").offset(x: 0, y: self.getYposition(height: height) )
 ZStack(alignment: .bottomLeading) {
 ForEach(showOrigin == true ? 0...5 : 0...4, id: \.self) { height in
 HStack(alignment: .center) {
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")")
 .offset(x: 0, y: self.getYposition(height: height))
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width - 32)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 .opacity((self.hideHorizontalLines && height != 0) ? 0 : 1)
 .rotationEffect(.degrees(180), anchor: .center)
 .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
 .animation(.easeOut(duration: 0.2))
 .clipped()
 }

 }

 }
 }

 func getYLegendSafe(height:Int)->CGFloat{

 func getYLegendSafe(height: Int) -> CGFloat {
 if let legend = getYLegend() {
 return CGFloat(legend[height])
 }
 return 0
 }

 func getYposition(height: Int)-> CGFloat {
 func getYposition(height: Int)-> CGFloat {
 if let legend = getYLegend() {
 return (self.frame.height-((CGFloat(legend[height]) - min)*self.stepHeight))-(self.frame.height/2)
 return (frame.height - ((CGFloat(legend[height]) - min) * stepHeight)) - (frame.height / 2)
 }
 return 0

 }

 func line(atHeight: CGFloat, width: CGFloat) -> Path {
 var hLine = Path()
 hLine.move(to: CGPoint(x:5, y: (atHeight-min)*stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight-min)*stepHeight))
 hLine.move(to: CGPoint(x:5, y: (atHeight - min) * stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight - min) * stepHeight))
 return hLine
 }

 func getYLegend() -> [Double]? {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 guard let max = points.max() else { return nil }
 guard let min = points.min() else { return nil }
 let step = Double(max - min)/4
 return [min+step * 0, min+step * 1, min+step * 2, min+step * 3, min+step * 4]
 let step = Double(max - min) / 4
 guard showOrigin == true else {
 return [min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
 return [0.00, min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
}

struct Legend_Previews: PreviewProvider {
 static var previews: some View {
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false))
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false), showOrigin: true)
 }.frame(width: 320, height: 200)
 }
}

3 changes: 1 addition & 2 deletions
Sources/SwiftUICharts/LineChart/LineChartView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,6 @@ public struct LineChartView: View {
 Spacer()
 Text("\(self.currentValue, specifier: self.valueSpecifier)")
 .font(.system(size: 41, weight: .bold, design: .default))
 .offset(x: 0, y: 30)
 Spacer()
 }
 .transition(.scale)
Expand All@@ -109,7 +108,7 @@ public struct LineChartView: View {
 }
 .frame(width: frame.width, height: frame.height + 30)
 .clipShape(RoundedRectangle(cornerRadius: 20))
 .offset(x: 0, y: 0)
 .offset(x: 0, y: -30)
 }.frame(width: self.formSize.width, height: self.formSize.height)
 }
 .gesture(DragGesture()
Expand Down

95 changes: 56 additions & 39 deletions
Sources/SwiftUICharts/LineChart/LineView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,117 +10,134 @@ import SwiftUI

public struct LineView: View {
 @ObservedObject var data: ChartData
 public var xAxisLables: [String]?
 public var title: String?
 public var legend: String?
 public var showOrigin: Bool?
 public var style: ChartStyle
 public var darkModeStyle: ChartStyle
 public var valueSpecifier:String
 public var valueSpecifier:String

 @Environment(\.colorScheme) var colorScheme: ColorScheme
 @State private var showLegend = false
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var closestPoint: CGPoint = .zero
 @State private var opacity:Double = 0
 @State private var opacity:Double = 0
 @State private var currentDataNumber: Double = 0
 @State private var currentDataLabel: String = ""
 @State private var hideHorizontalLines: Bool = false

 public init(data: [Double],
 xAxisLables: [String]? = [],
 title: String? = nil,
 legend: String? = nil,
 showOrigin: Bool? = true,
 style: ChartStyle = Styles.lineChartStyleOne,
 valueSpecifier: String? = "%.1f") {

 self.data = ChartData(points: data)
 self.xAxisLables = xAxisLables
 self.title = title
 self.legend = legend
 self.showOrigin = showOrigin
 self.style = style
 self.valueSpecifier = valueSpecifier!
 self.darkModeStyle = style.darkModeStyle != nil ? style.darkModeStyle! : Styles.lineViewDarkMode
 }

 public var body: some View {
 GeometryReader{ geometry in
 GeometryReader{ geometry in
 VStack(alignment: .leading, spacing: 8) {
 Group{
 if (self.title != nil){
 Group{
 if self.title != nil{
 Text(self.title!)
 .font(.title)
 .bold().foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.textColor : self.style.textColor)
 }
 if (self.legend != nil){
 if self.legend != nil{
 Text(self.legend!)
 .font(.callout)
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.legendTextColor : self.style.legendTextColor)
 }
 }.offset(x: 0, y: 20)
 ZStack{
 GeometryReader{ reader in
 }
 ZStack{
 GeometryReader{ reader in
 Rectangle()
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.backgroundColor : self.style.backgroundColor)
 if(self.showLegend){
 ifself.showLegend{
 Legend(data: self.data,
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines)
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines, showOrigin: self.showOrigin)
 .transition(.opacity)
 .animation(Animation.easeOut(duration: 1).delay(1))
 }
 Line(data: self.data,
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 30, height: reader.frame(in: .local).height)),
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 32, height: reader.frame(in: .local).height)),
 touchLocation: self.$indicatorLocation,
 showIndicator: self.$hideHorizontalLines,
 minDataValue: .constant(nil),
 maxDataValue: .constant(nil),
 showBackground: false
 )
 .offset(x: 30, y: 0)
 .onAppear(){
 self.showLegend = true
 showBackground: false)
 .offset(x: 32, y: 0)
 .onAppear {
 self.showLegend = true
 }
 .onDisappear(){
 .onDisappear{
 self.showLegend = false
 }
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .offset(x: 0, y: 40 )
 MagnifierRect(currentNumber: self.$currentDataNumber, valueSpecifier: self.valueSpecifier)
 MagnifierRect(currentNumber: self.$currentDataNumber, currentDataLabel: self.$currentDataLabel, valueSpecifier: self.valueSpecifier)
 .opacity(self.opacity)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width/2, y: 36)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width / 2, y: 32)
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .gesture(DragGesture()
 .onChanged({ value in
 .onChanged{ value in
 self.dragLocation = value.location
 self.indicatorLocation = CGPoint(x: max(value.location.x-30,0), y: 32)
 self.indicatorLocation = CGPoint(x: max(value.location.x - 30,0), y: 32)
 self.opacity = 1
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width-30, height: 240)
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width - 30, height: 240)
 self.hideHorizontalLines = true
 })
.onEnded({ value in
self.opacity = 0
self.hideHorizontalLines = false
 })
 }
 .onEnded { _ in
 self.opacity = 0
 self.hideHorizontalLines = false
 }
 )
 if self.xAxisLables != nil {
 HStack{
 ForEach(self.xAxisLables!, id: \.self) { xAxisLable in
 Text(xAxisLable)
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 }
 }
 .padding(.trailing, 32)
 .offset(x: 32, y: self.showOrigin == true ? 26 : 0)
 }
 }
 }
 }

 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 let points = self.data.onlyPoints()
 let stepWidth: CGFloat = width / CGFloat(points.count-1)
 let stepWidth: CGFloat = width / CGFloat(points.count - 1)
 let stepHeight: CGFloat = height / CGFloat(points.max()! + points.min()!)

 let index:Int = Int(floor((toPoint.x-15)/stepWidth))
 if (index >= 0 && index < points.count){
 let index: Int = Int(floor((toPoint.x - 15) / stepWidth))
 if let xAxisLables = xAxisLables, index >= 0 && index < xAxisLables.count {
 self.currentDataLabel = xAxisLables[index]
 }
 if index >= 0 && index < points.count {
 self.currentDataNumber = points[index]
 return CGPoint(x: CGFloat(index)*stepWidth, y: CGFloat(points[index])*stepHeight)
 return CGPoint(x: CGFloat(index) * stepWidth, y: CGFloat(points[index]) * stepHeight)
 }
 return .zero
 }
}

struct LineView_Previews: PreviewProvider {
 static var previews: some View {
 LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne)
 LineView(data: [8,23,54,32,12,37, 7, 23,43], xAxisLables: [], title: "Full chart", legend: "Full chart", showOrigin: true, style: Styles.lineChartStyleOne)
 }
}


9 changes: 8 additions & 1 deletion
Sources/SwiftUICharts/LineChart/MagnifierRect.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,21 @@ import SwiftUI

public struct MagnifierRect: View {
 @Binding var currentNumber: Double
 @Binding var currentDataLabel: String
 var valueSpecifier:String
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 public var body: some View {
 ZStack{
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 VStack {
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 Text(currentDataLabel)
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 }
 if (self.colorScheme == .dark ){
 RoundedRectangle(cornerRadius: 16)
 .stroke(Color.white, lineWidth: self.colorScheme == .dark ? 2 : 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add xAxisLables and showOrigin option#77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

L1cardo
wants to merge
1
commit into

from

 Closed


Add xAxisLables and showOrigin option
#77
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 32 additions & 29 deletions
Sources/SwiftUICharts/LineChart/Legend.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,87 +13,90 @@ struct Legend: View {
 @Binding var frame: CGRect
 @Binding var hideHorizontalLines: Bool
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 let padding:CGFloat = 3

 var showOrigin: Bool?
 let padding: CGFloat = 3

 var stepWidth: CGFloat {
 if data.points.count < 2 {
 return 0
 }
 return frame.size.width / CGFloat(data.points.count-1)
 return frame.size.width / CGFloat(data.points.count - 1)
 }

 var stepHeight: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 if let min = points.min(), let max = points.max(), min != max {
 if (min < 0){
 return (frame.size.height-padding) / CGFloat(max - min)
 }else{
 return (frame.size.height-padding) / CGFloat(max + min)
 if min < 0{
 return (frame.size.height - padding) / CGFloat(max - min)
 }else{
 return (frame.size.height - padding) / CGFloat(max + min)
 }
 }
 return 0
 }

 var min: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 return CGFloat(points.min() ?? 0)
 }

 var body: some View {
 ZStack(alignment: .topLeading){
 ForEach((0...4), id: \.self) { height in
 HStack(alignment: .center){
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")").offset(x: 0, y: self.getYposition(height: height) )
 ZStack(alignment: .bottomLeading) {
 ForEach(showOrigin == true ? 0...5 : 0...4, id: \.self) { height in
 HStack(alignment: .center) {
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")")
 .offset(x: 0, y: self.getYposition(height: height))
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width - 32)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 .opacity((self.hideHorizontalLines && height != 0) ? 0 : 1)
 .rotationEffect(.degrees(180), anchor: .center)
 .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
 .animation(.easeOut(duration: 0.2))
 .clipped()
 }

 }

 }
 }

 func getYLegendSafe(height:Int)->CGFloat{

 func getYLegendSafe(height: Int) -> CGFloat {
 if let legend = getYLegend() {
 return CGFloat(legend[height])
 }
 return 0
 }

 func getYposition(height: Int)-> CGFloat {
 func getYposition(height: Int)-> CGFloat {
 if let legend = getYLegend() {
 return (self.frame.height-((CGFloat(legend[height]) - min)*self.stepHeight))-(self.frame.height/2)
 return (frame.height - ((CGFloat(legend[height]) - min) * stepHeight)) - (frame.height / 2)
 }
 return 0

 }

 func line(atHeight: CGFloat, width: CGFloat) -> Path {
 var hLine = Path()
 hLine.move(to: CGPoint(x:5, y: (atHeight-min)*stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight-min)*stepHeight))
 hLine.move(to: CGPoint(x:5, y: (atHeight - min) * stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight - min) * stepHeight))
 return hLine
 }

 func getYLegend() -> [Double]? {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 guard let max = points.max() else { return nil }
 guard let min = points.min() else { return nil }
 let step = Double(max - min)/4
 return [min+step * 0, min+step * 1, min+step * 2, min+step * 3, min+step * 4]
 let step = Double(max - min) / 4
 guard showOrigin == true else {
 return [min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
 return [0.00, min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
}

struct Legend_Previews: PreviewProvider {
 static var previews: some View {
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false))
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false), showOrigin: true)
 }.frame(width: 320, height: 200)
 }
}

3 changes: 1 addition & 2 deletions
Sources/SwiftUICharts/LineChart/LineChartView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,6 @@ public struct LineChartView: View {
 Spacer()
 Text("\(self.currentValue, specifier: self.valueSpecifier)")
 .font(.system(size: 41, weight: .bold, design: .default))
 .offset(x: 0, y: 30)
 Spacer()
 }
 .transition(.scale)
Expand All@@ -109,7 +108,7 @@ public struct LineChartView: View {
 }
 .frame(width: frame.width, height: frame.height + 30)
 .clipShape(RoundedRectangle(cornerRadius: 20))
 .offset(x: 0, y: 0)
 .offset(x: 0, y: -30)
 }.frame(width: self.formSize.width, height: self.formSize.height)
 }
 .gesture(DragGesture()
Expand Down

95 changes: 56 additions & 39 deletions
Sources/SwiftUICharts/LineChart/LineView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,117 +10,134 @@ import SwiftUI

public struct LineView: View {
 @ObservedObject var data: ChartData
 public var xAxisLables: [String]?
 public var title: String?
 public var legend: String?
 public var showOrigin: Bool?
 public var style: ChartStyle
 public var darkModeStyle: ChartStyle
 public var valueSpecifier:String
 public var valueSpecifier:String

 @Environment(\.colorScheme) var colorScheme: ColorScheme
 @State private var showLegend = false
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var closestPoint: CGPoint = .zero
 @State private var opacity:Double = 0
 @State private var opacity:Double = 0
 @State private var currentDataNumber: Double = 0
 @State private var currentDataLabel: String = ""
 @State private var hideHorizontalLines: Bool = false

 public init(data: [Double],
 xAxisLables: [String]? = [],
 title: String? = nil,
 legend: String? = nil,
 showOrigin: Bool? = true,
 style: ChartStyle = Styles.lineChartStyleOne,
 valueSpecifier: String? = "%.1f") {

 self.data = ChartData(points: data)
 self.xAxisLables = xAxisLables
 self.title = title
 self.legend = legend
 self.showOrigin = showOrigin
 self.style = style
 self.valueSpecifier = valueSpecifier!
 self.darkModeStyle = style.darkModeStyle != nil ? style.darkModeStyle! : Styles.lineViewDarkMode
 }

 public var body: some View {
 GeometryReader{ geometry in
 GeometryReader{ geometry in
 VStack(alignment: .leading, spacing: 8) {
 Group{
 if (self.title != nil){
 Group{
 if self.title != nil{
 Text(self.title!)
 .font(.title)
 .bold().foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.textColor : self.style.textColor)
 }
 if (self.legend != nil){
 if self.legend != nil{
 Text(self.legend!)
 .font(.callout)
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.legendTextColor : self.style.legendTextColor)
 }
 }.offset(x: 0, y: 20)
 ZStack{
 GeometryReader{ reader in
 }
 ZStack{
 GeometryReader{ reader in
 Rectangle()
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.backgroundColor : self.style.backgroundColor)
 if(self.showLegend){
 ifself.showLegend{
 Legend(data: self.data,
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines)
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines, showOrigin: self.showOrigin)
 .transition(.opacity)
 .animation(Animation.easeOut(duration: 1).delay(1))
 }
 Line(data: self.data,
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 30, height: reader.frame(in: .local).height)),
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 32, height: reader.frame(in: .local).height)),
 touchLocation: self.$indicatorLocation,
 showIndicator: self.$hideHorizontalLines,
 minDataValue: .constant(nil),
 maxDataValue: .constant(nil),
 showBackground: false
 )
 .offset(x: 30, y: 0)
 .onAppear(){
 self.showLegend = true
 showBackground: false)
 .offset(x: 32, y: 0)
 .onAppear {
 self.showLegend = true
 }
 .onDisappear(){
 .onDisappear{
 self.showLegend = false
 }
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .offset(x: 0, y: 40 )
 MagnifierRect(currentNumber: self.$currentDataNumber, valueSpecifier: self.valueSpecifier)
 MagnifierRect(currentNumber: self.$currentDataNumber, currentDataLabel: self.$currentDataLabel, valueSpecifier: self.valueSpecifier)
 .opacity(self.opacity)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width/2, y: 36)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width / 2, y: 32)
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .gesture(DragGesture()
 .onChanged({ value in
 .onChanged{ value in
 self.dragLocation = value.location
 self.indicatorLocation = CGPoint(x: max(value.location.x-30,0), y: 32)
 self.indicatorLocation = CGPoint(x: max(value.location.x - 30,0), y: 32)
 self.opacity = 1
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width-30, height: 240)
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width - 30, height: 240)
 self.hideHorizontalLines = true
 })
.onEnded({ value in
self.opacity = 0
self.hideHorizontalLines = false
 })
 }
 .onEnded { _ in
 self.opacity = 0
 self.hideHorizontalLines = false
 }
 )
 if self.xAxisLables != nil {
 HStack{
 ForEach(self.xAxisLables!, id: \.self) { xAxisLable in
 Text(xAxisLable)
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 }
 }
 .padding(.trailing, 32)
 .offset(x: 32, y: self.showOrigin == true ? 26 : 0)
 }
 }
 }
 }

 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 let points = self.data.onlyPoints()
 let stepWidth: CGFloat = width / CGFloat(points.count-1)
 let stepWidth: CGFloat = width / CGFloat(points.count - 1)
 let stepHeight: CGFloat = height / CGFloat(points.max()! + points.min()!)

 let index:Int = Int(floor((toPoint.x-15)/stepWidth))
 if (index >= 0 && index < points.count){
 let index: Int = Int(floor((toPoint.x - 15) / stepWidth))
 if let xAxisLables = xAxisLables, index >= 0 && index < xAxisLables.count {
 self.currentDataLabel = xAxisLables[index]
 }
 if index >= 0 && index < points.count {
 self.currentDataNumber = points[index]
 return CGPoint(x: CGFloat(index)*stepWidth, y: CGFloat(points[index])*stepHeight)
 return CGPoint(x: CGFloat(index) * stepWidth, y: CGFloat(points[index]) * stepHeight)
 }
 return .zero
 }
}

struct LineView_Previews: PreviewProvider {
 static var previews: some View {
 LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne)
 LineView(data: [8,23,54,32,12,37, 7, 23,43], xAxisLables: [], title: "Full chart", legend: "Full chart", showOrigin: true, style: Styles.lineChartStyleOne)
 }
}


9 changes: 8 additions & 1 deletion
Sources/SwiftUICharts/LineChart/MagnifierRect.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,21 @@ import SwiftUI

public struct MagnifierRect: View {
 @Binding var currentNumber: Double
 @Binding var currentDataLabel: String
 var valueSpecifier:String
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 public var body: some View {
 ZStack{
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 VStack {
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 Text(currentDataLabel)
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 }
 if (self.colorScheme == .dark ){
 RoundedRectangle(cornerRadius: 16)
 .stroke(Color.white, lineWidth: self.colorScheme == .dark ? 2 : 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add xAxisLables and showOrigin option#77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

L1cardo
wants to merge
1
commit into

from

 Closed


Add xAxisLables and showOrigin option
#77
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 32 additions & 29 deletions
Sources/SwiftUICharts/LineChart/Legend.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,87 +13,90 @@ struct Legend: View {
 @Binding var frame: CGRect
 @Binding var hideHorizontalLines: Bool
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 let padding:CGFloat = 3

 var showOrigin: Bool?
 let padding: CGFloat = 3

 var stepWidth: CGFloat {
 if data.points.count < 2 {
 return 0
 }
 return frame.size.width / CGFloat(data.points.count-1)
 return frame.size.width / CGFloat(data.points.count - 1)
 }

 var stepHeight: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 if let min = points.min(), let max = points.max(), min != max {
 if (min < 0){
 return (frame.size.height-padding) / CGFloat(max - min)
 }else{
 return (frame.size.height-padding) / CGFloat(max + min)
 if min < 0{
 return (frame.size.height - padding) / CGFloat(max - min)
 }else{
 return (frame.size.height - padding) / CGFloat(max + min)
 }
 }
 return 0
 }

 var min: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 return CGFloat(points.min() ?? 0)
 }

 var body: some View {
 ZStack(alignment: .topLeading){
 ForEach((0...4), id: \.self) { height in
 HStack(alignment: .center){
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")").offset(x: 0, y: self.getYposition(height: height) )
 ZStack(alignment: .bottomLeading) {
 ForEach(showOrigin == true ? 0...5 : 0...4, id: \.self) { height in
 HStack(alignment: .center) {
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")")
 .offset(x: 0, y: self.getYposition(height: height))
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width - 32)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 .opacity((self.hideHorizontalLines && height != 0) ? 0 : 1)
 .rotationEffect(.degrees(180), anchor: .center)
 .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
 .animation(.easeOut(duration: 0.2))
 .clipped()
 }

 }

 }
 }

 func getYLegendSafe(height:Int)->CGFloat{

 func getYLegendSafe(height: Int) -> CGFloat {
 if let legend = getYLegend() {
 return CGFloat(legend[height])
 }
 return 0
 }

 func getYposition(height: Int)-> CGFloat {
 func getYposition(height: Int)-> CGFloat {
 if let legend = getYLegend() {
 return (self.frame.height-((CGFloat(legend[height]) - min)*self.stepHeight))-(self.frame.height/2)
 return (frame.height - ((CGFloat(legend[height]) - min) * stepHeight)) - (frame.height / 2)
 }
 return 0

 }

 func line(atHeight: CGFloat, width: CGFloat) -> Path {
 var hLine = Path()
 hLine.move(to: CGPoint(x:5, y: (atHeight-min)*stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight-min)*stepHeight))
 hLine.move(to: CGPoint(x:5, y: (atHeight - min) * stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight - min) * stepHeight))
 return hLine
 }

 func getYLegend() -> [Double]? {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 guard let max = points.max() else { return nil }
 guard let min = points.min() else { return nil }
 let step = Double(max - min)/4
 return [min+step * 0, min+step * 1, min+step * 2, min+step * 3, min+step * 4]
 let step = Double(max - min) / 4
 guard showOrigin == true else {
 return [min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
 return [0.00, min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
}

struct Legend_Previews: PreviewProvider {
 static var previews: some View {
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false))
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false), showOrigin: true)
 }.frame(width: 320, height: 200)
 }
}

3 changes: 1 addition & 2 deletions
Sources/SwiftUICharts/LineChart/LineChartView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,6 @@ public struct LineChartView: View {
 Spacer()
 Text("\(self.currentValue, specifier: self.valueSpecifier)")
 .font(.system(size: 41, weight: .bold, design: .default))
 .offset(x: 0, y: 30)
 Spacer()
 }
 .transition(.scale)
Expand All@@ -109,7 +108,7 @@ public struct LineChartView: View {
 }
 .frame(width: frame.width, height: frame.height + 30)
 .clipShape(RoundedRectangle(cornerRadius: 20))
 .offset(x: 0, y: 0)
 .offset(x: 0, y: -30)
 }.frame(width: self.formSize.width, height: self.formSize.height)
 }
 .gesture(DragGesture()
Expand Down

95 changes: 56 additions & 39 deletions
Sources/SwiftUICharts/LineChart/LineView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,117 +10,134 @@ import SwiftUI

public struct LineView: View {
 @ObservedObject var data: ChartData
 public var xAxisLables: [String]?
 public var title: String?
 public var legend: String?
 public var showOrigin: Bool?
 public var style: ChartStyle
 public var darkModeStyle: ChartStyle
 public var valueSpecifier:String
 public var valueSpecifier:String

 @Environment(\.colorScheme) var colorScheme: ColorScheme
 @State private var showLegend = false
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var closestPoint: CGPoint = .zero
 @State private var opacity:Double = 0
 @State private var opacity:Double = 0
 @State private var currentDataNumber: Double = 0
 @State private var currentDataLabel: String = ""
 @State private var hideHorizontalLines: Bool = false

 public init(data: [Double],
 xAxisLables: [String]? = [],
 title: String? = nil,
 legend: String? = nil,
 showOrigin: Bool? = true,
 style: ChartStyle = Styles.lineChartStyleOne,
 valueSpecifier: String? = "%.1f") {

 self.data = ChartData(points: data)
 self.xAxisLables = xAxisLables
 self.title = title
 self.legend = legend
 self.showOrigin = showOrigin
 self.style = style
 self.valueSpecifier = valueSpecifier!
 self.darkModeStyle = style.darkModeStyle != nil ? style.darkModeStyle! : Styles.lineViewDarkMode
 }

 public var body: some View {
 GeometryReader{ geometry in
 GeometryReader{ geometry in
 VStack(alignment: .leading, spacing: 8) {
 Group{
 if (self.title != nil){
 Group{
 if self.title != nil{
 Text(self.title!)
 .font(.title)
 .bold().foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.textColor : self.style.textColor)
 }
 if (self.legend != nil){
 if self.legend != nil{
 Text(self.legend!)
 .font(.callout)
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.legendTextColor : self.style.legendTextColor)
 }
 }.offset(x: 0, y: 20)
 ZStack{
 GeometryReader{ reader in
 }
 ZStack{
 GeometryReader{ reader in
 Rectangle()
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.backgroundColor : self.style.backgroundColor)
 if(self.showLegend){
 ifself.showLegend{
 Legend(data: self.data,
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines)
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines, showOrigin: self.showOrigin)
 .transition(.opacity)
 .animation(Animation.easeOut(duration: 1).delay(1))
 }
 Line(data: self.data,
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 30, height: reader.frame(in: .local).height)),
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 32, height: reader.frame(in: .local).height)),
 touchLocation: self.$indicatorLocation,
 showIndicator: self.$hideHorizontalLines,
 minDataValue: .constant(nil),
 maxDataValue: .constant(nil),
 showBackground: false
 )
 .offset(x: 30, y: 0)
 .onAppear(){
 self.showLegend = true
 showBackground: false)
 .offset(x: 32, y: 0)
 .onAppear {
 self.showLegend = true
 }
 .onDisappear(){
 .onDisappear{
 self.showLegend = false
 }
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .offset(x: 0, y: 40 )
 MagnifierRect(currentNumber: self.$currentDataNumber, valueSpecifier: self.valueSpecifier)
 MagnifierRect(currentNumber: self.$currentDataNumber, currentDataLabel: self.$currentDataLabel, valueSpecifier: self.valueSpecifier)
 .opacity(self.opacity)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width/2, y: 36)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width / 2, y: 32)
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .gesture(DragGesture()
 .onChanged({ value in
 .onChanged{ value in
 self.dragLocation = value.location
 self.indicatorLocation = CGPoint(x: max(value.location.x-30,0), y: 32)
 self.indicatorLocation = CGPoint(x: max(value.location.x - 30,0), y: 32)
 self.opacity = 1
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width-30, height: 240)
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width - 30, height: 240)
 self.hideHorizontalLines = true
 })
.onEnded({ value in
self.opacity = 0
self.hideHorizontalLines = false
 })
 }
 .onEnded { _ in
 self.opacity = 0
 self.hideHorizontalLines = false
 }
 )
 if self.xAxisLables != nil {
 HStack{
 ForEach(self.xAxisLables!, id: \.self) { xAxisLable in
 Text(xAxisLable)
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 }
 }
 .padding(.trailing, 32)
 .offset(x: 32, y: self.showOrigin == true ? 26 : 0)
 }
 }
 }
 }

 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 let points = self.data.onlyPoints()
 let stepWidth: CGFloat = width / CGFloat(points.count-1)
 let stepWidth: CGFloat = width / CGFloat(points.count - 1)
 let stepHeight: CGFloat = height / CGFloat(points.max()! + points.min()!)

 let index:Int = Int(floor((toPoint.x-15)/stepWidth))
 if (index >= 0 && index < points.count){
 let index: Int = Int(floor((toPoint.x - 15) / stepWidth))
 if let xAxisLables = xAxisLables, index >= 0 && index < xAxisLables.count {
 self.currentDataLabel = xAxisLables[index]
 }
 if index >= 0 && index < points.count {
 self.currentDataNumber = points[index]
 return CGPoint(x: CGFloat(index)*stepWidth, y: CGFloat(points[index])*stepHeight)
 return CGPoint(x: CGFloat(index) * stepWidth, y: CGFloat(points[index]) * stepHeight)
 }
 return .zero
 }
}

struct LineView_Previews: PreviewProvider {
 static var previews: some View {
 LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne)
 LineView(data: [8,23,54,32,12,37, 7, 23,43], xAxisLables: [], title: "Full chart", legend: "Full chart", showOrigin: true, style: Styles.lineChartStyleOne)
 }
}


9 changes: 8 additions & 1 deletion
Sources/SwiftUICharts/LineChart/MagnifierRect.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,21 @@ import SwiftUI

public struct MagnifierRect: View {
 @Binding var currentNumber: Double
 @Binding var currentDataLabel: String
 var valueSpecifier:String
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 public var body: some View {
 ZStack{
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 VStack {
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 Text(currentDataLabel)
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 }
 if (self.colorScheme == .dark ){
 RoundedRectangle(cornerRadius: 16)
 .stroke(Color.white, lineWidth: self.colorScheme == .dark ? 2 : 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add xAxisLables and showOrigin option#77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

L1cardo
wants to merge
1
commit into

from

 Closed


Add xAxisLables and showOrigin option
#77
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 32 additions & 29 deletions
Sources/SwiftUICharts/LineChart/Legend.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,87 +13,90 @@ struct Legend: View {
 @Binding var frame: CGRect
 @Binding var hideHorizontalLines: Bool
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 let padding:CGFloat = 3

 var showOrigin: Bool?
 let padding: CGFloat = 3

 var stepWidth: CGFloat {
 if data.points.count < 2 {
 return 0
 }
 return frame.size.width / CGFloat(data.points.count-1)
 return frame.size.width / CGFloat(data.points.count - 1)
 }

 var stepHeight: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 if let min = points.min(), let max = points.max(), min != max {
 if (min < 0){
 return (frame.size.height-padding) / CGFloat(max - min)
 }else{
 return (frame.size.height-padding) / CGFloat(max + min)
 if min < 0{
 return (frame.size.height - padding) / CGFloat(max - min)
 }else{
 return (frame.size.height - padding) / CGFloat(max + min)
 }
 }
 return 0
 }

 var min: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 return CGFloat(points.min() ?? 0)
 }

 var body: some View {
 ZStack(alignment: .topLeading){
 ForEach((0...4), id: \.self) { height in
 HStack(alignment: .center){
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")").offset(x: 0, y: self.getYposition(height: height) )
 ZStack(alignment: .bottomLeading) {
 ForEach(showOrigin == true ? 0...5 : 0...4, id: \.self) { height in
 HStack(alignment: .center) {
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")")
 .offset(x: 0, y: self.getYposition(height: height))
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width - 32)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 .opacity((self.hideHorizontalLines && height != 0) ? 0 : 1)
 .rotationEffect(.degrees(180), anchor: .center)
 .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
 .animation(.easeOut(duration: 0.2))
 .clipped()
 }

 }

 }
 }

 func getYLegendSafe(height:Int)->CGFloat{

 func getYLegendSafe(height: Int) -> CGFloat {
 if let legend = getYLegend() {
 return CGFloat(legend[height])
 }
 return 0
 }

 func getYposition(height: Int)-> CGFloat {
 func getYposition(height: Int)-> CGFloat {
 if let legend = getYLegend() {
 return (self.frame.height-((CGFloat(legend[height]) - min)*self.stepHeight))-(self.frame.height/2)
 return (frame.height - ((CGFloat(legend[height]) - min) * stepHeight)) - (frame.height / 2)
 }
 return 0

 }

 func line(atHeight: CGFloat, width: CGFloat) -> Path {
 var hLine = Path()
 hLine.move(to: CGPoint(x:5, y: (atHeight-min)*stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight-min)*stepHeight))
 hLine.move(to: CGPoint(x:5, y: (atHeight - min) * stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight - min) * stepHeight))
 return hLine
 }

 func getYLegend() -> [Double]? {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 guard let max = points.max() else { return nil }
 guard let min = points.min() else { return nil }
 let step = Double(max - min)/4
 return [min+step * 0, min+step * 1, min+step * 2, min+step * 3, min+step * 4]
 let step = Double(max - min) / 4
 guard showOrigin == true else {
 return [min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
 return [0.00, min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
}

struct Legend_Previews: PreviewProvider {
 static var previews: some View {
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false))
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false), showOrigin: true)
 }.frame(width: 320, height: 200)
 }
}

3 changes: 1 addition & 2 deletions
Sources/SwiftUICharts/LineChart/LineChartView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,6 @@ public struct LineChartView: View {
 Spacer()
 Text("\(self.currentValue, specifier: self.valueSpecifier)")
 .font(.system(size: 41, weight: .bold, design: .default))
 .offset(x: 0, y: 30)
 Spacer()
 }
 .transition(.scale)
Expand All@@ -109,7 +108,7 @@ public struct LineChartView: View {
 }
 .frame(width: frame.width, height: frame.height + 30)
 .clipShape(RoundedRectangle(cornerRadius: 20))
 .offset(x: 0, y: 0)
 .offset(x: 0, y: -30)
 }.frame(width: self.formSize.width, height: self.formSize.height)
 }
 .gesture(DragGesture()
Expand Down

95 changes: 56 additions & 39 deletions
Sources/SwiftUICharts/LineChart/LineView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,117 +10,134 @@ import SwiftUI

public struct LineView: View {
 @ObservedObject var data: ChartData
 public var xAxisLables: [String]?
 public var title: String?
 public var legend: String?
 public var showOrigin: Bool?
 public var style: ChartStyle
 public var darkModeStyle: ChartStyle
 public var valueSpecifier:String
 public var valueSpecifier:String

 @Environment(\.colorScheme) var colorScheme: ColorScheme
 @State private var showLegend = false
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var closestPoint: CGPoint = .zero
 @State private var opacity:Double = 0
 @State private var opacity:Double = 0
 @State private var currentDataNumber: Double = 0
 @State private var currentDataLabel: String = ""
 @State private var hideHorizontalLines: Bool = false

 public init(data: [Double],
 xAxisLables: [String]? = [],
 title: String? = nil,
 legend: String? = nil,
 showOrigin: Bool? = true,
 style: ChartStyle = Styles.lineChartStyleOne,
 valueSpecifier: String? = "%.1f") {

 self.data = ChartData(points: data)
 self.xAxisLables = xAxisLables
 self.title = title
 self.legend = legend
 self.showOrigin = showOrigin
 self.style = style
 self.valueSpecifier = valueSpecifier!
 self.darkModeStyle = style.darkModeStyle != nil ? style.darkModeStyle! : Styles.lineViewDarkMode
 }

 public var body: some View {
 GeometryReader{ geometry in
 GeometryReader{ geometry in
 VStack(alignment: .leading, spacing: 8) {
 Group{
 if (self.title != nil){
 Group{
 if self.title != nil{
 Text(self.title!)
 .font(.title)
 .bold().foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.textColor : self.style.textColor)
 }
 if (self.legend != nil){
 if self.legend != nil{
 Text(self.legend!)
 .font(.callout)
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.legendTextColor : self.style.legendTextColor)
 }
 }.offset(x: 0, y: 20)
 ZStack{
 GeometryReader{ reader in
 }
 ZStack{
 GeometryReader{ reader in
 Rectangle()
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.backgroundColor : self.style.backgroundColor)
 if(self.showLegend){
 ifself.showLegend{
 Legend(data: self.data,
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines)
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines, showOrigin: self.showOrigin)
 .transition(.opacity)
 .animation(Animation.easeOut(duration: 1).delay(1))
 }
 Line(data: self.data,
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 30, height: reader.frame(in: .local).height)),
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 32, height: reader.frame(in: .local).height)),
 touchLocation: self.$indicatorLocation,
 showIndicator: self.$hideHorizontalLines,
 minDataValue: .constant(nil),
 maxDataValue: .constant(nil),
 showBackground: false
 )
 .offset(x: 30, y: 0)
 .onAppear(){
 self.showLegend = true
 showBackground: false)
 .offset(x: 32, y: 0)
 .onAppear {
 self.showLegend = true
 }
 .onDisappear(){
 .onDisappear{
 self.showLegend = false
 }
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .offset(x: 0, y: 40 )
 MagnifierRect(currentNumber: self.$currentDataNumber, valueSpecifier: self.valueSpecifier)
 MagnifierRect(currentNumber: self.$currentDataNumber, currentDataLabel: self.$currentDataLabel, valueSpecifier: self.valueSpecifier)
 .opacity(self.opacity)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width/2, y: 36)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width / 2, y: 32)
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .gesture(DragGesture()
 .onChanged({ value in
 .onChanged{ value in
 self.dragLocation = value.location
 self.indicatorLocation = CGPoint(x: max(value.location.x-30,0), y: 32)
 self.indicatorLocation = CGPoint(x: max(value.location.x - 30,0), y: 32)
 self.opacity = 1
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width-30, height: 240)
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width - 30, height: 240)
 self.hideHorizontalLines = true
 })
.onEnded({ value in
self.opacity = 0
self.hideHorizontalLines = false
 })
 }
 .onEnded { _ in
 self.opacity = 0
 self.hideHorizontalLines = false
 }
 )
 if self.xAxisLables != nil {
 HStack{
 ForEach(self.xAxisLables!, id: \.self) { xAxisLable in
 Text(xAxisLable)
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 }
 }
 .padding(.trailing, 32)
 .offset(x: 32, y: self.showOrigin == true ? 26 : 0)
 }
 }
 }
 }

 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 let points = self.data.onlyPoints()
 let stepWidth: CGFloat = width / CGFloat(points.count-1)
 let stepWidth: CGFloat = width / CGFloat(points.count - 1)
 let stepHeight: CGFloat = height / CGFloat(points.max()! + points.min()!)

 let index:Int = Int(floor((toPoint.x-15)/stepWidth))
 if (index >= 0 && index < points.count){
 let index: Int = Int(floor((toPoint.x - 15) / stepWidth))
 if let xAxisLables = xAxisLables, index >= 0 && index < xAxisLables.count {
 self.currentDataLabel = xAxisLables[index]
 }
 if index >= 0 && index < points.count {
 self.currentDataNumber = points[index]
 return CGPoint(x: CGFloat(index)*stepWidth, y: CGFloat(points[index])*stepHeight)
 return CGPoint(x: CGFloat(index) * stepWidth, y: CGFloat(points[index]) * stepHeight)
 }
 return .zero
 }
}

struct LineView_Previews: PreviewProvider {
 static var previews: some View {
 LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne)
 LineView(data: [8,23,54,32,12,37, 7, 23,43], xAxisLables: [], title: "Full chart", legend: "Full chart", showOrigin: true, style: Styles.lineChartStyleOne)
 }
}


9 changes: 8 additions & 1 deletion
Sources/SwiftUICharts/LineChart/MagnifierRect.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,21 @@ import SwiftUI

public struct MagnifierRect: View {
 @Binding var currentNumber: Double
 @Binding var currentDataLabel: String
 var valueSpecifier:String
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 public var body: some View {
 ZStack{
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 VStack {
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 Text(currentDataLabel)
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 }
 if (self.colorScheme == .dark ){
 RoundedRectangle(cornerRadius: 16)
 .stroke(Color.white, lineWidth: self.colorScheme == .dark ? 2 : 0)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add xAxisLables and showOrigin option#77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

L1cardo
wants to merge
1
commit into

from

 Closed


Add xAxisLables and showOrigin option
#77
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


61 changes: 32 additions & 29 deletions
Sources/SwiftUICharts/LineChart/Legend.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,87 +13,90 @@ struct Legend: View {
 @Binding var frame: CGRect
 @Binding var hideHorizontalLines: Bool
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 let padding:CGFloat = 3

 var showOrigin: Bool?
 let padding: CGFloat = 3

 var stepWidth: CGFloat {
 if data.points.count < 2 {
 return 0
 }
 return frame.size.width / CGFloat(data.points.count-1)
 return frame.size.width / CGFloat(data.points.count - 1)
 }

 var stepHeight: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 if let min = points.min(), let max = points.max(), min != max {
 if (min < 0){
 return (frame.size.height-padding) / CGFloat(max - min)
 }else{
 return (frame.size.height-padding) / CGFloat(max + min)
 if min < 0{
 return (frame.size.height - padding) / CGFloat(max - min)
 }else{
 return (frame.size.height - padding) / CGFloat(max + min)
 }
 }
 return 0
 }

 var min: CGFloat {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 return CGFloat(points.min() ?? 0)
 }

 var body: some View {
 ZStack(alignment: .topLeading){
 ForEach((0...4), id: \.self) { height in
 HStack(alignment: .center){
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")").offset(x: 0, y: self.getYposition(height: height) )
 ZStack(alignment: .bottomLeading) {
 ForEach(showOrigin == true ? 0...5 : 0...4, id: \.self) { height in
 HStack(alignment: .center) {
 Text("\(self.getYLegendSafe(height: height), specifier: "%.2f")")
 .offset(x: 0, y: self.getYposition(height: height))
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 self.line(atHeight: self.getYLegendSafe(height: height), width: self.frame.width - 32)
 .stroke(self.colorScheme == .dark ? Colors.LegendDarkColor : Colors.LegendColor, style: StrokeStyle(lineWidth: 1.5, lineCap: .round, dash:[5,height == 0 ? 0 : 10]))
 .opacity((self.hideHorizontalLines && height != 0) ? 0 : 1)
 .rotationEffect(.degrees(180), anchor: .center)
 .rotation3DEffect(.degrees(180), axis: (x: 0, y: 1, z: 0))
 .animation(.easeOut(duration: 0.2))
 .clipped()
 }

 }

 }
 }

 func getYLegendSafe(height:Int)->CGFloat{

 func getYLegendSafe(height: Int) -> CGFloat {
 if let legend = getYLegend() {
 return CGFloat(legend[height])
 }
 return 0
 }

 func getYposition(height: Int)-> CGFloat {
 func getYposition(height: Int)-> CGFloat {
 if let legend = getYLegend() {
 return (self.frame.height-((CGFloat(legend[height]) - min)*self.stepHeight))-(self.frame.height/2)
 return (frame.height - ((CGFloat(legend[height]) - min) * stepHeight)) - (frame.height / 2)
 }
 return 0

 }

 func line(atHeight: CGFloat, width: CGFloat) -> Path {
 var hLine = Path()
 hLine.move(to: CGPoint(x:5, y: (atHeight-min)*stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight-min)*stepHeight))
 hLine.move(to: CGPoint(x:5, y: (atHeight - min) * stepHeight))
 hLine.addLine(to: CGPoint(x: width, y: (atHeight - min) * stepHeight))
 return hLine
 }

 func getYLegend() -> [Double]? {
 let points = self.data.onlyPoints()
 let points = data.onlyPoints()
 guard let max = points.max() else { return nil }
 guard let min = points.min() else { return nil }
 let step = Double(max - min)/4
 return [min+step * 0, min+step * 1, min+step * 2, min+step * 3, min+step * 4]
 let step = Double(max - min) / 4
 guard showOrigin == true else {
 return [min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
 return [0.00, min + step * 0, min + step * 1, min + step * 2, min + step * 3, min + step * 4]
 }
}

struct Legend_Previews: PreviewProvider {
 static var previews: some View {
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false))
 GeometryReader{ geometry in
 Legend(data: ChartData(points: [0.2,0.4,1.4,4.5]), frame: .constant(geometry.frame(in: .local)), hideHorizontalLines: .constant(false), showOrigin: true)
 }.frame(width: 320, height: 200)
 }
}

3 changes: 1 addition & 2 deletions
Sources/SwiftUICharts/LineChart/LineChartView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,7 +92,6 @@ public struct LineChartView: View {
 Spacer()
 Text("\(self.currentValue, specifier: self.valueSpecifier)")
 .font(.system(size: 41, weight: .bold, design: .default))
 .offset(x: 0, y: 30)
 Spacer()
 }
 .transition(.scale)
Expand All@@ -109,7 +108,7 @@ public struct LineChartView: View {
 }
 .frame(width: frame.width, height: frame.height + 30)
 .clipShape(RoundedRectangle(cornerRadius: 20))
 .offset(x: 0, y: 0)
 .offset(x: 0, y: -30)
 }.frame(width: self.formSize.width, height: self.formSize.height)
 }
 .gesture(DragGesture()
Expand Down

95 changes: 56 additions & 39 deletions
Sources/SwiftUICharts/LineChart/LineView.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,117 +10,134 @@ import SwiftUI

public struct LineView: View {
 @ObservedObject var data: ChartData
 public var xAxisLables: [String]?
 public var title: String?
 public var legend: String?
 public var showOrigin: Bool?
 public var style: ChartStyle
 public var darkModeStyle: ChartStyle
 public var valueSpecifier:String
 public var valueSpecifier:String

 @Environment(\.colorScheme) var colorScheme: ColorScheme
 @State private var showLegend = false
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var dragLocation:CGPoint = .zero
 @State private var indicatorLocation:CGPoint = .zero
 @State private var closestPoint: CGPoint = .zero
 @State private var opacity:Double = 0
 @State private var opacity:Double = 0
 @State private var currentDataNumber: Double = 0
 @State private var currentDataLabel: String = ""
 @State private var hideHorizontalLines: Bool = false

 public init(data: [Double],
 xAxisLables: [String]? = [],
 title: String? = nil,
 legend: String? = nil,
 showOrigin: Bool? = true,
 style: ChartStyle = Styles.lineChartStyleOne,
 valueSpecifier: String? = "%.1f") {

 self.data = ChartData(points: data)
 self.xAxisLables = xAxisLables
 self.title = title
 self.legend = legend
 self.showOrigin = showOrigin
 self.style = style
 self.valueSpecifier = valueSpecifier!
 self.darkModeStyle = style.darkModeStyle != nil ? style.darkModeStyle! : Styles.lineViewDarkMode
 }

 public var body: some View {
 GeometryReader{ geometry in
 GeometryReader{ geometry in
 VStack(alignment: .leading, spacing: 8) {
 Group{
 if (self.title != nil){
 Group{
 if self.title != nil{
 Text(self.title!)
 .font(.title)
 .bold().foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.textColor : self.style.textColor)
 }
 if (self.legend != nil){
 if self.legend != nil{
 Text(self.legend!)
 .font(.callout)
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.legendTextColor : self.style.legendTextColor)
 }
 }.offset(x: 0, y: 20)
 ZStack{
 GeometryReader{ reader in
 }
 ZStack{
 GeometryReader{ reader in
 Rectangle()
 .foregroundColor(self.colorScheme == .dark ? self.darkModeStyle.backgroundColor : self.style.backgroundColor)
 if(self.showLegend){
 ifself.showLegend{
 Legend(data: self.data,
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines)
 frame: .constant(reader.frame(in: .local)), hideHorizontalLines: self.$hideHorizontalLines, showOrigin: self.showOrigin)
 .transition(.opacity)
 .animation(Animation.easeOut(duration: 1).delay(1))
 }
 Line(data: self.data,
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 30, height: reader.frame(in: .local).height)),
 frame: .constant(CGRect(x: 0, y: 0, width: reader.frame(in: .local).width - 32, height: reader.frame(in: .local).height)),
 touchLocation: self.$indicatorLocation,
 showIndicator: self.$hideHorizontalLines,
 minDataValue: .constant(nil),
 maxDataValue: .constant(nil),
 showBackground: false
 )
 .offset(x: 30, y: 0)
 .onAppear(){
 self.showLegend = true
 showBackground: false)
 .offset(x: 32, y: 0)
 .onAppear {
 self.showLegend = true
 }
 .onDisappear(){
 .onDisappear{
 self.showLegend = false
 }
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .offset(x: 0, y: 40 )
 MagnifierRect(currentNumber: self.$currentDataNumber, valueSpecifier: self.valueSpecifier)
 MagnifierRect(currentNumber: self.$currentDataNumber, currentDataLabel: self.$currentDataLabel, valueSpecifier: self.valueSpecifier)
 .opacity(self.opacity)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width/2, y: 36)
 .offset(x: self.dragLocation.x - geometry.frame(in: .local).size.width / 2, y: 32)
 }
 .frame(width: geometry.frame(in: .local).size.width, height: 240)
 .gesture(DragGesture()
 .onChanged({ value in
 .onChanged{ value in
 self.dragLocation = value.location
 self.indicatorLocation = CGPoint(x: max(value.location.x-30,0), y: 32)
 self.indicatorLocation = CGPoint(x: max(value.location.x - 30,0), y: 32)
 self.opacity = 1
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width-30, height: 240)
 self.closestPoint = self.getClosestDataPoint(toPoint: value.location, width: geometry.frame(in: .local).size.width - 30, height: 240)
 self.hideHorizontalLines = true
 })
.onEnded({ value in
self.opacity = 0
self.hideHorizontalLines = false
 })
 }
 .onEnded { _ in
 self.opacity = 0
 self.hideHorizontalLines = false
 }
 )
 if self.xAxisLables != nil {
 HStack{
 ForEach(self.xAxisLables!, id: \.self) { xAxisLable in
 Text(xAxisLable)
 .foregroundColor(Colors.LegendText)
 .font(.caption)
 }
 }
 .padding(.trailing, 32)
 .offset(x: 32, y: self.showOrigin == true ? 26 : 0)
 }
 }
 }
 }

 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 func getClosestDataPoint(toPoint: CGPoint, width:CGFloat, height: CGFloat) -> CGPoint {
 let points = self.data.onlyPoints()
 let stepWidth: CGFloat = width / CGFloat(points.count-1)
 let stepWidth: CGFloat = width / CGFloat(points.count - 1)
 let stepHeight: CGFloat = height / CGFloat(points.max()! + points.min()!)

 let index:Int = Int(floor((toPoint.x-15)/stepWidth))
 if (index >= 0 && index < points.count){
 let index: Int = Int(floor((toPoint.x - 15) / stepWidth))
 if let xAxisLables = xAxisLables, index >= 0 && index < xAxisLables.count {
 self.currentDataLabel = xAxisLables[index]
 }
 if index >= 0 && index < points.count {
 self.currentDataNumber = points[index]
 return CGPoint(x: CGFloat(index)*stepWidth, y: CGFloat(points[index])*stepHeight)
 return CGPoint(x: CGFloat(index) * stepWidth, y: CGFloat(points[index]) * stepHeight)
 }
 return .zero
 }
}

struct LineView_Previews: PreviewProvider {
 static var previews: some View {
 LineView(data: [8,23,54,32,12,37,7,23,43], title: "Full chart", style: Styles.lineChartStyleOne)
 LineView(data: [8,23,54,32,12,37, 7, 23,43], xAxisLables: [], title: "Full chart", legend: "Full chart", showOrigin: true, style: Styles.lineChartStyleOne)
 }
}


9 changes: 8 additions & 1 deletion
Sources/SwiftUICharts/LineChart/MagnifierRect.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,21 @@ import SwiftUI

public struct MagnifierRect: View {
 @Binding var currentNumber: Double
 @Binding var currentDataLabel: String
 var valueSpecifier:String
 @Environment(\.colorScheme) var colorScheme: ColorScheme
 public var body: some View {
 ZStack{
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 VStack {
 Text("\(self.currentNumber, specifier: valueSpecifier)")
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 Text(currentDataLabel)
 .font(.system(size: 18, weight: .bold))
 .offset(x: 0, y:-110)
 .foregroundColor(self.colorScheme == .dark ? Color.white : Color.black)
 }
 if (self.colorScheme == .dark ){
 RoundedRectangle(cornerRadius: 16)
 .stroke(Color.white, lineWidth: self.colorScheme == .dark ? 2 : 0)
Expand Down