-
-## Features
-
-- Progress animation
-- Customizable start/end and backdrop ring colors
-- Customizable ring width
-- Customizable progress line end style
-- Customizable shadow under progress line end
-- Progress values above 100% (or 360°) can also be displayed
-
-## Installation
-
-### CocoaPods
-
-To install `MKRingProgressView` via [CocoaPods](http://cocoapods.org), add the following line to your Podfile:
-
-```
-pod 'MKRingProgressView'
-```
-
-### Carthage
-
-To install `MKRingProgressView` via [Carthage](https://github.com/Carthage/Carthage#if-youre-building-for-ios-tvos-or-watchos), add the following line to your Cartfile:
-
-```
-github "maxkonovalov/MKRingProgressView"
-```
-
-## Usage
-
-See the example Xcode project. It contains 2 targets:
-- **ProgressRingExample** - a simple example containing a single progress ring with adjustable parameters.
-- **ActivityRingsExample** - an advanced usage example replicating Activity app by Apple. It also contains additional classes for convenient grouping of 3 ring progress views together.
-
-### Interface Builder
-
-`MKRingProgressView` can be set up in Interface Builder. To use it, set the custom view class to `MKRingProgressView`. Most of the control's parameters can be customized in Interface Builder.
-
-### Code
-
-```swift
-let ringProgressView = RingProgressView(frame: CGRect(x: 0, y: 100, width: 100, height: 100))
-ringProgressView.startColor = .red
-ringProgressView.endColor = .magenta
-ringProgressView.ringWidth = 25
-ringProgressView.progress = 0.0
-view.addSubview(ringProgressView)
-```
-
-The `progress` value can be animated the same way you would normally animate any property using `UIView`'s block-based animations:
-
-```swift
-UIView.animate(withDuration: 0.5) {
- ringProgressView.progress = 1.0
-}
-```
-
-## Performance
-
-To achieve better performance the following options are possible:
-
-- Set `gradientImageScale` to lower values like `0.5` (defaults to `1.0`)
-- Set `startColor` and `endColor` to the same value
-- Set `shadowOpacity` to `0.0`
-- Set `allowsAntialiasing` to `false`
-
-## Requirements
-
-- iOS 8.2
-- tvOS 9.0
-- Xcode 10, Swift 4+
-
-## License
-
-`MKRingProgressView` is available under the MIT license. See the LICENSE file for more info.
diff --git a/Dependecies/SwiftCharts/.gitignore b/Dependecies/SwiftCharts/.gitignore
deleted file mode 100644
index 58384e4b1..000000000
--- a/Dependecies/SwiftCharts/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-# Xcode
-#
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
-.DS_Store
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
-#
-Pods
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
diff --git a/Dependecies/SwiftCharts/CHANGELOG.md b/Dependecies/SwiftCharts/CHANGELOG.md
deleted file mode 100644
index c1093402b..000000000
--- a/Dependecies/SwiftCharts/CHANGELOG.md
+++ /dev/null
@@ -1,145 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-## [Unreleased]
-
-## [0.6.5] - 2019.03.30
-- Correct deployment target
-
-## [0.6.4] - 2019.03.29
-- Swift 5.0 upgrade
-
-
-## [0.6.3] - 2018.09.30
-- Swift 4.2 upgrade
-
-
-## [0.6.2] - 2018.09.15
-- Fix iPad demo crash
-- Add missing AppIcon image sizes
-- Fix Xcode 10 compilation
-- Fix dividing by zero while calculating axis inner frame
-- Fill area width fixed: now it is equal to graph line width
-- Expose bar views, e.g. to enable highlighting by external events
-
-## [0.6.1] - 2017.12.04
-- Fix area chart broken with straight line generator
-- Fix unclipped container behind content view, don't mask if there's no clip rect
-- Implemented gradient fill for curved areas
-- Added support for gradient line charts
-- Make candle stick fill colours configurable
-- ChartPointViewBarStacked: allowing only rounding some corners
-- Make candle stick fill colours configurable, show usage in example
-- Fixed 2 leaks setting stackedTapHandler
-- Bar chart axis labels now use provided label font and color
-- Swift 4 support
-- Fix passing incorrect parameter to Zoomable
-
-## [0.6] - 2017.04.23
-- Fix guidelines overlap with axis lines
-- Fix axis line minor irregularities (fixes #151)
-- Make ChartPointsLayer.display(Chart) open
-- Allow to retrieve frames of axis labels
-- Separate axis from layer with related UI elements (refactoring)
-- Implement dynamic axis values and labels generators (multiplier, fixed, non-overapping, nice numbers, suffix, date)
-- Zooming & panning
-- Allow to set line join/cap
-- Allow to set padding in points for axis values
-- Implement global tap handling
-- Allow to set fixed bar width for grouped bars
-- Improve info bubble
-- Implement axis tap handling
-- Add multiline support to tracker, modify gesture handling work well with zoom & pan
-- Implement tap handling for bars and stack frames
-- Implement animators
-- Implement catmull rom path generator
-- Add modes to views layer to add subviews to scale&translate subviews as part of own transform or only translate by updating their positions individually
-- Allow to generate custom views in bars(plain, grouped, stacked) and line layer
-- Implement elastic zoom/pan
-- Fix dashed path not showing when line is not animated
-- Implement grouped bars companion layer (to add e.g. labels to individual grouped bars).
-- Remove unnecessary use of self, improve formatting
-- Don't force unwrap context
-- Add custom transform mode to ChartPointsViewsLayer.
-- Allow to disable axis layer modification of chart's frame
-- Allow to show chart points outside of the chart's inner frame
-- Add example for ranged axis and rotation handling
-- Adjust "Custom units" example to show how to set a fixed scrollable area / initial zoom.
-- Allow to use gradients in ChartPointsAreaLayer
-- Allow to use bars with rounded corners
-- Diverse other improvements and fixes
-
-## [0.5] - 2016.11.23
-- Add multi-chart tracker layer
-- Add dashed line support
-- Migrate to Swift 2.3
-- Migrate to Swift 3.0
-- Fix division by 0 in axis layer
-- Fix not being able to use reversed axis values
-
-## [0.4] - 2016.05.29
-- Fix tracker showing NaN on constant coordinate
-- Pass tension values to cubic line to be able to modify curviness
-- Add tvOS target
-- Fix value of ChartAxisValue does not update in subsequent calls to copy
-- Fix axis stroke width setting has no effect
-- Add public init so to ChartLayerBase to allow it to be subclassed
-- Update examples to use ChartAxisValueDouble instead of ChartAxisValueFloat (deprecated)
-- Make ChartPoint, ChartAxisValue and subclasses conform to CustomStringConvertible
-- Use closure to map dates instead of date formatter for more flexibility
-- Improve inline documentation
-- Allow to change text alignment of y axis labels
-- Make ChartPointsScatterLayer class along with its' properties and methods public for subclassing outside swift module
-- Use flatMap instead of reduce to improve performance
-- Don't sort axis values in axis layer
-- Move labels in y axis if they overlap
-- Fix dividers not showing in upper x axis
-- Fix line layer blocking touch
-- Fix memory leak in CoordExample (issue #101)
-- Add top right coord space initialisation helper
-
-## [0.3] - 2015.09.28
-- Merge swift2.0 in master
-
-## [0.2.5] - 2015.08.31
-- Fix stacked bar frames displaying incorrectly when start is not 0
-- Improve project organization
-- Make usage of ChartAxisValue clearer, improve docs
-- Use only Double instead of CGFloat for axis values, deprecate ChartAxisValueFloat and ChartAxisValueFloatScreenLoc
-
-## [0.2.4] - 2015.08.09
-- Automatic generation of trendlines
-- Add Carthage support
-
-## [0.2.3]
-- Allow rotating y axis title label
-- Add LineChart to create (multi)line chart with few lines
-- Add BarChart to create bar chart with few lines
-- Change axis value's scalar type to Double to fix inaccuracies when using dates
-
-## [0.2.2]
-- Refactor circle and bubble views, now ChartPointEllipseView
-- Rename BubbleView in InfoBubble and move it to example project
-
-## [0.2.1] - 2015-05-24
-- Improve performance drawing guidelines
-- Generate calculation intensive coordinates spaces in the background (examples)
-- Performance improvements calculating axis labels size
-
-## [0.2] - 2015-05-22
-
-### Added
-- iOS7 support
-- Bars example with variable axes
-- Stacked bars layer and example
-- Bubble chart layer and example, example includes functionality to map model values to colors from gradient bar
-- Scatter chart layer and example
-- Bars layer, +/- bars with dynamic gradient example
-- Grouped bars layer and example
-
-### Removed
-- Bars example with horizontal axis - now included in variable axes example
-
-## [0.1] - 2015-05-10
-First import, pods settings
diff --git a/Dependecies/SwiftCharts/Examples/AppDelegate.swift b/Dependecies/SwiftCharts/Examples/AppDelegate.swift
deleted file mode 100644
index 0f8529559..000000000
--- a/Dependecies/SwiftCharts/Examples/AppDelegate.swift
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// AppDelegate.swift
-// Examples
-//
-// Created by ischuetz on 08/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-@UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate, UISplitViewControllerDelegate {
-
- var window: UIWindow?
-
-
- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-
- if UIDevice.current.userInterfaceIdiom == .pad {
-
- let splitViewController = self.window!.rootViewController as! UISplitViewController
- let navigationController = splitViewController.viewControllers.last as! UINavigationController
- splitViewController.delegate = self
-
- if #available(iOS 8.0, *) {
- navigationController.topViewController?.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem
- }
- }
-
- return true
-
- }
-
- func applicationWillResignActive(_ application: UIApplication) {
- // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
- // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
- }
-
- func applicationDidEnterBackground(_ application: UIApplication) {
- // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
- // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
- }
-
- func applicationWillEnterForeground(_ application: UIApplication) {
- // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
- }
-
- func applicationDidBecomeActive(_ application: UIApplication) {
- // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
- }
-
- func applicationWillTerminate(_ application: UIApplication) {
- // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
- }
-
- // MARK: - Split view
-
- func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController:UIViewController, onto primaryViewController:UIViewController) -> Bool {
- if let secondaryAsNavController = secondaryViewController as? UINavigationController {
- if let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController {
- if topAsDetailController.detailItem == nil {
- // Return true to indicate that we have handled the collapse by doing nothing; the secondary controller will be discarded.
- return true
- }
- }
- }
- return false
- }
-
- fileprivate func setSplitSwipeEnabled(_ enabled: Bool) {
- if UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad {
- let splitViewController = UIApplication.shared.delegate?.window!!.rootViewController as! UISplitViewController
- splitViewController.presentsWithGesture = enabled
- }
- }
-
- func splitViewController(_ svc: UISplitViewController, willHide aViewController: UIViewController, with barButtonItem: UIBarButtonItem, for pc: UIPopoverController) {
-
- let navigationController = svc.viewControllers[svc.viewControllers.count-1] as! UINavigationController
- if let topAsDetailController = navigationController.topViewController as? DetailViewController {
- barButtonItem.title = "Examples"
- topAsDetailController.navigationItem.setLeftBarButton(barButtonItem, animated: true)
- }
- }
-}
-
-
-// src: http://stackoverflow.com/a/27399688/930450
-extension UISplitViewController {
- func toggleMasterView() {
- if #available(iOS 8.0, *) {
- let barButtonItem = self.displayModeButtonItem
- UIApplication.shared.sendAction(barButtonItem.action!, to: barButtonItem.target, from: nil, for: nil)
- }
- }
-}
diff --git a/Dependecies/SwiftCharts/Examples/DetailViewController.swift b/Dependecies/SwiftCharts/Examples/DetailViewController.swift
deleted file mode 100644
index 8f45e3e9e..000000000
--- a/Dependecies/SwiftCharts/Examples/DetailViewController.swift
+++ /dev/null
@@ -1,132 +0,0 @@
-//
-// DetailViewController.swift
-// SwiftCharts
-//
-// Created by ischuetz on 20/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-class DetailViewController: UIViewController, UISplitViewControllerDelegate {
-
- @IBOutlet weak var detailDescriptionLabel: UILabel!
-
- lazy private(set) var chartFrame: CGRect! = {
- CGRect(x: 0, y: 80, width: self.view.frame.size.width, height: self.view.frame.size.height - 80)
- }()
-
- var detailItem: Example? {
- didSet {
- configureView()
- }
- }
- var currentExampleController: UIViewController?
-
- func configureView() {
-
- if let example: Example = detailItem {
- switch example {
- case .helloWorld:
- setSplitSwipeEnabled(true)
- showExampleController(HelloWorld())
- case .bars:
- setSplitSwipeEnabled(true)
- showExampleController(BarsExample())
- case .stackedBars:
- setSplitSwipeEnabled(true)
- showExampleController(StackedBarsExample())
- case .barsPlusMinus:
- setSplitSwipeEnabled(true)
- showExampleController(BarsPlusMinusWithGradientExample())
- case .groupedBars:
- setSplitSwipeEnabled(true)
- showExampleController(GroupedBarsExample())
- case .barsStackedGrouped:
- setSplitSwipeEnabled(true)
- showExampleController(GroupedAndStackedBarsExample())
- case .scatter:
- setSplitSwipeEnabled(true)
- showExampleController(ScatterExample())
- case .notifications:
- setSplitSwipeEnabled(true)
- showExampleController(NotificationsExample())
- case .target:
- setSplitSwipeEnabled(true)
- showExampleController(TargetExample())
- case .areas:
- setSplitSwipeEnabled(true)
- showExampleController(AreasExample())
- case .rangedAxis:
- setSplitSwipeEnabled(true)
- showExampleController(RangedAxisExample())
- case .bubble:
- setSplitSwipeEnabled(true)
- showExampleController(BubbleExample())
- case .combination:
- setSplitSwipeEnabled(true)
- showExampleController(BarsPlusMinusAndLinesExample())
- case .coords:
- setSplitSwipeEnabled(true)
- showExampleController(CoordsExample())
- case .tracker:
- setSplitSwipeEnabled(false)
- showExampleController(TrackerExample())
- case .multiTracker:
- setSplitSwipeEnabled(false)
- showExampleController(MultiTrackerExample())
- case .equalSpacing:
- setSplitSwipeEnabled(true)
- showExampleController(EqualSpacingExample())
- case .customUnits:
- setSplitSwipeEnabled(true)
- showExampleController(CustomUnitsExample())
- case .multival:
- setSplitSwipeEnabled(true)
- showExampleController(MultipleLabelsExample())
- case .multiAxis:
- setSplitSwipeEnabled(true)
- showExampleController(MultipleAxesExample())
- case .multiAxisInteractive:
- setSplitSwipeEnabled(true)
- showExampleController(MultipleAxesInteractiveExample())
- case .candleStick:
- setSplitSwipeEnabled(true)
- showExampleController(CandleStickExample())
- case .cubiclines:
- setSplitSwipeEnabled(true)
- showExampleController(CubicLinesExample())
- case .cubiclinesWithGradient:
- setSplitSwipeEnabled(true)
- showExampleController(CubicLinesWithGradientExample())
- case .notNumeric:
- setSplitSwipeEnabled(true)
- showExampleController(NotNumericExample())
- case .candleStickInteractive:
- setSplitSwipeEnabled(false)
- showExampleController(CandleStickInteractiveExample())
- case .trendline:
- setSplitSwipeEnabled(true)
- showExampleController(TrendlineExample())
- }
- }
- }
-
- fileprivate func showExampleController(_ controller: UIViewController) {
- if let currentExampleController = currentExampleController {
- currentExampleController.removeFromParent()
- currentExampleController.view.removeFromSuperview()
- }
- addChild(controller)
- view.addSubview(controller.view)
- currentExampleController = controller
- }
-
- fileprivate func setSplitSwipeEnabled(_ enabled: Bool) {
- if UIDevice.current.userInterfaceIdiom == UIUserInterfaceIdiom.pad {
- let splitViewController = UIApplication.shared.delegate?.window!!.rootViewController as! UISplitViewController
- splitViewController.presentsWithGesture = enabled
- }
- }
-}
-
diff --git a/Dependecies/SwiftCharts/Examples/Examples/AreasExample.swift b/Dependecies/SwiftCharts/Examples/Examples/AreasExample.swift
deleted file mode 100644
index 5cfc1caf6..000000000
--- a/Dependecies/SwiftCharts/Examples/Examples/AreasExample.swift
+++ /dev/null
@@ -1,172 +0,0 @@
-//
-// AreasExample.swift
-// SwiftCharts
-//
-// Created by ischuetz on 04/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-import SwiftCharts
-
-class AreasExample: UIViewController, ChartDelegate {
-
- fileprivate var chart: Chart? // arc
-
- fileprivate var popups: [UIView] = []
-
- override func viewDidLoad() {
- super.viewDidLoad()
-
- let labelSettings = ChartLabelSettings(font: ExamplesDefaults.labelFont)
-
- let chartPoints1 = [(0, 50), (2, 65), (4, 125), (6, 140)].map{ChartPoint(x: ChartAxisValueInt($0.0, labelSettings: labelSettings), y: ChartAxisValueInt($0.1))}
- let chartPoints2 = [(0, 150), (2, 100), (4, 200), (6, 60)].map{ChartPoint(x: ChartAxisValueInt($0.0, labelSettings: labelSettings), y: ChartAxisValueInt($0.1))}
- let chartPoints3 = [(0, 200), (2, 210), (4, 260), (6, 290)].map{ChartPoint(x: ChartAxisValueInt($0.0, labelSettings: labelSettings), y: ChartAxisValueInt($0.1))}
-
- let allChartPoints = (chartPoints1 + chartPoints2 + chartPoints3).sorted {(obj1, obj2) in return obj1.x.scalar < obj2.x.scalar}
-
- let xValues: [ChartAxisValue] = (NSOrderedSet(array: allChartPoints).array as! [ChartPoint]).map{$0.x}
- let yValues = ChartAxisValuesStaticGenerator.generateYAxisValuesWithChartPoints(allChartPoints, minSegmentCount: 5, maxSegmentCount: 20, multiple: 50, axisValueGenerator: {ChartAxisValueDouble($0, labelSettings: labelSettings)}, addPaddingSegmentIfEdge: false)
-
- let xModel = ChartAxisModel(axisValues: xValues, axisTitleLabel: ChartAxisLabel(text: "Axis title", settings: labelSettings))
- let yModel = ChartAxisModel(axisValues: yValues, axisTitleLabel: ChartAxisLabel(text: "Axis title", settings: labelSettings.defaultVertical()))
- let chartFrame = ExamplesDefaults.chartFrame(view.bounds)
- var chartSettings = ExamplesDefaults.chartSettingsWithPanZoom
- chartSettings.trailing = 20
- chartSettings.labelsToAxisSpacingX = 20
- chartSettings.labelsToAxisSpacingY = 20
- let coordsSpace = ChartCoordsSpaceLeftBottomSingleAxis(chartSettings: chartSettings, chartFrame: chartFrame, xModel: xModel, yModel: yModel)
- let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
-
- let c1 = UIColor(red: 0.1, green: 0.1, blue: 0.9, alpha: 0.4)
- let c2 = UIColor(red: 0.9, green: 0.1, blue: 0.1, alpha: 0.4)
- let c3 = UIColor(red: 0.1, green: 0.9, blue: 0.1, alpha: 0.4)
-
- let lineModel1 = ChartLineModel(chartPoints: chartPoints1, lineColor: UIColor.black, animDuration: 1, animDelay: 0)
- let lineModel2 = ChartLineModel(chartPoints: chartPoints2, lineColor: UIColor.black, animDuration: 1, animDelay: 0)
- let lineModel3 = ChartLineModel(chartPoints: chartPoints3, lineColor: UIColor.black, animDuration: 1, animDelay: 0)
-
- let chartPointsLineLayer = ChartPointsLineLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, lineModels: [lineModel1, lineModel2, lineModel3], pathGenerator: CatmullPathGenerator())
-
- let chartPointsLayer1 = ChartPointsAreaLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: chartPoints1, areaColors: [c1], animDuration: 3, animDelay: 0, addContainerPoints: true, pathGenerator: chartPointsLineLayer.pathGenerator)
- let chartPointsLayer2 = ChartPointsAreaLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: chartPoints2, areaColors: [c2], animDuration: 3, animDelay: 0, addContainerPoints: true, pathGenerator: chartPointsLineLayer.pathGenerator)
- let chartPointsLayer3 = ChartPointsAreaLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: chartPoints3, areaColors: [c3], animDuration: 3, animDelay: 0, addContainerPoints: true, pathGenerator: chartPointsLineLayer.pathGenerator)
-
- var selectedView: ChartPointTextCircleView?
-
- let circleViewGenerator = {[weak self] (chartPointModel: ChartPointLayerModel, layer: ChartPointsLayer, chart: Chart) -> UIView? in guard let weakSelf = self else {return nil}
-
- let (chartPoint, screenLoc) = (chartPointModel.chartPoint, chartPointModel.screenLoc)
-
- let v = ChartPointTextCircleView(chartPoint: chartPoint, center: screenLoc, diameter: Env.iPad ? 50 : 30, cornerRadius: Env.iPad ? 24: 15, borderWidth: Env.iPad ? 2 : 1, font: ExamplesDefaults.fontWithSize(Env.iPad ? 14 : 8))
- v.viewTapped = {view in
- for p in weakSelf.popups {p.removeFromSuperview()}
- selectedView?.selected = false
-
- let w: CGFloat = Env.iPad ? 250 : 150
- let h: CGFloat = Env.iPad ? 100 : 80
-
- if let chartViewScreenLoc = layer.containerToGlobalScreenLoc(chartPoint) {
- let x: CGFloat = {
- let attempt = chartViewScreenLoc.x - (w/2)
- let leftBound: CGFloat = chart.bounds.origin.x
- let rightBound = chart.bounds.size.width - 5
- if attempt < leftBound {
- return view.frame.origin.x
- } else if attempt + w > rightBound {
- return rightBound - w
- }
- return attempt
- }()
-
- let frame = CGRect(x: x, y: chartViewScreenLoc.y - (h + (Env.iPad ? 30 : 12)), width: w, height: h)
-
- let bubbleView = InfoBubble(point: chartViewScreenLoc, frame: frame, arrowWidth: Env.iPad ? 40 : 28, arrowHeight: Env.iPad ? 20 : 14, bgColor: UIColor.black, arrowX: chartViewScreenLoc.x - x, arrowY: -1) // TODO don't calculate this here
- chart.view.addSubview(bubbleView)
-
- bubbleView.transform = CGAffineTransform(scaleX: 0, y: 0).concatenating(CGAffineTransform(translationX: 0, y: 100))
- let infoView = UILabel(frame: CGRect(x: 0, y: 10, width: w, height: h - 30))
- infoView.textColor = UIColor.white
- infoView.backgroundColor = UIColor.black
- infoView.text = "Some text about \(chartPoint)"
- infoView.font = ExamplesDefaults.fontWithSize(Env.iPad ? 14 : 12)
- infoView.textAlignment = NSTextAlignment.center
-
- bubbleView.addSubview(infoView)
- weakSelf.popups.append(bubbleView)
-
- UIView.animate(withDuration: 0.2, delay: 0, options: UIView.AnimationOptions(), animations: {
- view.selected = true
- selectedView = view
-
- bubbleView.transform = CGAffineTransform.identity
- }, completion: {finished in})
- }
- }
-
- UIView.animate(withDuration: 0.7, delay: 0, usingSpringWithDamping: 0.6, initialSpringVelocity: 0, options: UIView.AnimationOptions(), animations: {
- let w: CGFloat = v.frame.size.width
- let h: CGFloat = v.frame.size.height
- let frame = CGRect(x: screenLoc.x - (w/2), y: screenLoc.y - (h/2), width: w, height: h)
- v.frame = frame
- }, completion: nil)
-
- return v
- }
-
- let itemsDelay: Float = 0.08
-
- // To not have circles clipped by the chart bounds, pass clipViews: false (and ChartSettings.customClipRect in case you want to clip them by other bounds)
- let chartPointsCircleLayer1 = ChartPointsViewsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: chartPoints1, viewGenerator: circleViewGenerator, displayDelay: 0.9, delayBetweenItems: itemsDelay, mode: .translate)
-
- let chartPointsCircleLayer2 = ChartPointsViewsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: chartPoints2, viewGenerator: circleViewGenerator, displayDelay: 1.8, delayBetweenItems: itemsDelay, mode: .translate)
-
- let chartPointsCircleLayer3 = ChartPointsViewsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: chartPoints3, viewGenerator: circleViewGenerator, displayDelay: 2.7, delayBetweenItems: itemsDelay, mode: .translate)
-
- let settings = ChartGuideLinesDottedLayerSettings(linesColor: UIColor.black, linesWidth: ExamplesDefaults.guidelinesWidth)
- let guidelinesLayer = ChartGuideLinesDottedLayer(xAxisLayer: xAxisLayer, yAxisLayer: yAxisLayer, settings: settings)
-
- let chart = Chart(
- frame: chartFrame,
- innerFrame: innerFrame,
- settings: chartSettings,
- layers: [
- xAxisLayer,
- yAxisLayer,
- guidelinesLayer,
- chartPointsLayer1,
- chartPointsLayer2,
- chartPointsLayer3,
- chartPointsLineLayer,
- chartPointsCircleLayer1,
- chartPointsCircleLayer2,
- chartPointsCircleLayer3
- ]
- )
-
- chart.delegate = self
-
- view.addSubview(chart.view)
- self.chart = chart
- }
-
- fileprivate func removePopups() {
- for popup in popups {
- popup.removeFromSuperview()
- }
- }
-
- // MARK: - ChartDelegate
-
- func onZoom(scaleX: CGFloat, scaleY: CGFloat, deltaX: CGFloat, deltaY: CGFloat, centerX: CGFloat, centerY: CGFloat, isGesture: Bool) {
- removePopups()
- }
-
- func onPan(transX: CGFloat, transY: CGFloat, deltaX: CGFloat, deltaY: CGFloat, isGesture: Bool, isDeceleration: Bool) {
- removePopups()
- }
-
- func onTap(_ models: [TappedChartPointLayerModels
-
-
-Ivan SchuetzMobile ••• Web
- Contact / info, other profiles: GitHub | Blog | StackOverflow
-
-
- - -
- - - - - - -
- - -
- - - - -
-
- - - - - - - -
-
- -
-
- - - - -
- - Web
- - - -
-
- -
-
- -
- -()) {u, scalar in
- return u + [axis.screenLocForScalar(scalar)]
- }
- }
-
- // smallest screen space between axis values
- open var minAxisScreenSpace: CGFloat {
- return axisValuesScreenLocs.reduce((CGFloat.greatestFiniteMagnitude, -CGFloat.greatestFiniteMagnitude)) {tuple, screenLoc in
- let minSpace = tuple.0
- let previousScreenLoc = tuple.1
- return (min(minSpace, abs(screenLoc - previousScreenLoc)), screenLoc)
- }.0
- }
-
- lazy private(set) var axisTitleLabelsHeight: CGFloat = {
- return self.axisTitleLabels.reduce(0) { sum, label in
- sum + label.textSize.height
- }
- }()
-
- lazy private(set) var axisTitleLabelsWidth: CGFloat = {
- return self.axisTitleLabels.reduce(0) { sum, label in
- sum + label.textSize.width
- }
- }()
-
- open func keepInBoundaries() {
- axis.keepInBoundaries()
- initDrawers()
- chart?.view.setNeedsDisplay()
- }
-
- var width: CGFloat {
- fatalError("override")
- }
-
- open var lineP1: CGPoint {
- fatalError("override")
- }
-
- open var lineP2: CGPoint {
- fatalError("override")
- }
-
- var height: CGFloat {
- fatalError("override")
- }
-
- open var low: Bool {
- fatalError("override")
- }
-
- /// Frame of layer after last update. This is used to detect deltas with the frame resulting from an update. Note that the layer's frame can be altered by only updating the model data (this depends on how the concrete axis layer calculates the frame), which is why this frame is not always identical to the layer's frame directly before calling udpate.
- var lastFrame: CGRect = CGRect.zero
-
- // NOTE: Assumes axis values sorted by scalar (can be increasing or decreasing)
- public required init(axis: ChartAxis, offset: CGFloat, valuesGenerator: ChartAxisValuesGenerator, labelsGenerator: ChartAxisLabelsGenerator, axisTitleLabels: [ChartAxisLabel], settings: ChartAxisSettings, labelsConflictSolver: ChartAxisLabelsConflictSolver? = nil, labelSpaceReservationMode: AxisLabelsSpaceReservationMode, clipContents: Bool) {
- self.axis = axis
- self.offset = offset
- self.valuesGenerator = valuesGenerator
- self.labelsGenerator = labelsGenerator
- self.axisTitleLabels = axisTitleLabels
- self.settings = settings
- self.labelsConflictSolver = labelsConflictSolver
- self.labelSpaceReservationMode = labelSpaceReservationMode
- self.clipContents = clipContents
- self.lastFrame = frame
-
- self.currentAxisValues = valuesGenerator.generate(axis)
- }
-
- open func update() {
- prepareUpdate()
- updateInternal()
- postUpdate()
- }
-
- fileprivate func clearDrawers() {
- lineDrawer = nil
- labelDrawers = []
- axisTitleLabelDrawers = []
- }
-
- func prepareUpdate() {
- clearDrawers()
- }
-
- func updateInternal() {
- initDrawers()
- }
-
- func postUpdate() {
- lastFrame = frame
- }
-
- open func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {
- }
-
- open func chartInitialized(chart: Chart) {
- self.chart = chart
-
- update()
- }
-
- /**
- Draws the axis' line, labels and axis title label
-
- - parameter context: The context to draw the axis contents in
- - parameter chart: The chart that this axis belongs to
- */
- open func chartViewDrawing(context: CGContext, chart: Chart) {
- func draw() {
- if settings.isAxisLineVisible {
- if let lineDrawer = lineDrawer {
- context.setLineWidth(CGFloat(settings.axisStrokeWidth))
- lineDrawer.triggerDraw(context: context, chart: chart)
- }
- }
-
- for (_, labelDrawers) in labelDrawers {
- for labelDrawer in labelDrawers {
- labelDrawer.triggerDraw(context: context, chart: chart)
- }
- }
- for axisTitleLabelDrawer in axisTitleLabelDrawers {
- axisTitleLabelDrawer.triggerDraw(context: context, chart: chart)
- }
- }
-
- if clipContents {
- context.saveGState()
- context.addRect(visibleFrame)
- context.clip()
- draw()
- context.restoreGState()
- } else {
- draw()
- }
- }
-
- open func chartContentViewDrawing(context: CGContext, chart: Chart) {}
-
- open func chartDrawersContentViewDrawing(context: CGContext, chart: Chart, view: UIView) {}
-
- open func handleGlobalTap(_ location: CGPoint) {}
-
- func initDrawers() {
- fatalError("override")
- }
-
- func generateLineDrawer(offset: CGFloat) -> ChartLineDrawer {
- fatalError("override")
- }
-
- func generateAxisTitleLabelsDrawers(offset: CGFloat) -> [ChartLabelDrawer] {
- fatalError("override")
- }
-
- /// Generates label drawers to be displayed on the screen. Calls generateDirectLabelDrawers to generate labels and passes result to an optional conflict solver, which maps the labels array to a new one such that the conflicts are solved. If there's no conflict solver returns the drawers unmodified.
- func generateLabelDrawers(offset: CGFloat) -> [ChartAxisValueLabelDrawers] {
- let directLabelDrawers = generateDirectLabelDrawers(offset: offset)
- return labelsConflictSolver.map{$0.solveConflicts(directLabelDrawers)} ?? directLabelDrawers
- }
-
- /// Generates label drawers which correspond directly to axis values. No conflict solving.
- func generateDirectLabelDrawers(offset: CGFloat) -> [ChartAxisValueLabelDrawers] {
- fatalError("override")
- }
-
- open func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- fatalError("override")
- }
-
- open func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- fatalError("override")
- }
-
- open func pan(_ deltaX: CGFloat, deltaY: CGFloat) {
- fatalError("override")
- }
-
- open func handlePanStart(_ location: CGPoint) {}
-
- open func handlePanStart() {}
-
- open func handlePanFinish() {}
-
- open func handleZoomFinish() {}
-
- open func handlePanEnd() {}
-
- open func handleZoomEnd() {}
-
- open func copy(_ axis: ChartAxis? = nil, offset: CGFloat? = nil, valuesGenerator: ChartAxisValuesGenerator? = nil, labelsGenerator: ChartAxisLabelsGenerator? = nil, axisTitleLabels: [ChartAxisLabel]? = nil, settings: ChartAxisSettings? = nil, labelsConflictSolver: ChartAxisLabelsConflictSolver? = nil, labelSpaceReservationMode: AxisLabelsSpaceReservationMode? = nil, clipContents: Bool? = nil) -> ChartAxisLayerDefault {
- return type(of: self).init(
- axis: axis ?? self.axis,
- offset: offset ?? self.offset,
- valuesGenerator: valuesGenerator ?? self.valuesGenerator,
- labelsGenerator: labelsGenerator ?? self.labelsGenerator,
- axisTitleLabels: axisTitleLabels ?? self.axisTitleLabels,
- settings: settings ?? self.settings,
- labelsConflictSolver: labelsConflictSolver ?? self.labelsConflictSolver,
- labelSpaceReservationMode: labelSpaceReservationMode ?? self.labelSpaceReservationMode,
- clipContents: clipContents ?? self.clipContents
- )
- }
-
- open func handleGlobalTap(_ location: CGPoint) -> Any? {
- guard let tapSettings = tapSettings else {return nil}
-
- if visibleFrame.contains(location) {
- if let tappedLabelDrawers = (labelDrawers.filter{$0.drawers.contains{drawer in drawer.frame.insetBy(dx: -tapSettings.expandArea.width, dy: -tapSettings.expandArea.height).contains(location)}}).first {
- tapSettings.handler?((valueLabelDrawers: tappedLabelDrawers, layer: self))
- return tappedLabelDrawers
- } else {
- return nil
- }
- } else {
- return nil
- }
- }
-
- open func processZoom(deltaX: CGFloat, deltaY: CGFloat, anchorX: CGFloat, anchorY: CGFloat) -> Bool {
- return false
- }
-
- open func processPan(location: CGPoint, deltaX: CGFloat, deltaY: CGFloat, isGesture: Bool, isDeceleration: Bool) -> Bool {
- return false
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisModel.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisModel.swift
deleted file mode 100644
index 3c4be1547..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisModel.swift
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// ChartAxisModel.swift
-// SwiftCharts
-//
-// Created by ischuetz on 22/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-public enum ChartAxisPadding {
- case label /// Add padding corresponding to half of leading / trailing label sizes
- case none
- case fixed(CGFloat) /// Set a fixed padding value
- case maxLabelFixed(CGFloat) /// Use max of padding value corresponding to .Label and a fixed value
- case labelPlus(CGFloat) /// Use .Label padding + a fixed value
-}
-
-public func ==(a: ChartAxisPadding, b: ChartAxisPadding) -> Bool {
- switch (a, b) {
- case (.label, .label): return true
- case (.fixed(let a), .fixed(let b)) where a == b: return true
- case (.maxLabelFixed(let a), .maxLabelFixed(let b)) where a == b: return true
- case (.labelPlus(let a), .labelPlus(let b)) where a == b: return true
- case (.none, .none): return true
- default: return false
- }
-}
-
-/// This class models the contents of a chart axis
-open class ChartAxisModel {
-
- let firstModelValue: Double
- let lastModelValue: Double
-
- let axisValuesGenerator: ChartAxisValuesGenerator
- let labelsGenerator: ChartAxisLabelsGenerator
-
- /// The color used to draw the axis lines
- let lineColor: UIColor
-
- /// The axis title lables
- let axisTitleLabels: [ChartAxisLabel]
-
- let labelsConflictSolver: ChartAxisLabelsConflictSolver?
-
- let leadingPadding: ChartAxisPadding
- let trailingPadding: ChartAxisPadding
-
- let labelSpaceReservationMode: AxisLabelsSpaceReservationMode
- let clipContents: Bool
-
- public convenience init(axisValues: [ChartAxisValue], lineColor: UIColor = UIColor.black, axisTitleLabel: ChartAxisLabel, labelsConflictSolver: ChartAxisLabelsConflictSolver? = nil, leadingPadding: ChartAxisPadding = .none, trailingPadding: ChartAxisPadding = .none, labelSpaceReservationMode: AxisLabelsSpaceReservationMode = .minPresentedSize, clipContents: Bool = false) {
- self.init(axisValues: axisValues, lineColor: lineColor, axisTitleLabels: [axisTitleLabel], labelsConflictSolver: labelsConflictSolver, leadingPadding: leadingPadding, trailingPadding: trailingPadding, labelSpaceReservationMode: labelSpaceReservationMode, clipContents: clipContents)
- }
-
- /// Convenience initializer to pass a fixed axis value array. The array is mapped to axis values and label generators.
- public convenience init(axisValues: [ChartAxisValue], lineColor: UIColor = UIColor.black, axisTitleLabels: [ChartAxisLabel] = [], labelsConflictSolver: ChartAxisLabelsConflictSolver? = nil, leadingPadding: ChartAxisPadding = .none, trailingPadding: ChartAxisPadding = .none, labelSpaceReservationMode: AxisLabelsSpaceReservationMode = .minPresentedSize, clipContents: Bool = false) {
- precondition(!axisValues.isEmpty, "Axis cannot be empty")
-
- var scalars: [Double] = []
- var dict = [Double: [ChartAxisLabel]]()
- for axisValue in axisValues {
- scalars.append(axisValue.scalar)
- dict[axisValue.scalar] = axisValue.labels
- }
- let (firstModelValue, lastModelValue) = (axisValues.first!.scalar, axisValues.last!.scalar)
-
- let fixedArrayGenerator = ChartAxisValuesGeneratorFixed(values: scalars)
- let fixedLabelGenerator = ChartAxisLabelsGeneratorFixed(dict: dict)
-
- self.init(lineColor: lineColor, firstModelValue: firstModelValue, lastModelValue: lastModelValue, axisTitleLabels: axisTitleLabels, axisValuesGenerator: fixedArrayGenerator, labelsGenerator: fixedLabelGenerator, labelsConflictSolver: labelsConflictSolver, leadingPadding: leadingPadding, trailingPadding: trailingPadding, labelSpaceReservationMode: labelSpaceReservationMode, clipContents: clipContents)
- }
-
- public convenience init(lineColor: UIColor = UIColor.black, firstModelValue: Double, lastModelValue: Double, axisTitleLabel: ChartAxisLabel, axisValuesGenerator: ChartAxisValuesGenerator, labelsGenerator: ChartAxisLabelsGenerator, labelsConflictSolver: ChartAxisLabelsConflictSolver? = nil, leadingPadding: ChartAxisPadding = .none, trailingPadding: ChartAxisPadding = .none, labelSpaceReservationMode: AxisLabelsSpaceReservationMode = .minPresentedSize, clipContents: Bool = false) {
- self.init(lineColor: lineColor, firstModelValue: firstModelValue, lastModelValue: lastModelValue, axisTitleLabels: [axisTitleLabel], axisValuesGenerator: axisValuesGenerator, labelsGenerator: labelsGenerator, labelsConflictSolver: labelsConflictSolver, leadingPadding: leadingPadding, trailingPadding: trailingPadding, labelSpaceReservationMode: labelSpaceReservationMode, clipContents: clipContents)
- }
-
- public init(lineColor: UIColor = UIColor.black, firstModelValue: Double, lastModelValue: Double, axisTitleLabels: [ChartAxisLabel] = [], axisValuesGenerator: ChartAxisValuesGenerator, labelsGenerator: ChartAxisLabelsGenerator, labelsConflictSolver: ChartAxisLabelsConflictSolver? = nil, leadingPadding: ChartAxisPadding = .none, trailingPadding: ChartAxisPadding = .none, labelSpaceReservationMode: AxisLabelsSpaceReservationMode = .minPresentedSize, clipContents: Bool = false) {
-
- self.lineColor = lineColor
- self.firstModelValue = firstModelValue
- self.lastModelValue = lastModelValue
- self.axisTitleLabels = axisTitleLabels
- self.axisValuesGenerator = axisValuesGenerator
- self.labelsGenerator = labelsGenerator
- self.labelsConflictSolver = labelsConflictSolver
- self.leadingPadding = leadingPadding
- self.trailingPadding = trailingPadding
- self.labelSpaceReservationMode = labelSpaceReservationMode
- self.clipContents = clipContents
- }
-}
-
-extension ChartAxisModel: CustomDebugStringConvertible {
- public var debugDescription: String {
- return [
- "firstModelValue": firstModelValue,
- "lastModelValue": lastModelValue,
- "axisTitleLabels": axisTitleLabels,
-
- ]
- .debugDescription
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValueStaticGenerator.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValueStaticGenerator.swift
deleted file mode 100644
index 6ab266cb3..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValueStaticGenerator.swift
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// ChartAxisValuesGenerator.swift
-// swift_charts
-//
-// Created by ischuetz on 12/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-public typealias ChartAxisValueStaticGenerator = (Double) -> ChartAxisValue
-
-/// Dynamic axis values generation
-public struct ChartAxisValuesStaticGenerator {
-
- /**
- Calculates the axis values that bound some chart points along the X axis
-
- Think of a segment as the "space" between two axis values.
-
- - parameter chartPoints: The chart points to bound.
- - parameter minSegmentCount: The minimum number of segments in the range of axis values. This value is prioritized over the maximum in order to prevent a conflict.
- - parameter maxSegmentCount: The maximum number of segments in the range of axis values.
- - parameter multiple: The desired width of each segment between axis values.
- - parameter axisValueGenerator: Function that converts a scalar value to an axis value.
- - parameter addPaddingSegmentIfEdge: Whether or not to add an extra value to the start and end if the first and last chart points fall exactly on the axis values.
-
- - returns: An array of axis values.
- */
- public static func generateXAxisValuesWithChartPoints(_ chartPoints: [ChartPoint], minSegmentCount: Double, maxSegmentCount: Double, multiple: Double = 10, axisValueGenerator: ChartAxisValueStaticGenerator, addPaddingSegmentIfEdge: Bool) -> [ChartAxisValue] {
- return generateAxisValuesWithChartPoints(chartPoints, minSegmentCount: minSegmentCount, maxSegmentCount: maxSegmentCount, multiple: multiple, axisValueGenerator: axisValueGenerator, addPaddingSegmentIfEdge: addPaddingSegmentIfEdge, axisPicker: {$0.x})
- }
-
- /**
- Calculates the axis values that bound some chart points along the Y axis
-
- Think of a segment as the "space" between two axis values.
-
- - parameter chartPoints: The chart points to bound.
- - parameter minSegmentCount: The minimum number of segments in the range of axis values. This value is prioritized over the maximum in order to prevent a conflict.
- - parameter maxSegmentCount: The maximum number of segments in the range of axis values.
- - parameter multiple: The desired width of each segment between axis values.
- - parameter axisValueGenerator: Function that converts a scalar value to an axis value.
- - parameter addPaddingSegmentIfEdge: Whether or not to add an extra value to the start and end if the first and last chart points fall exactly on the axis values.
-
- - returns: An array of axis values.
- */
- public static func generateYAxisValuesWithChartPoints(_ chartPoints: [ChartPoint], minSegmentCount: Double, maxSegmentCount: Double, multiple: Double = 10, axisValueGenerator: ChartAxisValueStaticGenerator, addPaddingSegmentIfEdge: Bool) -> [ChartAxisValue] {
- return generateAxisValuesWithChartPoints(chartPoints, minSegmentCount: minSegmentCount, maxSegmentCount: maxSegmentCount, multiple: multiple, axisValueGenerator: axisValueGenerator, addPaddingSegmentIfEdge: addPaddingSegmentIfEdge, axisPicker: {$0.y})
- }
-
- /**
- Calculates the axis values that bound some chart points along a particular axis dimension.
-
- Think of a segment as the "space" between two axis values.
-
- - parameter chartPoints: The chart points to bound.
- - parameter minSegmentCount: The minimum number of segments in the range of axis values. This value is prioritized over the maximum in order to prevent a conflict.
- - parameter maxSegmentCount: The maximum number of segments in the range of axis values.
- - parameter multiple: The desired width of each segment between axis values.
- - parameter axisValueGenerator: Function that converts a scalar value to an axis value.
- - parameter addPaddingSegmentIfEdge: Whether or not to add an extra value to the start and end if the first and last chart points fall exactly on the axis values.
- - parameter axisPicker: A function that maps a chart point to its value for a particular axis.
-
- - returns: An array of axis values.
- */
- fileprivate static func generateAxisValuesWithChartPoints(_ chartPoints: [ChartPoint], minSegmentCount: Double, maxSegmentCount: Double, multiple: Double = 10, axisValueGenerator: ChartAxisValueStaticGenerator, addPaddingSegmentIfEdge: Bool, axisPicker: (ChartPoint) -> ChartAxisValue) -> [ChartAxisValue] {
-
- let sortedChartPoints = chartPoints.sorted {(obj1, obj2) in
- return axisPicker(obj1).scalar < axisPicker(obj2).scalar
- }
-
- if let first = sortedChartPoints.first, let last = sortedChartPoints.last {
- return generateAxisValuesWithChartPoints(axisPicker(first).scalar, last: axisPicker(last).scalar, minSegmentCount: minSegmentCount, maxSegmentCount: maxSegmentCount, multiple: multiple, axisValueGenerator: axisValueGenerator, addPaddingSegmentIfEdge: addPaddingSegmentIfEdge)
-
- } else {
- print("Trying to generate Y axis without datapoints, returning empty array")
- return []
- }
- }
-
- /**
- Calculates the axis values that bound two values and have an optimal number of segments between them.
-
- Think of a segment as the "space" between two axis values.
-
- - parameter first: The first scalar value to bound.
- - parameter last: The last scalar value to bound.
- - parameter minSegmentCount: The minimum number of segments in the range of axis values. This value is prioritized over the maximum in order to prevent a conflict.
- - parameter maxSegmentCount: The maximum number of segments in the range of axis values.
- - parameter multiple: The desired width of each segment between axis values.
- - parameter axisValueGenerator: Function that converts a scalar value to an axis value.
- - parameter addPaddingSegmentIfEdge: Whether or not to add an extra value to the start and end if the first and last scalar values fall exactly on the axis values.
-
- - returns: An array of axis values
- */
- fileprivate static func generateAxisValuesWithChartPoints(_ first: Double, last lastPar: Double, minSegmentCount: Double, maxSegmentCount: Double, multiple: Double, axisValueGenerator: ChartAxisValueStaticGenerator, addPaddingSegmentIfEdge: Bool) -> [ChartAxisValue] {
- precondition(multiple > 0, "Invalid multiple: \(multiple)")
-
- guard lastPar >=~ first else {fatalError("Invalid range generating axis values")}
-
- let last = lastPar =~ first ? lastPar + 1 : lastPar
-
- // The first axis value will be less than or equal to the first scalar value, aligned with the desired multiple
- var firstValue = first - (first.truncatingRemainder(dividingBy: multiple))
- // The last axis value will be greater than or equal to the first scalar value, aligned with the desired multiple
- var lastValue = last + (abs(multiple - last).truncatingRemainder(dividingBy: multiple))
- var segmentSize = multiple
-
- // If there should be a padding segment added when a scalar value falls on the first or last axis value, adjust the first and last axis values
- if firstValue =~ first && addPaddingSegmentIfEdge {
- firstValue = firstValue - segmentSize
- }
- if lastValue =~ last && addPaddingSegmentIfEdge {
- lastValue = lastValue + segmentSize
- }
-
- let distance = lastValue - firstValue
- var currentMultiple = multiple
- var segmentCount = distance / currentMultiple
-
- // Find the optimal number of segments and segment width
-
- // If the number of segments is greater than desired, make each segment wider
- while segmentCount > maxSegmentCount {
- currentMultiple *= 2
- segmentCount = distance / currentMultiple
- }
- segmentCount = ceil(segmentCount)
-
- // Increase the number of segments until there are enough as desired
- while segmentCount < minSegmentCount {
- segmentCount += 1
- }
- segmentSize = currentMultiple
-
- // Generate axis values from the first value, segment size and number of segments
- let offset = firstValue
- return (0...Int(segmentCount)).map {segment in
- let scalar = offset + (Double(segment) * segmentSize)
- return axisValueGenerator(scalar)
- }
- }
-
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGenerator.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGenerator.swift
deleted file mode 100644
index 1fa7ed5ac..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGenerator.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// ChartAxisValuesGenerator.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-/// Generates axis values to be displayed
-public protocol ChartAxisValuesGenerator {
-
- var first: Double? {get}
-
- var last: Double? {get}
-
- func axisInitialized(_ axis: ChartAxis)
-
- func generate(_ axis: ChartAxis) -> [Double]
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorDate.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorDate.swift
deleted file mode 100644
index 9e3b67a51..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorDate.swift
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// ChartAxisValuesGeneratorDate.swift
-// SwiftCharts
-//
-// Created by ischuetz on 05/08/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValuesGeneratorDate: ChartAxisGeneratorMultiplier {
-
- let unit: Calendar.Component
-
- fileprivate let minSpace: CGFloat
- fileprivate let preferredDividers: Int
- fileprivate let maxTextSize: CGFloat
-
- public init(unit: Calendar.Component, preferredDividers: Int, minSpace: CGFloat, maxTextSize: CGFloat, multiplierUpdateMode: ChartAxisGeneratorMultiplierUpdateMode = .halve) {
- self.unit = unit
- self.preferredDividers = preferredDividers
- self.minSpace = minSpace
- self.maxTextSize = maxTextSize
- super.init(0, multiplierUpdateMode: multiplierUpdateMode)
- }
-
- override func calculateModelStart(_ axis: ChartAxis, multiplier: Double) -> Double {
- guard !multiplier.isNaN && !multiplier.isZero else {return Double.nan}
-
- let firstVisibleDate = Date(timeIntervalSince1970: axis.firstVisible)
- let firstInitDate = Date(timeIntervalSince1970: axis.firstInit)
-
- return firstInitDate.addComponent(Int((Double(firstVisibleDate.timeInterval(firstInitDate, unit: unit)) / multiplier)) * Int(multiplier), unit: unit).timeIntervalSince1970
- }
-
- override func incrementScalar(_ scalar: Double, multiplier: Double) -> Double {
- let scalarDate = Date(timeIntervalSince1970: scalar)
- return scalarDate.addComponent(Int(multiplier), unit: unit).timeIntervalSince1970
- }
-
- open override func axisInitialized(_ axis: ChartAxis) {
-
- var dividers = preferredDividers
- var cont = true
-
- while dividers > 1 && cont {
- if requiredLengthForDividers(dividers) < axis.screenLength {
-
- let firstDate = Date(timeIntervalSince1970: axis.first)
- let lastDate = Date(timeIntervalSince1970: axis.last)
- let lengthInUnits = lastDate.timeInterval(firstDate, unit: unit)
-
- multiplier = Double(lengthInUnits) / Double(dividers)
- cont = false
-
- } else {
- dividers -= 1
- }
- }
- }
-
- fileprivate func requiredLengthForDividers(_ dividers: Int) -> CGFloat {
- return minSpace + ((maxTextSize + minSpace) * CGFloat(dividers))
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorFixed.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorFixed.swift
deleted file mode 100644
index 0aa4afe18..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorFixed.swift
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// ChartAxisValuesGeneratorFixed.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-/// Generates a fixed axis values array
-open class ChartAxisValuesGeneratorFixed: ChartAxisValuesGenerator {
-
- open var first: Double? {
- return values.first
- }
-
- open var last: Double? {
- return values.last
- }
-
- open internal(set) var values: [Double]
-
- public convenience init(values: [ChartAxisValue]) {
- self.init(values: values.map{$0.scalar})
- }
-
- public init(values: [Double]) {
- self.values = values
- }
-
- open func axisInitialized(_ axis: ChartAxis) {}
-
- open func generate(_ axis: ChartAxis) -> [Double] {
- let (first, last) = axis.firstVisible > axis.lastVisible ? (axis.lastModelValueInBounds, axis.firstVisible) : (axis.firstVisible, axis.lastVisible)
- return values.filter{$0 >= first && $0 <= last}
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorFixedNonOverlapping.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorFixedNonOverlapping.swift
deleted file mode 100644
index 666f06ab5..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorFixedNonOverlapping.swift
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// ChartAxisValuesGeneratorFixedNonOverlapping.swift
-// SwiftCharts
-//
-// Created by ischuetz / Iain Bryson on 19/07/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValuesGeneratorFixedNonOverlapping: ChartAxisValuesGeneratorFixed {
-
- public let axisValues: [ChartAxisValue]
-
- public let maxLabelSize: CGSize
- public let totalLabelSize: CGSize
- public let spacing: CGFloat
-
- fileprivate var isX: Bool
-
- init(axisValues: [ChartAxisValue], spacing: CGFloat, isX: Bool) {
- self.axisValues = axisValues
- self.spacing = spacing
- self.isX = isX
-
- (totalLabelSize, maxLabelSize) = axisValues.calculateLabelsDimensions()
-
- super.init(values: axisValues.map{$0.scalar})
- }
-
- open override func generate(_ axis: ChartAxis) -> [Double] {
- updateAxisValues(axis)
- return super.generate(axis)
- }
-
- fileprivate func updateAxisValues(_ axis: ChartAxis) {
- values = selectNonOverlappingAxisLabels(axisValues, screenLength: axis.screenLength).map{$0.scalar}
- }
-
- fileprivate func selectNonOverlappingAxisLabels(_ axisValues: [ChartAxisValue], screenLength: CGFloat) -> [ChartAxisValue] {
-
- // Select only the x-axis labels which would prevent any overlap
- let spacePerTick = screenLength / CGFloat(axisValues.count)
-
- var filteredAxisValues: [ChartAxisValue] = []
-
- var coord: CGFloat = 0, currentLabelEnd: CGFloat = 0
- axisValues.forEach({axisValue in
- coord += spacePerTick
- if (currentLabelEnd <= coord) {
- filteredAxisValues.append(axisValue)
- currentLabelEnd = coord + (isX ? maxLabelSize.width : maxLabelSize.height) + spacing
- }
- })
-
- // Always show the last label
- if let filteredLast = filteredAxisValues.last, let axisLabelLast = axisValues.last , filteredLast != axisLabelLast {
- filteredAxisValues[filteredAxisValues.count - 1] = axisLabelLast
- }
-
- return filteredAxisValues
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorNice.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorNice.swift
deleted file mode 100644
index 3fa9a47a0..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorNice.swift
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// ChartAxisValuesGeneratorNice.swift
-// SwiftCharts
-//
-// Created by ischuetz on 04/08/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValuesGeneratorNice: ChartAxisGeneratorMultiplier {
-
- open override var first: Double? {
- return Double(minValue)
- }
-
- open override var last: Double? {
- return Double(maxValue)
- }
-
- fileprivate var minValue: Double
- fileprivate var maxValue: Double
- fileprivate let minSpace: CGFloat
- fileprivate let preferredDividers: Int
-
- fileprivate let maxTextSize: CGFloat
-
- public init(minValue: Double, maxValue: Double, preferredDividers: Int, minSpace: CGFloat, maxTextSize: CGFloat, multiplierUpdateMode: ChartAxisGeneratorMultiplierUpdateMode = .halve) {
-
- self.minValue = minValue
- self.maxValue = maxValue
-
- self.preferredDividers = preferredDividers
- self.minSpace = minSpace
-
- self.maxTextSize = maxTextSize
-
- super.init(Double.greatestFiniteMagnitude, multiplierUpdateMode: multiplierUpdateMode)
- }
-
- func niceRangeAndMultiplier(_ dividers: Int) -> (minValue: Double, maxValue: Double, multiplier: Double) {
- let niceLength = ChartNiceNumberCalculator.niceNumber(maxValue - minValue, round: true)
- let niceMultiplier = ChartNiceNumberCalculator.niceNumber(niceLength / (Double(dividers) - 1), round: true)
- let niceMinValue = floor(minValue / niceMultiplier) * niceMultiplier
- let niceMaxValue = ceil(maxValue / niceMultiplier) * niceMultiplier
- return (niceMinValue, niceMaxValue, niceMultiplier)
- }
-
- open override func axisInitialized(_ axis: ChartAxis) {
-
- var dividers = preferredDividers
- var cont = true
-
- while dividers > 1 && cont {
-
- let nice = niceRangeAndMultiplier(dividers)
-
- if requiredLengthForDividers(dividers) < axis.screenLength {
-
- minValue = nice.minValue
- maxValue = nice.maxValue
- multiplier = nice.multiplier
-
- cont = false
-
- } else {
- dividers -= 1
- }
- }
- }
-
- fileprivate func requiredLengthForDividers(_ dividers: Int) -> CGFloat {
- return minSpace + ((maxTextSize + minSpace) * CGFloat(dividers))
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorXDividers.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorXDividers.swift
deleted file mode 100644
index 57018b0f4..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorXDividers.swift
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// ChartAxisValuesGeneratorXDividers.swift
-// SwiftCharts
-//
-// Created by ischuetz on 26/07/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-open class ChartAxisValuesGeneratorXDividers: ChartAxisGeneratorMultiplier {
-
- open override var first: Double? {
- return Double(minValue)
- }
-
- open override var last: Double? {
- return Double(maxValue)
- }
-
- fileprivate var minValue: Double
- fileprivate var maxValue: Double
- fileprivate let minSpace: CGFloat
- fileprivate let nice: Bool
- fileprivate let preferredDividers: Int
-
- fileprivate let maxTextSize: CGFloat
-
- public init(minValue: Double, maxValue: Double, preferredDividers: Int, nice: Bool, formatter: NumberFormatter, font: UIFont, minSpace: CGFloat = 10, multiplierUpdateMode: ChartAxisGeneratorMultiplierUpdateMode = .halve) {
-
- self.minValue = minValue
- self.maxValue = maxValue
-
- self.nice = nice
- self.preferredDividers = preferredDividers
- self.minSpace = minSpace
-
- self.maxTextSize = ChartAxisValuesGeneratorXDividers.largestSize(minValue, maxValue: maxValue, formatter: formatter, font: font)
-
- super.init(Double.greatestFiniteMagnitude, multiplierUpdateMode: multiplierUpdateMode)
- }
-
- fileprivate static func largestSize(_ minValue: Double, maxValue: Double, formatter: NumberFormatter, font: UIFont) -> CGFloat {
-
- let minNumberTextSize = formatter.string(from: NSNumber(value: minValue))!.width(font)
- let maxNumberTextSize = formatter.string(from: NSNumber(value: maxValue))!.width(font)
-
- let minDigits = formatter.minimumFractionDigits
- let maxDigits = formatter.maximumFractionDigits
-
- let remainingWidth: CGFloat = {
- if minDigits < maxDigits {
- return (minDigits.. (min: Double, max: Double, factor: Double)? {
-
- if nice {
- let niceMinMax = nice(minValue: Double(minValue), maxValue: Double(maxValue))
- minValue = niceMinMax.minValue
- maxValue = niceMinMax.maxValue
- }
-
- let growDelta = floor(pow(10, round(log10(Double(min(abs(minValue), abs(maxValue)))))))
-
- let length = maxValue - minValue
- let maxDelta = length / 6 // try to expand range to the left/right of initial range
-
- var fittingFactorsPerDelta = [(min: Double, max: Double, factor: Double)]()
- var currentDelta: Double = 0
- var counter = 0 // just in case
- while(currentDelta < maxDelta && counter < 100) {
- let min = minValue - currentDelta
- let max = maxValue + currentDelta
- if let fittingFactor = findFittingFactor(axis, modelLength: Int(max - min)) {
- fittingFactorsPerDelta.append((min, max, Double(fittingFactor)))
- }
-
- currentDelta += growDelta // grow left and right
- counter += 1
- }
-
- var maxFittingFactorOpt: (min: Double, max: Double, factor: Double)?
- for f in fittingFactorsPerDelta {
-
- if let maxFittingFactor = maxFittingFactorOpt {
- if f.factor > maxFittingFactor.factor {
- maxFittingFactorOpt = f
- }
- } else {
- maxFittingFactorOpt = f
- }
- }
-
- return maxFittingFactorOpt
- }
-
- // inspired by d3 nice
- fileprivate func nice(minValue: Double, maxValue: Double) -> (minValue: Double, maxValue: Double) {
- let span = pow(10, round(log(maxValue - minValue)/log(10)) - 1)
- return(minValue: (floor(minValue / span) * span), maxValue: (ceil(maxValue / span) * span))
- }
-
- fileprivate func findFittingFactor(_ axis: ChartAxis, modelLength: Int) -> Int? {
-
- let factors = modelLength.primeFactors
-
- var lastFitting: Int?
-
- // look for max factor which fits
- for factor in factors {
- if minSpace + ((maxTextSize + minSpace) * CGFloat(factor)) < axis.screenLength {
- lastFitting = factor
- } else { // when labels don't fit, return the previous fitting
- return lastFitting
- }
- }
- return lastFitting
- }
-
- open override func axisInitialized(_ axis: ChartAxis) {
-
- func defaultInit() {
- let maxDividers = Int((axis.screenLength + minSpace) / (maxTextSize + minSpace))
- let dividers = min(preferredDividers, maxDividers)
- multiplier = axis.length / Double(dividers)
- }
-
- if nice {
- if let rangeAndMultiplier = calculateFittingRangeAndFactor(axis) {
- minValue = rangeAndMultiplier.min
- maxValue = rangeAndMultiplier.max
- multiplier = Double(maxValue - minValue) / Double(rangeAndMultiplier.factor)
-
- } else {
- defaultInit()
- }
- } else {
- defaultInit()
- }
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorXFixedNonOverlapping.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorXFixedNonOverlapping.swift
deleted file mode 100644
index 8fc1fd2ad..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorXFixedNonOverlapping.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// ChartAxisValuesGeneratorXFixedNonOverlapping.swift
-// SwiftCharts
-//
-// Created by ischuetz / Iain Bryson on 19/07/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValuesGeneratorXFixedNonOverlapping: ChartAxisValuesGeneratorFixedNonOverlapping {
-
- public init(axisValues: [ChartAxisValue], spacing: CGFloat = 4) {
- super.init(axisValues: axisValues, spacing: spacing, isX: true)
- }
-}
\ No newline at end of file
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorYFixedNonOverlapping.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorYFixedNonOverlapping.swift
deleted file mode 100644
index 2f734ee11..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisValuesGeneratorYFixedNonOverlapping.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// ChartAxisValuesGeneratorYFixedNonOverlapping.swift
-// SwiftCharts
-//
-// Created by ischuetz on 21/07/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValuesGeneratorYFixedNonOverlapping: ChartAxisValuesGeneratorFixedNonOverlapping {
-
- public init(axisValues: [ChartAxisValue], spacing: CGFloat = 4) {
- super.init(axisValues: axisValues, spacing: spacing, isX: false)
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisX.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisX.swift
deleted file mode 100644
index 6ff1e5bb7..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisX.swift
+++ /dev/null
@@ -1,152 +0,0 @@
-//
-// ChartAxisX.swift
-// SwiftCharts
-//
-// Created by ischuetz on 26/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisX: ChartAxis {
-
- open override var length: Double {
- return last - first
- }
-
- open override var screenLength: CGFloat {
- return lastScreen - firstScreen
- }
-
- open override var screenLengthInit: CGFloat {
- return lastScreenInit - firstScreenInit
- }
-
- open override var visibleLength: Double {
- return lastVisible - firstVisible
- }
-
- open override var visibleScreenLength: CGFloat {
- return lastVisibleScreen - firstVisibleScreen
- }
-
- open override func screenLocForScalar(_ scalar: Double) -> CGFloat {
- return firstScreen + internalScreenLocForScalar(scalar)
- }
-
- open override func innerScreenLocForScalar(_ scalar: Double) -> CGFloat {
- return internalScreenLocForScalar(scalar)
- }
-
- open override func scalarForScreenLoc(_ screenLoc: CGFloat) -> Double {
- return Double((screenLoc - firstScreen) * modelToScreenRatio) + first
- }
-
- open override func innerScalarForScreenLoc(_ screenLoc: CGFloat) -> Double {
- return Double(screenLoc * modelToScreenRatio) + first
- }
-
- open override var firstModelValueInBounds: Double {
- return firstVisible + screenToModelLength(fixedPaddingFirstScreen ?? paddingFirstScreen)
- }
-
- open override var lastModelValueInBounds: Double {
- return lastVisible - screenToModelLength(fixedPaddingLastScreen ?? paddingLastScreen)
- }
-
- override func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat, elastic: Bool) {
-
- // Zoom around center of gesture. Uses center as anchor point dividing the line in 2 segments which are scaled proportionally.
- let segment1 = centerX - firstScreen
- let segment2 = lastScreen - centerX
- let deltaSegment1 = (segment1 * x) - segment1
- let deltaSegment2 = (segment2 * x) - segment2
- let newOriginX = firstScreen - deltaSegment1
- let newEndX = lastScreen + deltaSegment2
-
- if elastic {
- firstScreen = newOriginX
- lastScreen = newEndX
- } else {
- keepInBoundaries(newOriginX, newEndX: newEndX)
- }
- }
-
- fileprivate func keepInBoundaries(_ newOriginX: CGFloat, newEndX: CGFloat) {
-
- var newOriginX = newOriginX
- var newEndX = newEndX
-
- if newEndX < lastScreenInit {
- let delta = lastScreenInit - newEndX
- newEndX = lastScreenInit
- newOriginX = newOriginX + delta
- }
-
- if newOriginX > firstScreenInit {
- let delta = newOriginX - firstScreenInit
- newOriginX = firstScreenInit
- newEndX = newEndX - delta
- }
-
- if newEndX - newOriginX > lastScreenInit - firstScreenInit { // new length > original length
- firstScreen = newOriginX
- lastScreen = newEndX
-
- // if p1 is to the right of origin, move it back
- let offsetOriginX = firstScreen - firstScreenInit
- if offsetOriginX > 0 {
- firstScreen = firstScreen - offsetOriginX
- lastScreen = lastScreen - offsetOriginX
- }
-
- } else { // possible correction
- firstScreen = firstScreenInit
- lastScreen = lastScreenInit
- }
- }
-
- override func keepInBoundaries() {
- keepInBoundaries(firstScreen, newEndX: lastScreen)
- }
-
- override func pan(_ deltaX: CGFloat, deltaY: CGFloat, elastic: Bool) {
-
- let length = screenLength
-
- let (newOriginX, newEndX): (CGFloat, CGFloat) = {
-
- if deltaX < 0 { // scrolls left
- let tryX = lastScreen + deltaX
- let endX = elastic ? tryX : max(lastScreenInit, tryX)
- let originX = endX - length
- return (originX, endX)
-
- } else if deltaX > 0 { // scrolls right
- let tryX = firstScreen + deltaX
- let originX = elastic ? tryX : min(tryX, firstScreenInit)
- let endX = originX + length
- return (originX, endX)
-
- } else {
- return (firstScreen, lastScreen)
- }
- }()
-
- firstScreen = newOriginX
- lastScreen = newEndX
- }
-
- override func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat, elastic: Bool) {
- zoom(scaleX / CGFloat(zoomFactor), y: scaleY, centerX: centerX, centerY: centerY, elastic: elastic)
- }
-
- override func toModelInner(_ screenLoc: CGFloat) -> Double {
- return Double(screenLoc - firstScreenInit - paddingFirstScreen) * innerRatio + firstInit
- }
-
- override func isInBoundaries(_ screenCenter: CGFloat, screenSize: CGSize) -> Bool {
- return screenCenter - screenSize.width / 2 >= firstVisibleScreen && screenCenter + screenSize.width / 2 <= lastVisibleScreen
- }
-
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisXHighLayerDefault.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisXHighLayerDefault.swift
deleted file mode 100644
index 686c7dc6b..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisXHighLayerDefault.swift
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// ChartAxisXHighLayerDefault.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// A ChartAxisLayer for high X axes
-class ChartAxisXHighLayerDefault: ChartAxisXLayerDefault {
-
- override var low: Bool {return false}
-
- /// The start point of the axis line.
- override var lineP1: CGPoint {
- return CGPoint(x: origin.x, y: origin.y + lineOffset)
- }
-
- /// The end point of the axis line
- override var lineP2: CGPoint {
- return CGPoint(x: end.x, y: end.y + lineOffset)
- }
-
- /// The offset of the axis labels from the edge of the axis bounds
- ///
- /// ````
- /// ─ ─ ─ ─ ▲
- /// Title │
- /// │
- /// ▼
- /// Label
- /// ````
- fileprivate var labelsOffset: CGFloat {
- return axisTitleLabelsHeight + settings.axisTitleLabelsToLabelsSpacing
- }
-
- /// The offset of the axis line from the edge of the axis bounds
- ///
- /// ````
- /// ─ ─ ─ ─ ▲
- /// Title │
- /// │
- /// │
- /// Label │
- /// │
- /// │
- /// ─────── ▼
- /// ````
- fileprivate var lineOffset: CGFloat {
- return labelsOffset + settings.labelsToAxisSpacingX + labelsTotalHeight
- }
-
- override func chartViewDrawing(context: CGContext, chart: Chart) {
- super.chartViewDrawing(context: context, chart: chart)
- }
-
- override func updateInternal() {
- guard let chart = chart else {return}
-
- super.updateInternal()
-
- if lastFrame.height != frame.height, canChangeFrameSize {
- chart.notifyAxisInnerFrameChange(xHigh: ChartAxisLayerWithFrameDelta(layer: self, delta: frame.height - lastFrame.height))
- }
- }
-
- override func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {
- super.handleAxisInnerFrameChange(xLow, yLow: yLow, xHigh: xHigh, yHigh: yHigh)
-
- // handle resizing of other high x axes
- if let xHigh = xHigh, xHigh.layer.frame.minY < frame.minY {
- offset = offset + xHigh.delta
-
- initDrawers()
- }
- }
-
- override func axisLineY(offset: CGFloat) -> CGFloat {
- return lineP1.y + settings.axisStrokeWidth / 2
- }
-
- override func initDrawers() {
- axisTitleLabelDrawers = generateAxisTitleLabelsDrawers(offset: 0)
- labelDrawers = generateLabelDrawers(offset: labelsOffset)
- lineDrawer = generateLineDrawer(offset: lineOffset)
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisXLayerDefault.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisXLayerDefault.swift
deleted file mode 100644
index f500d2717..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisXLayerDefault.swift
+++ /dev/null
@@ -1,211 +0,0 @@
-//
-// ChartAxisXLayerDefault.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// A ChartAxisLayer for X axes
-class ChartAxisXLayerDefault: ChartAxisLayerDefault {
-
- fileprivate var minTotalCalculatedRowHeights: CGFloat?
- fileprivate var maxTotalCalculatedRowHeights: CGFloat?
-
- override var origin: CGPoint {
- return CGPoint(x: axis.firstScreen, y: offset)
- }
-
- override var end: CGPoint {
- return CGPoint(x: axis.lastScreen, y: offset)
- }
-
- override var width: CGFloat {
- return axis.screenLength
- }
-
- override var visibleFrame: CGRect {
- return CGRect(x: axis.firstVisibleScreen, y: offset, width: axis.visibleScreenLength, height: height)
- }
-
- var labelsTotalHeight: CGFloat {
-
- let currentTotalHeight = rowHeights.reduce(0) {sum, height in
- sum + height + settings.labelsSpacing
- }
-
- let height: CGFloat = {
- switch labelSpaceReservationMode {
- case .minPresentedSize: return minTotalCalculatedRowHeights.maxOpt(currentTotalHeight)
- case .maxPresentedSize: return maxTotalCalculatedRowHeights.maxOpt(currentTotalHeight)
- case .fixed(let value): return value
- case .current: return currentTotalHeight
- }
- }()
-
- if !rowHeights.isEmpty {
- let (min, max): (CGFloat, CGFloat) = (minTotalCalculatedRowHeights.minOpt(currentTotalHeight), maxTotalCalculatedRowHeights.maxOpt(currentTotalHeight))
- minTotalCalculatedRowHeights = min
- maxTotalCalculatedRowHeights = max
- }
-
- return height
- }
-
- var rowHeights: [CGFloat] {
- return calculateRowHeights()
- }
-
- override var height: CGFloat {
- return labelsTotalHeight + settings.axisStrokeWidth + settings.labelsToAxisSpacingX + settings.axisTitleLabelsToLabelsSpacing + axisTitleLabelsHeight
- }
-
- override var widthWithoutLabels: CGFloat {
- return width
- }
-
- override var heightWithoutLabels: CGFloat {
- return settings.axisStrokeWidth + settings.labelsToAxisSpacingX + settings.axisTitleLabelsToLabelsSpacing + axisTitleLabelsHeight
- }
-
- override func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {
- super.handleAxisInnerFrameChange(xLow, yLow: yLow, xHigh: xHigh, yHigh: yHigh)
-
- if let yLow = yLow {
- axis.offsetFirstScreen(yLow.delta)
- initDrawers()
- }
-
- if let yHigh = yHigh {
- axis.offsetLastScreen(-yHigh.delta)
- initDrawers()
- }
- }
-
- func axisLineY(offset: CGFloat) -> CGFloat {
- fatalError("Override")
- }
-
- override func generateLineDrawer(offset: CGFloat) -> ChartLineDrawer {
- let y = axisLineY(offset: offset)
-
- // (-/+ axisStrokeWidth): Expand the line a little to the sides to form rect angle with y lines
- let p1 = CGPoint(x: axis.firstVisibleScreen - settings.axisStrokeWidth, y: y)
- let p2 = CGPoint(x: axis.lastVisibleScreen + settings.axisStrokeWidth, y: y)
- return ChartLineDrawer(p1: p1, p2: p2, color: settings.lineColor, strokeWidth: settings.axisStrokeWidth)
- }
-
- override func generateAxisTitleLabelsDrawers(offset: CGFloat) -> [ChartLabelDrawer] {
- return generateAxisTitleLabelsDrawers(axisTitleLabels, spacingLabelAxisX: settings.labelsToAxisSpacingX, spacingLabelBetweenAxis: settings.labelsSpacing, offset: offset)
- }
-
-
- fileprivate func generateAxisTitleLabelsDrawers(_ labels: [ChartAxisLabel], spacingLabelAxisX: CGFloat, spacingLabelBetweenAxis: CGFloat, offset: CGFloat) -> [ChartLabelDrawer] {
-
- let rowHeights = rowHeightsForRows(labels.map { [$0] })
-
- return labels.enumerated().map{ index, label in
-
- let rowY = calculateRowY(rowHeights: rowHeights, rowIndex: index, spacing: spacingLabelBetweenAxis)
-
- let labelWidth = label.textSizeNonRotated.width
- let x = (axis.lastScreenInit - axis.firstScreenInit) / 2 + axis.firstScreenInit - labelWidth / 2
- let y = self.offset + offset + rowY
-
- let drawer = ChartLabelDrawer(label: label, screenLoc: CGPoint(x: x, y: y))
- drawer.hidden = label.hidden
- return drawer
- }
- }
-
- // calculate row heights (max text height) for each row
- fileprivate func calculateRowHeights() -> [CGFloat] {
-
- guard !currentAxisValues.isEmpty else {return []}
-
- let axisValuesWithLabels: [(axisValue: Double, labels: [ChartAxisLabel])] = currentAxisValues.map {
- ($0, labelsGenerator.generate($0, axis: axis))
- }
-
- // organize labels in rows
- let maxRowCount = axisValuesWithLabels.reduce(-1) {maxCount, tuple in
- max(maxCount, tuple.labels.count)
- }
- let rows: [[ChartAxisLabel?]] = (0.. [ChartAxisValueLabelDrawers] {
-
- let spacingLabelBetweenAxis = settings.labelsSpacing
-
- let rowHeights = self.rowHeights
-
- // generate label drawers for each axis value and return them bundled with the respective axis value.
-
- let scalars = valuesGenerator.generate(axis)
-
- currentAxisValues = scalars
- return scalars.compactMap {scalar in
-
- let labels = labelsGenerator.generate(scalar, axis: axis)
-
- let labelDrawers: [ChartLabelDrawer] = labels.enumerated().map { index, label in
- let rowY = calculateRowY(rowHeights: rowHeights, rowIndex: index, spacing: spacingLabelBetweenAxis)
-
- let x = axis.screenLocForScalar(scalar)
- let y = self.offset + offset + rowY
-
- let labelSize = label.textSizeNonRotated
- let labelX = x - (labelSize.width / 2)
-
- let labelDrawer = ChartLabelDrawer(label: label, screenLoc: CGPoint(x: labelX, y: y))
- labelDrawer.hidden = label.hidden
- return labelDrawer
- }
- return ChartAxisValueLabelDrawers(scalar, labelDrawers)
- }
- }
-
- // Get the y offset of row relative to the y position of the first row
- fileprivate func calculateRowY(rowHeights: [CGFloat], rowIndex: Int, spacing: CGFloat) -> CGFloat {
- return Array(0.. [CGFloat] {
- return rows.map { row in
- row.compactMap { $0 }.reduce(-1) { maxHeight, label in
- return max(maxHeight, label.textSize.height)
- }
- }
- }
-
- override func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- axis.zoom(x, y: y, centerX: centerX, centerY: centerY, elastic: chart?.zoomPanSettings.elastic ?? false)
- initDrawers()
- chart?.view.setNeedsDisplay()
- }
-
- override func pan(_ deltaX: CGFloat, deltaY: CGFloat) {
- axis.pan(deltaX, deltaY: deltaY, elastic: chart?.zoomPanSettings.elastic ?? false)
- initDrawers()
- chart?.view.setNeedsDisplay()
- }
-
- override func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- axis.zoom(scaleX, scaleY: scaleY, centerX: centerX, centerY: centerY, elastic: chart?.zoomPanSettings.elastic ?? false)
- initDrawers()
- chart?.view.setNeedsDisplay()
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisXLowLayerDefault.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisXLowLayerDefault.swift
deleted file mode 100644
index 1417f124e..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisXLowLayerDefault.swift
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// ChartAxisXLowLayerDefault.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// A ChartAxisLayer for low X axes
-class ChartAxisXLowLayerDefault: ChartAxisXLayerDefault {
-
- override var low: Bool {return true}
-
- /// The start point of the axis line.
- override var lineP1: CGPoint {
- return CGPoint(x: axis.firstVisibleScreen, y: origin.y)
- }
-
- /// The end point of the axis line.
- override var lineP2: CGPoint {
- return CGPoint(x: axis.lastVisibleScreen, y: end.y)
- }
-
- override func chartViewDrawing(context: CGContext, chart: Chart) {
- super.chartViewDrawing(context: context, chart: chart)
- }
-
- override func updateInternal() {
- guard let chart = chart else {return}
- super.updateInternal()
- if lastFrame.height != frame.height {
-
- // Move drawers by delta
- let delta = frame.height - lastFrame.height
- offset -= delta
- initDrawers()
-
- if canChangeFrameSize {
- chart.notifyAxisInnerFrameChange(xLow: ChartAxisLayerWithFrameDelta(layer: self, delta: delta))
- }
-
- }
- }
-
- override func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {
- super.handleAxisInnerFrameChange(xLow, yLow: yLow, xHigh: xHigh, yHigh: yHigh)
-
- // Handle resizing of other low x axes
- if let xLow = xLow , xLow.layer.frame.maxY > frame.maxY {
- offset = offset - xLow.delta
- initDrawers()
- }
- }
-
- override func axisLineY(offset: CGFloat) -> CGFloat {
- return self.offset + offset + settings.axisStrokeWidth / 2
- }
-
- override func initDrawers() {
- lineDrawer = generateLineDrawer(offset: 0)
- let labelsOffset = settings.axisStrokeWidth + settings.labelsToAxisSpacingX
- labelDrawers = generateLabelDrawers(offset: labelsOffset)
- let definitionLabelsOffset = labelsOffset + labelsTotalHeight + settings.axisTitleLabelsToLabelsSpacing
- axisTitleLabelDrawers = generateAxisTitleLabelsDrawers(offset: definitionLabelsOffset)
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisY.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisY.swift
deleted file mode 100644
index 7bd03851c..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisY.swift
+++ /dev/null
@@ -1,159 +0,0 @@
-//
-// ChartAxisY.swift
-// SwiftCharts
-//
-// Created by ischuetz on 26/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisY: ChartAxis {
-
- open override var length: Double {
- return last - first
- }
-
- open override var screenLength: CGFloat {
- return firstScreen - lastScreen
- }
-
- open override var screenLengthInit: CGFloat {
- return firstScreenInit - lastScreenInit
- }
-
- open override var visibleLength: Double {
- return lastVisible - firstVisible
- }
-
- open override var visibleScreenLength: CGFloat {
- return firstVisibleScreen - lastVisibleScreen
- }
-
- open override func screenLocForScalar(_ scalar: Double) -> CGFloat {
- return firstScreen - internalScreenLocForScalar(scalar)
- }
-
- open override func innerScreenLocForScalar(_ scalar: Double) -> CGFloat {
- return screenLength - internalScreenLocForScalar(scalar)
- }
-
- open override func scalarForScreenLoc(_ screenLoc: CGFloat) -> Double {
- return Double(-(screenLoc - firstScreen) * modelToScreenRatio) + first
- }
-
- open override func innerScalarForScreenLoc(_ screenLoc: CGFloat) -> Double {
- return length + Double(-screenLoc * modelToScreenRatio) + first
- }
-
- open override func screenToModelLength(_ screenLength: CGFloat) -> Double {
- return super.screenToModelLength(screenLength) * -1
- }
-
- open override func modelToScreenLength(_ modelLength: Double) -> CGFloat {
- return super.modelToScreenLength(modelLength) * -1
- }
-
- open override var firstModelValueInBounds: Double {
- return firstVisible + screenToModelLength(fixedPaddingFirstScreen ?? paddingFirstScreen)
- }
-
- open override var lastModelValueInBounds: Double {
- return lastVisible - screenToModelLength(fixedPaddingLastScreen ?? paddingLastScreen)
- }
-
- override func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat, elastic: Bool) {
-
- // Zoom around center of gesture. Uses center as anchor point dividing the line in 2 segments which are scaled proportionally.
- let segment1 = firstScreen - centerY
- let segment2 = centerY - lastScreen
- let deltaSegment1 = (segment1 * y) - segment1
- let deltaSegment2 = (segment2 * y) - segment2
- let newOriginY = firstScreen + deltaSegment1
- let newEndY = lastScreen - deltaSegment2
-
- if elastic {
- firstScreen = newOriginY
- lastScreen = newEndY
- } else {
- keepInBoundaries(newOriginY, newEndX: newEndY)
- }
- }
-
- override func keepInBoundaries() {
- keepInBoundaries(firstScreen, newEndX: lastScreen)
- }
-
- fileprivate func keepInBoundaries(_ newOriginX: CGFloat, newEndX: CGFloat) {
- var newOriginY = newOriginX
- var newEndY = newEndX
-
- if newEndY > lastScreenInit {
- let delta = newEndY - lastScreenInit
- newEndY = lastScreenInit
- newOriginY = newOriginY - delta
- }
-
- if newOriginY < firstScreenInit {
- let delta = firstScreenInit - newOriginY
- newOriginY = firstScreenInit
- newEndY = newEndY + delta
- }
-
- if newOriginY - newEndY > firstScreenInit - lastScreenInit { // new length > original length
- firstScreen = newOriginY
- lastScreen = newEndY
-
- // if new origin is above origin, move it back
- let offsetOriginY = firstScreenInit - firstScreen
- if offsetOriginY > 0 {
- firstScreen = firstScreen + offsetOriginY
- lastScreen = lastScreen + offsetOriginY
- }
-
- } else { // possible correction
- firstScreen = firstScreenInit
- lastScreen = lastScreenInit
- }
- }
-
- override func pan(_ deltaX: CGFloat, deltaY: CGFloat, elastic: Bool) {
-
- let length = screenLength
-
- let (newOriginY, newEndY): (CGFloat, CGFloat) = {
-
- if deltaY < 0 { // scrolls up
- let tryY = firstScreen + deltaY
- let originY = elastic ? tryY : max(firstScreenInit, tryY)
- let endY = originY - length
- return (originY, endY)
-
- } else if deltaY > 0 { // scrolls down
- let tryY = lastScreen + deltaY
- let endY = elastic ? tryY : min(lastScreenInit, tryY)
- let originY = endY + length
- return (originY, endY)
-
- } else {
- return (firstScreen, lastScreen)
- }
- }()
-
- firstScreen = newOriginY
- lastScreen = newEndY
- }
-
- override func toModelInner(_ screenLoc: CGFloat) -> Double {
- let modelInner = Double(screenLoc - lastScreenInit - paddingLastScreen) * innerRatio + firstInit
- return lastInit - modelInner + firstInit // invert
- }
-
- override func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat, elastic: Bool) {
- zoom(scaleX, y: scaleY / CGFloat(zoomFactor), centerX: centerX, centerY: centerY, elastic: elastic)
- }
-
- override func isInBoundaries(_ screenCenter: CGFloat, screenSize: CGSize) -> Bool {
- return screenCenter - screenSize.height / 2 >= lastVisibleScreen && screenCenter + screenSize.height / 2 <= firstVisibleScreen
- }
-}
\ No newline at end of file
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisYHighLayerDefault.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisYHighLayerDefault.swift
deleted file mode 100644
index 741f57ecd..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisYHighLayerDefault.swift
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// ChartAxisYHighLayerDefault.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// A ChartAxisLayer for high Y axes
-class ChartAxisYHighLayerDefault: ChartAxisYLayerDefault {
-
- override var low: Bool {return false}
-
- /// The start point of the axis line.
- override var lineP1: CGPoint {
- return CGPoint(x: origin.x, y: axis.firstVisibleScreen)
- }
-
- /// The end point of the axis line.
- override var lineP2: CGPoint {
- return CGPoint(x: end.x, y: axis.lastVisibleScreen)
- }
-
- override func updateInternal() {
- guard let chart = chart else {return}
- super.updateInternal()
- if lastFrame.width != frame.width {
-
- // Move drawers by delta
- let delta = frame.width - lastFrame.width
- offset -= delta
- initDrawers()
-
- if canChangeFrameSize {
- chart.notifyAxisInnerFrameChange(yHigh: ChartAxisLayerWithFrameDelta(layer: self, delta: delta))
- }
- }
- }
-
-
- override func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {
- super.handleAxisInnerFrameChange(xLow, yLow: yLow, xHigh: xHigh, yHigh: yHigh)
-
- // Handle resizing of other high y axes
- if let yHigh = yHigh , yHigh.layer.frame.maxX > frame.maxX {
- offset = offset - yHigh.delta
- initDrawers()
- }
- }
-
- override func initDrawers() {
-
- lineDrawer = generateLineDrawer(offset: 0)
-
- let labelsOffset = settings.labelsToAxisSpacingY + settings.axisStrokeWidth
- labelDrawers = generateLabelDrawers(offset: labelsOffset)
- let axisTitleLabelsOffset = labelsOffset + labelsMaxWidth + settings.axisTitleLabelsToLabelsSpacing
- axisTitleLabelDrawers = generateAxisTitleLabelsDrawers(offset: axisTitleLabelsOffset)
- }
-
- override func generateLineDrawer(offset: CGFloat) -> ChartLineDrawer {
- let halfStrokeWidth = settings.axisStrokeWidth / 2 // we want that the stroke begins at the beginning of the frame, not in the middle of it
- let x = origin.x + offset + halfStrokeWidth
- let p1 = CGPoint(x: x, y: axis.firstVisibleScreen)
- let p2 = CGPoint(x: x, y: axis.lastVisibleScreen)
- return ChartLineDrawer(p1: p1, p2: p2, color: settings.lineColor, strokeWidth: settings.axisStrokeWidth)
- }
-
- override func labelsX(offset: CGFloat, labelWidth: CGFloat, textAlignment: ChartLabelTextAlignment) -> CGFloat {
- var labelsX: CGFloat
- switch textAlignment {
- case .left, .default:
- labelsX = origin.x + offset
- case .right:
- labelsX = origin.x + offset + labelsMaxWidth - labelWidth
- }
- return labelsX
- }
-
- override func axisLineX(offset: CGFloat) -> CGFloat {
- return self.offset + offset + settings.axisStrokeWidth / 2
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisYLayerDefault.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisYLayerDefault.swift
deleted file mode 100644
index e75c465e7..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisYLayerDefault.swift
+++ /dev/null
@@ -1,179 +0,0 @@
-//
-// ChartAxisYLayerDefault.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// A ChartAxisLayer for Y axes
-class ChartAxisYLayerDefault: ChartAxisLayerDefault {
-
- fileprivate var minCalculatedLabelWidth: CGFloat?
- fileprivate var maxCalculatedLabelWidth: CGFloat?
-
- override var origin: CGPoint {
- return CGPoint(x: offset, y: axis.lastScreen)
- }
-
- override var end: CGPoint {
- return CGPoint(x: offset, y: axis.firstScreen)
- }
-
- override var height: CGFloat {
- return axis.screenLength
- }
-
- override var visibleFrame: CGRect {
- return CGRect(x: offset, y: axis.lastVisibleScreen, width: width, height: axis.visibleScreenLength)
- }
-
- var labelsMaxWidth: CGFloat {
-
- let currentWidth: CGFloat = {
- if self.labelDrawers.isEmpty {
- return self.maxLabelWidth(self.currentAxisValues)
- } else {
- return self.labelDrawers.reduce(0) {maxWidth, labelDrawer in
- return max(maxWidth, labelDrawer.drawers.reduce(0) {maxWidth, drawer in
- max(maxWidth, drawer.size.width)
- })
- }
- }
- }()
-
-
- let width: CGFloat = {
- switch labelSpaceReservationMode {
- case .minPresentedSize: return minCalculatedLabelWidth.maxOpt(currentWidth)
- case .maxPresentedSize: return maxCalculatedLabelWidth.maxOpt(currentWidth)
- case .fixed(let value): return value
- case .current: return currentWidth
- }
- }()
-
- if !currentAxisValues.isEmpty {
- let (min, max): (CGFloat, CGFloat) = (minCalculatedLabelWidth.minOpt(currentWidth), maxCalculatedLabelWidth.maxOpt(currentWidth))
- minCalculatedLabelWidth = min
- maxCalculatedLabelWidth = max
- }
-
- return width
- }
-
- override var width: CGFloat {
- return labelsMaxWidth + settings.axisStrokeWidth + settings.labelsToAxisSpacingY + settings.axisTitleLabelsToLabelsSpacing + axisTitleLabelsWidth
- }
-
- override var widthWithoutLabels: CGFloat {
- return settings.axisStrokeWidth + settings.labelsToAxisSpacingY + settings.axisTitleLabelsToLabelsSpacing + axisTitleLabelsWidth
- }
-
- override var heightWithoutLabels: CGFloat {
- return height
- }
-
- override func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {
- super.handleAxisInnerFrameChange(xLow, yLow: yLow, xHigh: xHigh, yHigh: yHigh)
-
- if let xLow = xLow {
- axis.offsetFirstScreen(-xLow.delta)
- initDrawers()
- }
-
- if let xHigh = xHigh {
- axis.offsetLastScreen(xHigh.delta)
- initDrawers()
- }
-
- }
-
- override func generateAxisTitleLabelsDrawers(offset: CGFloat) -> [ChartLabelDrawer] {
-
- if let firstTitleLabel = axisTitleLabels.first {
-
- if axisTitleLabels.count > 1 {
- print("WARNING: No support for multiple definition labels on vertical axis. Using only first one.")
- }
- let axisLabel = firstTitleLabel
- let labelSize = axisLabel.textSizeNonRotated
- let axisLabelDrawer = ChartLabelDrawer(label: axisLabel, screenLoc: CGPoint(
- x: self.offset + offset,
- y: axis.lastScreenInit + ((axis.firstScreenInit - axis.lastScreenInit) / 2) - (labelSize.height / 2)))
-
- return [axisLabelDrawer]
-
- } else { // definitionLabels is empty
- return []
- }
- }
-
- override func generateDirectLabelDrawers(offset: CGFloat) -> [ChartAxisValueLabelDrawers] {
-
- var drawers: [ChartAxisValueLabelDrawers] = []
-
- let scalars = valuesGenerator.generate(axis)
- currentAxisValues = scalars
- for scalar in scalars {
- let labels = labelsGenerator.generate(scalar, axis: axis)
- let y = axis.screenLocForScalar(scalar)
- if let axisLabel = labels.first { // for now y axis supports only one label x value
- let labelSize = axisLabel.textSizeNonRotated
- let labelY = y - (labelSize.height / 2)
- let labelX = labelsX(offset: offset, labelWidth: labelSize.width, textAlignment: axisLabel.settings.textAlignment)
- let labelDrawer = ChartLabelDrawer(label: axisLabel, screenLoc: CGPoint(x: labelX, y: labelY))
-
- let labelDrawers = ChartAxisValueLabelDrawers(scalar, [labelDrawer])
- drawers.append(labelDrawers)
- }
- }
- return drawers
- }
-
- func labelsX(offset: CGFloat, labelWidth: CGFloat, textAlignment: ChartLabelTextAlignment) -> CGFloat {
- fatalError("override")
- }
-
- fileprivate func maxLabelWidth(_ axisLabels: [ChartAxisLabel]) -> CGFloat {
- return axisLabels.reduce(CGFloat(0)) {maxWidth, label in
- return max(maxWidth, label.textSizeNonRotated.width)
- }
- }
- fileprivate func maxLabelWidth(_ axisValues: [Double]) -> CGFloat {
- return axisValues.reduce(CGFloat(0)) {maxWidth, value in
- let labels = labelsGenerator.generate(value, axis: axis)
- return max(maxWidth, maxLabelWidth(labels))
- }
- }
-
- override func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- axis.zoom(x, y: y, centerX: centerX, centerY: centerY, elastic: chart?.zoomPanSettings.elastic ?? false)
- update()
- chart?.view.setNeedsDisplay()
- }
-
- override func pan(_ deltaX: CGFloat, deltaY: CGFloat) {
- axis.pan(deltaX, deltaY: deltaY, elastic: chart?.zoomPanSettings.elastic ?? false)
- update()
- chart?.view.setNeedsDisplay()
- }
-
- override func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- axis.zoom(scaleX, scaleY: scaleY, centerX: centerX, centerY: centerY, elastic: chart?.zoomPanSettings.elastic ?? false)
- update()
- chart?.view.setNeedsDisplay()
- }
-
- func axisLineX(offset: CGFloat) -> CGFloat {
- fatalError("Override")
- }
-
- override func generateLineDrawer(offset: CGFloat) -> ChartLineDrawer {
- let x = axisLineX(offset: offset)
- let p1 = CGPoint(x: x, y: axis.firstVisibleScreen)
- let p2 = CGPoint(x: x, y: axis.lastVisibleScreen)
- return ChartLineDrawer(p1: p1, p2: p2, color: settings.lineColor, strokeWidth: settings.axisStrokeWidth)
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisYLowLayerDefault.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisYLowLayerDefault.swift
deleted file mode 100644
index 4f1a46c16..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisYLowLayerDefault.swift
+++ /dev/null
@@ -1,105 +0,0 @@
-//
-// ChartAxisYLowLayerDefault.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// A ChartAxisLayer for low Y axes
-class ChartAxisYLowLayerDefault: ChartAxisYLayerDefault {
-
- override var low: Bool {return true}
-
- /// The start point of the axis line.
- override var lineP1: CGPoint {
- return CGPoint(x: origin.x + lineOffset, y: axis.firstVisibleScreen)
- }
-
- /// The end point of the axis line.
- override var lineP2: CGPoint {
- return CGPoint(x: end.x + lineOffset, y: axis.lastVisibleScreen)
- }
-
- /// The offset of the axis labels from the edge of the axis bounds
- ///
- /// Imagine the following image rotated 90 degrees counter-clockwise.
- ///
- /// ````
- /// ─ ─ ─ ─ ▲
- /// Title │
- /// │
- /// ▼
- /// Label
- /// ````
- fileprivate var labelsOffset: CGFloat {
- return axisTitleLabelsWidth + settings.axisTitleLabelsToLabelsSpacing
- }
-
- /// The offset of the axis line from the edge of the axis bounds.
- ///
- /// Imagine the following image rotated 90 degrees counter-clockwise.
- ///
- /// ````
- /// ─ ─ ─ ─ ▲
- /// Title │
- /// │
- /// │
- /// Label │
- /// │
- /// │
- /// ─────── ▼
- /// ````
- fileprivate var lineOffset: CGFloat {
- return labelsOffset + labelsMaxWidth + settings.labelsToAxisSpacingY + settings.axisStrokeWidth
- }
-
- override func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {
- super.handleAxisInnerFrameChange(xLow, yLow: yLow, xHigh: xHigh, yHigh: yHigh)
-
- // Handle resizing of other low y axes
- if let yLow = yLow , yLow.layer.frame.origin.x < origin.x {
- offset = offset + yLow.delta
- initDrawers()
- }
- }
-
- override func updateInternal() {
- guard let chart = chart else {return}
- super.updateInternal()
- if lastFrame.width != frame.width, canChangeFrameSize {
- chart.notifyAxisInnerFrameChange(yLow: ChartAxisLayerWithFrameDelta(layer: self, delta: frame.width - lastFrame.width))
- }
- }
-
- override func initDrawers() {
- axisTitleLabelDrawers = generateAxisTitleLabelsDrawers(offset: 0)
- labelDrawers = generateLabelDrawers(offset: labelsOffset)
- lineDrawer = generateLineDrawer(offset: lineOffset)
- }
-
- override func generateLineDrawer(offset: CGFloat) -> ChartLineDrawer {
- let halfStrokeWidth = settings.axisStrokeWidth / 2 // we want that the stroke ends at the end of the frame, not be in the middle of it
- let p1 = CGPoint(x: origin.x + offset - halfStrokeWidth, y: axis.firstVisibleScreen)
- let p2 = CGPoint(x: end.x + offset - halfStrokeWidth, y: axis.lastVisibleScreen)
- return ChartLineDrawer(p1: p1, p2: p2, color: settings.lineColor, strokeWidth: settings.axisStrokeWidth)
- }
-
- override func labelsX(offset: CGFloat, labelWidth: CGFloat, textAlignment: ChartLabelTextAlignment) -> CGFloat {
- let labelsXRight = origin.x + offset
- var labelsX: CGFloat
- switch textAlignment {
- case .right, .default:
- labelsX = labelsXRight + labelsMaxWidth - labelWidth
- case .left:
- labelsX = labelsXRight
- }
- return labelsX
- }
-
- override func axisLineX(offset: CGFloat) -> CGFloat {
- return self.offset + offset - settings.axisStrokeWidth / 2
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValue.swift b/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValue.swift
deleted file mode 100644
index 8c3d61b39..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValue.swift
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// ChartAxisValue.swift
-// swift_charts
-//
-// Created by ischuetz on 01/03/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/**
- A ChartAxisValue models a value along a particular chart axis. For example, two ChartAxisValues represent the two components of a ChartPoint. It has a backing Double scalar value, which provides a canonical form for all subclasses to be laid out along an axis. It also has one or more labels that are drawn in the chart.
- This class is not meant to be instantiated directly. Use one of the existing subclasses or create a new one.
- */
-open class ChartAxisValue: Equatable, Hashable, CustomStringConvertible {
-
- /// The backing value for all other types of axis values
- public let scalar: Double
- public let labelSettings: ChartLabelSettings
- public var hidden = false
-
- /// The labels that will be displayed in the chart
- open var labels: [ChartAxisLabel] {
- let axisLabel = ChartAxisLabel(text: description, settings: labelSettings)
- axisLabel.hidden = hidden
- return [axisLabel]
- }
-
- public init(scalar: Double, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.scalar = scalar
- self.labelSettings = labelSettings
- }
-
- open var copy: ChartAxisValue {
- return copy(scalar)
- }
-
- open func copy(_ scalar: Double) -> ChartAxisValue {
- return ChartAxisValue(scalar: scalar, labelSettings: labelSettings)
- }
-
- // MARK: CustomStringConvertible
-
- open var description: String {
- return String(scalar)
- }
-
- open func hash(into hasher: inout Hasher) {
- hasher.combine(self.scalar.hashValue)
- }
-}
-
-public func ==(lhs: ChartAxisValue, rhs: ChartAxisValue) -> Bool {
- return lhs.scalar =~ rhs.scalar
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueDate.swift b/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueDate.swift
deleted file mode 100644
index 5c32905ae..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueDate.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// ChartAxisValueDate.swift
-// swift_charts
-//
-// Created by ischuetz on 01/03/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValueDate: ChartAxisValue {
-
- fileprivate let formatter: (Date) -> String
-
- open var date: Date {
- return ChartAxisValueDate.dateFromScalar(scalar)
- }
-
- public init(date: Date, formatter: @escaping (Date) -> String, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.formatter = formatter
- super.init(scalar: ChartAxisValueDate.scalarFromDate(date), labelSettings: labelSettings)
- }
-
- convenience public init(date: Date, formatter: DateFormatter, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.init(date: date, formatter: { formatter.string(from: $0) }, labelSettings: labelSettings)
- }
-
- open class func dateFromScalar(_ scalar: Double) -> Date {
- return Date(timeIntervalSince1970: TimeInterval(scalar))
- }
-
- open class func scalarFromDate(_ date: Date) -> Double {
- return Double(date.timeIntervalSince1970)
- }
-
- // MARK: CustomStringConvertible
-
- override open var description: String {
- return formatter(date)
- }
-
- open override func copy(_ scalar: Double) -> ChartAxisValue {
- return ChartAxisValueDate(date: ChartAxisValueDate.dateFromScalar(scalar), formatter: formatter, labelSettings: labelSettings)
- }
-}
-
diff --git a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueDouble.swift b/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueDouble.swift
deleted file mode 100644
index a9b4b42e4..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueDouble.swift
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// ChartAxisValueDouble.swift
-// SwiftCharts
-//
-// Created by ischuetz on 30/08/15.
-// Copyright © 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValueDouble: ChartAxisValue {
-
- public let formatter: NumberFormatter
-
- public convenience init(_ int: Int, formatter: NumberFormatter = ChartAxisValueDouble.defaultFormatter, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.init(Double(int), formatter: formatter, labelSettings: labelSettings)
- }
-
- public init(_ double: Double, formatter: NumberFormatter = ChartAxisValueDouble.defaultFormatter, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.formatter = formatter
- super.init(scalar: double, labelSettings: labelSettings)
- }
-
- override open func copy(_ scalar: Double) -> ChartAxisValueDouble {
- return ChartAxisValueDouble(scalar, formatter: formatter, labelSettings: labelSettings)
- }
-
- public static var defaultFormatter: NumberFormatter = {
- let formatter = NumberFormatter()
- formatter.maximumFractionDigits = 2
- return formatter
- }()
-
- // MARK: CustomStringConvertible
-
- override open var description: String {
- return formatter.string(from: NSNumber(value: scalar))!
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueDoubleScreenLoc.swift b/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueDoubleScreenLoc.swift
deleted file mode 100644
index d8fbbe74c..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueDoubleScreenLoc.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// ChartAxisValueDoubleScreenLoc.swift
-// SwiftCharts
-//
-// Created by ischuetz on 30/08/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValueDoubleScreenLoc: ChartAxisValueDouble {
-
- fileprivate let actualDouble: Double
-
- var screenLocDouble: Double {
- return scalar
- }
-
- // screenLocFloat: model value which will be used to calculate screen position
- // actualFloat: scalar which this axis value really represents
- public init(screenLocDouble: Double, actualDouble: Double, formatter: NumberFormatter = ChartAxisValueDouble.defaultFormatter, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.actualDouble = actualDouble
- super.init(screenLocDouble, formatter: formatter, labelSettings: labelSettings)
- }
-
- // MARK: CustomStringConvertible
-
- override open var description: String {
- return formatter.string(from: NSNumber(value: actualDouble))!
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueFloat.swift b/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueFloat.swift
deleted file mode 100644
index bf73e5786..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueFloat.swift
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// ChartAxisValueFloat.swift
-// swift_charts
-//
-// Created by ischuetz on 15/03/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-@available(*, deprecated, message: "use ChartAxisValueDouble instead")
-open class ChartAxisValueFloat: ChartAxisValue {
-
- public let formatter: NumberFormatter
-
- open var float: CGFloat {
- return CGFloat(scalar)
- }
-
- public init(_ float: CGFloat, formatter: NumberFormatter = ChartAxisValueFloat.defaultFormatter, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.formatter = formatter
- super.init(scalar: Double(float), labelSettings: labelSettings)
- }
-
- override open func copy(_ scalar: Double) -> ChartAxisValueFloat {
- return ChartAxisValueFloat(CGFloat(scalar), formatter: formatter, labelSettings: labelSettings)
- }
-
- public static var defaultFormatter: NumberFormatter = {
- let formatter = NumberFormatter()
- formatter.maximumFractionDigits = 2
- return formatter
- }()
-
- // MARK: CustomStringConvertible
-
- override open var description: String {
- return formatter.string(from: NSNumber(value: Float(float)))!
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueFloatScreenLoc.swift b/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueFloatScreenLoc.swift
deleted file mode 100644
index 0ec8668e5..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueFloatScreenLoc.swift
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// ChartAxisValueFloatScreenLoc.swift
-// SwiftCharts
-//
-// Created by ischuetz on 30/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-@available(*, deprecated, message: "use ChartAxisValueDoubleScreenLoc instead")
-open class ChartAxisValueFloatScreenLoc: ChartAxisValueFloat {
-
- fileprivate let actualFloat: CGFloat
-
- var screenLocFloat: CGFloat {
- return CGFloat(scalar)
- }
-
- // screenLocFloat: model value which will be used to calculate screen position
- // actualFloat: scalar which this axis value really represents
- public init(screenLocFloat: CGFloat, actualFloat: CGFloat, formatter: NumberFormatter = ChartAxisValueFloat.defaultFormatter, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.actualFloat = actualFloat
- super.init(screenLocFloat, formatter: formatter, labelSettings: labelSettings)
- }
-
- // MARK: CustomStringConvertible
-
- override open var description: String {
- return self.formatter.string(from: NSNumber(value: Float(actualFloat)))!
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueInt.swift b/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueInt.swift
deleted file mode 100644
index 929e17eec..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueInt.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// ChartAxisValueInt.swift
-// SwiftCharts
-//
-// Created by ischuetz on 04/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValueInt: ChartAxisValue {
-
- public let int: Int
-
- public init(_ int: Int, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.int = int
- super.init(scalar: Double(int), labelSettings: labelSettings)
- }
-
- override open func copy(_ scalar: Double) -> ChartAxisValueInt {
- return ChartAxisValueInt(int, labelSettings: labelSettings)
- }
-
- // MARK: CustomStringConvertible
-
- override open var description: String {
- return String(int)
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueString.swift b/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueString.swift
deleted file mode 100644
index e5bbae9e5..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/AxisValues/ChartAxisValueString.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// ChartAxisValueString.swift
-// SwiftCharts
-//
-// Created by ischuetz on 29/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisValueString: ChartAxisValue {
-
- public let string: String
-
- public init(_ string: String = "", order: Int, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
- self.string = string
- super.init(scalar: Double(order), labelSettings: labelSettings)
- }
-
- // MARK: CustomStringConvertible
-
- override open var description: String {
- return string
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/CGPoint.swift b/Dependecies/SwiftCharts/SwiftCharts/CGPoint.swift
deleted file mode 100644
index 9d4c2aac3..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/CGPoint.swift
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// CGPoint.swift
-// SwiftCharts
-//
-// Created by ischuetz on 30/07/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-extension CGPoint {
-
- func distance(_ point: CGPoint) -> CGFloat {
- return CGFloat(hypotf(Float(x) - Float(point.x), Float(y) - Float(point.y)))
- }
-
- func add(_ point: CGPoint) -> CGPoint {
- return offset(x: point.x, y: point.y)
- }
-
- func substract(_ point: CGPoint) -> CGPoint {
- return offset(x: -point.x, y: -point.y)
- }
-
- func offset(x: CGFloat = 0, y: CGFloat = 0) -> CGPoint {
- return CGPoint(x: self.x + x, y: self.y + y)
- }
-
- func surroundingRect(_ size: CGFloat) -> CGRect {
- return CGRect(x: x - size / 2, y: y - size / 2, width: size, height: size)
- }
-
- func nearest(_ intersections: [CGPoint]) -> (distance: CGFloat, point: CGPoint)? {
- return nearest(intersections, pointMapper: {$0}).map{(distance: $0.distance, point: $0.pointMappable)}
- }
-
- /// Finds nearest object which can be mapped to a point using pointMapper function. This is convenient for objects that contain/represent a point, in order to avoid having to map to points and back.
- func nearest(_ pointMappables: [T], pointMapper: (T) -> CGPoint) -> (distance: CGFloat, pointMappable: T)? {
- var minDistancePoint: (distance: CGFloat, pointMappable: T)? = nil
- for pointMappable in pointMappables {
- let dist = distance(pointMapper(pointMappable))
- if (minDistancePoint.map{dist < $0.0}) ?? true {
- minDistancePoint = (dist, pointMappable)
- }
- }
- return minDistancePoint
- }
-
- func multiplyBy(_ value:CGFloat) -> CGPoint{
- return CGPoint(x: x * value, y: y * value)
- }
-
- func length() -> CGFloat {
- return CGFloat(sqrt(CDouble(
- x * x + y * y
- )))
- }
-
- func normalize() -> CGPoint {
- let l = length()
- return CGPoint(x: x / l, y: y / l)
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/CGRect.swift b/Dependecies/SwiftCharts/SwiftCharts/CGRect.swift
deleted file mode 100644
index 6e94683dd..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/CGRect.swift
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// CGRect.swift
-// SwiftCharts
-//
-// Created by ischuetz on 13/08/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-extension CGRect {
-
- public func insetBy(dx: CGFloat = 0, dy: CGFloat = 0, dw: CGFloat = 0, dh: CGFloat = 0) -> CGRect {
- return CGRect(
- x: origin.x + dx,
- y: origin.y + dy,
- width: width - dw - dx,
- height: height - dh - dy
- )
- }
-
- func asLinesArray() -> [(p1: CGPoint, p2: CGPoint)] {
- return [
- (p1: CGPoint(x: minX, y: minY), p2: CGPoint(x: maxX, y: minY)),
- (p1: CGPoint(x: maxX, y: minY), p2: CGPoint(x: maxX, y: maxY)),
- (p1: CGPoint(x: maxX, y: maxY), p2: CGPoint(x: minX, y: maxY)),
- (p1: CGPoint(x: minX, y: maxY), p2: CGPoint(x: minX, y: minY))
- ]
- }
- var center: CGPoint {
- return CGPoint(x: width / 2, y: height / 2)
- }
-
-
- /**
- Calculates the bounding rectangle of a rectangle after it's rotated.
-
- Source: http://stackoverflow.com/a/9168238/930450
-
- - parameter radians: The angle in radians that it's to be rotated
-
- - returns: The bounding rectangle of the rotated rectangle
- */
- public func boundingRectAfterRotating(radians: CGFloat) -> CGRect {
- return applying(CGAffineTransform(rotationAngle: radians))
- }
-
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Chart.swift b/Dependecies/SwiftCharts/SwiftCharts/Chart.swift
deleted file mode 100644
index be5abeeea..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Chart.swift
+++ /dev/null
@@ -1,807 +0,0 @@
-//
-// Chart.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// ChartSettings allows configuration of the visual layout of a chart
-public struct ChartSettings {
-
- /// Empty space in points added to the leading edge of the chart
- public var leading: CGFloat = 0
-
- /// Empty space in points added to the top edge of the chart
- public var top: CGFloat = 0
-
- /// Empty space in points added to the trailing edge of the chart
- public var trailing: CGFloat = 0
-
- /// Empty space in points added to the bottom edge of the chart
- public var bottom: CGFloat = 0
-
- /// The spacing in points between axis labels when using multiple labels for each axis value. This is currently only supported with an X axis.
- public var labelsSpacing: CGFloat = 5
-
- /// The spacing in points between X axis labels and the X axis line
- public var labelsToAxisSpacingX: CGFloat = 5
-
- /// The spacing in points between Y axis labels and the Y axis line
- public var labelsToAxisSpacingY: CGFloat = 5
-
- public var spacingBetweenAxesX: CGFloat = 15
-
- public var spacingBetweenAxesY: CGFloat = 15
-
- /// The spacing in points between axis title labels and axis labels
- public var axisTitleLabelsToLabelsSpacing: CGFloat = 5
-
- /// The stroke width in points of the axis lines
- public var axisStrokeWidth: CGFloat = 1.0
-
- public var zoomPan = ChartSettingsZoomPan()
-
- public var clipInnerFrame = true
-
- /// Define a custom clipping rect for chart layers that use containerViewUnclipped to display chart points.
- // TODO (review): this probably should be moved to ChartPointsViewsLayer
- public var customClipRect: CGRect? = nil
-
- public init() {}
-}
-
-public struct ChartSettingsZoomPan {
- public var panEnabled = false
-
- public var zoomEnabled = false
-
- public var minZoomX: CGFloat?
-
- public var minZoomY: CGFloat?
-
- public var maxZoomX: CGFloat?
-
- public var maxZoomY: CGFloat?
-
- public var gestureMode: ChartZoomPanGestureMode = .max
-
- public var elastic: Bool = false
-}
-
-public enum ChartZoomPanGestureMode {
- case onlyX // Only X axis is zoomed/panned
- case onlyY // Only Y axis is zoomed/panned
- case max // Only axis corresponding to dimension with max zoom/pan delta is zoomed/panned
- case both // Both axes are zoomed/panned
-}
-
-public protocol ChartDelegate {
-
- func onZoom(scaleX: CGFloat, scaleY: CGFloat, deltaX: CGFloat, deltaY: CGFloat, centerX: CGFloat, centerY: CGFloat, isGesture: Bool)
-
- func onPan(transX: CGFloat, transY: CGFloat, deltaX: CGFloat, deltaY: CGFloat, isGesture: Bool, isDeceleration: Bool)
-
- func onTap(_ models: [TappedChartPointLayerModels])
-}
-
-/// A Chart object is the highest level access to your chart. It has the view where all of the chart layers are drawn, which you can provide (useful if you want to position it as part of a storyboard or XIB), or it can be created for you.
-open class Chart: Pannable, Zoomable {
-
- /// The view that the chart is drawn in
- public let view: ChartView
-
- public let containerView: UIView
- public let contentView: UIView
- public let drawersContentView: UIView
- public let containerViewUnclipped: UIView
-
- /// The layers of the chart that are drawn in the view
- fileprivate let layers: [ChartLayer]
-
- open var delegate: ChartDelegate?
-
- open var transX: CGFloat {
- return contentFrame.minX
- }
-
- open var transY: CGFloat {
- return contentFrame.minY
- }
-
- open var scaleX: CGFloat {
- return contentFrame.width / containerFrame.width
- }
-
- open var scaleY: CGFloat {
- return contentFrame.height / containerFrame.height
- }
-
- open var maxScaleX: CGFloat? {
- return settings.zoomPan.maxZoomX
- }
-
- open var minScaleX: CGFloat? {
- return settings.zoomPan.minZoomX
- }
-
- open var maxScaleY: CGFloat? {
- return settings.zoomPan.maxZoomY
- }
-
- open var minScaleY: CGFloat? {
- return settings.zoomPan.minZoomY
- }
-
- /// Max possible total pan distance with current transformation
- open var currentMaxPan: CGFloat {
- return contentView.frame.height - containerView.frame.height
- }
-
- fileprivate var settings: ChartSettings
-
- open var zoomPanSettings: ChartSettingsZoomPan {
- set {
- settings.zoomPan = newValue
- configZoomPan(newValue)
- } get {
- return settings.zoomPan
- }
- }
-
- /**
- Create a new Chart with a frame and layers. A new ChartBaseView will be created for you.
-
- - parameter innerFrame: Frame comprised by axes, where the chart displays content
- - parameter settings: Chart settings
- - parameter frame: The frame used for the ChartBaseView
- - parameter layers: The layers that are drawn in the chart
-
- - returns: The new Chart
- */
- convenience public init(frame: CGRect, innerFrame: CGRect? = nil, settings: ChartSettings, layers: [ChartLayer]) {
- self.init(view: ChartBaseView(frame: frame), innerFrame: innerFrame, settings: settings, layers: layers)
- }
-
- /**
- Create a new Chart with a view and layers.
-
-
- - parameter innerFrame: Frame comprised by axes, where the chart displays content
- - parameter settings: Chart settings
- - parameter view: The view that the chart will be drawn in
- - parameter layers: The layers that are drawn in the chart
-
- - returns: The new Chart
- */
- public init(view: ChartView, innerFrame: CGRect? = nil, settings: ChartSettings, layers: [ChartLayer],
- enableTouchOnUnclippedContainer: Bool = false) {
-
- self.layers = layers
-
- self.view = view
-
- self.settings = settings
-
- let containerView = UIView(frame: innerFrame ?? view.bounds)
-
- let drawersContentView = ChartContentView(frame: containerView.bounds)
- drawersContentView.backgroundColor = UIColor.clear
- containerView.addSubview(drawersContentView)
-
- let contentView = ChartContentView(frame: containerView.bounds)
- contentView.backgroundColor = UIColor.clear
- containerView.addSubview(contentView)
-
- containerView.clipsToBounds = settings.clipInnerFrame
- view.addSubview(containerView)
-
- // TODO consider moving this view to ChartPointsViewsLayer (together with customClipRect setting) and create it on demand.
- // then `enableTouchOnUnclippedContainer` can also be removed from `Chart`
- containerViewUnclipped = UIView(frame: containerView.bounds)
- view.addSubview(containerViewUnclipped)
- containerViewUnclipped.isUserInteractionEnabled = enableTouchOnUnclippedContainer
- if let customClipRect = settings.customClipRect {
- let shape = CAShapeLayer()
- shape.path = UIBezierPath(rect: customClipRect).cgPath
- containerViewUnclipped.layer.mask = shape
- }
-
- self.contentView = contentView
- self.drawersContentView = drawersContentView
- self.containerView = containerView
- contentView.chart = self
- drawersContentView.chart = self
-
- self.view.chart = self
-
- for layer in self.layers {
- layer.chartInitialized(chart: self)
- }
-
- self.view.setNeedsDisplay()
-
- #if !os(tvOS)
- view.initRecognizers(settings)
- #endif
-
- configZoomPan(settings.zoomPan)
- }
-
- fileprivate func configZoomPan(_ settings: ChartSettingsZoomPan) {
- if settings.minZoomX != nil || settings.minZoomY != nil {
- zoom(scaleX: settings.minZoomX ?? 1, scaleY: settings.minZoomY ?? 1, anchorX: 0, anchorY: 0)
- }
- }
-
- public required init(coder aDecoder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-
- /**
- Adds a subview to the chart's content view
-
- - parameter view: The subview to add to the chart's content view
- */
- open func addSubview(_ view: UIView) {
- contentView.addSubview(view)
- }
-
- open func addSubviewNoTransform(_ view: UIView) {
- containerView.addSubview(view)
- }
-
- open func addSubviewNoTransformUnclipped(_ view: UIView) {
- containerViewUnclipped.addSubview(view)
- }
-
- /// The frame of the chart's view
- open var frame: CGRect {
- return view.frame
- }
-
- var containerFrame: CGRect {
- return containerView.frame
- }
-
- // Implementation details free variable name & backwards compatibility
- open var innerFrame: CGRect {
- return containerFrame
- }
-
- open var contentFrame: CGRect {
- return contentView.frame
- }
-
- /// The bounds of the chart's view
- open var bounds: CGRect {
- return view.bounds
- }
-
- /**
- Removes the chart's view from its superview
- */
- open func clearView() {
- view.removeFromSuperview()
- }
-
- open func update() {
- for layer in layers {
- layer.update()
- }
- self.view.setNeedsDisplay()
- }
-
- func notifyAxisInnerFrameChange(xLow: ChartAxisLayerWithFrameDelta? = nil, yLow: ChartAxisLayerWithFrameDelta? = nil, xHigh: ChartAxisLayerWithFrameDelta? = nil, yHigh: ChartAxisLayerWithFrameDelta? = nil) {
- for layer in layers {
- layer.handleAxisInnerFrameChange(xLow, yLow: yLow, xHigh: xHigh, yHigh: yHigh)
- }
-
- handleAxisInnerFrameChange(xLow, yLow: yLow, xHigh: xHigh, yHigh: yHigh)
- }
-
- fileprivate func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {
- let previousContentFrame = contentView.frame
-
- // Resize container view
- containerView.frame = containerView.frame.insetBy(dx: yLow.deltaDefault0, dy: xHigh.deltaDefault0, dw: yHigh.deltaDefault0, dh: xLow.deltaDefault0)
- containerViewUnclipped.frame = containerView.frame
-
- // Change dimensions of content view by total delta of container view
- contentView.frame = CGRect(x: contentView.frame.origin.x, y: contentView.frame.origin.y, width: contentView.frame.width - (yLow.deltaDefault0 + yHigh.deltaDefault0), height: contentView.frame.height - (xLow.deltaDefault0 + xHigh.deltaDefault0))
-
- // Scale contents of content view
- var widthChangeFactor: CGFloat = 0
- if previousContentFrame.width.isZero == false {
- widthChangeFactor = contentView.frame.width / previousContentFrame.width
- }
- var heightChangeFactor: CGFloat = 0
- if previousContentFrame.height.isZero == false {
- heightChangeFactor = contentView.frame.height / previousContentFrame.height
- }
- let frameBeforeScale = contentView.frame
- contentView.transform = CGAffineTransform(scaleX: contentView.transform.a * widthChangeFactor, y: contentView.transform.d * heightChangeFactor)
- contentView.frame = frameBeforeScale
- }
-
- open func onZoomStart(deltaX: CGFloat, deltaY: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- for layer in layers {
- layer.zoom(deltaX, y: deltaY, centerX: centerX, centerY: centerY)
- }
- }
-
- open func onZoomStart(scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- for layer in layers {
- layer.zoom(scaleX, scaleY: scaleY, centerX: centerX, centerY: centerY)
- }
- }
-
- open func onZoomFinish(scaleX: CGFloat, scaleY: CGFloat, deltaX: CGFloat, deltaY: CGFloat, centerX: CGFloat, centerY: CGFloat, isGesture: Bool) {
- for layer in layers {
- layer.handleZoomFinish()
- }
- delegate?.onZoom(scaleX: scaleX, scaleY: scaleY, deltaX: deltaX, deltaY: deltaY, centerX: centerX, centerY: centerY, isGesture: isGesture)
- }
-
- open func onPanStart(deltaX: CGFloat, deltaY: CGFloat) {
- for layer in layers {
- layer.pan(deltaX, deltaY: deltaY)
- }
- }
-
- open func onPanStart(location: CGPoint) {
- for layer in layers {
- layer.handlePanStart(location)
- }
- }
-
- open func onPanEnd() {
- for layer in layers {
- layer.handlePanEnd()
- }
- }
-
- open func onZoomEnd() {
- for layer in layers {
- layer.handleZoomEnd()
- }
- }
-
- open func onPanFinish(transX: CGFloat, transY: CGFloat, deltaX: CGFloat, deltaY: CGFloat, isGesture: Bool, isDeceleration: Bool) {
- for layer in layers {
- layer.handlePanFinish()
- }
- delegate?.onPan(transX: transX, transY: transY, deltaX: deltaX, deltaY: deltaY, isGesture: isGesture, isDeceleration: isDeceleration)
- }
-
- func onTap(_ location: CGPoint) {
- var models = [TappedChartPointLayerModels]()
- for layer in layers {
- if let chartPointsLayer = layer as? ChartPointsLayer {
- if let tappedModels = chartPointsLayer.handleGlobalTap(location) as? TappedChartPointLayerModels {
- models.append(tappedModels)
- }
- } else {
- layer.handleGlobalTap(location)
- }
- }
- delegate?.onTap(models)
- }
-
- open func resetPanZoom() {
- zoom(scaleX: minScaleX ?? 1, scaleY: minScaleY ?? 1, anchorX: 0, anchorY: 0)
-
- // TODO exact numbers.
- // Chart needs unified functionality to get/set current transform matrix independently of implementation details like contentView or axes transform, which are separate.
- // Currently the axes and the content view basically manage the transform separately
- // For more details, see http://stackoverflow.com/questions/41337146/apply-transform-matrix-to-core-graphics-drawing-and-subview
- pan(deltaX: 10000, deltaY: 10000, isGesture: false, isDeceleration: false, elastic: false)
-
- keepInBoundaries()
- for layer in layers {
- layer.keepInBoundaries()
- }
- }
-
- /**
- Draws the chart's layers in the chart view
-
- - parameter rect: The rect that needs to be drawn
- */
- fileprivate func drawRect(_ rect: CGRect) {
- guard let context = UIGraphicsGetCurrentContext() else {return}
- for layer in self.layers {
- layer.chartViewDrawing(context: context, chart: self)
- }
- }
-
- fileprivate func drawContentViewRect(_ rect: CGRect, sender: ChartContentView) {
- guard let context = UIGraphicsGetCurrentContext() else {return}
- if sender == drawersContentView {
- for layer in layers {
- layer.chartDrawersContentViewDrawing(context: context, chart: self, view: sender)
- }
- } else if sender == contentView {
- for layer in layers {
- layer.chartContentViewDrawing(context: context, chart: self)
- }
- drawersContentView.setNeedsDisplay()
- }
- }
-
- func allowPan(location: CGPoint, deltaX: CGFloat, deltaY: CGFloat, isGesture: Bool, isDeceleration: Bool) -> Bool {
- var someLayerProcessedPan = false
- for layer in layers {
- if layer.processPan(location: location, deltaX: deltaX, deltaY: deltaY, isGesture: isGesture, isDeceleration: isDeceleration) {
- someLayerProcessedPan = true
- }
- }
- return !someLayerProcessedPan
- }
-
- func allowZoom(deltaX: CGFloat, deltaY: CGFloat, anchorX: CGFloat, anchorY: CGFloat) -> Bool {
- var someLayerProcessedZoom = false
- for layer in layers {
- if layer.processZoom(deltaX: deltaX, deltaY: deltaY, anchorX: anchorX, anchorY: anchorY) {
- someLayerProcessedZoom = true
- }
- }
- return !someLayerProcessedZoom
- }
-}
-
-
-open class ChartContentView: UIView {
-
- weak var chart: Chart?
-
- override open func draw(_ rect: CGRect) {
- self.chart?.drawContentViewRect(rect, sender: self)
- }
-}
-
-/// A UIView subclass for drawing charts
-open class ChartBaseView: ChartView {
-
- override open func draw(_ rect: CGRect) {
- self.chart?.drawRect(rect)
- }
-}
-
-open class ChartView: UIView, UIGestureRecognizerDelegate {
-
- /// The chart that will be drawn in this view
- weak var chart: Chart?
-
- fileprivate var lastPanTranslation: CGPoint?
- fileprivate var isPanningX: Bool? // true: x, false: y
-
- override public init(frame: CGRect) {
- super.init(frame: frame)
- sharedInit()
- }
-
- required public init?(coder aDecoder: NSCoder) {
- super.init(coder: aDecoder)
- sharedInit()
- }
-
- /**
- Initialization code shared between all initializers
- */
- func sharedInit() {
- backgroundColor = UIColor.clear
- }
-
-
- #if !os(tvOS)
-
- // MARK: Interactivity
-
- fileprivate var pinchRecognizer: UIPinchGestureRecognizer?
- fileprivate var panRecognizer: UIPanGestureRecognizer?
- fileprivate var tapRecognizer: UITapGestureRecognizer?
-
- func initRecognizers(_ settings: ChartSettings) {
- if settings.zoomPan.zoomEnabled {
- let pinchRecognizer = UIPinchGestureRecognizer(target: self, action: #selector(ChartView.onPinch(_:)))
- pinchRecognizer.delegate = self
- addGestureRecognizer(pinchRecognizer)
- self.pinchRecognizer = pinchRecognizer
- }
-
- if settings.zoomPan.panEnabled {
- let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(ChartView.onPan(_:)))
- panRecognizer.delegate = self
- addGestureRecognizer(panRecognizer)
- self.panRecognizer = panRecognizer
- }
-
- let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(ChartView.onTap(_:)))
- tapRecognizer.delegate = self
- tapRecognizer.cancelsTouchesInView = false
- addGestureRecognizer(tapRecognizer)
- self.tapRecognizer = tapRecognizer
- }
-
- fileprivate var zoomCenter: CGPoint?
-
- @objc func onPinch(_ sender: UIPinchGestureRecognizer) {
-
- guard let chartSettings = chart?.settings, chartSettings.zoomPan.zoomEnabled else {return}
-
- switch sender.state {
- case .began:
- zoomCenter = nil
- fallthrough
-
- case .changed:
- guard sender.numberOfTouches > 1 else {return}
-
- let center = zoomCenter ?? {
- let center = sender.location(in: self)
- zoomCenter = center
- return center
- }()
-
- let x = abs(sender.location(in: self).x - sender.location(ofTouch: 1, in: self).x)
- let y = abs(sender.location(in: self).y - sender.location(ofTouch: 1, in: self).y)
-
- let (deltaX, deltaY): (CGFloat, CGFloat) = {
- switch chartSettings.zoomPan.gestureMode {
- case .onlyX: return (sender.scale, 1)
- case .onlyY: return (1, sender.scale)
- case .max: return x > y ? (sender.scale, 1) : (1, sender.scale)
- case .both:
- // calculate scale x and scale y
- let (absMax, absMin) = x > y ? (abs(x), abs(y)) : (abs(y), abs(x))
- let minScale = (absMin * (sender.scale - 1) / absMax) + 1
- return x > y ? (sender.scale, minScale) : (minScale, sender.scale)
- }
- }()
- chart?.zoom(deltaX: deltaX, deltaY: deltaY, centerX: center.x, centerY: center.y, isGesture: true)
-
- case .ended:
- guard let center = zoomCenter, let chart = chart else {print("No center or chart"); return}
-
- let adjustBoundsVelocity: CGFloat = 0.2
-
- let minScaleX = chart.settings.zoomPan.minZoomX ?? 1
- let minScaleY = chart.settings.zoomPan.minZoomY ?? 1
-
- func outOfBoundsOffsets(_ limit: Bool) -> (x: CGFloat, y: CGFloat) {
- let scaleX = chart.scaleX
- var x: CGFloat?
- if scaleX < minScaleX {
- x = limit ? min(1 + adjustBoundsVelocity, minScaleX / scaleX) : minScaleX / scaleX
- }
- if x == minScaleX {
- x = nil
- }
-
- let scaleY = chart.scaleY
- var y: CGFloat?
- if scaleY < minScaleY {
- y = limit ? min(1 + adjustBoundsVelocity, minScaleY / scaleY) : minScaleY / scaleY
- }
- if y == minScaleY {
- y = nil
- }
-
- return (x ?? 1, y ?? 1)
- }
-
-
- func adjustBoundsRec(_ counter: Int) {
- // FIXME
- if counter > 400 {
- let (xOffset, yOffset) = outOfBoundsOffsets(false)
- chart.zoom(deltaX: xOffset, deltaY: yOffset, centerX: center.x, centerY: center.y, isGesture: true)
- return
- }
-
- DispatchQueue.main.async {
-
- let (xOffset, yOffset) = outOfBoundsOffsets(true)
-
- if xOffset != 1 || yOffset != 1 {
- chart.zoom(deltaX: xOffset, deltaY: yOffset, centerX: center.x, centerY: center.y, isGesture: true)
- adjustBoundsRec(counter + 1)
- }
- }
- }
-
- @discardableResult
- func adjustBounds() -> Bool {
- let (xOffset, yOffset) = outOfBoundsOffsets(true)
-
- guard (xOffset != 1 || yOffset != 1) else {
- if chart.scaleX =~ minScaleX || chart.scaleY =~ minScaleY {
- chart.pan(deltaX: chart.scaleX =~ minScaleY ? -chart.contentView.frame.minX : 0, deltaY: chart.scaleY =~ minScaleY ? -chart.contentView.frame.minY : 0, isGesture: false, isDeceleration: false, elastic: chart.zoomPanSettings.elastic)
- }
- return false
- }
-
- adjustBoundsRec(0)
-
- return true
- }
-
- if chart.zoomPanSettings.elastic {
- adjustBounds()
- }
-
- chart.onZoomEnd()
-
- case .cancelled:
- chart?.onZoomEnd()
- case .failed:
- fallthrough
- default:
- break
- }
-
- sender.scale = 1.0
- }
-
- @objc func onPan(_ sender: UIPanGestureRecognizer) {
-
- guard let chartSettings = chart?.settings , chartSettings.zoomPan.panEnabled else {return}
-
- func finalPanDelta(deltaX: CGFloat, deltaY: CGFloat) -> (deltaX: CGFloat, deltaY: CGFloat) {
- switch chartSettings.zoomPan.gestureMode {
- case .onlyX: return (deltaX, 0)
- case .onlyY: return (0, deltaY)
- case .max:
- if isPanningX == nil {
- isPanningX = abs(deltaX) > abs(deltaY)
- }
- return isPanningX! ? (deltaX, 0) : (0, deltaY)
- case .both: return (deltaX, deltaY)
- }
- }
-
- switch sender.state {
-
- case .began:
- lastPanTranslation = nil
- isPanningX = nil
-
- chart?.onPanStart(location: sender.location(in: self))
-
- case .changed:
-
- let trans = sender.translation(in: self)
-
- let location = sender.location(in: self)
-
- var deltaX = lastPanTranslation.map{trans.x - $0.x} ?? trans.x
- let deltaY = lastPanTranslation.map{trans.y - $0.y} ?? trans.y
-
- var (finalDeltaX, finalDeltaY) = finalPanDelta(deltaX: deltaX, deltaY: deltaY)
-
- lastPanTranslation = trans
-
- if (chart?.allowPan(location: location, deltaX: finalDeltaX, deltaY: finalDeltaY, isGesture: true, isDeceleration: false)) ?? false {
- chart?.pan(deltaX: finalDeltaX, deltaY: finalDeltaY, isGesture: true, isDeceleration: false, elastic: chart?.zoomPanSettings.elastic ?? false)
- }
-
- case .ended:
-
- guard let view = sender.view, let chart = chart else {print("No view or chart"); return}
-
-
- let velocityX = sender.velocity(in: sender.view).x
- let velocityY = sender.velocity(in: sender.view).y
-
- let (finalDeltaX, finalDeltaY) = finalPanDelta(deltaX: velocityX, deltaY: velocityY)
-
- let location = sender.location(in: self)
-
- func next(_ velocityX: CGFloat, velocityY: CGFloat) {
- DispatchQueue.main.async {
-
- chart.pan(deltaX: velocityX, deltaY: velocityY, isGesture: true, isDeceleration: true, elastic: chart.zoomPanSettings.elastic)
-
- if abs(velocityX) > 0.1 || abs(velocityY) > 0.1 {
- let friction: CGFloat = 0.9
-
- next(velocityX * friction, velocityY: velocityY * friction)
-
- } else {
- if chart.zoomPanSettings.elastic {
- adjustBounds()
- }
- }
- }
- }
-
-
- let adjustBoundsVelocity: CGFloat = 20
-
- func outOfBoundsOffsets(_ limit: Bool) -> (x: CGFloat, y: CGFloat) {
- var x: CGFloat?
- if chart.contentView.frame.minX > 0 {
- x = limit ? max(-adjustBoundsVelocity, -chart.contentView.frame.minX) : -chart.contentView.frame.minX
- } else {
- let offset = chart.contentView.frame.maxX - chart.containerView.frame.width
- if offset < 0 {
- x = limit ? min(adjustBoundsVelocity, -offset) : -offset
- }
- }
-
- var y: CGFloat?
- if chart.contentView.frame.minY > 0 {
- y = limit ? max(-adjustBoundsVelocity, -chart.contentView.frame.minY) : -chart.contentView.frame.minY
- } else {
- let offset = chart.contentView.frame.maxY - chart.containerView.frame.height
- if offset < 0 {
- y = limit ? min(adjustBoundsVelocity, -offset) : -offset
- }
- }
-
- // Drop possile values < epsilon, this causes endless loop since adding them to the view translation apparently is a no-op
- let roundDecimals: CGFloat = 1000000000
- x = x.map{($0 * roundDecimals) / roundDecimals}.flatMap{$0 =~ 0 ? 0 : x}
- y = y.map{($0 * roundDecimals) / roundDecimals}.flatMap{$0 =~ 0 ? 0 : y}
-
- return (x ?? 0, y ?? 0)
- }
-
- func adjustBoundsRec(_ counter: Int) {
-
- // FIXME
- if counter > 400 {
- let (xOffset, yOffset) = outOfBoundsOffsets(false)
- chart.pan(deltaX: xOffset, deltaY: yOffset, isGesture: true, isDeceleration: false, elastic: chart.zoomPanSettings.elastic)
- return
- }
-
- DispatchQueue.main.async {
- let (xOffset, yOffset) = outOfBoundsOffsets(true)
-
- if xOffset != 0 || yOffset != 0 {
- chart.pan(deltaX: xOffset, deltaY: yOffset, isGesture: true, isDeceleration: false, elastic: chart.zoomPanSettings.elastic)
- adjustBoundsRec(counter + 1)
- }
- }
- }
-
- @discardableResult
- func adjustBounds() -> Bool {
- let (xOffset, yOffset) = outOfBoundsOffsets(true)
-
- guard (xOffset != 0 || yOffset != 0) else {return false}
- adjustBoundsRec(0)
-
- return true
- }
-
- let initFriction: CGFloat = 50
-
- if (chart.allowPan(location: location, deltaX: finalDeltaX, deltaY: finalDeltaY, isGesture: true, isDeceleration: false)) {
- if (chart.zoomPanSettings.elastic && !adjustBounds()) || !chart.zoomPanSettings.elastic {
- next(finalDeltaX / initFriction, velocityY: finalDeltaY / initFriction)
- }
- }
-
- chart.onPanEnd()
-
- case .cancelled, .failed:
- fallthrough
- case .possible:
-// sender.state = UIGestureRecognizerState.Changed
- fallthrough
- @unknown default:
- break
- }
- }
-
- @objc func onTap(_ sender: UITapGestureRecognizer) {
- chart?.onTap(sender.location(in: self))
- }
- #endif
-
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/ChartAxisValueArray.swift b/Dependecies/SwiftCharts/SwiftCharts/ChartAxisValueArray.swift
deleted file mode 100644
index 0733515ef..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/ChartAxisValueArray.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// ChartAxisValue.swift
-// SwiftCharts
-//
-// Created by ischuetz on 26/07/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-extension Array where Element: ChartAxisValue {
-
- func calculateLabelsDimensions() -> (total: CGSize, max: CGSize) {
- return compactMap({
- guard let label = $0.labels.first else {return nil}
- return label.textSizeNonRotated
- }).reduce((total: CGSize.zero, max: CGSize.zero), {(lhs: (total: CGSize, max: CGSize), rhs: CGSize) in
- return (
- CGSize(width: lhs.total.width + rhs.width, height: lhs.total.height + rhs.height),
- CGSize(width: Swift.max(lhs.max.width, rhs.width), height: Swift.max(lhs.max.height, rhs.height))
- )
- })
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/ChartCoordsSpace.swift b/Dependecies/SwiftCharts/SwiftCharts/ChartCoordsSpace.swift
deleted file mode 100644
index ffe30c878..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/ChartCoordsSpace.swift
+++ /dev/null
@@ -1,365 +0,0 @@
-//
-// ChartCoordsSpace.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/**
- A ChartCoordsSpace calculates the chart's inner frame and generates the axis layers based on given axis models, chart size and chart settings. In doing so it's able to calculate the frame for the inner area of the chart where points, bars, lines, etc. are drawn to represent data.
-
- ````
- ┌────────────────────────────────────────────────┐
- │ ChartSettings.top │
- │ ┌────┬────────────────────────────────┬────┐ │
- │ │ │ X │ │ │
- │ │ │ high │ │ │
- │ ├────┼────────────────────────────────┼────┤ │
- │ │ │ │ │ │
- │ │ │ │ │ │
- │ │ │ │ │ │
- │ │ │ │ │ │
- ChartSettings.leading ──┼▶ │ Y │ Chart Inner Frame │ Y │ ◀┼── ChartSettings.trailing
- │ │low │ │high│ │
- │ │ │ │ │ │
- │ │ │ │ │ │
- │ ├────┼────────────────────────────────┼────┤ │
- │ │ │ X │ │ │
- │ │ │ low │ │ │
- │ └────┴────────────────────────────────┴────┘ │
- │ ChartSettings.bottom │
- └────────────────────────────────────────────────┘
- │─────────────────── chartSize ──────────────────│
- ````
- */
-open class ChartCoordsSpace {
-
- public typealias ChartAxisLayerModel = (p1: CGPoint, p2: CGPoint, firstModelValue: Double, lastModelValue: Double, axisValuesGenerator: ChartAxisValuesGenerator, labelsGenerator: ChartAxisLabelsGenerator, axisTitleLabels: [ChartAxisLabel], settings: ChartAxisSettings, labelsConflictSolver: ChartAxisLabelsConflictSolver?, leadingPadding: ChartAxisPadding, trailingPadding: ChartAxisPadding, labelSpaceReservationMode: AxisLabelsSpaceReservationMode, clipContents: Bool)
- public typealias ChartAxisLayerGenerator = (ChartAxisLayerModel) -> ChartAxisLayer
-
- fileprivate let chartSettings: ChartSettings
- fileprivate let chartSize: CGSize
-
- open fileprivate(set) var chartInnerFrame: CGRect = CGRect.zero
-
- fileprivate let yLowModels: [ChartAxisModel]
- fileprivate let yHighModels: [ChartAxisModel]
- fileprivate let xLowModels: [ChartAxisModel]
- fileprivate let xHighModels: [ChartAxisModel]
-
- fileprivate let yLowGenerator: ChartAxisLayerGenerator
- fileprivate let yHighGenerator: ChartAxisLayerGenerator
- fileprivate let xLowGenerator: ChartAxisLayerGenerator
- fileprivate let xHighGenerator: ChartAxisLayerGenerator
-
- open fileprivate(set) var yLowAxesLayers: [ChartAxisLayer] = []
- open fileprivate(set) var yHighAxesLayers: [ChartAxisLayer] = []
- open fileprivate(set) var xLowAxesLayers: [ChartAxisLayer] = []
- open fileprivate(set) var xHighAxesLayers: [ChartAxisLayer] = []
-
- /**
- A convenience initializer with default axis layer generators
-
- - parameter chartSettings: The chart layout settings
- - parameter chartSize: The desired size of the chart
- - parameter yLowModels: The chart axis model used to generate the Y low axis
- - parameter yHighModels: The chart axis model used to generate the Y high axis
- - parameter xLowModels: The chart axis model used to generate the X low axis
- - parameter xHighModels: The chart axis model used to generate the X high axis
-
- - returns: The coordinate space with generated axis layers
- */
- public convenience init(chartSettings: ChartSettings, chartSize: CGSize, yLowModels: [ChartAxisModel] = [], yHighModels: [ChartAxisModel] = [], xLowModels: [ChartAxisModel] = [], xHighModels: [ChartAxisModel] = []) {
-
- func calculatePaddingValues(_ axis: ChartAxis, model: ChartAxisLayerModel, dimensionExtractor: @escaping (CGSize) -> CGFloat) -> (CGFloat, CGFloat) {
-
- func paddingForAxisValue(_ axisValueMaybe: Double?) -> CGFloat {
- return axisValueMaybe.map{model.labelsGenerator.generate($0, axis: axis)}?.first.map{dimensionExtractor($0.textSize) / 2} ?? 0
- }
-
- func calculatePadding(_ padding: ChartAxisPadding, axisValueMaybe: Double?) -> CGFloat {
- switch padding {
- case .label: return paddingForAxisValue(axisValueMaybe)
- case .labelPlus(let plus): return paddingForAxisValue(axisValueMaybe) + plus
- case .maxLabelFixed(let length): return max(paddingForAxisValue(axisValueMaybe), length)
- case .fixed(let length): return length
- case .none: return 0
- }
- }
-
- let axisValues: [Double] = {
- switch (model.leadingPadding, model.trailingPadding) {
- case (.label, _): fallthrough
- case (_, .label): fallthrough
- case (.labelPlus, _): fallthrough
- case (_, .labelPlus): fallthrough
- case (.maxLabelFixed(_), _): fallthrough
- case (_, .maxLabelFixed(_)): return model.axisValuesGenerator.generate(axis)
- default: return []
- }
- }()
-
- return (
- calculatePadding(model.leadingPadding, axisValueMaybe: axisValues.first),
- calculatePadding(model.trailingPadding, axisValueMaybe: axisValues.last)
- )
- }
-
- let yLowGenerator: ChartAxisLayerGenerator = {model in
- let tmpAxis = ChartAxisY(first: model.firstModelValue, last: model.lastModelValue, firstScreen: model.p1.y, lastScreen: model.p2.y)
- model.axisValuesGenerator.axisInitialized(tmpAxis)
- let tmpAxis2 = ChartAxisY(first: model.axisValuesGenerator.first ?? model.firstModelValue, last: model.axisValuesGenerator.last ?? model.lastModelValue, firstScreen: model.p1.y, lastScreen: model.p2.y)
- let (firstPadding, lastPadding) = calculatePaddingValues(tmpAxis2, model: model, dimensionExtractor: {$0.height})
- let axis = ChartAxisY(first: model.axisValuesGenerator.first ?? model.firstModelValue, last: model.axisValuesGenerator.last ?? model.lastModelValue, firstScreen: model.p1.y, lastScreen: model.p2.y, paddingFirstScreen: firstPadding, paddingLastScreen: lastPadding)
- return ChartAxisYLowLayerDefault(axis: axis, offset: model.p1.x, valuesGenerator: model.axisValuesGenerator, labelsGenerator: model.labelsGenerator, axisTitleLabels: model.axisTitleLabels, settings: model.settings, labelsConflictSolver: model.labelsConflictSolver, labelSpaceReservationMode: model.labelSpaceReservationMode, clipContents: model.clipContents)
- }
- let yHighGenerator: ChartAxisLayerGenerator = {model in
- let tmpAxis = ChartAxisY(first: model.firstModelValue, last: model.lastModelValue, firstScreen: model.p1.y, lastScreen: model.p2.y)
- model.axisValuesGenerator.axisInitialized(tmpAxis)
- let tmpAxis2 = ChartAxisY(first: model.axisValuesGenerator.first ?? model.firstModelValue, last: model.axisValuesGenerator.last ?? model.lastModelValue, firstScreen: model.p1.y, lastScreen: model.p2.y)
- let (firstPadding, lastPadding) = calculatePaddingValues(tmpAxis2, model: model, dimensionExtractor: {$0.height})
- let axis = ChartAxisY(first: model.axisValuesGenerator.first ?? model.firstModelValue, last: model.axisValuesGenerator.last ?? model.lastModelValue, firstScreen: model.p1.y, lastScreen: model.p2.y, paddingFirstScreen: firstPadding, paddingLastScreen: lastPadding)
- return ChartAxisYHighLayerDefault(axis: axis, offset: model.p1.x, valuesGenerator: model.axisValuesGenerator, labelsGenerator: model.labelsGenerator, axisTitleLabels: model.axisTitleLabels, settings: model.settings, labelsConflictSolver: model.labelsConflictSolver, labelSpaceReservationMode: model.labelSpaceReservationMode, clipContents: model.clipContents)
- }
- let xLowGenerator: ChartAxisLayerGenerator = {model in
- let tmpAxis = ChartAxisX(first: model.firstModelValue, last: model.lastModelValue, firstScreen: model.p1.x, lastScreen: model.p2.x)
- model.axisValuesGenerator.axisInitialized(tmpAxis)
- let tmpAxis2 = ChartAxisX(first: model.axisValuesGenerator.first ?? model.firstModelValue, last: model.axisValuesGenerator.last ?? model.lastModelValue, firstScreen: model.p1.x, lastScreen: model.p2.x)
- let (firstPadding, lastPadding) = calculatePaddingValues(tmpAxis2, model: model, dimensionExtractor: {$0.width})
- let axis = ChartAxisX(first: model.axisValuesGenerator.first ?? model.firstModelValue, last: model.axisValuesGenerator.last ?? model.lastModelValue, firstScreen: model.p1.x, lastScreen: model.p2.x, paddingFirstScreen: firstPadding, paddingLastScreen: lastPadding)
- return ChartAxisXLowLayerDefault(axis: axis, offset: model.p1.y, valuesGenerator: model.axisValuesGenerator, labelsGenerator: model.labelsGenerator, axisTitleLabels: model.axisTitleLabels, settings: model.settings, labelsConflictSolver: model.labelsConflictSolver, labelSpaceReservationMode: model.labelSpaceReservationMode, clipContents: model.clipContents)
- }
- let xHighGenerator: ChartAxisLayerGenerator = {model in
- let tmpAxis = ChartAxisX(first: model.firstModelValue, last: model.lastModelValue, firstScreen: model.p1.x, lastScreen: model.p2.x)
- model.axisValuesGenerator.axisInitialized(tmpAxis)
- let tmpAxis2 = ChartAxisX(first: model.axisValuesGenerator.first ?? model.firstModelValue, last: model.axisValuesGenerator.last ?? model.lastModelValue, firstScreen: model.p1.x, lastScreen: model.p2.x)
- let (firstPadding, lastPadding) = calculatePaddingValues(tmpAxis2, model: model, dimensionExtractor: {$0.width})
- let axis = ChartAxisX(first: model.axisValuesGenerator.first ?? model.firstModelValue, last: model.axisValuesGenerator.last ?? model.lastModelValue, firstScreen: model.p1.x, lastScreen: model.p2.x, paddingFirstScreen: firstPadding, paddingLastScreen: lastPadding)
- return ChartAxisXHighLayerDefault(axis: axis, offset: model.p1.y, valuesGenerator: model.axisValuesGenerator, labelsGenerator: model.labelsGenerator, axisTitleLabels: model.axisTitleLabels, settings: model.settings, labelsConflictSolver: model.labelsConflictSolver, labelSpaceReservationMode: model.labelSpaceReservationMode, clipContents: model.clipContents)
- }
-
- self.init(chartSettings: chartSettings, chartSize: chartSize, yLowModels: yLowModels, yHighModels: yHighModels, xLowModels: xLowModels, xHighModels: xHighModels, yLowGenerator: yLowGenerator, yHighGenerator: yHighGenerator, xLowGenerator: xLowGenerator, xHighGenerator: xHighGenerator)
- }
-
- public init(chartSettings: ChartSettings, chartSize: CGSize, yLowModels: [ChartAxisModel], yHighModels: [ChartAxisModel], xLowModels: [ChartAxisModel], xHighModels: [ChartAxisModel], yLowGenerator: @escaping ChartAxisLayerGenerator, yHighGenerator: @escaping ChartAxisLayerGenerator, xLowGenerator: @escaping ChartAxisLayerGenerator, xHighGenerator: @escaping ChartAxisLayerGenerator) {
- self.chartSettings = chartSettings
- self.chartSize = chartSize
-
- self.yLowModels = yLowModels
- self.yHighModels = yHighModels
- self.xLowModels = xLowModels
- self.xHighModels = xHighModels
-
- self.yLowGenerator = yLowGenerator
- self.yHighGenerator = yHighGenerator
- self.xLowGenerator = xLowGenerator
- self.xHighGenerator = xHighGenerator
-
- chartInnerFrame = calculateChartInnerFrame()
-
- self.yLowAxesLayers = generateYLowAxes()
- self.yHighAxesLayers = generateYHighAxes()
- self.xLowAxesLayers = generateXLowAxes()
- self.xHighAxesLayers = generateXHighAxes()
- }
-
-
- fileprivate func generateYLowAxes() -> [ChartAxisLayer] {
- return generateYAxisShared(axisModels: yLowModels, offset: chartSettings.leading, generator: yLowGenerator)
- }
-
- fileprivate func generateYHighAxes() -> [ChartAxisLayer] {
- let chartFrame = chartInnerFrame
- return generateYAxisShared(axisModels: yHighModels, offset: chartFrame.origin.x + chartFrame.width, generator: yHighGenerator)
- }
-
- fileprivate func generateXLowAxes() -> [ChartAxisLayer] {
- let chartFrame = chartInnerFrame
- let y = chartFrame.origin.y + chartFrame.height
- return self.generateXAxesShared(axisModels: xLowModels, offset: y, generator: xLowGenerator)
- }
-
- fileprivate func generateXHighAxes() -> [ChartAxisLayer] {
- return generateXAxesShared(axisModels: xHighModels, offset: chartSettings.top, generator: xHighGenerator)
- }
-
- /**
- Uses a generator to make X axis layers from axis models. This method is used for both low and high X axes.
-
- - parameter axisModels: The models used to generate the axis layers
- - parameter offset: The offset in points for the generated layers
- - parameter generator: The generator used to create the layers
-
- - returns: An array of ChartAxisLayers
- */
- fileprivate func generateXAxesShared(axisModels: [ChartAxisModel], offset: CGFloat, generator: ChartAxisLayerGenerator) -> [ChartAxisLayer] {
- let chartFrame = chartInnerFrame
- let chartSettings = self.chartSettings
- let x = chartFrame.origin.x
- let length = chartFrame.width
-
- return generateAxisShared(axisModels: axisModels, offset: offset, boundingPointsCreator: {offset in
- (p1: CGPoint(x: x, y: offset), p2: CGPoint(x: x + length, y: offset))
- }, nextLayerOffset: {layer in
- layer.frameWithoutLabels.height + chartSettings.spacingBetweenAxesX
- }, generator: generator)
- }
-
- /**
- Uses a generator to make Y axis layers from axis models. This method is used for both low and high Y axes.
-
- - parameter axisModels: The models used to generate the axis layers
- - parameter offset: The offset in points for the generated layers
- - parameter generator: The generator used to create the layers
-
- - returns: An array of ChartAxisLayers
- */
- fileprivate func generateYAxisShared(axisModels: [ChartAxisModel], offset: CGFloat, generator: ChartAxisLayerGenerator) -> [ChartAxisLayer] {
- let chartFrame = chartInnerFrame
- let chartSettings = self.chartSettings
- let y = chartFrame.origin.y
- let length = chartFrame.height
-
- return generateAxisShared(axisModels: axisModels, offset: offset, boundingPointsCreator: {offset in
- (p1: CGPoint(x: offset, y: y + length), p2: CGPoint(x: offset, y: y))
- }, nextLayerOffset: {layer in
- layer.frameWithoutLabels.width + chartSettings.spacingBetweenAxesY
- }, generator: generator)
- }
-
- /**
- Uses a generator to make axis layers from axis models. This method is used for all axes.
-
- - parameter axisModels: The models used to generate the axis layers
- - parameter offset: The offset in points for the generated layers
- - parameter boundingPointsCreator: A closure that creates a tuple containing the location of the smallest and largest values along the axis. For example, boundingPointsCreator for a Y axis might return a value like (p1: CGPoint(x, 0), p2: CGPoint(x, 100)), where x is the offset of the axis layer.
- - parameter nextLayerOffset: A closure that returns the offset of the next axis layer relative to the current layer
- - parameter generator: The generator used to create the layers
-
- - returns: An array of ChartAxisLayers
- */
- fileprivate func generateAxisShared(axisModels: [ChartAxisModel], offset: CGFloat, boundingPointsCreator: @escaping (_ offset: CGFloat) -> (p1: CGPoint, p2: CGPoint), nextLayerOffset: @escaping (ChartAxisLayer) -> CGFloat, generator: ChartAxisLayerGenerator) -> [ChartAxisLayer] {
-
- let chartSettings = self.chartSettings
-
- return axisModels.reduce((axes: Array(), x: offset)) {tuple, chartAxisModel in
- let layers = tuple.axes
- let x: CGFloat = tuple.x
- let axisSettings = ChartAxisSettings(chartSettings)
- axisSettings.lineColor = chartAxisModel.lineColor
- let points = boundingPointsCreator(x)
- let layer = generator((p1: points.p1, p2: points.p2, firstModelValue: chartAxisModel.firstModelValue, lastModelValue: chartAxisModel.lastModelValue, axisValuesGenerator: chartAxisModel.axisValuesGenerator, labelsGenerator: chartAxisModel.labelsGenerator, axisTitleLabels: chartAxisModel.axisTitleLabels, settings: axisSettings, labelsConflictSolver: chartAxisModel.labelsConflictSolver, leadingPadding: chartAxisModel.leadingPadding, trailingPadding: chartAxisModel.trailingPadding, labelSpaceReservationMode: chartAxisModel.labelSpaceReservationMode, clipContents: chartAxisModel.clipContents))
- return (
- axes: layers + [layer],
- x: x + nextLayerOffset(layer)
- )
- }.0
- }
-
- /**
- Calculates the inner frame of the chart, which in short is the area where your points, bars, lines etc. are drawn. In order to calculate this frame the axes will be generated.
-
- - returns: The inner frame as a CGRect
- */
- fileprivate func calculateChartInnerFrame() -> CGRect {
-
- let totalDim = {(axisLayers: [ChartAxisLayer], dimPicker: (ChartAxisLayer) -> CGFloat, spacingBetweenAxes: CGFloat) -> CGFloat in
- return axisLayers.reduce((CGFloat(0), CGFloat(0))) {tuple, chartAxisLayer in
- let totalDim = tuple.0 + tuple.1
- return (totalDim + dimPicker(chartAxisLayer), spacingBetweenAxes)
- }.0
- }
-
- func totalWidth(_ axisLayers: [ChartAxisLayer]) -> CGFloat {
- return totalDim(axisLayers, {$0.frame.width}, chartSettings.spacingBetweenAxesY)
- }
-
- func totalHeight(_ axisLayers: [ChartAxisLayer]) -> CGFloat {
- return totalDim(axisLayers, {$0.frame.height}, chartSettings.spacingBetweenAxesX)
- }
-
- let yLowWidth = totalWidth(generateYLowAxes())
- let yHighWidth = totalWidth(generateYHighAxes())
- let xLowHeight = totalHeight(generateXLowAxes())
- let xHighHeight = totalHeight(generateXHighAxes())
-
- let leftWidth = yLowWidth + chartSettings.leading
- let topHeigth = xHighHeight + chartSettings.top
- let rightWidth = yHighWidth + chartSettings.trailing
- let bottomHeight = xLowHeight + chartSettings.bottom
-
- return CGRect(
- x: leftWidth,
- y: topHeigth,
- width: chartSize.width - leftWidth - rightWidth,
- height: chartSize.height - topHeigth - bottomHeight
- )
- }
-}
-
-/// A ChartCoordsSpace subclass specifically for a chart with axes along the left and bottom edges
-open class ChartCoordsSpaceLeftBottomSingleAxis {
-
- public let yAxisLayer: ChartAxisLayer
- public let xAxisLayer: ChartAxisLayer
- public let chartInnerFrame: CGRect
-
- public init(chartSettings: ChartSettings, chartFrame: CGRect, xModel: ChartAxisModel, yModel: ChartAxisModel) {
- let coordsSpaceInitializer = ChartCoordsSpace(chartSettings: chartSettings, chartSize: chartFrame.size, yLowModels: [yModel], xLowModels: [xModel])
- self.chartInnerFrame = coordsSpaceInitializer.chartInnerFrame
-
- self.yAxisLayer = coordsSpaceInitializer.yLowAxesLayers[0]
- self.xAxisLayer = coordsSpaceInitializer.xLowAxesLayers[0]
- }
-}
-
-/// A ChartCoordsSpace subclass specifically for a chart with axes along the left and top edges
-open class ChartCoordsSpaceLeftTopSingleAxis {
-
- public let yAxisLayer: ChartAxisLayer
- public let xAxisLayer: ChartAxisLayer
- public let chartInnerFrame: CGRect
-
- public init(chartSettings: ChartSettings, chartFrame: CGRect, xModel: ChartAxisModel, yModel: ChartAxisModel) {
- let coordsSpaceInitializer = ChartCoordsSpace(chartSettings: chartSettings, chartSize: chartFrame.size, yLowModels: [yModel], xHighModels: [xModel])
- self.chartInnerFrame = coordsSpaceInitializer.chartInnerFrame
-
- self.yAxisLayer = coordsSpaceInitializer.yLowAxesLayers[0]
- self.xAxisLayer = coordsSpaceInitializer.xHighAxesLayers[0]
- }
-}
-
-/// A ChartCoordsSpace subclass specifically for a chart with axes along the right and bottom edges
-open class ChartCoordsSpaceRightBottomSingleAxis {
-
- public let yAxisLayer: ChartAxisLayer
- public let xAxisLayer: ChartAxisLayer
- public let chartInnerFrame: CGRect
-
- public init(chartSettings: ChartSettings, chartFrame: CGRect, xModel: ChartAxisModel, yModel: ChartAxisModel) {
- let coordsSpaceInitializer = ChartCoordsSpace(chartSettings: chartSettings, chartSize: chartFrame.size, yHighModels: [yModel], xLowModels: [xModel])
- self.chartInnerFrame = coordsSpaceInitializer.chartInnerFrame
-
- self.yAxisLayer = coordsSpaceInitializer.yHighAxesLayers[0]
- self.xAxisLayer = coordsSpaceInitializer.xLowAxesLayers[0]
- }
-}
-
-/// A ChartCoordsSpace subclass specifically for a chart with axes along the right and top edges
-open class ChartCoordsSpaceRightTopSingleAxis {
-
- public let yAxisLayer: ChartAxisLayer
- public let xAxisLayer: ChartAxisLayer
- public let chartInnerFrame: CGRect
-
- public init(chartSettings: ChartSettings, chartFrame: CGRect, xModel: ChartAxisModel, yModel: ChartAxisModel) {
- let coordsSpaceInitializer = ChartCoordsSpace(chartSettings: chartSettings, chartSize: chartFrame.size, yHighModels: [yModel], xHighModels: [xModel])
- self.chartInnerFrame = coordsSpaceInitializer.chartInnerFrame
-
- self.yAxisLayer = coordsSpaceInitializer.yHighAxesLayers[0]
- self.xAxisLayer = coordsSpaceInitializer.xHighAxesLayers[0]
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/ChartLineModel.swift b/Dependecies/SwiftCharts/SwiftCharts/ChartLineModel.swift
deleted file mode 100644
index 81bbfb379..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/ChartLineModel.swift
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// ChartLineModel.swift
-// swift_charts
-//
-// Created by ischuetz on 11/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// Models a line to be drawn in a chart based on an array of chart points.
-public struct ChartLineModel {
-
- /// The array of chart points that the line should be drawn with. In a simple case this would be drawn as straight line segments connecting each point.
- public let chartPoints: [T]
-
- /// The color(s) that the line is drawn with
- public let lineColors: [UIColor]
-
- /// The width of the line in points
- public let lineWidth: CGFloat
-
- public let lineJoin: LineJoin
-
- public let lineCap: LineCap
-
- /// The duration in seconds of the animation that is run when the line appears
- public let animDuration: Float
-
- /// The delay in seconds before the animation runs
- public let animDelay: Float
-
- /// The dash pattern for the line
- public let dashPattern: [Double]?
-
- public init(chartPoints: [T], lineColors: [UIColor], lineWidth: CGFloat = 1, lineJoin: LineJoin = .round, lineCap: LineCap = .round, animDuration: Float, animDelay: Float, dashPattern: [Double]? = nil) {
- self.chartPoints = chartPoints
- self.lineColors = lineColors
- self.lineWidth = lineWidth
- self.lineJoin = lineJoin
- self.lineCap = lineCap
- self.animDuration = animDuration
- self.animDelay = animDelay
- self.dashPattern = dashPattern
- }
-
- public init(chartPoints: [T], lineColor: UIColor, lineWidth: CGFloat = 1, lineJoin: LineJoin = .round, lineCap: LineCap = .round, animDuration: Float, animDelay: Float, dashPattern: [Double]? = nil) {
- self.init(chartPoints: chartPoints, lineColors: [lineColor], lineWidth: lineWidth, lineJoin: lineJoin, lineCap: lineCap, animDuration: animDuration, animDelay: animDelay, dashPattern: dashPattern)
- }
- /// The number of chart points in the model
- var chartPointsCount: Int {
- return chartPoints.count
- }
-
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/ChartPoint/ChartPoint.swift b/Dependecies/SwiftCharts/SwiftCharts/ChartPoint/ChartPoint.swift
deleted file mode 100644
index 5fbb202f6..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/ChartPoint/ChartPoint.swift
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// ChartPoint.swift
-// swift_charts
-//
-// Created by ischuetz on 01/03/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartPoint: Hashable, Equatable, CustomStringConvertible {
-
- public let x: ChartAxisValue
- public let y: ChartAxisValue
-
- required public init(x: ChartAxisValue, y: ChartAxisValue) {
- self.x = x
- self.y = y
- }
-
- open var description: String {
- return "\(x), \(y)"
- }
-
- open func hash(into hasher: inout Hasher) {
- let hash = 31 &* x.hashValue &+ y.hashValue
- hasher.combine(hash)
- }
-}
-
-public func ==(lhs: ChartPoint, rhs: ChartPoint) -> Bool {
- return lhs.x == rhs.x && lhs.y == rhs.y
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/ChartPoint/ChartPointBubble.swift b/Dependecies/SwiftCharts/SwiftCharts/ChartPoint/ChartPointBubble.swift
deleted file mode 100644
index 5e67fd578..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/ChartPoint/ChartPointBubble.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// ChartPointBubble.swift
-// Examples
-//
-// Created by ischuetz on 17/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartPointBubble: ChartPoint {
- public let diameterScalar: Double
- public let bgColor: UIColor
- public let borderColor: UIColor
-
- public init(x: ChartAxisValue, y: ChartAxisValue, diameterScalar: Double, bgColor: UIColor, borderColor: UIColor = UIColor.black) {
- self.diameterScalar = diameterScalar
- self.bgColor = bgColor
- self.borderColor = borderColor
- super.init(x: x, y: y)
- }
-
- required public init(x: ChartAxisValue, y: ChartAxisValue) {
- fatalError("init(x:y:) has not been implemented")
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/ChartPoint/ChartPointCandleStick.swift b/Dependecies/SwiftCharts/SwiftCharts/ChartPoint/ChartPointCandleStick.swift
deleted file mode 100644
index 6ab0c4473..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/ChartPoint/ChartPointCandleStick.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// ChartPointCandleStick.swift
-// SwiftCharts
-//
-// Created by ischuetz on 28/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartPointCandleStick: ChartPoint {
-
- public let date: Date
- public let open: Double
- public let close: Double
- public let low: Double
- public let high: Double
-
- public init(date: Date, formatter: DateFormatter, high: Double, low: Double, open: Double, close: Double, labelHidden: Bool = false) {
-
- let x = ChartAxisValueDate(date: date, formatter: formatter)
- self.date = date
- x.hidden = labelHidden
-
- let highY = ChartAxisValueDouble(high)
- self.high = high
- self.low = low
- self.open = open
- self.close = close
-
- super.init(x: x, y: highY)
- }
-
- required public init(x: ChartAxisValue, y: ChartAxisValue) {
- fatalError("init(x:y:) has not been implemented")
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/ChartViewsConflictSolver.swift b/Dependecies/SwiftCharts/SwiftCharts/ChartViewsConflictSolver.swift
deleted file mode 100644
index 174bb45cc..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/ChartViewsConflictSolver.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// ChartViewsConflictSolver.swift
-// SwiftCharts
-//
-// Created by ischuetz on 30/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// For now as class, which in this case is acceptable. Protocols currently don't work very well with generics.
-open class ChartViewsConflictSolver {
-
- /**
- Repositions views if they overlap
-
- - parameter views: The views to check for overlap and resolve
- */
- func solveConflicts(views: [ChartPointsViewsLayer.ViewWithChartPoint]) {}
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Convenience/BarsChart.swift b/Dependecies/SwiftCharts/SwiftCharts/Convenience/BarsChart.swift
deleted file mode 100644
index f3c655c68..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Convenience/BarsChart.swift
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// BarsChart.swift
-// Examples
-//
-// Created by ischuetz on 19/07/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class BarsChartConfig: ChartConfig {
- public let valsAxisConfig: ChartAxisConfig
- public let xAxisLabelSettings: ChartLabelSettings
- public let yAxisLabelSettings: ChartLabelSettings
-
- public init(chartSettings: ChartSettings = ChartSettings(), valsAxisConfig: ChartAxisConfig, xAxisLabelSettings: ChartLabelSettings = ChartLabelSettings(), yAxisLabelSettings: ChartLabelSettings = ChartLabelSettings(), guidelinesConfig: GuidelinesConfig = GuidelinesConfig()) {
- self.valsAxisConfig = valsAxisConfig
- self.xAxisLabelSettings = xAxisLabelSettings
- self.yAxisLabelSettings = yAxisLabelSettings
-
- super.init(chartSettings: chartSettings, guidelinesConfig: guidelinesConfig)
- }
-}
-
-open class BarsChart: Chart {
-
- public init(frame: CGRect, chartConfig: BarsChartConfig, xTitle: String, yTitle: String, bars barModels: [(String, Double)], color: UIColor, barWidth: CGFloat, animDuration: Float = 0.5, animDelay: Float = 0.5, horizontal: Bool = false) {
-
- let zero = ChartAxisValueDouble(0)
- let bars: [ChartBarModel] = barModels.enumerated().map { index, barModel in
- return ChartBarModel(constant: ChartAxisValueDouble(index), axisValue1: zero, axisValue2: ChartAxisValueDouble(barModel.1), bgColor: color)
- }
-
- let valAxisValues = stride(from: chartConfig.valsAxisConfig.from, through: chartConfig.valsAxisConfig.to, by: chartConfig.valsAxisConfig.by).map{ChartAxisValueDouble($0, labelSettings : chartConfig.xAxisLabelSettings)}
- let labelAxisValues = [ChartAxisValueString(order: -1)] + barModels.enumerated().map{ index, tuple in
- ChartAxisValueString(tuple.0, order: index, labelSettings : chartConfig.xAxisLabelSettings)
- } + [ChartAxisValueString(order: barModels.count)]
-
- let (xValues, yValues): ([ChartAxisValue], [ChartAxisValue]) = horizontal ? (valAxisValues, labelAxisValues) : (labelAxisValues, valAxisValues)
-
- let xModel = ChartAxisModel(axisValues: xValues, axisTitleLabel: ChartAxisLabel(text: xTitle, settings: chartConfig.xAxisLabelSettings))
- let yModel = ChartAxisModel(axisValues: yValues, axisTitleLabel: ChartAxisLabel(text: yTitle, settings: chartConfig.xAxisLabelSettings.defaultVertical()))
- let coordsSpace = ChartCoordsSpaceLeftBottomSingleAxis(chartSettings: chartConfig.chartSettings, chartFrame: frame, xModel: xModel, yModel: yModel)
- let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
-
- let barViewSettings = ChartBarViewSettings(animDuration: animDuration, animDelay: animDelay)
-
- let barsLayer: ChartLayer = ChartBarsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, bars: bars, horizontal: horizontal, barWidth: barWidth, settings: barViewSettings)
-
- let guidelinesLayer = GuidelinesDefaultLayerGenerator.generateOpt(xAxisLayer: xAxisLayer, yAxisLayer: yAxisLayer, guidelinesConfig: chartConfig.guidelinesConfig)
-
- let view = ChartBaseView(frame: frame)
- let layers: [ChartLayer] = [xAxisLayer, yAxisLayer] + (guidelinesLayer.map{[$0]} ?? []) + [barsLayer]
-
- super.init(
- view: view,
- innerFrame: innerFrame,
- settings: chartConfig.chartSettings,
- layers: layers
- )
- }
-
- public required init(coder aDecoder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Convenience/ChartConfig.swift b/Dependecies/SwiftCharts/SwiftCharts/Convenience/ChartConfig.swift
deleted file mode 100644
index 59f3d0f6f..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Convenience/ChartConfig.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// ChartConfig.swift
-// Examples
-//
-// Settings wrappers for default charts.
-// These charts are assumed to have one x axis at the bottom and one y axis at the left.
-//
-// Created by ischuetz on 19/07/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartConfig {
- public let chartSettings: ChartSettings
- public let guidelinesConfig: GuidelinesConfig? // nil means no guidelines
-
- public init(chartSettings: ChartSettings, guidelinesConfig: GuidelinesConfig?) {
- self.chartSettings = chartSettings
- self.guidelinesConfig = guidelinesConfig
- }
-}
-
-
-open class ChartConfigXY: ChartConfig {
- public let xAxisConfig: ChartAxisConfig
- public let yAxisConfig: ChartAxisConfig
- public let xAxisLabelSettings: ChartLabelSettings
- public let yAxisLabelSettings: ChartLabelSettings
-
- public init(chartSettings: ChartSettings = ChartSettings(), xAxisConfig: ChartAxisConfig, yAxisConfig: ChartAxisConfig, xAxisLabelSettings: ChartLabelSettings = ChartLabelSettings(), yAxisLabelSettings: ChartLabelSettings = ChartLabelSettings(), guidelinesConfig: GuidelinesConfig? = GuidelinesConfig()) {
- self.xAxisConfig = xAxisConfig
- self.yAxisConfig = yAxisConfig
- self.xAxisLabelSettings = xAxisLabelSettings
- self.yAxisLabelSettings = yAxisLabelSettings
-
- super.init(chartSettings: chartSettings, guidelinesConfig: guidelinesConfig)
- }
-}
-
-public struct ChartAxisConfig {
- public let from: Double
- public let to: Double
- public let by: Double
-
- public init(from: Double, to: Double, by: Double) {
- self.from = from
- self.to = to
- self.by = by
- }
-}
-
-public struct GuidelinesConfig {
- public let dotted: Bool
- public let lineWidth: CGFloat
- public let lineColor: UIColor
-
- public init(dotted: Bool = true, lineWidth: CGFloat = 0.1, lineColor: UIColor = UIColor.black) {
- self.dotted = dotted
- self.lineWidth = lineWidth
- self.lineColor = lineColor
- }
-}
-
-// Helper to generate default guidelines layer for GuidelinesConfig
-public struct GuidelinesDefaultLayerGenerator {
-
- public static func generateOpt(xAxisLayer: ChartAxisLayer, yAxisLayer: ChartAxisLayer, guidelinesConfig: GuidelinesConfig?) -> ChartLayer? {
- if let guidelinesConfig = guidelinesConfig {
- return generate(xAxisLayer: xAxisLayer, yAxisLayer: yAxisLayer, guidelinesConfig: guidelinesConfig)
- } else {
- return nil
- }
- }
-
- public static func generate(xAxisLayer: ChartAxisLayer, yAxisLayer: ChartAxisLayer, guidelinesConfig: GuidelinesConfig) -> ChartLayer {
- if guidelinesConfig.dotted {
- let settings = ChartGuideLinesDottedLayerSettings(linesColor: guidelinesConfig.lineColor, linesWidth: guidelinesConfig.lineWidth)
- return ChartGuideLinesDottedLayer(xAxisLayer: xAxisLayer, yAxisLayer: yAxisLayer, settings: settings)
-
- } else {
- let settings = ChartGuideLinesDottedLayerSettings(linesColor: guidelinesConfig.lineColor, linesWidth: guidelinesConfig.lineWidth)
- return ChartGuideLinesDottedLayer(xAxisLayer: xAxisLayer, yAxisLayer: yAxisLayer, settings: settings)
- }
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Convenience/LineChart.swift b/Dependecies/SwiftCharts/SwiftCharts/Convenience/LineChart.swift
deleted file mode 100644
index 12094c1b2..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Convenience/LineChart.swift
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// LineChart.swift
-// Examples
-//
-// Created by ischuetz on 19/07/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class LineChart: Chart {
-
- public typealias ChartLine = (chartPoints: [(Double, Double)], color: UIColor)
-
- // Initializer for single line
- public convenience init(frame: CGRect, chartConfig: ChartConfigXY, xTitle: String, yTitle: String, line: ChartLine) {
- self.init(frame: frame, chartConfig: chartConfig, xTitle: xTitle, yTitle: yTitle, lines: [line])
- }
-
- // Initializer for multiple lines
- public init(frame: CGRect, chartConfig: ChartConfigXY, xTitle: String, yTitle: String, lines: [ChartLine]) {
-
- let xValues = stride(from: chartConfig.xAxisConfig.from, through: chartConfig.xAxisConfig.to, by: chartConfig.xAxisConfig.by).map{ChartAxisValueDouble($0)}
- let yValues = stride(from: chartConfig.yAxisConfig.from, through: chartConfig.yAxisConfig.to, by: chartConfig.yAxisConfig.by).map{ChartAxisValueDouble($0)}
-
- let xModel = ChartAxisModel(axisValues: xValues, axisTitleLabel: ChartAxisLabel(text: xTitle, settings: chartConfig.xAxisLabelSettings))
- let yModel = ChartAxisModel(axisValues: yValues, axisTitleLabel: ChartAxisLabel(text: yTitle, settings: chartConfig.yAxisLabelSettings.defaultVertical()))
- let coordsSpace = ChartCoordsSpaceLeftBottomSingleAxis(chartSettings: chartConfig.chartSettings, chartFrame: frame, xModel: xModel, yModel: yModel)
- let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
-
- let lineLayers: [ChartLayer] = lines.map {line in
- let chartPoints = line.chartPoints.map {chartPointScalar in
- ChartPoint(x: ChartAxisValueDouble(chartPointScalar.0), y: ChartAxisValueDouble(chartPointScalar.1))
- }
-
- let lineModel = ChartLineModel(chartPoints: chartPoints, lineColor: line.color, animDuration: 0.5, animDelay: 0)
- return ChartPointsLineLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, lineModels: [lineModel])
- }
-
- let guidelinesLayer = GuidelinesDefaultLayerGenerator.generateOpt(xAxisLayer: xAxisLayer, yAxisLayer: yAxisLayer, guidelinesConfig: chartConfig.guidelinesConfig)
-
- let view = ChartBaseView(frame: frame)
- let layers: [ChartLayer] = [xAxisLayer, yAxisLayer] + (guidelinesLayer.map{[$0]} ?? []) + lineLayers
-
- super.init(
- view: view,
- innerFrame: innerFrame,
- settings: chartConfig.chartSettings,
- layers: layers
- )
- }
-
- public required init(coder aDecoder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartContextDrawer.swift b/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartContextDrawer.swift
deleted file mode 100644
index f1804b051..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartContextDrawer.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// ChartContextDrawer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartContextDrawer {
-
- var hidden: Bool = false
-
- final func triggerDraw(context: CGContext, chart: Chart) {
- if !hidden {
- self.draw(context: context, chart: chart)
- }
- }
-
- func draw(context: CGContext, chart: Chart) {}
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartDrawerFunctions.swift b/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartDrawerFunctions.swift
deleted file mode 100644
index fe865f144..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartDrawerFunctions.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// ChartDrawerFunctions.swift
-// Examples
-//
-// Created by ischuetz on 21/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-func ChartDrawLine(context: CGContext, p1: CGPoint, p2: CGPoint, width: CGFloat, color: UIColor) {
- context.setStrokeColor(color.cgColor)
- context.setLineWidth(width)
- context.move(to: CGPoint(x: p1.x, y: p1.y))
- context.addLine(to: CGPoint(x: p2.x, y: p2.y))
- context.strokePath()
-}
-
-func ChartDrawDottedLine(context: CGContext, p1: CGPoint, p2: CGPoint, width: CGFloat, color: UIColor, dotWidth: CGFloat, dotSpacing: CGFloat) {
- context.setStrokeColor(color.cgColor)
- context.setLineWidth(width)
- context.setLineDash(phase: 0, lengths: [dotWidth, dotSpacing])
- context.move(to: CGPoint(x: p1.x, y: p1.y))
- context.addLine(to: CGPoint(x: p2.x, y: p2.y))
- context.strokePath()
- context.setLineDash(phase: 0, lengths: [])
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartLabelDrawer.swift b/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartLabelDrawer.swift
deleted file mode 100644
index 61fed6e25..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartLabelDrawer.swift
+++ /dev/null
@@ -1,177 +0,0 @@
-//
-// ChartLabelDrawer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-public enum ChartLabelTextAlignment {
- case left, right, `default`
-}
-
-public struct ChartLabelSettings {
- public var font: UIFont
- public var fontColor: UIColor
- public var rotation: CGFloat
- public var rotationKeep: ChartLabelDrawerRotationKeep
- public var shiftXOnRotation: Bool
- public var textAlignment: ChartLabelTextAlignment
-
- public init(font: UIFont = UIFont.systemFont(ofSize: 14), fontColor: UIColor = UIColor.black, rotation: CGFloat = 0, rotationKeep: ChartLabelDrawerRotationKeep = .center, shiftXOnRotation: Bool = true, textAlignment: ChartLabelTextAlignment = .default) {
- self.font = font
- self.fontColor = fontColor
- self.rotation = rotation
- self.rotationKeep = rotationKeep
- self.shiftXOnRotation = shiftXOnRotation
- self.textAlignment = textAlignment
- }
-}
-
-public extension ChartLabelSettings {
- func defaultVertical() -> ChartLabelSettings {
- var copy = self
- copy.rotation = -90
-
- return copy
- }
-}
-
-extension ChartLabelSettings: CustomDebugStringConvertible {
- public var debugDescription: String {
- return [
- "font": font,
- "fontColor": fontColor,
- "rotation": rotation,
- "rotationKeep": rotationKeep,
- "shiftXOnRotation": shiftXOnRotation,
- "textAlignment": textAlignment
- ]
- .debugDescription
- }
-}
-
-// coordinate of original label which will be preserved after the rotation
-public enum ChartLabelDrawerRotationKeep {
- case center, top, bottom
-}
-
-open class ChartLabelDrawer: ChartContextDrawer {
-
- public var screenLoc: CGPoint
- public var transform: CGAffineTransform?
- public let label: ChartAxisLabel
-
- open var center: CGPoint {
- return CGPoint(x: screenLoc.x + size.width / 2, y: screenLoc.y + size.height / 2)
- }
-
- open var size: CGSize {
- return label.textSizeNonRotated
- }
-
- open var frame: CGRect {
- return CGRect(x: screenLoc.x, y: screenLoc.y, width: size.width, height: size.height)
- }
-
- public init(label: ChartAxisLabel, screenLoc: CGPoint) {
- self.label = label
- self.screenLoc = screenLoc
-
- super.init()
-
- self.transform = self.transform(screenLoc, settings: label.settings)
- }
-
- override open func draw(context: CGContext, chart: Chart) {
- let labelSize = size
-
- let labelX = screenLoc.x
- let labelY = screenLoc.y
-
- func drawLabel() {
- self.drawLabel(x: labelX, y: labelY, text: label.text)
- }
-
- if let transform = transform {
- context.saveGState()
- context.concatenate(transform)
- drawLabel()
- context.restoreGState()
-
- } else {
- drawLabel()
- }
- }
-
- fileprivate func transform(_ screenLoc: CGPoint, settings: ChartLabelSettings) -> CGAffineTransform? {
- let labelSize = size
-
- let labelX = screenLoc.x
- let labelY = screenLoc.y
-
- let labelHalfWidth = labelSize.width / 2
- let labelHalfHeight = labelSize.height / 2
-
- if settings.rotation != 0 {
-
- let centerX = labelX + labelHalfWidth
- let centerY = labelY + labelHalfHeight
-
- let rotation = settings.rotation * CGFloat.pi / 180
-
- var transform = CGAffineTransform.identity
-
- if settings.rotationKeep == .center {
- transform = CGAffineTransform(translationX: -(labelHalfWidth - labelHalfHeight), y: 0)
-
- } else {
-
- var transformToGetBounds = CGAffineTransform(translationX: 0, y: 0)
- transformToGetBounds = transformToGetBounds.translatedBy(x: centerX, y: centerY)
- transformToGetBounds = transformToGetBounds.rotated(by: rotation)
- transformToGetBounds = transformToGetBounds.translatedBy(x: -centerX, y: -centerY)
- let rect = CGRect(x: labelX, y: labelY, width: labelSize.width, height: labelSize.height)
- let newRect = rect.applying(transformToGetBounds)
-
- let offsetTop: CGFloat = {
- switch settings.rotationKeep {
- case .top:
- return labelY - newRect.origin.y
- case .bottom:
- return newRect.origin.y + newRect.size.height - (labelY + rect.size.height)
- default:
- return 0
- }
- }()
-
- // when the labels are diagonal we have to shift a little so they look aligned with axis value. We align origin of new rect with the axis value
- if settings.shiftXOnRotation {
- let xOffset: CGFloat = abs(settings.rotation) =~ 90 ? 0 : centerX - newRect.origin.x
- transform = transform.translatedBy(x: xOffset, y: offsetTop)
- }
- }
-
- transform = transform.translatedBy(x: centerX, y: centerY)
- transform = transform.rotated(by: rotation)
- transform = transform.translatedBy(x: -centerX, y: -centerY)
- return transform
-
- } else {
- return nil
- }
- }
-
-
- fileprivate func drawLabel(x: CGFloat, y: CGFloat, text: String) {
- #if swift(>=4)
- let attributes = [NSAttributedString.Key.font: label.settings.font, NSAttributedString.Key.foregroundColor: label.settings.fontColor]
- #else
- let attributes = [NSFontAttributeName: label.settings.font, NSForegroundColorAttributeName: label.settings.fontColor]
- #endif
- let attrStr = NSAttributedString(string: text, attributes: attributes)
- attrStr.draw(at: CGPoint(x: x, y: y))
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartLineDrawer.swift b/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartLineDrawer.swift
deleted file mode 100644
index 6a259ea8e..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Drawers/ChartLineDrawer.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// ChartLineDrawer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-class ChartLineDrawer: ChartContextDrawer {
- fileprivate let p1: CGPoint
- fileprivate let p2: CGPoint
- fileprivate let color: UIColor
- fileprivate let strokeWidth: CGFloat
-
- init(p1: CGPoint, p2: CGPoint, color: UIColor, strokeWidth: CGFloat = 0.2) {
- self.p1 = p1
- self.p2 = p2
- self.color = color
- self.strokeWidth = strokeWidth
- }
-
- override func draw(context: CGContext, chart: Chart) {
- ChartDrawLine(context: context, p1: p1, p2: p2, width: strokeWidth, color: color)
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Globals.swift b/Dependecies/SwiftCharts/SwiftCharts/Globals.swift
deleted file mode 100644
index 2e28b714f..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Globals.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Globals.swift
-// SwiftCharts
-//
-// Created by Ivan Schütz on 27/10/2016.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-func _max(a: T, b: T) -> T {
- return max(a, b)
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Int.swift b/Dependecies/SwiftCharts/SwiftCharts/Int.swift
deleted file mode 100644
index 716c3e83a..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Int.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Int.swift
-// SwiftCharts
-//
-// Created by ischuetz on 26/07/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-extension Int {
-
- // Lazily computes prime factors
- // src: https://gist.github.com/JadenGeller/f998071fe71c2bc2976ef6465f0e6e5d
- public var primeFactors: AnySequence {
- func factor(_ input: Int) -> (prime: Int, remainder: Int) {
- let end = Int(sqrt(Float(input)))
- if end > 2 {
- for prime in 2...end {
- if input % prime == 0 {
- return (prime, input / prime)
- }
- }
- }
- return (input, 1)
- }
- var current = self
- return AnySequence(AnyIterator {
- guard current != 1 else { return nil }
-
- let result = factor(current)
- current = result.remainder
- return result.prime
- })
- }
-
- func floorMultiple(_ value: Int) -> Int {
- return Int(floor(Double(self) / Double(value)) * Double(value))
- }
-
- func ceilMultiple(_ value: Int) -> Int {
- return Int(ceil(Double(self) / Double(value)) * Double(value))
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartBarsLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartBarsLayer.swift
deleted file mode 100644
index 5ddfd6b43..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartBarsLayer.swift
+++ /dev/null
@@ -1,181 +0,0 @@
-//
-// ChartBarsLayer.swift
-// Examples
-//
-// Created by ischuetz on 17/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartBarModel {
- public let constant: ChartAxisValue
- public let axisValue1: ChartAxisValue
- public let axisValue2: ChartAxisValue
- public let bgColor: UIColor?
-
- /**
- - parameter constant:Value of coordinate which doesn't change between start and end of the bar - if the bar is horizontal, this is y, if it's vertical it's x.
- - parameter axisValue1:Start, variable coordinate.
- - parameter axisValue2:End, variable coordinate.
- - parameter bgColor:Background color of bar.
- */
- public init(constant: ChartAxisValue, axisValue1: ChartAxisValue, axisValue2: ChartAxisValue, bgColor: UIColor? = nil) {
- self.constant = constant
- self.axisValue1 = axisValue1
- self.axisValue2 = axisValue2
- self.bgColor = bgColor
- }
-}
-
-class ChartBarsViewGenerator {
- let layer: ChartCoordsSpaceLayer
- let barWidth: CGFloat
-
- let horizontal: Bool
-
- let viewGenerator: ChartBarsLayer.ChartBarViewGenerator?
-
- init(horizontal: Bool, layer: ChartCoordsSpaceLayer, barWidth: CGFloat, viewGenerator: ChartBarsLayer.ChartBarViewGenerator?) {
- self.layer = layer
- self.horizontal = horizontal
- self.barWidth = barWidth
- self.viewGenerator = viewGenerator
- }
-
- func viewPoints(_ barModel: T, constantScreenLoc: CGFloat) -> (p1: CGPoint, p2: CGPoint) {
- switch horizontal {
- case true:
- return (
- CGPoint(x: layer.modelLocToScreenLoc(x: barModel.axisValue1.scalar), y: constantScreenLoc),
- CGPoint(x: layer.modelLocToScreenLoc(x: barModel.axisValue2.scalar), y: constantScreenLoc))
- case false:
- return (
- CGPoint(x: constantScreenLoc, y: layer.modelLocToScreenLoc(y: barModel.axisValue1.scalar)),
- CGPoint(x: constantScreenLoc, y: layer.modelLocToScreenLoc(y: barModel.axisValue2.scalar)))
- }
- }
-
- func constantScreenLoc(_ barModel: T) -> CGFloat {
- return horizontal ? layer.modelLocToScreenLoc(y: barModel.constant.scalar) : layer.modelLocToScreenLoc(x: barModel.constant.scalar)
- }
-
- func viewPoints(_ barModel: T, constantScreenLoc constantScreenLocMaybe: CGFloat? = nil) -> (p1: CGPoint, p2: CGPoint) {
- let constantScreenLoc = constantScreenLocMaybe ?? self.constantScreenLoc(barModel)
- return viewPoints(barModel, constantScreenLoc: constantScreenLoc)
- }
-
- func generateView(_ barModel: T, constantScreenLoc constantScreenLocMaybe: CGFloat? = nil, bgColor: UIColor?, settings: ChartBarViewSettings, model: ChartBarModel, index: Int, groupIndex: Int, chart: Chart? = nil) -> U {
- let viewPoints = self.viewPoints(barModel, constantScreenLoc: constantScreenLocMaybe)
- return viewGenerator?(viewPoints.p1, viewPoints.p2, barWidth, bgColor, settings, model, index) ??
- U(p1: viewPoints.p1, p2: viewPoints.p2, width: barWidth, bgColor: bgColor, settings: settings)
- }
-}
-
-
-public struct ChartTappedBar {
- public let model: ChartBarModel
- public let view: ChartPointViewBar
- public let layer: ChartCoordsSpaceLayer
-}
-
-
-open class ChartBarsLayer: ChartCoordsSpaceLayer {
-
- public typealias ChartBarViewGenerator = (_ p1: CGPoint, _ p2: CGPoint, _ width: CGFloat, _ bgColor: UIColor?, _ settings: ChartBarViewSettings, _ model: ChartBarModel, _ index: Int) -> T
-
- fileprivate let bars: [ChartBarModel]
- fileprivate let barWidth: CGFloat
- fileprivate let horizontal: Bool
- fileprivate let settings: ChartBarViewSettings
-
- open fileprivate(set) var barViews: [(model: ChartBarModel, view: T)] = []
-
- fileprivate var tapHandler: ((ChartTappedBar) -> Void)?
-
- fileprivate var viewGenerator: ChartBarViewGenerator? // Custom bar views
-
- fileprivate let mode: ChartPointsViewsLayerMode
-
- fileprivate var barsGenerator: ChartBarsViewGenerator?
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, bars: [ChartBarModel], horizontal: Bool = false, barWidth: CGFloat, settings: ChartBarViewSettings, mode: ChartPointsViewsLayerMode = .scaleAndTranslate, tapHandler: ((ChartTappedBar) -> Void)? = nil, viewGenerator: ChartBarViewGenerator? = nil) {
- self.bars = bars
- self.horizontal = horizontal
- self.barWidth = barWidth
- self.settings = settings
- self.mode = mode
- self.tapHandler = tapHandler
- self.viewGenerator = viewGenerator
-
- super.init(xAxis: xAxis, yAxis: yAxis)
-
- barsGenerator = ChartBarsViewGenerator(horizontal: horizontal, layer: self, barWidth: barWidth, viewGenerator: viewGenerator)
- }
-
- open override func chartInitialized(chart: Chart) {
- super.chartInitialized(chart: chart)
-
- guard let barsGenerator = barsGenerator else {return}
-
- for (index, barModel) in bars.enumerated() {
- let barView = barsGenerator.generateView(barModel, bgColor: barModel.bgColor, settings: settings, model: barModel, index: index, groupIndex: 0, chart: chart)
- barView.tapHandler = {[weak self] tappedBarView in guard let weakSelf = self else {return}
- weakSelf.tapHandler?(ChartTappedBar(model: barModel, view: tappedBarView, layer: weakSelf))
- }
-
- barViews.append((barModel, barView))
-
- addSubview(chart, view: barView)
- }
- }
-
- func addSubview(_ chart: Chart, view: UIView) {
- mode == .scaleAndTranslate ? chart.addSubview(view) : chart.addSubviewNoTransform(view)
- }
-
- open override func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- super.zoom(x, y: y, centerX: centerX, centerY: centerY)
- updateForTransform()
- }
-
- open override func pan(_ deltaX: CGFloat, deltaY: CGFloat) {
- super.pan(deltaX, deltaY: deltaY)
- updateForTransform()
- }
-
- func updateForTransform() {
- guard let barsGenerator = barsGenerator else {return}
- switch mode {
- case .scaleAndTranslate:
- break
- case .translate:
- for (barModel, barView) in barViews {
- let (p1, p2) = barsGenerator.viewPoints(barModel)
- barView.updateFrame(p1, p2: p2)
- }
- case .custom: fatalError("Not supported")
- }
- }
-
- open override func modelLocToScreenLoc(x: Double) -> CGFloat {
- switch mode {
- case .scaleAndTranslate:
- return super.modelLocToScreenLoc(x: x)
- case .translate:
- return super.modelLocToContainerScreenLoc(x: x)
- case .custom: fatalError("Not supported")
- }
- }
-
- open override func modelLocToScreenLoc(y: Double) -> CGFloat {
- switch mode {
- case .scaleAndTranslate:
- return super.modelLocToScreenLoc(y: y)
- case .translate:
- return super.modelLocToContainerScreenLoc(y: y)
- case .custom: fatalError("Not supported")
- }
- }
-
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartCandleStickLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartCandleStickLayer.swift
deleted file mode 100644
index 5b6ce8710..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartCandleStickLayer.swift
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// ChartCandleStickLayer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 28/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-// TODO correct scaling mode - currently it uses default, uniform scaling with which items don't stay sharp. Needs to draw views similar to ChartPointsScatterLayer
-open class ChartCandleStickLayer: ChartPointsLayer {
-
- fileprivate var screenItems: [CandleStickScreenItem] = []
-
- fileprivate let itemWidth: CGFloat
- fileprivate let strokeWidth: CGFloat
- fileprivate let increasingColor: UIColor
- fileprivate let decreasingColor: UIColor
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], itemWidth: CGFloat = 10, strokeWidth: CGFloat = 1, increasingColor: UIColor = UIColor.black, decreasingColor: UIColor = UIColor.white) {
- self.itemWidth = itemWidth
- self.strokeWidth = strokeWidth
- self.increasingColor = increasingColor
- self.decreasingColor = decreasingColor
-
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints)
- }
-
- open override func chartInitialized(chart: Chart) {
- super.chartInitialized(chart: chart)
-
- self.screenItems = generateScreenItems()
- }
-
- override open func chartContentViewDrawing(context: CGContext, chart: Chart) {
- for screenItem in screenItems {
- context.setLineWidth(strokeWidth)
- context.setStrokeColor(UIColor.black.cgColor)
- context.move(to: CGPoint(x: screenItem.x, y: screenItem.lineTop))
- context.addLine(to: CGPoint(x: screenItem.x, y: screenItem.lineBottom))
- context.strokePath()
-
- context.setFillColor(red: 1.0, green: 1.0, blue: 1.0, alpha: 0.0)
- context.setFillColor(screenItem.fillColor.cgColor)
- context.fill(screenItem.rect)
- context.stroke(screenItem.rect)
- }
- }
-
- fileprivate func generateScreenItems() -> [CandleStickScreenItem] {
- return chartPointsModels.map {model in
-
- let chartPoint = model.chartPoint
-
- let x = model.screenLoc.x
-
- let highScreenY = modelLocToScreenLoc(x: Double(x), y: Double(chartPoint.high)).y
- let lowScreenY = modelLocToScreenLoc(x: Double(x), y: Double(chartPoint.low)).y
- let openScreenY = modelLocToScreenLoc(x: Double(x), y: Double(chartPoint.open)).y
- let closeScreenY = modelLocToScreenLoc(x: Double(x), y: Double(chartPoint.close)).y
-
- let (rectTop, rectBottom, fillColor) = closeScreenY < openScreenY ? (closeScreenY, openScreenY, self.increasingColor) : (openScreenY, closeScreenY, self.decreasingColor)
- return CandleStickScreenItem(x: x, lineTop: highScreenY, lineBottom: lowScreenY, rectTop: rectTop, rectBottom: rectBottom, width: itemWidth, fillColor: fillColor)
- }
- }
-
- override func updateChartPointsScreenLocations() {
- super.updateChartPointsScreenLocations()
- screenItems = generateScreenItems()
- }
-}
-
-
-private struct CandleStickScreenItem {
- let x: CGFloat
- let lineTop: CGFloat
- let lineBottom: CGFloat
- let fillColor: UIColor
- let rect: CGRect
-
- init(x: CGFloat, lineTop: CGFloat, lineBottom: CGFloat, rectTop: CGFloat, rectBottom: CGFloat, width: CGFloat, fillColor: UIColor) {
- self.x = x
- self.lineTop = lineTop
- self.lineBottom = lineBottom
- self.rect = CGRect(x: x - (width / 2), y: rectTop, width: width, height: rectBottom - rectTop)
- self.fillColor = fillColor
- }
-
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartCoordsSpaceLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartCoordsSpaceLayer.swift
deleted file mode 100644
index 9051c3ff6..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartCoordsSpaceLayer.swift
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// ChartCoordsSpaceLayer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartCoordsSpaceLayer: ChartLayerBase {
-
- public let xAxis: ChartAxis
- public let yAxis: ChartAxis
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis) {
- self.xAxis = xAxis
- self.yAxis = yAxis
- }
-
- open func modelLocToScreenLoc(x: Double, y: Double) -> CGPoint {
- return CGPoint(x: modelLocToScreenLoc(x: x), y: modelLocToScreenLoc(y: y))
- }
-
- open func modelLocToScreenLoc(x: Double) -> CGFloat {
- return xAxis.innerScreenLocForScalar(x) / (chart?.contentView.transform.a ?? 1)
- }
-
- open func modelLocToScreenLoc(y: Double) -> CGFloat {
- return yAxis.innerScreenLocForScalar(y) / (chart?.contentView.transform.d ?? 1)
- }
-
- open func modelLocToContainerScreenLoc(x: Double, y: Double) -> CGPoint {
- return CGPoint(x: modelLocToContainerScreenLoc(x: x), y: modelLocToContainerScreenLoc(y: y))
- }
-
- open func modelLocToContainerScreenLoc(x: Double) -> CGFloat {
- return xAxis.screenLocForScalar(x) - (chart?.containerFrame.origin.x ?? 0)
- }
-
- open func modelLocToContainerScreenLoc(y: Double) -> CGFloat {
- return yAxis.screenLocForScalar(y) - (chart?.containerFrame.origin.y ?? 0)
- }
-
- open func modelLocToGlobalScreenLoc(x: Double, y: Double) -> CGPoint {
- return CGPoint(x: modelLocToGlobalScreenLoc(x: x), y: modelLocToGlobalScreenLoc(y: y))
- }
-
- open func modelLocToGlobalScreenLoc(x: Double) -> CGFloat {
- return xAxis.screenLocForScalar(x)
- }
-
- open func modelLocToGlobalScreenLoc(y: Double) -> CGFloat {
- return yAxis.screenLocForScalar(y)
- }
-
- open func scalarForScreenLoc(x: CGFloat) -> Double {
- return xAxis.innerScalarForScreenLoc(x * (chart?.contentView.transform.a ?? 1))
- }
-
- open func scalarForScreenLoc(y: CGFloat) -> Double {
- return yAxis.innerScalarForScreenLoc(y * (chart?.contentView.transform.d ?? 1))
- }
-
- open func globalToDrawersContainerCoordinates(_ point: CGPoint) -> CGPoint? {
- return globalToContainerCoordinates(point)
- }
-
- open func globalToContainerCoordinates(_ point: CGPoint) -> CGPoint? {
- guard let chart = chart else {return nil}
- return point.substract(chart.containerView.frame.origin)
- }
-
- open func globalToContentCoordinates(_ point: CGPoint) -> CGPoint? {
- guard let chart = chart else {return nil}
- guard let containerCoords = globalToContainerCoordinates(point) else {return nil}
- return CGPoint(
- x: (containerCoords.x - chart.contentView.frame.origin.x) / chart.contentView.transform.a,
- y: (containerCoords.y - chart.contentView.frame.origin.y) / chart.contentView.transform.d
- )
- }
-
- open func containerToGlobalCoordinates(_ point: CGPoint) -> CGPoint? {
- guard let chart = chart else {return nil}
- return point.add(chart.containerView.frame.origin)
- }
-
- open func contentToContainerCoordinates(_ point: CGPoint) -> CGPoint? {
- guard let chart = chart else {return nil}
- let containerX = (point.x * chart.contentView.transform.a) + chart.contentView.frame.minX
- let containerY = (point.y * chart.contentView.transform.d) + chart.contentView.frame.minY
- return CGPoint(x: containerX, y: containerY)
- }
-
- open func contentToGlobalCoordinates(_ point: CGPoint) -> CGPoint? {
- return contentToContainerCoordinates(point).flatMap{containerToGlobalCoordinates($0)}
- }
-
- // TODO review method, variable names
- open func contentToGlobalScreenLoc(_ chartPoint: ChartPoint) -> CGPoint? {
- let containerScreenLoc = CGPoint(x: modelLocToScreenLoc(x: chartPoint.x.scalar), y: modelLocToScreenLoc(y: chartPoint.y.scalar))
- return containerToGlobalCoordinates(containerScreenLoc)
- }
-
- open func containerToGlobalScreenLoc(_ chartPoint: ChartPoint) -> CGPoint? {
- let containerScreenLoc = CGPoint(x: modelLocToContainerScreenLoc(x: chartPoint.x.scalar), y: modelLocToContainerScreenLoc(y: chartPoint.y.scalar))
- return containerToGlobalCoordinates(containerScreenLoc)
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartDividersLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartDividersLayer.swift
deleted file mode 100644
index 7a1ed6ba6..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartDividersLayer.swift
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// ChartDividersLayer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 21/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-public struct ChartDividersLayerSettings {
- let linesColor: UIColor
- let linesWidth: CGFloat
- let start: CGFloat // Points from start to axis, axis is 0
- let end: CGFloat // Points from axis to end, axis is 0
- let show: ((Double) -> Bool)? // Set visibility of individual axis values. If nil, all axis values will be shown.
-
- public init(linesColor: UIColor = UIColor.gray, linesWidth: CGFloat = 0.3, start: CGFloat = 5, end: CGFloat = 5, show: ((Double) -> Bool)? = nil) {
- self.linesColor = linesColor
- self.linesWidth = linesWidth
- self.start = start
- self.end = end
- self.show = show
- }
-}
-
-public enum ChartDividersLayerAxis {
- case x, y, xAndY
-}
-
-open class ChartDividersLayer: ChartCoordsSpaceLayer {
-
- fileprivate let settings: ChartDividersLayerSettings
-
- let axis: ChartDividersLayerAxis
-
- fileprivate let xAxisLayer: ChartAxisLayer
- fileprivate let yAxisLayer: ChartAxisLayer
-
- public init(xAxisLayer: ChartAxisLayer, yAxisLayer: ChartAxisLayer, axis: ChartDividersLayerAxis = .xAndY, settings: ChartDividersLayerSettings) {
- self.axis = axis
- self.settings = settings
-
- self.xAxisLayer = xAxisLayer
- self.yAxisLayer = yAxisLayer
-
- super.init(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis)
- }
-
- fileprivate func drawLine(context: CGContext, color: UIColor, width: CGFloat, p1: CGPoint, p2: CGPoint) {
- ChartDrawLine(context: context, p1: p1, p2: p2, width: width, color: color)
- }
-
- override open func chartViewDrawing(context: CGContext, chart: Chart) {
- let xValues = xAxisLayer.currentAxisValues
- let yValues = yAxisLayer.currentAxisValues
-
- if axis == .x || axis == .xAndY {
- for xValue in xValues {
- guard (settings.show?(xValue) ?? true) else {continue}
-
- let xScreenLoc = xAxisLayer.axis.screenLocForScalar(xValue)
-
- let x1 = xScreenLoc
- let y1 = xAxisLayer.lineP1.y + (xAxisLayer.low ? -settings.end : settings.end)
- let x2 = xScreenLoc
- let y2 = xAxisLayer.lineP1.y + (xAxisLayer.low ? settings.start : -settings.start)
- drawLine(context: context, color: settings.linesColor, width: settings.linesWidth, p1: CGPoint(x: x1, y: y1), p2: CGPoint(x: x2, y: y2))
- }
- }
-
- if axis == .y || axis == .xAndY {
- for yValue in yValues {
- guard (settings.show?(yValue) ?? true) else {continue}
-
- let yScreenLoc = yAxisLayer.axis.screenLocForScalar(yValue)
-
- let x1 = yAxisLayer.lineP1.x + (yAxisLayer.low ? -settings.start : settings.start)
- let y1 = yScreenLoc
- let x2 = yAxisLayer.lineP1.x + (yAxisLayer.low ? settings.end : settings.end)
- let y2 = yScreenLoc
- drawLine(context: context, color: settings.linesColor, width: settings.linesWidth, p1: CGPoint(x: x1, y: y1), p2: CGPoint(x: x2, y: y2))
- }
- }
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartGroupedBarsLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartGroupedBarsLayer.swift
deleted file mode 100644
index b04fa8711..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartGroupedBarsLayer.swift
+++ /dev/null
@@ -1,276 +0,0 @@
-//
-// ChartGroupedBarsLayer.swift
-// Examples
-//
-// Created by ischuetz on 19/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-public final class ChartPointsBarGroup {
- public let constant: ChartAxisValue
- public let bars: [T]
-
- public init(constant: ChartAxisValue, bars: [T]) {
- self.constant = constant
- self.bars = bars
- }
-}
-
-
-open class ChartGroupedBarsLayer: ChartCoordsSpaceLayer {
-
- fileprivate let groups: [ChartPointsBarGroup]
-
- fileprivate let barWidth: CGFloat?
- fileprivate let barSpacing: CGFloat?
- fileprivate let groupSpacing: CGFloat?
-
- public let horizontal: Bool
-
- fileprivate let settings: ChartBarViewSettings
-
- open fileprivate(set) var groupViews: [(ChartPointsBarGroup, [ChartPointViewBar])] = []
-
- fileprivate let mode: ChartPointsViewsLayerMode
-
- fileprivate let viewGenerator: ChartBarsLayer.ChartBarViewGenerator?
-
- convenience init(xAxis: ChartAxis, yAxis: ChartAxis, groups: [ChartPointsBarGroup], horizontal: Bool = false, barSpacing: CGFloat?, groupSpacing: CGFloat?, settings: ChartBarViewSettings, mode: ChartPointsViewsLayerMode = .scaleAndTranslate, viewGenerator: ChartBarsLayer.ChartBarViewGenerator? = nil) {
- self.init(xAxis: xAxis, yAxis: yAxis, groups: groups, horizontal: horizontal, barWidth: nil, barSpacing: barSpacing, groupSpacing: groupSpacing, settings: settings, mode: mode, viewGenerator: viewGenerator)
- }
-
- init(xAxis: ChartAxis, yAxis: ChartAxis, groups: [ChartPointsBarGroup], horizontal: Bool = false, barWidth: CGFloat?, barSpacing: CGFloat?, groupSpacing: CGFloat?, settings: ChartBarViewSettings, mode: ChartPointsViewsLayerMode = .scaleAndTranslate, viewGenerator: ChartBarsLayer.ChartBarViewGenerator? = nil) {
- self.groups = groups
- self.horizontal = horizontal
- self.barWidth = barWidth
- self.barSpacing = barSpacing
- self.groupSpacing = groupSpacing
- self.settings = settings
- self.mode = mode
- self.viewGenerator = viewGenerator
-
- super.init(xAxis: xAxis, yAxis: yAxis)
- }
-
- func barsGenerator(barWidth: CGFloat, chart: Chart) -> ChartBarsViewGenerator {
- fatalError("override")
- }
-
- open override func chartInitialized(chart: Chart) {
- super.chartInitialized(chart: chart)
- if !settings.delayInit {
- initBars(chart)
- }
- }
-
- open func initBars(_ chart: Chart) {
- calculateDimensions(chart) {maxBarCountInGroup, barWidth in
- let barsGenerator = self.barsGenerator(barWidth: barWidth, chart: chart)
-
- for (groupIndex, group) in self.groups.enumerated() {
- var groupBars = [ChartPointViewBar]()
- for (barIndex, bar) in group.bars.enumerated() {
-
- let constantScreenLoc = self.calculateConstantScreenLocDir({self.modelLocToScreenLoc(y: $0)}, index: barIndex, group: group, barWidth: barWidth, maxBarCountInGroup: maxBarCountInGroup, horizontal: barsGenerator.horizontal)
- let barView = barsGenerator.generateView(bar, constantScreenLoc: constantScreenLoc, bgColor: bar.bgColor, settings: self.settings, model: bar, index: barIndex, groupIndex: groupIndex)
- self.configBarView(group, groupIndex: groupIndex, barIndex: barIndex, bar: bar, barView: barView)
- groupBars.append(barView)
- self.addSubview(chart, view: barView)
- }
- self.groupViews.append((group, groupBars))
- }
- }
- }
-
- func calculateConstantScreenLoc(_ screenLocCalculator: (Double) -> CGFloat, index: Int, group: ChartPointsBarGroup, barWidth: CGFloat, maxBarCountInGroup: CGFloat) -> CGFloat {
- let totalWidth = CGFloat(group.bars.count) * barWidth + ((barSpacing ?? 0) * (maxBarCountInGroup - 1))
- let groupCenter = screenLocCalculator(group.constant.scalar)
- let origin = groupCenter - totalWidth / 2
- let internalBarOriginScreenLoc = CGFloat(index) * (barWidth + (barSpacing ?? 0))
- return origin + internalBarOriginScreenLoc + barWidth / 2
- }
-
- func mooh(_ screenLocCalculator: (Double) -> CGFloat, index: Int, group: ChartPointsBarGroup, barWidth: CGFloat, maxBarCountInGroup: CGFloat, horizontal: Bool) -> CGFloat {
- return 1
- }
-
- func calculateConstantScreenLocDir(_ screenLocCalculator: (Double) -> CGFloat, index: Int, group: ChartPointsBarGroup, barWidth: CGFloat, maxBarCountInGroup: CGFloat, horizontal: Bool) -> CGFloat {
- if horizontal {
- return calculateConstantScreenLoc({modelLocToScreenLoc(y: $0)}, index: index, group: group, barWidth: barWidth, maxBarCountInGroup: maxBarCountInGroup)
- } else {
- return calculateConstantScreenLoc({modelLocToScreenLoc(x: $0)}, index: index, group: group, barWidth: barWidth, maxBarCountInGroup: maxBarCountInGroup)
- }
- }
-
- fileprivate func calculateDimensions(_ chart: Chart, onCalculate: (_ maxBarCountInGroup: CGFloat, _ barWidth: CGFloat) -> Void) {
-
- let axis = horizontal ? yAxis : xAxis
- let groupAvailableLength = (axis.screenLength - (groupSpacing ?? 0) * CGFloat(groups.count)) / CGFloat(groups.count + 1)
- let maxBarCountInGroup = groups.reduce(CGFloat(0)) {maxCount, group in
- max(maxCount, CGFloat(group.bars.count))
- }
-
- func calculateBarWidth() -> CGFloat {
- return (((groupAvailableLength - ((barSpacing ?? 0) * (maxBarCountInGroup - 1))) / CGFloat(maxBarCountInGroup)))
- }
-
- let barWidth = self.barWidth ?? calculateBarWidth()
-
- onCalculate(maxBarCountInGroup, barWidth)
- }
-
- func configBarView(_ group: ChartPointsBarGroup, groupIndex: Int, barIndex: Int, bar: T, barView: U) {
-// barView.selectionViewUpdater = selectionViewUpdater
- }
-
- func addSubview(_ chart: Chart, view: UIView) {
- mode == .scaleAndTranslate ? chart.addSubview(view) : chart.addSubviewNoTransform(view)
- }
-
- open override func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- super.zoom(x, y: y, centerX: centerX, centerY: centerY)
- updateForTransform()
- }
-
- open override func pan(_ deltaX: CGFloat, deltaY: CGFloat) {
- super.pan(deltaX, deltaY: deltaY)
- updateForTransform()
- }
-
- fileprivate func updatePanZoomTranslateMode() {
- guard let chart = chart else {return}
-
- calculateDimensions(chart) {maxBarCountInGroup, barWidth in
- let barsGenerator = self.barsGenerator(barWidth: barWidth, chart: chart)
- for (groupIndex, group) in self.groups.enumerated() {
- for (barIndex, bar) in group.bars.enumerated() {
- let constantScreenLoc = self.calculateConstantScreenLocDir({self.modelLocToScreenLoc(y: $0)}, index: barIndex, group: group, barWidth: barWidth, maxBarCountInGroup: maxBarCountInGroup, horizontal: barsGenerator.horizontal)
-
- if groupIndex < self.groupViews.count {
- let groupViews = self.groupViews[groupIndex].1
- if barIndex < groupViews.count {
- let barView = groupViews[barIndex]
- let (p1, p2) = barsGenerator.viewPoints(bar, constantScreenLoc: constantScreenLoc)
- barView.updateFrame(p1, p2: p2)
- barView.setNeedsDisplay()
- }
- }
- }
- }
- }
- }
-
- func updateForTransform() {
- switch mode {
- case .scaleAndTranslate: break
- case .translate: updatePanZoomTranslateMode()
- case .custom: fatalError("Not supported")
- }
- }
-
- open override func modelLocToScreenLoc(x: Double) -> CGFloat {
- switch mode {
- case .scaleAndTranslate:
- return super.modelLocToScreenLoc(x: x)
- case .translate:
- return super.modelLocToContainerScreenLoc(x: x)
- case .custom: fatalError("Not supported")
- }
- }
-
- open override func modelLocToScreenLoc(y: Double) -> CGFloat {
- switch mode {
- case .scaleAndTranslate:
- return super.modelLocToScreenLoc(y: y)
- case .translate:
- return super.modelLocToContainerScreenLoc(y: y)
- case .custom: fatalError("Not supported")
- }
- }
-
-}
-
-
-public struct ChartTappedGroupBar {
- public let tappedBar: ChartTappedBar
- public let group: ChartPointsBarGroup
- public let groupIndex: Int
- public let barIndex: Int // in group
- public let layer: ChartGroupedBarsLayer
-}
-
-public typealias ChartGroupedPlainBarsLayer = ChartGroupedPlainBarsLayer_
-open class ChartGroupedPlainBarsLayer_: ChartGroupedBarsLayer {
-
- let tapHandler: ((ChartTappedGroupBar) -> Void)?
-
- public convenience init(xAxis: ChartAxis, yAxis: ChartAxis, groups: [ChartPointsBarGroup], horizontal: Bool = false, barSpacing: CGFloat?, groupSpacing: CGFloat?, settings: ChartBarViewSettings, mode: ChartPointsViewsLayerMode = .scaleAndTranslate, tapHandler: ((ChartTappedGroupBar) -> Void)? = nil, viewGenerator: ChartBarsLayer.ChartBarViewGenerator? = nil) {
- self.init(xAxis: xAxis, yAxis: yAxis, groups: groups, horizontal: horizontal, barWidth: nil, barSpacing: barSpacing, groupSpacing: groupSpacing, settings: settings, mode: mode, tapHandler: tapHandler, viewGenerator: viewGenerator)
- }
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, groups: [ChartPointsBarGroup], horizontal: Bool, barWidth: CGFloat?, barSpacing: CGFloat?, groupSpacing: CGFloat?, settings: ChartBarViewSettings, mode: ChartPointsViewsLayerMode = .scaleAndTranslate, tapHandler: ((ChartTappedGroupBar) -> Void)? = nil, viewGenerator: ChartBarsLayer.ChartBarViewGenerator? = nil) {
- self.tapHandler = tapHandler
- super.init(xAxis: xAxis, yAxis: yAxis, groups: groups, horizontal: horizontal, barWidth: barWidth, barSpacing: barSpacing, groupSpacing: groupSpacing, settings: settings, mode: mode, viewGenerator: viewGenerator)
- }
-
- override func barsGenerator(barWidth: CGFloat, chart: Chart) -> ChartBarsViewGenerator {
- return ChartBarsViewGenerator(horizontal: self.horizontal, layer: self, barWidth: barWidth, viewGenerator: viewGenerator)
- }
-
- override func configBarView(_ group: ChartPointsBarGroup, groupIndex: Int, barIndex: Int, bar: ChartBarModel, barView: ChartPointViewBar) {
- super.configBarView(group, groupIndex: groupIndex, barIndex: barIndex, bar: bar, barView: barView)
-
- barView.tapHandler = {[weak self] _ in guard let weakSelf = self else {return}
- let tappedBar = ChartTappedBar(model: bar, view: barView, layer: weakSelf)
- let tappedGroupBar = ChartTappedGroupBar(tappedBar: tappedBar, group: group, groupIndex: groupIndex, barIndex: barIndex, layer: weakSelf)
- weakSelf.tapHandler?(tappedGroupBar)
- }
- }
-}
-
-
-public struct ChartTappedGroupBarStacked {
- public let tappedBar: ChartTappedBarStacked
- public let group: ChartPointsBarGroup
- public let groupIndex: Int
- public let barIndex: Int // in group
-}
-
-public typealias ChartGroupedStackedBarsLayer = ChartGroupedStackedBarsLayer_
-open class ChartGroupedStackedBarsLayer_: ChartGroupedBarsLayer {
- fileprivate let stackFrameSelectionViewUpdater: ChartViewSelector?
- let tapHandler: ((ChartTappedGroupBarStacked) -> Void)?
-
- fileprivate let stackedViewGenerator: ChartStackedBarsLayer.ChartBarViewGenerator?
-
- public convenience init(xAxis: ChartAxis, yAxis: ChartAxis, groups: [ChartPointsBarGroup], horizontal: Bool = false, barSpacing: CGFloat?, groupSpacing: CGFloat?, settings: ChartBarViewSettings, mode: ChartPointsViewsLayerMode = .scaleAndTranslate, stackFrameSelectionViewUpdater: ChartViewSelector? = nil, tapHandler: ((ChartTappedGroupBarStacked) -> Void)? = nil, viewGenerator: ChartStackedBarsLayer.ChartBarViewGenerator? = nil) {
- self.init(xAxis: xAxis, yAxis: yAxis, groups: groups, horizontal: horizontal, barWidth: nil, barSpacing: barSpacing, groupSpacing: groupSpacing, settings: settings, mode: mode, stackFrameSelectionViewUpdater: stackFrameSelectionViewUpdater, tapHandler: tapHandler, viewGenerator: viewGenerator)
- }
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, groups: [ChartPointsBarGroup], horizontal: Bool, barWidth: CGFloat?, barSpacing: CGFloat?, groupSpacing: CGFloat?, settings: ChartBarViewSettings, mode: ChartPointsViewsLayerMode = .scaleAndTranslate, stackFrameSelectionViewUpdater: ChartViewSelector? = nil, tapHandler: ((ChartTappedGroupBarStacked) -> Void)? = nil, viewGenerator: ChartStackedBarsLayer.ChartBarViewGenerator? = nil) {
- self.stackFrameSelectionViewUpdater = stackFrameSelectionViewUpdater
- self.tapHandler = tapHandler
- self.stackedViewGenerator = viewGenerator
- super.init(xAxis: xAxis, yAxis: yAxis, groups: groups, horizontal: horizontal, barWidth: barWidth, barSpacing: barSpacing, groupSpacing: groupSpacing, settings: settings, mode: mode)
- }
-
- override func barsGenerator(barWidth: CGFloat, chart: Chart) -> ChartBarsViewGenerator {
- return ChartStackedBarsViewGenerator(horizontal: horizontal, layer: self, barWidth: barWidth, viewGenerator: stackedViewGenerator)
- }
-
- override func configBarView(_ group: ChartPointsBarGroup, groupIndex: Int, barIndex: Int, bar: ChartStackedBarModel, barView: ChartPointViewBarStacked) {
- barView.stackedTapHandler = {[weak self, unowned barView] tappedStackedBar in guard let weakSelf = self else {return}
-
- let stackFrameData = tappedStackedBar.stackFrame.map{stackFrame in
- ChartTappedBarStackedFrame(stackedItemModel: bar.items[stackFrame.index], stackedItemView: stackFrame.view, stackedItemViewFrameRelativeToBarParent: stackFrame.viewFrameRelativeToBarSuperview, stackedItemIndex: stackFrame.index)
- }
-
- let tappedStacked = ChartTappedBarStacked(model: bar, barView: barView, stackFrameData: stackFrameData, layer: weakSelf)
- let tappedGroupBar = ChartTappedGroupBarStacked(tappedBar: tappedStacked, group: group, groupIndex: groupIndex, barIndex: barIndex)
- weakSelf.tapHandler?(tappedGroupBar)
- }
- barView.stackFrameSelectionViewUpdater = stackFrameSelectionViewUpdater
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartGuideLinesLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartGuideLinesLayer.swift
deleted file mode 100644
index 87f017467..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartGuideLinesLayer.swift
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// ChartGuideLinesLayer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 26/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartGuideLinesLayerSettings {
- public let linesColor: UIColor
- public let linesWidth: CGFloat
-
- public init(linesColor: UIColor = UIColor.gray, linesWidth: CGFloat = 0.3) {
- self.linesColor = linesColor
- self.linesWidth = linesWidth
- }
-}
-
-open class ChartGuideLinesDottedLayerSettings: ChartGuideLinesLayerSettings {
- public let dotWidth: CGFloat
- public let dotSpacing: CGFloat
-
- public init(linesColor: UIColor, linesWidth: CGFloat, dotWidth: CGFloat = 2, dotSpacing: CGFloat = 2) {
- self.dotWidth = dotWidth
- self.dotSpacing = dotSpacing
- super.init(linesColor: linesColor, linesWidth: linesWidth)
- }
-}
-
-public enum ChartGuideLinesLayerAxis {
- case x, y, xAndY
-}
-
-open class ChartGuideLinesLayerAbstract: ChartCoordsSpaceLayer {
-
- fileprivate let settings: T
- fileprivate let axis: ChartGuideLinesLayerAxis
- fileprivate let xAxisLayer: ChartAxisLayer
- fileprivate let yAxisLayer: ChartAxisLayer
-
- public init(xAxisLayer: ChartAxisLayer, yAxisLayer: ChartAxisLayer, axis: ChartGuideLinesLayerAxis = .xAndY, settings: T) {
- self.settings = settings
- self.axis = axis
- self.xAxisLayer = xAxisLayer
- self.yAxisLayer = yAxisLayer
-
- super.init(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis)
- }
-
- fileprivate func drawGuideline(_ context: CGContext, p1: CGPoint, p2: CGPoint) {
- fatalError("override")
- }
-
- override open func chartViewDrawing(context: CGContext, chart: Chart) {
- let originScreenLoc = chart.containerFrame.origin
- let xScreenLocs = xAxisLayer.axisValuesScreenLocs
- let yScreenLocs = yAxisLayer.axisValuesScreenLocs
-
- if axis == .x || axis == .xAndY {
- for xScreenLoc in xScreenLocs {
- guard (!yAxisLayer.low || xScreenLoc > yAxisLayer.frame.maxX) && (yAxisLayer.low || xScreenLoc < yAxisLayer.frame.minX) else {continue}
- let x1 = xScreenLoc
- let y1 = originScreenLoc.y
- let x2 = x1
- let y2 = originScreenLoc.y + chart.containerFrame.height
- drawGuideline(context, p1: CGPoint(x: x1, y: y1), p2: CGPoint(x: x2, y: y2))
- }
- }
-
- if axis == .y || axis == .xAndY {
- for yScreenLoc in yScreenLocs {
- guard (xAxisLayer.low || yScreenLoc > xAxisLayer.frame.maxY) && (!xAxisLayer.low || yScreenLoc < xAxisLayer.frame.minY) else {continue}
- let x1 = originScreenLoc.x
- let y1 = yScreenLoc
- let x2 = originScreenLoc.x + chart.containerFrame.width
- let y2 = y1
- drawGuideline(context, p1: CGPoint(x: x1, y: y1), p2: CGPoint(x: x2, y: y2))
- }
- }
- }
-}
-
-public typealias ChartGuideLinesLayer = ChartGuideLinesLayer_
-open class ChartGuideLinesLayer_: ChartGuideLinesLayerAbstract {
-
- override public init(xAxisLayer: ChartAxisLayer, yAxisLayer: ChartAxisLayer, axis: ChartGuideLinesLayerAxis = .xAndY, settings: ChartGuideLinesLayerSettings) {
- super.init(xAxisLayer: xAxisLayer, yAxisLayer: yAxisLayer, axis: axis, settings: settings)
- }
-
- override fileprivate func drawGuideline(_ context: CGContext, p1: CGPoint, p2: CGPoint) {
- ChartDrawLine(context: context, p1: p1, p2: p2, width: settings.linesWidth, color: settings.linesColor)
- }
-}
-
-public typealias ChartGuideLinesDottedLayer = ChartGuideLinesDottedLayer_
-open class ChartGuideLinesDottedLayer_: ChartGuideLinesLayerAbstract {
-
- override public init(xAxisLayer: ChartAxisLayer, yAxisLayer: ChartAxisLayer, axis: ChartGuideLinesLayerAxis = .xAndY, settings: ChartGuideLinesDottedLayerSettings) {
- super.init(xAxisLayer: xAxisLayer, yAxisLayer: yAxisLayer, axis: axis, settings: settings)
- }
-
- override fileprivate func drawGuideline(_ context: CGContext, p1: CGPoint, p2: CGPoint) {
- ChartDrawDottedLine(context: context, p1: p1, p2: p2, width: settings.linesWidth, color: settings.linesColor, dotWidth: settings.dotWidth, dotSpacing: settings.dotSpacing)
- }
-}
-
-
-open class ChartGuideLinesForValuesLayerAbstract: ChartCoordsSpaceLayer {
-
- fileprivate let settings: T
- fileprivate let axisValuesX: [ChartAxisValue]
- fileprivate let axisValuesY: [ChartAxisValue]
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, settings: T, axisValuesX: [ChartAxisValue], axisValuesY: [ChartAxisValue]) {
- self.settings = settings
- self.axisValuesX = axisValuesX
- self.axisValuesY = axisValuesY
- super.init(xAxis: xAxis, yAxis: yAxis)
- }
-
- fileprivate func drawGuideline(_ context: CGContext, color: UIColor, width: CGFloat, p1: CGPoint, p2: CGPoint, dotWidth: CGFloat, dotSpacing: CGFloat) {
- ChartDrawDottedLine(context: context, p1: p1, p2: p2, width: width, color: color, dotWidth: dotWidth, dotSpacing: dotSpacing)
- }
-
- fileprivate func drawGuideline(_ context: CGContext, p1: CGPoint, p2: CGPoint) {
- fatalError("override")
- }
-
- override open func chartViewDrawing(context: CGContext, chart: Chart) {
- let originScreenLoc = chart.containerFrame.origin
-
- for axisValue in axisValuesX {
- let screenLoc = xAxis.screenLocForScalar(axisValue.scalar)
- let x1 = screenLoc
- let y1 = originScreenLoc.y
- let x2 = x1
- let y2 = originScreenLoc.y + chart.containerFrame.height
- drawGuideline(context, p1: CGPoint(x: x1, y: y1), p2: CGPoint(x: x2, y: y2))
-
- }
-
- for axisValue in axisValuesY {
- let screenLoc = yAxis.screenLocForScalar(axisValue.scalar)
- let x1 = originScreenLoc.x
- let y1 = screenLoc
- let x2 = originScreenLoc.x + chart.containerFrame.width
- let y2 = y1
- drawGuideline(context, p1: CGPoint(x: x1, y: y1), p2: CGPoint(x: x2, y: y2))
-
- }
- }
-}
-
-
-public typealias ChartGuideLinesForValuesLayer = ChartGuideLinesForValuesLayer_
-open class ChartGuideLinesForValuesLayer_: ChartGuideLinesForValuesLayerAbstract {
-
- public override init(xAxis: ChartAxis, yAxis: ChartAxis, settings: ChartGuideLinesLayerSettings, axisValuesX: [ChartAxisValue], axisValuesY: [ChartAxisValue]) {
- super.init(xAxis: xAxis, yAxis: yAxis, settings: settings, axisValuesX: axisValuesX, axisValuesY: axisValuesY)
- }
-
- override fileprivate func drawGuideline(_ context: CGContext, p1: CGPoint, p2: CGPoint) {
- ChartDrawLine(context: context, p1: p1, p2: p2, width: settings.linesWidth, color: settings.linesColor)
- }
-}
-
-public typealias ChartGuideLinesForValuesDottedLayer = ChartGuideLinesForValuesDottedLayer_
-open class ChartGuideLinesForValuesDottedLayer_: ChartGuideLinesForValuesLayerAbstract {
-
- public override init(xAxis: ChartAxis, yAxis: ChartAxis, settings: ChartGuideLinesDottedLayerSettings, axisValuesX: [ChartAxisValue], axisValuesY: [ChartAxisValue]) {
- super.init(xAxis: xAxis, yAxis: yAxis, settings: settings, axisValuesX: axisValuesX, axisValuesY: axisValuesY)
- }
-
- override fileprivate func drawGuideline(_ context: CGContext, p1: CGPoint, p2: CGPoint) {
- ChartDrawDottedLine(context: context, p1: p1, p2: p2, width: settings.linesWidth, color: settings.linesColor, dotWidth: settings.dotWidth, dotSpacing: settings.dotSpacing)
- }
-}
-
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartLayer.swift
deleted file mode 100644
index bfe346fc1..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartLayer.swift
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// ChartLayer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 02/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-public protocol ChartLayer {
-
- var chart: Chart? {get set}
-
- // Execute actions after chart initialisation, e.g. add subviews
- func chartInitialized(chart: Chart)
-
- // Draw directly in chart's context
- // Everything drawn here will appear behind subviews added by any layer (regardless of position in layers array)
- func chartViewDrawing(context: CGContext, chart: Chart)
-
- func chartContentViewDrawing(context: CGContext, chart: Chart)
-
- func chartDrawersContentViewDrawing(context: CGContext, chart: Chart, view: UIView)
-
- /// Trigger views update, to match updated model data
- func update()
-
- /// Handle a change of the available inner space caused by an axis change of size in a direction orthogonal to the axis.
- func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?)
-
- func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat)
-
- func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat)
-
- func pan(_ deltaX: CGFloat, deltaY: CGFloat)
-
- func handlePanStart(_ location: CGPoint)
-
- func handlePanFinish()
-
- func handleZoomFinish()
-
- func handlePanEnd()
-
- func handleZoomEnd()
-
- @discardableResult
- func handleGlobalTap(_ location: CGPoint) -> Any?
-
- /// Return true to disable chart panning
- func processPan(location: CGPoint, deltaX: CGFloat, deltaY: CGFloat, isGesture: Bool, isDeceleration: Bool) -> Bool
-
- /// Return true to disable chart zooming
- func processZoom(deltaX: CGFloat, deltaY: CGFloat, anchorX: CGFloat, anchorY: CGFloat) -> Bool
-
- func keepInBoundaries()
-}
\ No newline at end of file
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartLayerBase.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartLayerBase.swift
deleted file mode 100644
index c00efb931..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartLayerBase.swift
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// ChartLayerBase.swift
-// SwiftCharts
-//
-// Created by ischuetz on 02/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// Convenience class to store common properties and make protocol's methods optional
-open class ChartLayerBase: NSObject, ChartLayer {
-
- open weak var chart: Chart?
-
- open func chartInitialized(chart: Chart) {
- self.chart = chart
- }
-
- open func chartViewDrawing(context: CGContext, chart: Chart) {}
-
- open func chartContentViewDrawing(context: CGContext, chart: Chart) {}
-
- open func chartDrawersContentViewDrawing(context: CGContext, chart: Chart, view: UIView) {}
-
- open func update() {}
-
- open func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {}
-
- open func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat) {}
-
- open func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat) {}
-
- open func pan(_ deltaX: CGFloat, deltaY: CGFloat) {}
-
- open func processPan(location: CGPoint, deltaX: CGFloat, deltaY: CGFloat, isGesture: Bool, isDeceleration: Bool) -> Bool {
- return false
- }
-
- open func handlePanStart(_ location: CGPoint) {}
-
- open func handlePanFinish() {}
-
- open func handleZoomFinish() {}
-
- open func handlePanEnd() {}
-
- open func handleZoomEnd() {}
-
- open func processZoom(deltaX: CGFloat, deltaY: CGFloat, anchorX: CGFloat, anchorY: CGFloat) -> Bool {
- return false
- }
-
- open func handleGlobalTap(_ location: CGPoint) -> Any? {
- return nil
- }
-
- open func keepInBoundaries() {}
-
- public override init() {}
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsAreaLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsAreaLayer.swift
deleted file mode 100644
index 72ca3a16a..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsAreaLayer.swift
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// ChartPointsAreaLayer.swift
-// swiftCharts
-//
-// Created by ischuetz on 15/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartPointsAreaLayer: ChartPointsLayer {
-
- fileprivate let areaColors: [UIColor]
- fileprivate let animDuration: Float
- fileprivate let animDelay: Float
- fileprivate let pathGenerator: ChartLinesViewPathGenerator
- fileprivate let addContainerPoints: Bool
- fileprivate var areaViews: [UIView] = []
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], areaColors: [UIColor], animDuration: Float, animDelay: Float, addContainerPoints: Bool, pathGenerator: ChartLinesViewPathGenerator) {
- self.areaColors = areaColors
- self.animDuration = animDuration
- self.animDelay = animDelay
- self.pathGenerator = pathGenerator
- self.addContainerPoints = addContainerPoints
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints)
- }
-
- public convenience init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], areaColor: UIColor, animDuration: Float, animDelay: Float, addContainerPoints: Bool, pathGenerator: ChartLinesViewPathGenerator) {
- self.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, areaColors: [areaColor], animDuration: animDuration, animDelay: animDelay, addContainerPoints: addContainerPoints, pathGenerator: pathGenerator)
- }
-
- open override func display(chart: Chart) {
- let areaView = ChartAreasView(points: chartPointScreenLocs, frame: chart.bounds, colors: areaColors, animDuration: animDuration, animDelay: animDelay, addContainerPoints: addContainerPoints, pathGenerator: pathGenerator)
- areaViews.append(areaView)
- chart.addSubview(areaView)
- }
-}
-
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsBubbleLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsBubbleLayer.swift
deleted file mode 100644
index 089eae866..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsBubbleLayer.swift
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// ChartPointsBubbleLayer.swift
-// Examples
-//
-// Created by ischuetz on 16/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartPointsBubbleLayer: ChartPointsLayer {
-
- fileprivate let diameterFactor: Double
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], displayDelay: Float = 0, maxBubbleDiameter: Double = 30, minBubbleDiameter: Double = 2) {
-
- let (minDiameterScalar, maxDiameterScalar): (Double, Double) = chartPoints.reduce((min: 0, max: 0)) {tuple, chartPoint in
- (min: min(tuple.min, chartPoint.diameterScalar), max: max(tuple.max, chartPoint.diameterScalar))
- }
-
- diameterFactor = (maxBubbleDiameter - minBubbleDiameter) / (maxDiameterScalar - minDiameterScalar)
-
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, displayDelay: displayDelay)
- }
-
- override open func chartViewDrawing(context: CGContext, chart: Chart) {
-
- for chartPointModel in chartPointsModels {
-
- context.setLineWidth(1.0)
- context.setStrokeColor(chartPointModel.chartPoint.borderColor.cgColor)
- context.setFillColor(chartPointModel.chartPoint.bgColor.cgColor)
-
- let diameter = CGFloat(chartPointModel.chartPoint.diameterScalar * diameterFactor)
- let circleRect = (CGRect(x: chartPointModel.screenLoc.x - diameter / 2, y: chartPointModel.screenLoc.y - diameter / 2, width: diameter, height: diameter))
-
- context.fillEllipse(in: circleRect)
- context.strokeEllipse(in: circleRect)
- }
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsCandleStickViewsLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsCandleStickViewsLayer.swift
deleted file mode 100644
index 811877980..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsCandleStickViewsLayer.swift
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// ChartPointsCandleStickViewsLayer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 29/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartPointsCandleStickViewsLayer: ChartPointsViewsLayer {
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, innerFrame: CGRect, chartPoints: [T], viewGenerator: @escaping ChartPointViewGenerator) {
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, viewGenerator: viewGenerator)
- }
-
- open func highlightChartpointView(screenLoc: CGPoint) {
- let x = screenLoc.x
- for viewWithChartPoint in viewsWithChartPoints {
- let view = viewWithChartPoint.view
- let originX = view.frame.origin.x
- view.highlighted = x > originX && x < originX + view.frame.width
- }
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsLayer.swift
deleted file mode 100644
index 9a42a70a3..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsLayer.swift
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// ChartPointsLayer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-public struct ChartPointLayerModel: CustomDebugStringConvertible {
- public let chartPoint: T
- public let index: Int
- public var screenLoc: CGPoint
-
- init(chartPoint: T, index: Int, screenLoc: CGPoint) {
- self.chartPoint = chartPoint
- self.index = index
- self.screenLoc = screenLoc
- }
-
- func copy(_ chartPoint: T? = nil, index: Int? = nil, screenLoc: CGPoint? = nil) -> ChartPointLayerModel {
- return ChartPointLayerModel(
- chartPoint: chartPoint ?? self.chartPoint,
- index: index ?? self.index,
- screenLoc: screenLoc ?? self.screenLoc
- )
- }
-
- public var debugDescription: String {
- return "chartPoint: \(chartPoint), index: \(index), screenLoc: \(screenLoc)"
- }
-}
-
-public struct TappedChartPointLayerModel {
- public let model: ChartPointLayerModel
- public let distance: CGFloat
-
- init(model: ChartPointLayerModel, distance: CGFloat) {
- self.model = model
- self.distance = distance
- }
-}
-
-
-public struct TappedChartPointLayerModels {
- public let models: [TappedChartPointLayerModel]
- public let layer: ChartPointsLayer
-
- init(models: [TappedChartPointLayerModel], layer: ChartPointsLayer) {
- self.models = models
- self.layer = layer
- }
-}
-
-public struct ChartPointsTapSettings {
- public let radius: CGFloat
- let handler: ((TappedChartPointLayerModels) -> Void)?
-
- public init(radius: CGFloat = 30, handler: ((TappedChartPointLayerModels) -> Void)? = nil) {
- self.radius = radius
- self.handler = handler
- }
-}
-
-open class ChartPointsLayer: ChartCoordsSpaceLayer {
-
- open internal(set) var chartPointsModels: [ChartPointLayerModel] = []
-
- public let displayDelay: Float
-
- open var chartPointScreenLocs: [CGPoint] {
- return chartPointsModels.map{$0.screenLoc}
- }
-
- fileprivate let chartPoints: [T]
-
- fileprivate let tapSettings: ChartPointsTapSettings?
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], displayDelay: Float = 0, tapSettings: ChartPointsTapSettings? = nil) {
- self.chartPoints = chartPoints
- self.displayDelay = displayDelay
- self.tapSettings = tapSettings
-
- super.init(xAxis: xAxis, yAxis: yAxis)
- }
-
- open override func handleGlobalTap(_ location: CGPoint) -> Any? {
- guard let tapSettings = tapSettings, let localCenter = toLocalCoordinates(location) else {return nil}
- var models: [TappedChartPointLayerModel] = []
- for chartPointModel in chartPointsModels {
- let transformedScreenLoc = modelLocToScreenLoc(x: chartPointModel.chartPoint.x.scalar, y: chartPointModel.chartPoint.y.scalar)
- let distance = transformedScreenLoc.distance(localCenter)
- if distance < tapSettings.radius {
- models.append(TappedChartPointLayerModel(model: chartPointModel.copy(screenLoc: contentToGlobalScreenLoc(chartPointModel.chartPoint)), distance: distance))
- }
- }
-
- let tappedModels = TappedChartPointLayerModels(models: models, layer: self)
-
- tapSettings.handler?(tappedModels)
-
- return tappedModels
- }
-
- func toLocalCoordinates(_ globalPoint: CGPoint) -> CGPoint? {
- return globalPoint
- }
-
- override open func chartInitialized(chart: Chart) {
- super.chartInitialized(chart: chart)
-
- initChartPointModels()
-
- if displayDelay == 0 {
- display(chart: chart)
- } else {
- DispatchQueue.main.asyncAfter(deadline: ChartTimeUtils.toDispatchTime(displayDelay)) {
- self.display(chart: chart)
- }
- }
- }
-
- func initChartPointModels() {
- chartPointsModels = generateChartPointModels(chartPoints)
- }
-
- func generateChartPointModels(_ chartPoints: [T]) -> [ChartPointLayerModel] {
- return chartPoints.enumerated().map { index, chartPoint in
- return ChartPointLayerModel(chartPoint: chartPoint, index: index, screenLoc: modelLocToScreenLoc(x: chartPoint.x.scalar, y: chartPoint.y.scalar))
- }
- }
-
- open func display(chart: Chart) {}
-
- open override func handleAxisInnerFrameChange(_ xLow: ChartAxisLayerWithFrameDelta?, yLow: ChartAxisLayerWithFrameDelta?, xHigh: ChartAxisLayerWithFrameDelta?, yHigh: ChartAxisLayerWithFrameDelta?) {
- super.handleAxisInnerFrameChange(xLow, yLow: yLow, xHigh: xHigh, yHigh: yHigh)
-
- chartPointsModels = chartPoints.enumerated().map { index, chartPoint in
- return ChartPointLayerModel(chartPoint: chartPoint, index: index, screenLoc: modelLocToScreenLoc(x: chartPoint.x.scalar, y: chartPoint.y.scalar))
- }
- }
-
- open func chartPointScreenLoc(_ chartPoint: ChartPoint) -> CGPoint {
- return modelLocToScreenLoc(x: chartPoint.x.scalar, y: chartPoint.y.scalar)
- }
-
- open func chartPointsForScreenLoc(_ screenLoc: CGPoint) -> [T] {
- return filterChartPoints { $0 == screenLoc }
- }
-
- open func chartPointsForScreenLocX(_ x: CGFloat) -> [T] {
- return filterChartPoints { $0.x =~ x }
- }
-
- open func chartPointsForScreenLocY(_ y: CGFloat) -> [T] {
- return filterChartPoints { $0.y =~ y }
-
- }
-
- // smallest screen space between chartpoints on x axis
- open lazy private(set) var minXScreenSpace: CGFloat = {
- return self.minAxisScreenSpace{$0.x}
- }()
-
- // smallest screen space between chartpoints on y axis
- open lazy private(set) var minYScreenSpace: CGFloat = {
- return self.minAxisScreenSpace{$0.y}
- }()
-
- fileprivate func minAxisScreenSpace(dimPicker: (CGPoint) -> CGFloat) -> CGFloat {
- return chartPointsModels.reduce((CGFloat.greatestFiniteMagnitude, -CGFloat.greatestFiniteMagnitude)) {tuple, viewWithChartPoint in
- let minSpace = tuple.0
- let previousScreenLoc = tuple.1
- return (min(minSpace, abs(dimPicker(viewWithChartPoint.screenLoc) - previousScreenLoc)), dimPicker(viewWithChartPoint.screenLoc))
- }.0
- }
-
- fileprivate func filterChartPoints(_ includePoint: (CGPoint) -> Bool) -> [T] {
- return chartPointsModels.reduce(Array()) {includedPoints, chartPointModel in
- let chartPoint = chartPointModel.chartPoint
- if includePoint(chartPointScreenLoc(chartPoint)) {
- return includedPoints + [chartPoint]
- } else {
- return includedPoints
- }
- }
- }
-
- func updateChartPointsScreenLocations() {
- chartPointsModels = updateChartPointsScreenLocations(chartPointsModels)
- }
-
- open func contentScreenCoords(_ chartPoint: T) -> CGPoint {
- return modelLocToScreenLoc(x: chartPoint.x.scalar, y: chartPoint.y.scalar)
- }
-
- open func containerScreenCoords(_ chartPoint: T) -> CGPoint {
- return modelLocToContainerScreenLoc(x: chartPoint.x.scalar, y: chartPoint.y.scalar)
- }
-
- func updateChartPointsScreenLocations(_ chartPointsModels: [ChartPointLayerModel]) -> [ChartPointLayerModel] {
- var chartPointsModelsVar = chartPointsModels
- for i in 0.. {
- public internal(set) var points: [CGPoint]
- public let colors: [UIColor]
- public let lineWidth: CGFloat
- public let lineJoin: LineJoin
- public let lineCap: LineCap
- public let animDuration: Float
- public let animDelay: Float
- public let lineModel: ChartLineModel
- public let dashPattern: [Double]?
-
- init(points: [CGPoint], colors: [UIColor], lineWidth: CGFloat, lineJoin: LineJoin, lineCap: LineCap, animDuration: Float, animDelay: Float, lineModel: ChartLineModel, dashPattern: [Double]?) {
- self.points = points
- self.colors = colors
- self.lineWidth = lineWidth
- self.lineJoin = lineJoin
- self.lineCap = lineCap
- self.animDuration = animDuration
- self.animDelay = animDelay
- self.lineModel = lineModel
- self.dashPattern = dashPattern
- }
-
- init(points: [CGPoint], color: UIColor, lineWidth: CGFloat, lineJoin: LineJoin, lineCap: LineCap, animDuration: Float, animDelay: Float, lineModel: ChartLineModel, dashPattern: [Double]?) {
- self.init(points: points, colors: [color], lineWidth: lineWidth, lineJoin: lineJoin, lineCap: lineCap, animDuration: animDuration, animDelay: animDelay, lineModel: lineModel, dashPattern: dashPattern)
- }
-}
-
-open class ChartPointsLineLayer: ChartPointsLayer {
- open fileprivate(set) var lineModels: [ChartLineModel]
- open fileprivate(set) var lineViews: [ChartLinesView] = []
- public let pathGenerator: ChartLinesViewPathGenerator
- open fileprivate(set) var screenLines: [(screenLine: ScreenLine, view: ChartLinesView)] = []
-
- public let useView: Bool
- public let delayInit: Bool
-
- fileprivate var isInTransform = false
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, lineModels: [ChartLineModel], pathGenerator: ChartLinesViewPathGenerator = StraightLinePathGenerator(), displayDelay: Float = 0, useView: Bool = true, delayInit: Bool = false) {
- self.lineModels = lineModels
- self.pathGenerator = pathGenerator
- self.useView = useView
- self.delayInit = delayInit
-
- let chartPoints: [T] = lineModels.flatMap{$0.chartPoints}
-
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, displayDelay: displayDelay)
- }
-
- fileprivate func toScreenLine(lineModel: ChartLineModel, chart: Chart) -> ScreenLine {
-
- return ScreenLine(
- points: lineModel.chartPoints.map{chartPointScreenLoc($0)},
- colors: lineModel.lineColors,
- lineWidth: lineModel.lineWidth,
- lineJoin: lineModel.lineJoin,
- lineCap: lineModel.lineCap,
- animDuration: lineModel.animDuration,
- animDelay: lineModel.animDelay,
- lineModel: lineModel,
- dashPattern: lineModel.dashPattern
- )
- }
-
- override open func display(chart: Chart) {
- if !delayInit {
- if useView {
- initScreenLines(chart)
- }
- }
- }
-
- open func initScreenLines(_ chart: Chart) {
- let screenLines = lineModels.map{toScreenLine(lineModel: $0, chart: chart)}
-
- for screenLine in screenLines {
- let lineView = generateLineView(screenLine, chart: chart)
- lineViews.append(lineView)
- lineView.isUserInteractionEnabled = false
- chart.addSubviewNoTransform(lineView)
- self.screenLines.append((screenLine, lineView))
- }
- }
-
- open func generateLineView(_ screenLine: ScreenLine, chart: Chart) -> ChartLinesView {
- return ChartLinesView(
- path: pathGenerator.generatePath(points: screenLine.points, lineWidth: screenLine.lineWidth),
- frame: chart.contentView.bounds,
- lineColors: screenLine.colors,
- lineWidth: screenLine.lineWidth,
- lineJoin: screenLine.lineJoin,
- lineCap: screenLine.lineCap,
- animDuration: isInTransform ? 0 : screenLine.animDuration,
- animDelay: isInTransform ? 0 : screenLine.animDelay,
- dashPattern: screenLine.dashPattern
- )
- }
-
- override open func chartDrawersContentViewDrawing(context: CGContext, chart: Chart, view: UIView) {
- if !useView {
- for lineModel in lineModels {
- let points = lineModel.chartPoints.map { modelLocToScreenLoc(x: $0.x.scalar, y: $0.y.scalar) }
- let path = pathGenerator.generatePath(points: points, lineWidth: lineModel.lineWidth)
-
- context.saveGState()
- context.addPath(path.cgPath)
- context.setLineWidth(lineModel.lineWidth)
- context.setLineJoin(lineModel.lineJoin.CGValue)
- context.setLineCap(lineModel.lineCap.CGValue)
- context.setLineDash(phase: 0, lengths: lineModel.dashPattern?.map { CGFloat($0) } ?? [])
- context.setStrokeColor(lineModel.lineColors.first?.cgColor ?? UIColor.white.cgColor)
- context.strokePath()
- context.restoreGState()
- }
- }
- }
-
- open override func modelLocToScreenLoc(x: Double) -> CGFloat {
- return xAxis.screenLocForScalar(x) - (chart?.containerFrame.origin.x ?? 0)
- }
-
- open override func modelLocToScreenLoc(y: Double) -> CGFloat {
- return yAxis.screenLocForScalar(y) - (chart?.containerFrame.origin.y ?? 0)
- }
-
- open override func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- if !useView {
- chart?.drawersContentView.setNeedsDisplay()
- }
- }
-
- open override func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- if !useView {
- chart?.drawersContentView.setNeedsDisplay()
- } else {
- updateScreenLines()
- }
- }
-
- open override func pan(_ deltaX: CGFloat, deltaY: CGFloat) {
- if !useView {
- chart?.drawersContentView.setNeedsDisplay()
- } else {
- updateScreenLines()
- }
- }
-
- fileprivate func updateScreenLines() {
-
- guard let chart = chart else {return}
-
- isInTransform = true
-
- for i in 0.. String {
- return input.rawValue
-}
-
-// Helper function inserted by Swift 4.2 migrator.
-fileprivate func convertFromCAShapeLayerLineCap(_ input: CAShapeLayerLineCap) -> String {
- return input.rawValue
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsLineTrackerLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsLineTrackerLayer.swift
deleted file mode 100644
index 48866490d..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsLineTrackerLayer.swift
+++ /dev/null
@@ -1,404 +0,0 @@
-//
-// ChartPointsTrackerLayer.swift
-// swift_charts
-//
-// Created by ischuetz on 16/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-public struct ChartPointsLineTrackerLayerThumbSettings {
- let thumbSize: CGFloat
- let thumbBorderWidth: CGFloat
- let thumbBorderColor: UIColor
-
- public init(thumbSize: CGFloat, thumbBorderWidth: CGFloat = 4, thumbBorderColor: UIColor = UIColor.black) {
- self.thumbSize = thumbSize
- self.thumbBorderWidth = thumbBorderWidth
- self.thumbBorderColor = thumbBorderColor
- }
-}
-
-public struct ChartPointsLineTrackerLayerSettings {
- let thumbSettings: ChartPointsLineTrackerLayerThumbSettings? // nil -> no thumb
- let selectNearest: Bool
-
- public init(thumbSettings: ChartPointsLineTrackerLayerThumbSettings? = nil, selectNearest: Bool = false) {
- self.thumbSettings = thumbSettings
- self.selectNearest = selectNearest
- }
-}
-
-
-public struct ChartTrackerSelectedChartPoint: CustomDebugStringConvertible {
-
- public let chartPoint: T
- public let screenLoc: CGPoint
- public let lineIndex: Int
- public let lineModel: ChartTrackerLineLayerModel
- public let lineExtra: U?
-
- init(chartPoint: T, intersection: ChartTrackerIntersection) {
- self.init(chartPoint: chartPoint, screenLoc: intersection.screenLoc, lineIndex: intersection.lineIndex, lineModel: intersection.lineModel, lineExtra: intersection.lineModel.extra)
- }
-
- init(chartPoint: T, screenLoc: CGPoint, lineIndex: Int, lineModel: ChartTrackerLineLayerModel, lineExtra: U?) {
- self.chartPoint = chartPoint
- self.screenLoc = screenLoc
- self.lineIndex = lineIndex
- self.lineModel = lineModel
- self.lineExtra = lineExtra
- }
-
- func copy(_ chartPoint: T? = nil, screenLoc: CGPoint? = nil, lineIndex: Int? = nil, lineModel: ChartTrackerLineLayerModel? = nil, lineExtra: U? = nil) -> ChartTrackerSelectedChartPoint {
- return ChartTrackerSelectedChartPoint(
- chartPoint: chartPoint ?? self.chartPoint,
- screenLoc: screenLoc ?? self.screenLoc,
- lineIndex: lineIndex ?? self.lineIndex,
- lineModel: lineModel ?? self.lineModel,
- lineExtra: lineExtra ?? self.lineExtra
- )
- }
-
- public var debugDescription: String {
- return "chartPoint: \(chartPoint), screenLoc: \(screenLoc), lineIndex: \(lineIndex), lineModel: \(lineModel)"
- }
-}
-
-public struct ChartTrackerIntersection {
- let screenLoc: CGPoint
- let lineIndex: Int
- let lineModel: ChartTrackerLineLayerModel
-
- init(screenLoc: CGPoint, lineIndex: Int, lineModel: ChartTrackerLineLayerModel) {
- self.screenLoc = screenLoc
- self.lineIndex = lineIndex
- self.lineModel = lineModel
- }
-}
-
-public struct ChartTrackerLineModel {
- public let chartPoints: [T]
- public let extra: U?
-
- public init(chartPoints: [T]) {
- self.init(chartPoints: chartPoints, extra: nil)
- }
-
- /// extra: optional object which is passed back with the line in the position update handler. Can be for example an id to group certain lines together, a color, etc.
- public init(chartPoints: [T], extra: U?) {
- self.chartPoints = chartPoints
- self.extra = extra
- }
-}
-
-public struct ChartTrackerLineLayerModel {
- public let chartPointModels: [ChartPointLayerModel]
- public let extra: U?
-
- init(chartPointModels: [ChartPointLayerModel], extra: U?) {
- self.chartPointModels = chartPointModels
- self.extra = extra
- }
-
- func copy(_ chartPointModels: [ChartPointLayerModel]? = nil, extra: U?? = nil) -> ChartTrackerLineLayerModel {
- return ChartTrackerLineLayerModel(
- chartPointModels: chartPointModels ?? self.chartPointModels,
- extra: extra ?? self.extra
- )
- }
-}
-
-open class ChartPointsLineTrackerLayer: ChartPointsLayer {
-
- fileprivate let lineColor: UIColor
- fileprivate let animDuration: Float
- fileprivate let animDelay: Float
-
- fileprivate let settings: ChartPointsLineTrackerLayerSettings
-
- fileprivate var isTracking: Bool = false
-
- open var positionUpdateHandler: (([ChartTrackerSelectedChartPoint]) -> Void)?
-
- public let lines: [ChartTrackerLineModel]
- open var lineModels: [ChartTrackerLineLayerModel] = []
-
- fileprivate var currentIntersections: [ChartTrackerIntersection] = []
-
- fileprivate var lineView: UIView?
-
- public convenience init(xAxis: ChartAxis, yAxis: ChartAxis, lines: [[T]], lineColor: UIColor, animDuration: Float, animDelay: Float, settings: ChartPointsLineTrackerLayerSettings, positionUpdateHandler: (([ChartTrackerSelectedChartPoint]) -> Void)? = nil) {
- self.init(xAxis: xAxis, yAxis: yAxis, lines: lines.map{ChartTrackerLineModel(chartPoints: $0)}, lineColor: lineColor, animDuration: animDuration, animDelay: animDelay, settings: settings, positionUpdateHandler: positionUpdateHandler)
- }
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, lines: [ChartTrackerLineModel], lineColor: UIColor, animDuration: Float, animDelay: Float, settings: ChartPointsLineTrackerLayerSettings, positionUpdateHandler: (([ChartTrackerSelectedChartPoint]) -> Void)? = nil) {
- self.lineColor = lineColor
- self.animDuration = animDuration
- self.animDelay = animDelay
- self.settings = settings
- self.positionUpdateHandler = positionUpdateHandler
- self.lines = lines
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: Array(lines.map{$0.chartPoints}.joined()))
- }
-
- fileprivate func linesIntersection(line1P1: CGPoint, line1P2: CGPoint, line2P1: CGPoint, line2P2: CGPoint) -> CGPoint? {
- return findLineIntersection(p0X: line1P1.x, p0y: line1P1.y, p1x: line1P2.x, p1y: line1P2.y, p2x: line2P1.x, p2y: line2P1.y, p3x: line2P2.x, p3y: line2P2.y)
- }
-
- override func initChartPointModels() {
- lineModels = lines.map{ChartTrackerLineLayerModel(chartPointModels: generateChartPointModels($0.chartPoints), extra: $0.extra)}
- chartPointsModels = Array(lineModels.map{$0.chartPointModels}.joined()) // consistency
- }
-
- override func updateChartPointsScreenLocations() {
- super.updateChartPointsScreenLocations()
- for i in 0.. CGPoint? {
-
- var s02x: CGFloat, s02y: CGFloat, s10x: CGFloat, s10y: CGFloat, s32x: CGFloat, s32y: CGFloat, sNumer: CGFloat, tNumer: CGFloat, denom: CGFloat, t: CGFloat;
-
- s10x = p1x - p0X
- s10y = p1y - p0y
- s32x = p3x - p2x
- s32y = p3y - p2y
-
- denom = s10x * s32y - s32x * s10y
- if denom =~ 0 {
- return nil // Collinear
- }
- let denomPositive: Bool = denom > 0
-
- s02x = p0X - p2x
- s02y = p0y - p2y
- sNumer = s10x * s02y - s10y * s02x
- if (sNumer < 0) == denomPositive {
- return nil // No collision
- }
-
- tNumer = s32x * s02y - s32y * s02x
- if (tNumer < 0) == denomPositive {
- return nil // No collision
- }
- if ((sNumer > denom) == denomPositive) || ((tNumer > denom) == denomPositive) {
- return nil // No collision
- }
-
- // Collision detected
- t = tNumer / denom
- let i_x = p0X + (t * s10x)
- let i_y = p0y + (t * s10y)
- return CGPoint(x: i_x, y: i_y)
- }
-
- fileprivate func intersectsWithChartPointLines(_ rect: CGRect) -> Bool {
- let rectLines = rect.asLinesArray()
- return iterateLineSegments({p1, p2, _, _ in
- for rectLine in rectLines {
- if self.linesIntersection(line1P1: rectLine.p1, line1P2: rectLine.p2, line2P1: p1.screenLoc, line2P2: p2.screenLoc) != nil {
- return true
- }
- }
- return nil
- }) ?? false
- }
-
- fileprivate func intersectsWithTrackerLine(_ rect: CGRect) -> Bool {
-
- guard let currentIntersection = currentIntersections.first else {return false}
-
- let rectLines = rect.asLinesArray()
-
- let line = toLine(currentIntersection.screenLoc)
-
- for rectLine in rectLines {
- if linesIntersection(line1P1: rectLine.p1, line1P2: rectLine.p2, line2P1: line.p1, line2P2: line.p2) != nil {
- return true
- }
- }
-
- return false
- }
-
- fileprivate func updateTrackerLineOnValidState(updateFunc: (_ view: UIView) -> ()) {
- if !chartPointsModels.isEmpty {
- if let view = chart?.contentView {
- updateFunc(view)
- }
- }
- }
-
- /// f: function to be applied to each segment in the lines defined by p1, p2. Returns an object of type U to exit, returning it from the outer function, or nil to continue
- fileprivate func iterateLineSegments(_ f: (_ p1: ChartPointLayerModel, _ p2: ChartPointLayerModel, _ lineIndex: Int, _ line: ChartTrackerLineLayerModel) -> V?) -> V? {
- for (index, line) in lineModels.enumerated() {
- let lineChartPoints = line.chartPointModels
-
- guard !lineChartPoints.isEmpty else {continue}
-
- for i in 0..<(lineChartPoints.count - 1) {
- let m1 = lineChartPoints[i]
- let m2 = lineChartPoints[i + 1]
-
- if let res = f(m1, m2, index, line) {
- return res
- }
- }
- }
- return nil
- }
-
- fileprivate func updateTrackerLine(touchPoint: CGPoint) {
-
- updateTrackerLineOnValidState{(view) in
-
- let constantX = touchPoint.x
-
- let touchlineP1 = CGPoint(x: constantX, y: 0)
- let touchlineP2 = CGPoint(x: constantX, y: view.frame.size.height)
-
- var intersections: [ChartTrackerIntersection] = []
-
- let _: Any? = self.iterateLineSegments({p1, p2, lineIndex, lineModel in
- if let intersection = self.linesIntersection(line1P1: touchlineP1, line1P2: touchlineP2, line2P1: p1.screenLoc, line2P2: p2.screenLoc) {
- intersections.append(ChartTrackerIntersection(screenLoc: intersection, lineIndex: lineIndex, lineModel: lineModel))
- }
- return nil
- })
-
- if !intersections.isEmpty {
-
- self.currentIntersections = self.settings.selectNearest ? touchPoint.nearest(intersections, pointMapper: {$0.screenLoc}).map{[$0.pointMappable]} ?? [] : intersections
- self.isTracking = true
-
- self.updateLineView()
-
- if self.chartPointsModels.count > 1 {
-
- let chartPoints: [ChartTrackerSelectedChartPoint] = intersections.map {intersection in
-
- // the charpoints as well as the touch (-> intersection) use global coordinates, to draw in drawer container we have to translate to its coordinates
- let trans = self.globalToDrawersContainerCoordinates(intersection.screenLoc)!
-
- let zoomedAxisX = self.xAxis.firstVisibleScreen - self.xAxis.firstScreen + trans.x
- let zoomedAxisY = self.yAxis.lastVisibleScreen - self.yAxis.lastScreen + trans.y
-
- let xScalar = self.xAxis.innerScalarForScreenLoc(zoomedAxisX)
- let yScalar = self.yAxis.innerScalarForScreenLoc(zoomedAxisY)
-
- let dummyModel = self.chartPointsModels[0]
- let x = dummyModel.chartPoint.x.copy(xScalar)
- let y = dummyModel.chartPoint.y.copy(yScalar)
-
- let chartPoint = T(x: x, y: y)
-
- return ChartTrackerSelectedChartPoint(chartPoint: chartPoint, intersection: intersection)
- }
-
- self.positionUpdateHandler?(chartPoints)
- }
-
- } else {
- self.clearIntersections()
- }
- }
- }
-
- fileprivate func updateLineView() {
-
- guard let firstIntersection = currentIntersections.first, let containerTouchCoordinates = globalToDrawersContainerCoordinates(firstIntersection.screenLoc) else {return}
-
- if lineView == nil {
- let lineView = UIView()
- lineView.frame.size = CGSize(width: 2, height: 10000000)
- lineView.backgroundColor = self.lineColor
- chart?.addSubviewNoTransform(lineView)
- self.lineView = lineView
- }
-
- lineView?.center.x = containerTouchCoordinates.x
- }
-
- fileprivate func toLine(_ intersection: CGPoint) -> (p1: CGPoint, p2: CGPoint) {
- return (p1: CGPoint(x: intersection.x, y: 0), p2: CGPoint(x: intersection.x, y: 10000000))
- }
-
- open override func handlePanStart(_ location: CGPoint) {
- guard let localLocation = toLocalCoordinates(location) else {return}
-
- updateChartPointsScreenLocations()
-
- let surroundingRect = localLocation.surroundingRect(30)
-
- if intersectsWithChartPointLines(surroundingRect) || intersectsWithTrackerLine(surroundingRect) {
- isTracking = true
- } else {
- clearIntersections()
- }
- }
-
- fileprivate func clearIntersections() {
- currentIntersections = []
- positionUpdateHandler?([])
- lineView?.removeFromSuperview()
- lineView = nil
- }
-
- open override func processPan(location: CGPoint, deltaX: CGFloat, deltaY: CGFloat, isGesture: Bool, isDeceleration: Bool) -> Bool {
- guard let localLocation = toLocalCoordinates(location) else {return false}
-
- if isTracking {
- updateTrackerLine(touchPoint: localLocation)
- return true
- } else {
- return false
- }
- }
-
- open override func handleGlobalTap(_ location: CGPoint) -> Any? {
- guard let localLocation = toLocalCoordinates(location) else {return nil}
-
- updateChartPointsScreenLocations()
-
- updateTrackerLine(touchPoint: localLocation)
-
- return nil
- }
-
- open override func handlePanEnd() {
- isTracking = false
- }
-
- open override func modelLocToScreenLoc(x: Double) -> CGFloat {
- return xAxis.screenLocForScalar(x) - (chart?.containerFrame.origin.x ?? 0)
- }
-
- open override func modelLocToScreenLoc(y: Double) -> CGFloat {
- return yAxis.screenLocForScalar(y) - (chart?.containerFrame.origin.y ?? 0)
- }
-
- open override func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- chart?.drawersContentView.setNeedsDisplay()
-
- clearIntersections()
- }
-
- open override func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- super.zoom(x, y: y, centerX: centerX, centerY: centerY)
- clearIntersections()
- chart?.drawersContentView.setNeedsDisplay()
- }
-
- open override func pan(_ deltaX: CGFloat, deltaY: CGFloat) {
- super.pan(deltaX, deltaY: deltaY)
- chart?.drawersContentView.setNeedsDisplay()
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsScatterLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsScatterLayer.swift
deleted file mode 100644
index 410bef5f0..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsScatterLayer.swift
+++ /dev/null
@@ -1,237 +0,0 @@
-//
-// ChartPointsScatterLayer.swift
-// Examples
-//
-// Created by ischuetz on 17/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartPointsScatterLayer: ChartPointsLayer {
-
- public let itemSize: CGSize
- public let itemFillColor: UIColor
-
- fileprivate let optimized: Bool
-
- required public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], displayDelay: Float = 0, itemSize: CGSize, itemFillColor: UIColor, optimized: Bool, tapSettings: ChartPointsTapSettings?) {
- self.itemSize = itemSize
- self.itemFillColor = itemFillColor
- self.optimized = optimized
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, displayDelay: displayDelay, tapSettings: tapSettings)
- }
-
- override open func chartContentViewDrawing(context: CGContext, chart: Chart) {
- }
-
- override open func chartDrawersContentViewDrawing(context: CGContext, chart: Chart, view: UIView) {
- if !optimized {
- for chartPointModel in chartPointsModels {
- drawChartPointModel(context, chartPointModel: chartPointModel, view: view)
- }
- } else { // Generate CGLayer with shape only once and draw it at different positions.
- let contentScale = view.contentScaleFactor * 2
- guard let layer = generateCGLayer(context, view: view, contentScale: contentScale) else {print("Couldn't generate layer"); return}
-
- let w = itemSize.width
- let h = itemSize.height
-
- for chartPointModel in chartPointsModels {
- let screenLoc = modelLocToScreenLoc(x: chartPointModel.chartPoint.x.scalar, y: chartPointModel.chartPoint.y.scalar)
- context.saveGState()
- context.translateBy(x: screenLoc.x, y: screenLoc.y)
- context.draw(layer, in: CGRect(x: -w / 2, y: -h / 2, width: w, height: h))
- context.restoreGState()
- }
- }
- }
-
- override func toLocalCoordinates(_ globalPoint: CGPoint) -> CGPoint? {
- return globalToDrawersContainerCoordinates(globalPoint)
- }
-
- open override func modelLocToScreenLoc(x: Double) -> CGFloat {
- return xAxis.screenLocForScalar(x) - (chart?.containerFrame.origin.x ?? 0)
- }
-
- open override func modelLocToScreenLoc(y: Double) -> CGFloat {
- return yAxis.screenLocForScalar(y) - (chart?.containerFrame.origin.y ?? 0)
- }
-
- open override func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- chart?.drawersContentView.setNeedsDisplay()
- }
-
- open override func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat) {
- chart?.drawersContentView.setNeedsDisplay()
- }
-
- open override func pan(_ deltaX: CGFloat, deltaY: CGFloat) {
- chart?.drawersContentView.setNeedsDisplay()
- }
-
- open func drawChartPointModel(_ context: CGContext, chartPointModel: ChartPointLayerModel, view: UIView) {
- fatalError("override")
- }
-
- open func updatePointLayer(_ chartPointModel: ChartPointLayerModel) {
- fatalError("override")
- }
-
- func generateCGLayer(_ context: CGContext, view: UIView, contentScale: CGFloat) -> CGLayer? {
- let scaledBounds = CGRect(x: 0, y: 0, width: itemSize.width * contentScale, height: itemSize.height * contentScale)
- let layer = CGLayer(context, size: scaledBounds.size, auxiliaryInfo: nil)
- let myLayerContext1 = layer?.context
- myLayerContext1?.scaleBy(x: contentScale, y: contentScale)
- return layer
- }
-
-}
-
-open class ChartPointsScatterTrianglesLayer: ChartPointsScatterLayer {
-
- fileprivate let trianglePointsCG: [CGPoint]
-
- required public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], displayDelay: Float = 0, itemSize: CGSize, itemFillColor: UIColor, optimized: Bool = true, tapSettings: ChartPointsTapSettings? = nil) {
- trianglePointsCG = [CGPoint(x: 0, y: itemSize.height), CGPoint(x: itemSize.width / 2, y: 0), CGPoint(x: itemSize.width, y: itemSize.height), CGPoint(x: 0, y: itemSize.height)]
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, displayDelay: displayDelay, itemSize: itemSize, itemFillColor: itemFillColor, optimized: optimized, tapSettings: tapSettings)
- }
-
- override func generateCGLayer(_ context: CGContext, view: UIView, contentScale: CGFloat) -> CGLayer? {
- guard let layer = super.generateCGLayer(context, view: view, contentScale: contentScale), let layerContext = layer.context else {print("Couldn't get context"); return nil}
-
- layerContext.setFillColor(itemFillColor.cgColor)
- layerContext.addLines(between: trianglePointsCG)
- layerContext.fillPath()
-
- return layer
- }
-
- override open func drawChartPointModel(_ context: CGContext, chartPointModel: ChartPointLayerModel, view: UIView) {
-
- let w = itemSize.width
- let h = itemSize.height
-
- let screenLoc = modelLocToScreenLoc(x: chartPointModel.chartPoint.x.scalar, y: chartPointModel.chartPoint.y.scalar)
-
- let path = CGMutablePath()
- path.move(to: CGPoint(x: screenLoc.x, y: screenLoc.y - h / 2))
- path.addLine(to: CGPoint(x: screenLoc.x + w / 2, y: screenLoc.y + h / 2))
- path.addLine(to: CGPoint(x: screenLoc.x - w / 2, y: screenLoc.y + h / 2))
- path.closeSubpath()
-
- context.setFillColor(itemFillColor.cgColor)
- context.addPath(path)
- context.fillPath()
- }
-}
-
-open class ChartPointsScatterSquaresLayer: ChartPointsScatterLayer {
-
- fileprivate let squarePointsCG: [CGPoint]
-
- required public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], displayDelay: Float = 0, itemSize: CGSize, itemFillColor: UIColor, optimized: Bool = true, tapSettings: ChartPointsTapSettings? = nil) {
- squarePointsCG = [CGPoint(x: 0, y: 0), CGPoint(x: itemSize.width, y: 0), CGPoint(x: itemSize.width, y: itemSize.height), CGPoint(x: 0, y: itemSize.height), CGPoint(x: 0, y: 0)]
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, displayDelay: displayDelay, itemSize: itemSize, itemFillColor: itemFillColor, optimized: optimized, tapSettings: tapSettings)
- }
-
- override open func drawChartPointModel(_ context: CGContext, chartPointModel: ChartPointLayerModel, view: UIView) {
-
- let w = itemSize.width
- let h = itemSize.height
-
- let screenLoc = modelLocToScreenLoc(x: chartPointModel.chartPoint.x.scalar, y: chartPointModel.chartPoint.y.scalar)
-
- context.setFillColor(itemFillColor.cgColor)
- context.fill(CGRect(x: screenLoc.x - w / 2, y: screenLoc.y - h / 2, width: w, height: h))
- }
-
- override func generateCGLayer(_ context: CGContext, view: UIView, contentScale: CGFloat) -> CGLayer? {
- guard let layer = super.generateCGLayer(context, view: view, contentScale: contentScale), let layerContext = layer.context else {print("Couldn't get context"); return nil}
-
- layerContext.setFillColor(itemFillColor.cgColor)
- layerContext.fill(CGRect(x: 0, y: 0, width: itemSize.width, height: itemSize.height))
- layerContext.fillPath()
-
- return layer
- }
-}
-
-open class ChartPointsScatterCirclesLayer: ChartPointsScatterLayer {
-
- required public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], displayDelay: Float = 0, itemSize: CGSize, itemFillColor: UIColor, optimized: Bool = true, tapSettings: ChartPointsTapSettings? = nil) {
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, displayDelay: displayDelay, itemSize: itemSize, itemFillColor: itemFillColor, optimized: optimized, tapSettings: tapSettings)
- }
-
- override open func drawChartPointModel(_ context: CGContext, chartPointModel: ChartPointLayerModel, view: UIView) {
- let w = itemSize.width
- let h = itemSize.height
-
- let screenLoc = modelLocToScreenLoc(x: chartPointModel.chartPoint.x.scalar, y: chartPointModel.chartPoint.y.scalar)
-
- context.setFillColor(itemFillColor.cgColor)
- context.fillEllipse(in: CGRect(x: screenLoc.x - w / 2, y: screenLoc.y - h / 2, width: w, height: h))
- }
-
- override func generateCGLayer(_ context: CGContext, view: UIView, contentScale: CGFloat) -> CGLayer? {
- guard let layer = super.generateCGLayer(context, view: view, contentScale: contentScale), let layerContext = layer.context else {print("Couldn't get context"); return nil}
-
- layerContext.setFillColor(itemFillColor.cgColor)
- layerContext.fillEllipse(in: CGRect(x: 0, y: 0, width: itemSize.width, height: itemSize.height))
- layerContext.fillPath()
-
- return layer
- }
-}
-
-open class ChartPointsScatterCrossesLayer: ChartPointsScatterLayer {
-
- public let strokeWidth: CGFloat
-
- fileprivate let line1PointsCG: [CGPoint]
- fileprivate let line2PointsCG: [CGPoint]
-
- required public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], displayDelay: Float = 0, itemSize: CGSize, itemFillColor: UIColor, strokeWidth: CGFloat = 2, optimized: Bool = true, tapSettings: ChartPointsTapSettings? = nil) {
- self.strokeWidth = strokeWidth
- line1PointsCG = [CGPoint(x: 0, y: 0), CGPoint(x: itemSize.width, y: itemSize.height)]
- line2PointsCG = [CGPoint(x: itemSize.width, y: 0), CGPoint(x: 0, y: itemSize.height)]
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, displayDelay: displayDelay, itemSize: itemSize, itemFillColor: itemFillColor, optimized: optimized, tapSettings: tapSettings)
- }
-
- required public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], displayDelay: Float, itemSize: CGSize, itemFillColor: UIColor, optimized: Bool, tapSettings: ChartPointsTapSettings?) {
- fatalError("init(xAxis:yAxis:chartPoints:displayDelay:itemSize:itemFillColor:optimized:tapSettings:) has not been implemented")
- }
-
- override open func drawChartPointModel(_ context: CGContext, chartPointModel: ChartPointLayerModel, view: UIView) {
- let w = itemSize.width
- let h = itemSize.height
-
- let screenLoc = modelLocToScreenLoc(x: chartPointModel.chartPoint.x.scalar, y: chartPointModel.chartPoint.y.scalar)
-
- func drawLine(_ p1X: CGFloat, p1Y: CGFloat, p2X: CGFloat, p2Y: CGFloat) {
- context.setStrokeColor(itemFillColor.cgColor)
- context.setLineWidth(strokeWidth)
- context.move(to: CGPoint(x: p1X, y: p1Y))
- context.addLine(to: CGPoint(x: p2X, y: p2Y))
- context.strokePath()
- }
-
- drawLine(screenLoc.x - w / 2, p1Y: screenLoc.y - h / 2, p2X: screenLoc.x + w / 2, p2Y: screenLoc.y + h / 2)
- drawLine(screenLoc.x + w / 2, p1Y: screenLoc.y - h / 2, p2X: screenLoc.x - w / 2, p2Y: screenLoc.y + h / 2)
- }
-
- override func generateCGLayer(_ context: CGContext, view: UIView, contentScale: CGFloat) -> CGLayer? {
- guard let layer = super.generateCGLayer(context, view: view, contentScale: contentScale), let layerContext = layer.context else {print("Couldn't get context"); return nil}
-
- context.setStrokeColor(itemFillColor.cgColor)
- context.setLineWidth(strokeWidth)
-
- layerContext.addLines(between: line1PointsCG)
- layerContext.addLines(between: line2PointsCG)
-
- layerContext.strokePath()
-
- return layer
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsSingleViewLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsSingleViewLayer.swift
deleted file mode 100644
index 298db07a3..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsSingleViewLayer.swift
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// ChartPointsSingleViewLayer.swift
-// swift_charts
-//
-// Created by ischuetz on 19/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-// Layer that shows only one view at a time
-open class ChartPointsSingleViewLayer: ChartPointsViewsLayer {
-
- fileprivate var addedViews: [UIView] = []
-
- fileprivate var activeChartPoint: T?
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, innerFrame: CGRect, chartPoints: [T], viewGenerator: @escaping ChartPointViewGenerator, mode: ChartPointsViewsLayerMode = .scaleAndTranslate, keepOnFront: Bool = true) {
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, viewGenerator: viewGenerator, mode: mode, keepOnFront: keepOnFront)
- }
-
- override open func display(chart: Chart) {
- // skip adding views - this layer manages its own list
- }
-
- open func showView(chartPoint: T, chart: Chart) {
-
- activeChartPoint = chartPoint
-
- for view in addedViews {
- view.removeFromSuperview()
- }
-
- let screenLoc = chartPointScreenLoc(chartPoint)
- let index = chartPointsModels.map{$0.chartPoint}.firstIndex(of: chartPoint)!
- let model: ChartPointLayerModel = ChartPointLayerModel(chartPoint: chartPoint, index: index, screenLoc: screenLoc)
- if let view = viewGenerator(model, self, chart) {
- addedViews.append(view)
- addSubview(chart, view: view)
-
- viewsWithChartPoints = [ViewWithChartPoint(view: view, chartPointModel: model)]
- }
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsTouchHighlightLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsTouchHighlightLayer.swift
deleted file mode 100644
index c790cd168..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsTouchHighlightLayer.swift
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// ChartPointsTouchHighlightLayer.swift
-// SwiftCharts
-//
-// Created by Nathan Racklyeft on 2/21/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-
-/// Displays a single view for a point in response to a pan gesture
-open class ChartPointsTouchHighlightLayer: ChartPointsViewsLayer {
- public typealias ChartPointLayerModelForScreenLocFilter = (_ screenLoc: CGPoint, _ chartPointModels: [ChartPointLayerModel]) -> ChartPointLayerModel?
-
- open fileprivate(set) var view: UIView?
-
- fileprivate let chartPointLayerModelForScreenLocFilter: ChartPointLayerModelForScreenLocFilter
-
- public let gestureRecognizer: UIGestureRecognizer
-
- open var onCompleteHighlight: (()->Void)?
-
- /// The delay after touches end before the highlighted point fades out. Set to `nil` to keep the highlight until the next touch.
- open var hideDelay: TimeInterval? = 1.0
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], gestureRecognizer: UIGestureRecognizer? = nil, onCompleteHighlight: (()->Void)? = nil, modelFilter: @escaping ChartPointLayerModelForScreenLocFilter, viewGenerator: @escaping ChartPointViewGenerator) {
- chartPointLayerModelForScreenLocFilter = modelFilter
- self.gestureRecognizer = gestureRecognizer ?? UILongPressGestureRecognizer()
- self.onCompleteHighlight = onCompleteHighlight
-
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints, viewGenerator: viewGenerator)
- }
-
- override open func display(chart: Chart) {
- self.chart = chart
-
- let view = UIView(frame: chart.bounds)
-
- gestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
-
- if gestureRecognizer.view == nil {
- view.addGestureRecognizer(gestureRecognizer)
- }
-
- chart.addSubview(view)
- self.view = view
- }
-
- open var highlightedPoint: T? {
- get {
- return highlightedModel?.chartPoint
- }
- set {
- if let index = chartPointsModels.firstIndex(where: { $0.chartPoint == newValue }) {
- highlightedModel = chartPointsModels[index]
- } else {
- highlightedModel = nil
- }
- }
- }
-
- var highlightedModel: ChartPointLayerModel? {
- didSet {
- if highlightedModel?.index != oldValue?.index, let view = view, let chart = chart {
- for subview in view.subviews {
- subview.removeFromSuperview()
- }
-
- if let model = highlightedModel, let pointView = viewGenerator(model, self, chart) {
- view.addSubview(pointView)
- }
- }
- }
- }
-
- @objc func handlePan(_ gestureRecognizer: UIGestureRecognizer) {
- switch gestureRecognizer.state {
- case .began, .changed:
- if let view = view {
- let point = gestureRecognizer.location(in: view)
-
- highlightedModel = chartPointLayerModelForScreenLocFilter(point, chartPointsModels)
- }
- case .cancelled, .failed, .ended:
- if let view = view, let hideDelay = hideDelay {
- UIView.animate(withDuration: 0.5,
- delay: hideDelay,
- options: [],
- animations: {
- for subview in view.subviews {
- subview.alpha = 0
- }
- }, completion: {completed in
- if completed {
- self.highlightedModel = nil
- self.onCompleteHighlight?()
- }
- }
- )
- }
- case .possible: fallthrough
- @unknown default:
- break
- }
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsTrackerLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsTrackerLayer.swift
deleted file mode 100644
index 338277c51..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Layers/ChartPointsTrackerLayer.swift
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// ChartPointsTrackerLayer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 29/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartPointsTrackerLayer: ChartPointsLayer {
-
- fileprivate var view: TrackerView?
- fileprivate let locChangedFunc: ((CGPoint) -> ())
-
- fileprivate let lineColor: UIColor
- fileprivate let lineWidth: CGFloat
-
- fileprivate lazy private(set) var currentPositionLineOverlay: UIView = {
- let currentPositionLineOverlay = UIView()
- currentPositionLineOverlay.backgroundColor = self.lineColor
- return currentPositionLineOverlay
- }()
-
-
- public init(xAxis: ChartAxis, yAxis: ChartAxis, chartPoints: [T], locChangedFunc: @escaping (CGPoint) -> (), lineColor: UIColor = UIColor.black, lineWidth: CGFloat = 1) {
- self.locChangedFunc = locChangedFunc
- self.lineColor = lineColor
- self.lineWidth = lineWidth
- super.init(xAxis: xAxis, yAxis: yAxis, chartPoints: chartPoints)
- }
-
- open override func display(chart: Chart) {
- let view = TrackerView(frame: chart.bounds, updateFunc: {[weak self] location in
- self?.locChangedFunc(location)
- self?.currentPositionLineOverlay.center.x = location.x
- })
- view.isUserInteractionEnabled = true
- chart.addSubview(view)
- self.view = view
-
- view.addSubview(currentPositionLineOverlay)
-
- currentPositionLineOverlay.frame = CGRect(x: chart.containerFrame.origin.x + 200 - lineWidth / 2, y: modelLocToScreenLoc(y: yAxis.last), width: lineWidth, height: modelLocToScreenLoc(y: yAxis.first))
- }
-}
-
-
-private class TrackerView: UIView {
-
- let updateFunc: ((CGPoint) -> ())?
-
- init(frame: CGRect, updateFunc: @escaping (CGPoint) -> ()) {
- self.updateFunc = updateFunc
-
- super.init(frame: frame)
- }
-
- required init(coder aDecoder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-
- override func touchesBegan(_ touches: Set
-
- Clojushop (Clojure) | The Iconic / Dafiti apps (Android) | Map areas (Android) | openfeedback.net (Scala, Play, Mongo, AngularJS) | Showcase app (Android) | Wastepedia (Scala, Lift, MySQL) | Zalora app (Android) | Drogifts app (Android) | Misc(mostly minigames) (Flash, Javascript, Java, etc.)
- - -
-
-- Clojushop (Clojure) | The Iconic / Dafiti apps (Android) | Map areas (Android) | openfeedback.net (Scala, Play, Mongo, AngularJS) | Showcase app (Android) | Wastepedia (Scala, Lift, MySQL) | Zalora app (Android) | Drogifts app (Android) | Misc(mostly minigames) (Flash, Javascript, Java, etc.)
- - -
-
-
-
-
-
-
--
-
-
- Online store backend/api written in Clojure. JSON api, supports paginated product list, authentication, user account, cart and payment, Unit tests. -
-Clojushop ↑
- Github- Online store backend/api written in Clojure. JSON api, supports paginated product list, authentication, user account, cart and payment, Unit tests. -
- - -
-
- Dafiti Google Play
- Zalora (relaunch) Google Play
- - Fashion e-commerce apps. Phone / Tablet, rest, md5 caching, internationalisation, custom views, etc. Similar core, customized for different ventures. Worked on this as lead Android developer with a remote team. After handover the ventures continue the mantainance / development of the apps. -
-The Iconic / Dafiti / Zalora Android apps ↑
- The Iconic Google Play- Dafiti Google Play
- Zalora (relaunch) Google Play
- - Fashion e-commerce apps. Phone / Tablet, rest, md5 caching, internationalisation, custom views, etc. Similar core, customized for different ventures. Worked on this as lead Android developer with a remote team. After handover the ventures continue the mantainance / development of the apps. -
- - - - - - -
- 
- 
- 
- 
- 
- 
- 
- - - -
- - - - -
- 
- -
-
- - Experimental social networking site. I did everything (idea/design/programming/translations)(except legal terms and privacy) Technologies: Play framework 2.1/Scala, MongoDB, ReactiveMongo (async driver for MongoDB), AngularJS, Json API, Responsive CSS (desktop/mobile), Chrome extension. Nobody used it and I took it down, but it works! (I even did QA in Intenet explorer!). Maybe coming to life again if I find a more sustainable way to develop it. -
-openfeedback.net ↑
- Code- - Experimental social networking site. I did everything (idea/design/programming/translations)(except legal terms and privacy) Technologies: Play framework 2.1/Scala, MongoDB, ReactiveMongo (async driver for MongoDB), AngularJS, Json API, Responsive CSS (desktop/mobile), Chrome extension. Nobody used it and I took it down, but it works! (I even did QA in Intenet explorer!). Maybe coming to life again if I find a more sustainable way to develop it. -
- - - - - - - -
- 
- -
-
- Samples of random functionality. Portrait / landscape and optimized for all screen sizes (also tablets). -
-Android showcase app ↑
- Google Play- Samples of random functionality. Portrait / landscape and optimized for all screen sizes (also tablets). -
- -
-
-
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
-
- Link Android app
- Code
- - Experimental project about waste information management. Did everything - concept, design, content, database, server, content management system, web interface, android app.
- The Android app is fragment based, and manages a structured cache of the server's data using content providers. It has also an option to do a full synchronisation to be used offline. The server is implemented with Lift/Scala and MySQL.
-
Note: Page loads slowly / might be inactive because of free hosting.
-
-
- Android appWastepedia ↑
- Link Web- Link Android app
- Code
- - Experimental project about waste information management. Did everything - concept, design, content, database, server, content management system, web interface, android app.
- The Android app is fragment based, and manages a structured cache of the server's data using content providers. It has also an option to do a full synchronisation to be used offline. The server is implemented with Lift/Scala and MySQL.
-
Note: Page loads slowly / might be inactive because of free hosting.
-
- - - - -
- 
- 
- 
- 
- - - Web
- - - -
- 
- -
-
- - Fashion shopping app for the Asian market. Available in multiple countries / languages. REST backend, Partial caching in local database.
- Ported it from iOS (worked on it until version 1.0.1).
- - - - - -
Zalora Android app ↑
- Google Play- - Fashion shopping app for the Asian market. Available in multiple countries / languages. REST backend, Partial caching in local database.
- Ported it from iOS (worked on it until version 1.0.1).
- - - - - -
- 
- 
- 
- 
- - -
-
-
- - Social gifting app with Facebook SDK and push notifications. Available in multiple countries / languages. REST backend.
- Implemented (programmed) complete relaunch of the Android app.
- Smartphone only (no tablets).
- - - - - -
Dropgifts Android app (relaunch) ↑
- Google Play- - Social gifting app with Facebook SDK and push notifications. Available in multiple countries / languages. REST backend.
- Implemented (programmed) complete relaunch of the Android app.
- Smartphone only (no tablets).
- - - - - -
- 
- 
- 
- 
- - -
- -
© Ivan Schuetz (except images, and apps which evidently belong to other companies), 2014 Old things...
-
-
-
-
-
diff --git a/Dependecies/SwiftCharts/Screenshots/layers.png b/Dependecies/SwiftCharts/Screenshots/layers.png
deleted file mode 100644
index 133c38213..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/layers.png and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/multi-chart-touch.jpg b/Dependecies/SwiftCharts/Screenshots/multi-chart-touch.jpg
deleted file mode 100644
index 16e2d7879..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/multi-chart-touch.jpg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0022.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0022.jpeg
deleted file mode 100644
index cc4aecfb1..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0022.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0023.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0023.jpeg
deleted file mode 100644
index d7f27a18e..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0023.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0024.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0024.jpeg
deleted file mode 100644
index 82b2f523c..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0024.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0025.png b/Dependecies/SwiftCharts/Screenshots/small/IMG_0025.png
deleted file mode 100644
index dc86d8031..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0025.png and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0026.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0026.jpeg
deleted file mode 100644
index d6f7ef0ae..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0026.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0027.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0027.jpeg
deleted file mode 100644
index b0cf4842d..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0027.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0028.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0028.jpeg
deleted file mode 100644
index c4bb1939b..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0028.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0029.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0029.jpeg
deleted file mode 100644
index 9a55db950..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0029.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0031.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0031.jpeg
deleted file mode 100644
index b4f6107a0..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0031.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0033.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0033.jpeg
deleted file mode 100644
index 12213b4f7..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0033.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0034.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0034.jpeg
deleted file mode 100644
index 67987f62b..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0034.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0037.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0037.jpeg
deleted file mode 100644
index a3488d8ad..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0037.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0038.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0038.jpeg
deleted file mode 100644
index 3ddde4aea..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0038.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0039.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0039.jpeg
deleted file mode 100644
index 36d98e117..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0039.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0040.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0040.jpeg
deleted file mode 100644
index d968578e1..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0040.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0041.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0041.jpeg
deleted file mode 100644
index c224ed4c4..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0041.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0101.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0101.jpeg
deleted file mode 100644
index b12dad1d0..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0101.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/Screenshots/small/IMG_0102.jpeg b/Dependecies/SwiftCharts/Screenshots/small/IMG_0102.jpeg
deleted file mode 100644
index d96e074f8..000000000
Binary files a/Dependecies/SwiftCharts/Screenshots/small/IMG_0102.jpeg and /dev/null differ
diff --git a/Dependecies/SwiftCharts/SwiftCharts.podspec b/Dependecies/SwiftCharts/SwiftCharts.podspec
deleted file mode 100644
index 0ccbcb59a..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts.podspec
+++ /dev/null
@@ -1,14 +0,0 @@
-Pod::Spec.new do |s|
- s.name = "SwiftCharts"
- s.version = "0.6.5"
- s.summary = "Easy to use and highly customizable charts library for iOS"
- s.homepage = "https://github.com/i-schuetz/SwiftCharts"
- s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
- s.authors = { "Ivan Schuetz" => "ivanschuetz@gmail.com"}
- s.ios.deployment_target = "8.0"
- s.tvos.deployment_target = "9.0"
- s.source = { :git => "https://github.com/i-schuetz/SwiftCharts.git", :tag => '0.6.5'}
- s.source_files = 'SwiftCharts/*.swift', 'SwiftCharts/**/*.swift'
- s.frameworks = "Foundation", "UIKit", "CoreGraphics"
- s.swift_version = '5.0'
-end
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Array_String.swift b/Dependecies/SwiftCharts/SwiftCharts/Array_String.swift
deleted file mode 100644
index 55fc1d019..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Array_String.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Array_String.swift
-// SwiftCharts
-//
-// Created by ischuetz on 13/08/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-protocol StringType {
- func width(_ font: UIFont) -> CGFloat
- func height(_ font: UIFont) -> CGFloat
-}
-
-extension String: StringType {}
-
-extension Array where Element: StringType {
-
- func maxWidth(_ font: UIFont) -> CGFloat {
- return reduce(0) {sum, str in
- sum + str.width(font)
- }
- }
-
- func maxHeight(_ font: UIFont) -> CGFloat {
- return reduce(0) {sum, str in
- sum + str.width(font)
- }
- }
-}
\ No newline at end of file
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxis.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxis.swift
deleted file mode 100644
index 10246a941..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxis.swift
+++ /dev/null
@@ -1,215 +0,0 @@
-//
-// ChartAxis.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxis: CustomStringConvertible {
-
- /// First model value
- open internal(set) var first: Double
-
- /// Last model value
- open internal(set) var last: Double
-
- // Screen location (relative to chart view's frame) corresponding to first model value
- open internal(set) var firstScreen: CGFloat
-
- // Screen location (relative to chart view's frame) corresponding to last model value
- open internal(set) var lastScreen: CGFloat
-
- open internal(set) var firstVisibleScreen: CGFloat
- open internal(set) var lastVisibleScreen: CGFloat
-
- public let paddingFirstScreen: CGFloat
- public let paddingLastScreen: CGFloat
-
- /// Optional fixed padding value which overwrites paddingFirstScreen/paddingLastScreen when determining if model values are in bounds. This is useful e.g. when setting an initial zoom level, and scaling the padding proportionally such that it appears constant for different zoom levels. In this case it may be necessary to store the un-scaled padding in these variables to keep the bounds constant.
- open var fixedPaddingFirstScreen: CGFloat?
- open var fixedPaddingLastScreen: CGFloat?
-
- open var firstVisible: Double {
- return scalarForScreenLoc(firstVisibleScreen)
- }
-
- open var lastVisible: Double {
- return scalarForScreenLoc(lastVisibleScreen)
- }
-
- open var zoomFactor: Double {
- guard visibleLength != 0 else {return 1}
- return abs(length / visibleLength)
- }
-
- // The space between first and last model values. Can be negative (used for mirrored axes)
- open var length: Double {
- fatalError("override")
- }
-
- // The space between first and last screen locations. Can be negative (used for mirrored axes)
- open var screenLength: CGFloat {
- fatalError("override")
- }
-
- open var screenLengthInit: CGFloat {
- fatalError("override")
- }
-
- open var visibleLength: Double {
- fatalError("override")
- }
-
- open var visibleScreenLength: CGFloat {
- fatalError("override")
- }
-
- open var screenToModelRatio: CGFloat {
- return screenLength / CGFloat(length)
- }
-
- open var modelToScreenRatio: CGFloat {
- return CGFloat(length) / screenLength
- }
-
- var firstInit: Double
- var lastInit: Double
- var firstScreenInit: CGFloat
- var lastScreenInit: CGFloat
-
- public required init(first: Double, last: Double, firstScreen: CGFloat, lastScreen: CGFloat, paddingFirstScreen: CGFloat = 0, paddingLastScreen: CGFloat = 0, fixedPaddingFirstScreen: CGFloat? = nil, fixedPaddingLastScreen: CGFloat? = nil) {
- self.first = first
- self.last = last
- self.firstInit = first
- self.lastInit = last
- self.firstScreen = firstScreen
- self.lastScreen = lastScreen
- self.firstScreenInit = firstScreen
- self.lastScreenInit = lastScreen
- self.paddingFirstScreen = paddingFirstScreen
- self.paddingLastScreen = paddingLastScreen
- self.fixedPaddingFirstScreen = fixedPaddingFirstScreen
- self.fixedPaddingLastScreen = fixedPaddingLastScreen
- self.firstVisibleScreen = firstScreen
- self.lastVisibleScreen = lastScreen
-
- adjustModelBoundariesForPadding()
- }
-
- /// Calculates screen location (relative to chart view's frame) of model value. It's not required that scalar is between first and last model values.
- open func screenLocForScalar(_ scalar: Double) -> CGFloat {
- fatalError("Override")
- }
-
- /// Calculates model value corresponding to screen location (relative to chart view's frame). It's not required that screenLoc is between firstScreen and lastScreen values.
- open func scalarForScreenLoc(_ screenLoc: CGFloat) -> Double {
- fatalError("Override")
- }
-
- /// Calculates screen location (relative to axis length) of model value. It's not required that scalar is between first and last model values.
- func internalScreenLocForScalar(_ scalar: Double) -> CGFloat {
- return CGFloat(scalar - first) * screenToModelRatio
- }
-
- // TODO rename content instead of inner
- // Calculate screen location (relative to axis length, taking into account inverted y axis). It's not required that scalar is between first and last model values.
- open func innerScreenLocForScalar(_ scalar: Double) -> CGFloat {
- fatalError("Override")
- }
-
- open func innerScalarForScreenLoc(_ screenLoc: CGFloat) -> Double {
- fatalError("Override")
- }
-
- func zoom(_ x: CGFloat, y: CGFloat, centerX: CGFloat, centerY: CGFloat, elastic: Bool) {
- fatalError("Override")
- }
-
- func zoom(_ scaleX: CGFloat, scaleY: CGFloat, centerX: CGFloat, centerY: CGFloat, elastic: Bool) {
- fatalError("Override")
- }
-
- func pan(_ deltaX: CGFloat, deltaY: CGFloat, elastic: Bool) {
- fatalError("Override")
- }
-
- open var transform: (scale: CGFloat, translation: CGFloat) {
- return (scale: CGFloat(zoomFactor), translation: firstScreenInit - firstScreen)
- }
-
- func offsetFirstScreen(_ offset: CGFloat) {
- firstScreen += offset
- firstScreenInit += offset
- firstVisibleScreen += offset
-
- adjustModelBoundariesForPadding()
- }
-
- func offsetLastScreen(_ offset: CGFloat) {
- lastScreen += offset
- lastScreenInit += offset
- lastVisibleScreen += offset
-
- adjustModelBoundariesForPadding()
- }
-
- open func screenToModelLength(_ screenLength: CGFloat) -> Double {
- return scalarForScreenLoc(screenLength) - scalarForScreenLoc(0)
- }
-
- open func modelToScreenLength(_ modelLength: Double) -> CGFloat {
- return screenLocForScalar(modelLength) - screenLocForScalar(0)
- }
-
- open var firstModelValueInBounds: Double {
- fatalError("Overrode")
- }
-
- open var lastModelValueInBounds: Double {
- fatalError("Overrode")
- }
-
- open var description: String {
- return "{\(type(of: self)), first: \(first), last: \(last), firstInit: \(firstInit), lastInit: \(lastInit), zoomFactor: \(zoomFactor), firstScreen: \(firstScreen), lastScreen: \(lastScreen), firstVisible: \(firstVisible), lastVisible: \(lastVisible), firstVisibleScreen: \(firstVisibleScreen), lastVisibleScreen: \(lastVisibleScreen), paddingFirstScreen: \(paddingFirstScreen), paddingLastScreen: \(paddingLastScreen), length: \(length), screenLength: \(screenLength), firstModelValueInBounds: \(firstModelValueInBounds), lastModelValueInBounds: \(lastModelValueInBounds))}"
- }
-
- var innerRatio: Double {
- return (lastInit - firstInit) / Double(screenLengthInit - paddingFirstScreen - paddingLastScreen)
- }
-
- func toModelInner(_ screenLoc: CGFloat) -> Double {
- fatalError("Override")
- }
-
- func isInBoundaries(_ screenCenter: CGFloat, screenSize: CGSize) -> Bool {
- fatalError("Override")
- }
-
- func keepInBoundaries() {
- fatalError("Override")
- }
-
- /// NOTE: this changes the model domain, which means that after this, view based chart points should be (re)generated using the updated ratio. For rendering layers this is not an issue since they request the position from the axis on each update. View based layers / content view children only update according to the transform of the parent, which is derived directly from the gestures and doesn't take into account the axes. This means in praxis that currently it's not possible to use view based layers together with padding and inner frame with varying size. Either the inner frame size has to be fixed, by setting fixed label size for all axes, or it must not have padding, or use a rendering based layer. TODO re-regenerate views on model domain update? This can lead though to stuterring when panning between labels of different sizes. Doing this at the end of the gesture would mean that during the gesture the chart points and axes can be not aligned correctly. Don't resize inner frame during the gesture (at least for view based layers)? In this case long labels would have to be cut during the gesture, and resize the frame / re-generate the chart points when the gesture ends.
- fileprivate func adjustModelBoundariesForPadding() {
- if paddingFirstScreen != 0 || paddingLastScreen != 0 {
- first = toModelInner(firstScreenInit)
- last = toModelInner(lastScreenInit)
- }
- }
-
- open func copy(_ first: Double? = nil, last: Double? = nil, firstScreen: CGFloat? = nil, lastScreen: CGFloat? = nil, paddingFirstScreen: CGFloat? = nil, paddingLastScreen: CGFloat? = nil, fixedPaddingFirstScreen: CGFloat? = nil, fixedPaddingLastScreen: CGFloat? = nil) -> ChartAxis {
- return type(of: self).init(
- first: first ?? self.first,
- last: last ?? self.last,
- firstScreen: firstScreen ?? self.firstScreen,
- lastScreen: lastScreen ?? self.lastScreen,
- paddingFirstScreen: paddingFirstScreen ?? self.paddingFirstScreen,
- paddingLastScreen: paddingLastScreen ?? self.paddingLastScreen,
- fixedPaddingFirstScreen: fixedPaddingFirstScreen ?? self.fixedPaddingFirstScreen,
- fixedPaddingLastScreen: fixedPaddingLastScreen ?? self.fixedPaddingLastScreen
- )
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisGeneratorMultiplier.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisGeneratorMultiplier.swift
deleted file mode 100644
index 25e54ac2e..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisGeneratorMultiplier.swift
+++ /dev/null
@@ -1,108 +0,0 @@
-//
-// ChartAxisGeneratorMultiplier.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-public enum ChartAxisGeneratorMultiplierUpdateMode {
- case halve
- case nice
-}
-
-public typealias ChartAxisGeneratorMultiplierUpdater = (_ axis: ChartAxis, _ generator: ChartAxisGeneratorMultiplier) -> Double
-
-open class ChartAxisGeneratorMultiplier: ChartAxisValuesGenerator {
-
- open var first: Double? {
- return nil
- }
-
- open var last: Double? {
- return nil
- }
-
- var multiplier: Double
-
- /// After zooming in a while the multiplier may be rounded down to 0, which means the intervals are not divisible anymore. We store the last multiplier which worked and keep returning values corresponding to it until the user zooms out until a new valid multiplier.
- fileprivate var lastValidMultiplier: Double?
-
- fileprivate let multiplierUpdater: ChartAxisGeneratorMultiplierUpdater
-
- public init(_ multiplier: Double, multiplierUpdateMode: ChartAxisGeneratorMultiplierUpdateMode = .halve) {
-
- let multiplierUpdater: ChartAxisGeneratorMultiplierUpdater = {
- switch multiplierUpdateMode {
- case .halve: return MultiplierUpdaters.halve
- case .nice: return MultiplierUpdaters.nice
- }
- }()
-
- self.multiplier = multiplier
- self.multiplierUpdater = multiplierUpdater
- }
-
- open func axisInitialized(_ axis: ChartAxis) {}
-
- open func generate(_ axis: ChartAxis) -> [Double] {
-
- let updatedMultiplier = multiplierUpdater(axis, self)
-
- return generate(axis, multiplier: updatedMultiplier)
- }
-
- fileprivate func generate(_ axis: ChartAxis, multiplier: Double) -> [Double] {
-
- let modelStart = calculateModelStart(axis, multiplier: multiplier)
-
- var values = [Double]()
- var scalar = modelStart
- while scalar <= axis.lastVisible {
- if ((scalar =~ axis.firstInit && axis.zoomFactor =~ 1) || scalar >= axis.firstVisible) && ((scalar =~ axis.lastInit && axis.zoomFactor =~ 1) || scalar <= axis.lastVisible) {
- values.append(scalar)
- }
- let newScalar = incrementScalar(scalar, multiplier: multiplier)
-
- if newScalar =~ scalar {
- return lastValidMultiplier.map{lastMultiplier in
- generate(axis, multiplier: lastMultiplier).filter{$0 >= axis.firstVisible && $0 <= axis.lastVisible}
- } ?? []
-
- } else {
- lastValidMultiplier = multiplier
- }
-
- scalar = newScalar
- }
-
- return values
- }
-
- func calculateModelStart(_ axis: ChartAxis, multiplier: Double) -> Double {
- return (floor((axis.firstVisible - axis.firstInit) / multiplier) * multiplier) + (axis.firstInit)
- }
-
- func incrementScalar(_ scalar: Double, multiplier: Double) -> Double {
- return scalar + multiplier
- }
-}
-
-private struct MultiplierUpdaters {
-
- static func halve(_ axis: ChartAxis, generator: ChartAxisGeneratorMultiplier) -> Double {
- // Update intervals when zooming duplicates / halves
- // In order to do this, we round the zooming factor to the lowest value in 2^0, 2^1...2^n sequence (this corresponds to 1x, 2x...nx zooming) and divide the original multiplier by this
- // For example, given a 2 multiplier, when zooming in, zooming factors in 2x..<4x are rounded down to 2x, and dividing our multiplier by 2x, we get a 1 multiplier, meaning during zoom 2x..<4x the values have 1 interval length. If continue zooming in, for 4x..<8x, we get a 0.5 multiplier, etc.
- let roundDecimals: Double = 1000000000000
- return generator.multiplier / pow(2, floor(round(log2(axis.zoomFactor) * roundDecimals) / roundDecimals))
- }
-
- static func nice(_ axis: ChartAxis, generator: ChartAxisGeneratorMultiplier) -> Double {
- let origDividers = axis.length / generator.multiplier
- let newDividers = floor(origDividers * axis.zoomFactor)
- return ChartNiceNumberCalculator.niceNumber(axis.length / (Double(newDividers)), round: true)
- }
-}
\ No newline at end of file
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabel.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabel.swift
deleted file mode 100644
index d9916c247..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabel.swift
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-// ChartAxisLabel.swift
-// swift_charts
-//
-// Created by ischuetz on 01/03/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/// A model of an axis label
-open class ChartAxisLabel {
-
- /// Displayed text. Can be truncated.
- public let text: String
-
- public let settings: ChartLabelSettings
-
- open fileprivate(set) var originalText: String
-
- var hidden: Bool = false
-
- open lazy private(set) var textSizeNonRotated: CGSize = {
- return self.text.size(self.settings.font)
- }()
-
- /// The size of the bounding rectangle for the axis label, taking into account the font and rotation it will be drawn with
- open lazy private(set) var textSize: CGSize = {
- let size = self.textSizeNonRotated
- if self.settings.rotation =~ 0 {
- return size
- } else {
- return CGRect(x: 0, y: 0, width: size.width, height: size.height).boundingRectAfterRotating(radians: self.settings.rotation * CGFloat.pi / 180.0).size
- }
- }()
-
- public init(text: String, settings: ChartLabelSettings) {
- self.text = text
- self.settings = settings
- self.originalText = text
- }
-
- func copy(_ text: String? = nil, settings: ChartLabelSettings? = nil, originalText: String? = nil, hidden: Bool? = nil) -> ChartAxisLabel {
- let label = ChartAxisLabel(
- text: text ?? self.text,
- settings: settings ?? self.settings
- )
- label.originalText = originalText ?? self.originalText
- label.hidden = hidden ?? self.hidden
- return label
- }
-}
-
-extension ChartAxisLabel: CustomDebugStringConvertible {
- public var debugDescription: String {
- return [
- "text": text,
- "settings": settings
- ]
- .debugDescription
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelGeneratorDate.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelGeneratorDate.swift
deleted file mode 100644
index a203e919f..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelGeneratorDate.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// ChartAxisLabelGeneratorDate.swift
-// SwiftCharts
-//
-// Created by ischuetz on 05/08/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-open class ChartAxisLabelsGeneratorDate: ChartAxisLabelsGeneratorBase {
-
- public let labelSettings: ChartLabelSettings
-
- public let formatter: DateFormatter
-
- public init(labelSettings: ChartLabelSettings, formatter: DateFormatter = ChartAxisLabelsGeneratorDate.defaultFormatter) {
- self.labelSettings = labelSettings
- self.formatter = formatter
- }
-
- open override func generate(_ scalar: Double) -> [ChartAxisLabel] {
- let text = formatter.string(from: Date(timeIntervalSince1970: scalar))
- return [ChartAxisLabel(text: text, settings: labelSettings)]
- }
-
- public static var defaultFormatter: DateFormatter = {
- let formatter = DateFormatter()
- formatter.dateFormat = "dd.MM.yyyy"
- return formatter
- }()
-
- open override func fonts(_ scalar: Double) -> [UIFont] {
- return [labelSettings.font]
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsConflictSolver.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsConflictSolver.swift
deleted file mode 100644
index 9b01d531f..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsConflictSolver.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// ChartAxisLabelsConflictSolver.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-/// Maps label drawers array to a new array in order to solve conflicts
-public protocol ChartAxisLabelsConflictSolver {
-
- func solveConflicts(_ labels: [ChartAxisValueLabelDrawers]) -> [ChartAxisValueLabelDrawers]
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsConflictSolverMoveUpDown.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsConflictSolverMoveUpDown.swift
deleted file mode 100644
index 9020a50b5..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsConflictSolverMoveUpDown.swift
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// ChartAxisLabelsConflictSolverMoveUpDown.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-/// Solves frame overlaps by moving drawers up and down by half of the height of their frames. Assumes being used for y axis, which currently supports only 1 label per axis value.
-open class ChartAxisLabelsConflictSolverMoveUpDown: ChartAxisLabelsConflictSolver {
-
- let maxIterations: Int
-
- /**
- - parameter maxIterations: Max count of iterations through the passed labels to solve conflicts.
- */
- public init(maxIterations: Int = 20) {
- self.maxIterations = maxIterations
- }
-
- open func solveConflicts(_ labels: [ChartAxisValueLabelDrawers]) -> [ChartAxisValueLabelDrawers] {
-
- var lastDrawerWithRect: (drawer: ChartLabelDrawer, rect: CGRect)?
-
- var iteration = 0
- var doNextIteration = true
-
- while (iteration < maxIterations && doNextIteration) {
-
- doNextIteration = false
-
- for (_, labelDrawers) in labels {
-
- guard let labelDrawer = labelDrawers.first else {continue} // for now y axis supports only one label / value
-
- if let (lastDrawer, lastRect) = lastDrawerWithRect {
- let intersection = labelDrawer.frame.intersection(lastRect)
- if intersection != CGRect.null {
-
- doNextIteration = true // if there's a conflict do another iteration after this iteration in case there are more conflicts as result of solving this conflict
-
- labelDrawer.screenLoc = CGPoint(x: labelDrawer.screenLoc.x, y: labelDrawer.screenLoc.y - intersection.height / 2)
- lastDrawer.screenLoc = CGPoint(x: lastDrawer.screenLoc.x, y: lastDrawer.screenLoc.y + intersection.height / 2)
- }
- }
-
- lastDrawerWithRect = (labelDrawer, labelDrawer.frame)
- }
-
- iteration += 1
- }
-
- return labels
- }
-}
\ No newline at end of file
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGenerator.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGenerator.swift
deleted file mode 100644
index e46198efa..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGenerator.swift
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// ChartAxisLabelsGenerator.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-/// Generates labels for an axis value. Note: Supports only one label per axis value (1 element array)
-public protocol ChartAxisLabelsGenerator {
-
- /// If the complete label should disappear as soon as a part of it is outside of the axis edges
- var onlyShowCompleteLabels: Bool {get set}
-
- var maxStringPTWidth: CGFloat? {get set}
-
- func generate(_ scalar: Double) -> [ChartAxisLabel]
-
- /// Generates label for scalar taking into account axis state
- func generate(_ scalar: Double, axis: ChartAxis) -> [ChartAxisLabel]
-
- func fonts(_ scalar: Double) -> [UIFont]
-
- func cache(_ scalar: Double, labels: [ChartAxisLabel])
-
- func cachedLabels(_ scalar: Double) -> [ChartAxisLabel]?
-}
-
-
-extension ChartAxisLabelsGenerator {
-
- public var onlyShowCompleteLabels: Bool {
- return true
- }
-
- public var maxStringPTWidth: CGFloat? {
- return nil
- }
-
- fileprivate func truncate(_ labels: [ChartAxisLabel], scalar: Double, maxStringPTWidth: CGFloat) -> [ChartAxisLabel] {
- guard let font = fonts(scalar).first else {return []}
- return labels.map {label in
- label.copy(label.text.truncate(maxStringPTWidth, font: font))
- }
- }
-
- public func generate(_ scalar: Double, axis: ChartAxis) -> [ChartAxisLabel] {
-
- return cachedLabels(scalar) ?? {
-
- let labels = generate(scalar)
-
- let truncatedLabels: [ChartAxisLabel] = maxStringPTWidth.map{truncate(labels, scalar: scalar, maxStringPTWidth: $0)} ?? labels
- cache(scalar, labels: truncatedLabels)
-
- if onlyShowCompleteLabels {
- return truncatedLabels.first.map {label in
- if axis.isInBoundaries(axis.screenLocForScalar(scalar), screenSize: label.textSize) {
- return [label]
- } else {
- return []
- }
- } ?? []
- } else {
- return truncatedLabels
- }
- }()
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorBase.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorBase.swift
deleted file mode 100644
index cf6af4bf0..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorBase.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// ChartAxisLabelsGeneratorBase.swift
-// SwiftCharts
-//
-// Created by ischuetz on 17/08/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-/// Needed for common stored properties which are not possible in the extension (without workarounds)
-open class ChartAxisLabelsGeneratorBase: ChartAxisLabelsGenerator {
-
- open var onlyShowCompleteLabels: Bool = false
-
- open var maxStringPTWidth: CGFloat? = nil
-
- var cache = [Double: [ChartAxisLabel]]()
-
- open func generate(_ scalar: Double) -> [ChartAxisLabel] {
- fatalError("Override")
- }
-
- open func fonts(_ scalar: Double) -> [UIFont] {
- fatalError("Override")
- }
-
- open func cache(_ scalar: Double, labels: [ChartAxisLabel]) {
- cache[scalar] = labels
- }
-
- open func cachedLabels(_ scalar: Double) -> [ChartAxisLabel]? {
- return cache[scalar]
- }
-}
\ No newline at end of file
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorBasic.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorBasic.swift
deleted file mode 100644
index af1156abd..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorBasic.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// ChartAxisLabelsGeneratorBasic.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-/// Generates a single unformatted label for scalar
-open class ChartAxisLabelsGeneratorBasic: ChartAxisLabelsGeneratorBase {
-
- public let labelSettings: ChartLabelSettings
-
- public init(labelSettings: ChartLabelSettings) {
- self.labelSettings = labelSettings
- }
-
- open override func generate(_ scalar: Double) -> [ChartAxisLabel] {
- return [ChartAxisLabel(text: "\(scalar)", settings: labelSettings)]
- }
-
- open override func fonts(_ scalar: Double) -> [UIFont] {
- return [labelSettings.font]
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorFixed.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorFixed.swift
deleted file mode 100644
index 1deb828a3..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorFixed.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// ChartAxisLabelsGeneratorFixed.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-open class ChartAxisLabelsGeneratorFixed: ChartAxisLabelsGeneratorBase {
-
- public let dict: [Double: [ChartAxisLabel]]
-
- public convenience init(axisValues: [ChartAxisValue]) {
- var dict = [Double: [ChartAxisLabel]]()
- for axisValue in axisValues {
- if !axisValue.hidden {
- dict[axisValue.scalar] = axisValue.labels
- }
-
- }
- self.init(dict: dict)
- }
-
- public init(dict: [Double: [ChartAxisLabel]]) {
- self.dict = dict
- }
-
- open override func generate(_ scalar: Double) -> [ChartAxisLabel] {
- return dict[scalar] ?? []
- }
-
- open override func fonts(_ scalar: Double) -> [UIFont] {
- return dict[scalar].map {labels in labels.map{$0.settings.font}} ?? []
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorFunc.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorFunc.swift
deleted file mode 100644
index 9d7c60801..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorFunc.swift
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// ChartAxisLabelsGeneratorFunc.swift
-// SwiftCharts
-//
-// Created by ischuetz on 28/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-/// Label generator that delegates to a closure, for greater flexibility
-open class ChartAxisLabelsGeneratorFunc: ChartAxisLabelsGeneratorBase {
-
- let f: (Double) -> [ChartAxisLabel]
-
- /// Convenience initializer for function which maps scalar to a single label
- public convenience init(f: @escaping (Double) -> ChartAxisLabel) {
- self.init(f: {scalar in
- return [f(scalar)]
- })
- }
-
- public init(f: @escaping (Double) -> [ChartAxisLabel]) {
- self.f = f
- }
-
- open override func generate(_ scalar: Double) -> [ChartAxisLabel] {
- return f(scalar)
- }
-
- open override func fonts(_ scalar: Double) -> [UIFont] {
- return f(scalar).map{$0.settings.font}
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumber.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumber.swift
deleted file mode 100644
index 3265f4ef8..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumber.swift
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// ChartAxisLabelsGeneratorNumber.swift
-// SwiftCharts
-//
-// Created by ischuetz on 27/06/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-/// Generates a single formatted number for scalar
-open class ChartAxisLabelsGeneratorNumber: ChartAxisLabelsGeneratorBase {
-
- public let labelSettings: ChartLabelSettings
-
- public let formatter: NumberFormatter
-
- public init(labelSettings: ChartLabelSettings, formatter: NumberFormatter = ChartAxisLabelsGeneratorNumber.defaultFormatter) {
- self.labelSettings = labelSettings
- self.formatter = formatter
- }
-
- open override func generate(_ scalar: Double) -> [ChartAxisLabel] {
- let text = formatter.string(from: NSNumber(value: scalar))!
- return [ChartAxisLabel(text: text, settings: labelSettings)]
- }
-
- public static var defaultFormatter: NumberFormatter = {
- let formatter = NumberFormatter()
- formatter.maximumFractionDigits = 2
- return formatter
- }()
-
- open override func fonts(_ scalar: Double) -> [UIFont] {
- return [labelSettings.font]
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumberSuffix.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumberSuffix.swift
deleted file mode 100644
index 7c266f4b5..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLabelsGeneratorNumberSuffix.swift
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// ChartAxisLabelsGeneratorNumberSuffix.swift
-// SwiftCharts
-//
-// Created by ischuetz on 21/07/16.
-// Copyright © 2016 ivanschuetz. All rights reserved.
-//
-
-import Foundation
-
-public enum ChartAxisLabelNumberSuffixUnit {
- case k, m, g, t, p, e
-
- static var seq: [ChartAxisLabelNumberSuffixUnit] {
- return [k, m, g, t, p, e]
- }
-
- var values: (factor: Double, text: String) {
- switch self {
- case .k: return (pow(10, 3), "K")
- case .m: return (pow(10, 6), "M")
- case .g: return (pow(10, 9), "G")
- case .t: return (pow(10, 12), "T")
- case .p: return (pow(10, 15), "P")
- case .e: return (pow(10, 18), "E")
- }
- }
-
- public var factor: Double {
- return values.factor
- }
-
- public var text: String {
- return values.text
- }
-}
-
-open class ChartAxisLabelsGeneratorNumberSuffix: ChartAxisLabelsGeneratorBase {
-
- public let labelSettings: ChartLabelSettings
-
- public let startUnit: ChartAxisLabelNumberSuffixUnit
-
- public let formatter: NumberFormatter
-
- public init(labelSettings: ChartLabelSettings, startUnit: ChartAxisLabelNumberSuffixUnit = .m, formatter: NumberFormatter = ChartAxisLabelsGeneratorNumberSuffix.defaultFormatter) {
- self.labelSettings = labelSettings
- self.startUnit = startUnit
- self.formatter = formatter
- }
-
- // src: http://stackoverflow.com/a/23290016/930450
- open override func generate(_ scalar: Double) -> [ChartAxisLabel] {
- let sign = scalar < 0 ? "-" : ""
-
- let absScalar = fabs(scalar)
-
- let (number, suffix): (Double, String) = {
- if (absScalar < startUnit.factor) {
- return (absScalar, "")
-
- } else {
- let exp = Int(log10(absScalar) / 3)
- let roundedScalar = round(10 * absScalar / pow(1000, Double(exp))) / 10
- return (roundedScalar, ChartAxisLabelNumberSuffixUnit.seq[exp - 1].text)
- }
- }()
-
- let text = "\(sign)\(formatter.string(from: NSNumber(value: number))!)\(suffix)"
- return [ChartAxisLabel(text: text, settings: labelSettings)]
- }
-
- public static var defaultFormatter: NumberFormatter = {
- let formatter = NumberFormatter()
- formatter.maximumFractionDigits = 2
- return formatter
- }()
-
- open override func fonts(_ scalar: Double) -> [UIFont] {
- return [labelSettings.font]
- }
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLayer.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLayer.swift
deleted file mode 100644
index 7ce222096..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLayer.swift
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// ChartAxisLayer.swift
-// SwiftCharts
-//
-// Created by ischuetz on 02/05/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-public protocol ChartAxisLayer: ChartLayer {
-
- // Axis, used to map between model values and screen locations
- var axis: ChartAxis {get}
-
- var tapSettings: ChartAxisLayerTapSettings? {get set}
-
- var labelsGenerator: ChartAxisLabelsGenerator {get set}
-
- /// Displayed axis values
- var currentAxisValues: [Double] {get}
-
- /// The frame of the layer. This includes title, labels and line, and takes into account possible rotation and spacing settings.
- var frame: CGRect {get}
-
- var frameWithoutLabels: CGRect {get}
-
- /// Screen locations of current axis values
- var axisValuesScreenLocs: [CGFloat] {get}
-
- /// The axis values with their respective frames relative to the chart's view
- var axisValuesWithFrames: [(axisValue: Double, frames: [CGRect])] {get}
-
- /// The smallest screen distance between axis values
- var minAxisScreenSpace: CGFloat {get}
-
- /// Whether the axis is low (leading or bottom) or high (trailing or top)
- var low: Bool {get}
-
- var lineP1: CGPoint {get}
- var lineP2: CGPoint {get}
-
- /// If the axis frame should (incrementally) affect the inner frame size of the chart
- var canChangeFrameSize: Bool {set get}
-}
diff --git a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLayerDefault.swift b/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLayerDefault.swift
deleted file mode 100644
index bab3a1e2b..000000000
--- a/Dependecies/SwiftCharts/SwiftCharts/Axis/ChartAxisLayerDefault.swift
+++ /dev/null
@@ -1,397 +0,0 @@
-//
-// ChartAxisLayerDefault.swift
-// SwiftCharts
-//
-// Created by ischuetz on 25/04/15.
-// Copyright (c) 2015 ivanschuetz. All rights reserved.
-//
-
-import UIKit
-
-/**
- This class allows customizing the layout of an axis layer and its contents. An example of how some of these settings affect the layout of a Y axis is shown below.
-
- ````
- ┌───────────────────────────────────────────────────────────────────┐
- │ screenTop │
- │ ┌───────────────────────────────────────────────────────────┐ │
- │ │ ───────────────────────────────────────────────────────── │ │ labelsToAxisSpacingX
- │ │ ◀───┼───┼──── similar for labelsToAxisSpacingY
- │ │ Label 1 Label 2 Label 3 Label 4 Label 5 │ │
- │ │ ◀───┼───┼──── labelsSpacing (only supported for X axes)
- screenLeading ────┼─▶ │ Label A Label B Label C Label D Label E │ │
- │ │ │ │
- │ │ ◀────────────────────────────┼───┼──── axisTitleLabelsToLabelsSpacing
- │ │ │ │
- │ │ Title │ ◀─┼──── screenTrailing
- │ └───────────────────────────────────────────────────────────┘ │
- │ screenBottom │
- └───────────────────────────────────────────────────────────────────┘
- ````
- */
-open class ChartAxisSettings {
- var screenLeading: CGFloat = 0
- var screenTrailing: CGFloat = 0
- var screenTop: CGFloat = 0
- var screenBottom: CGFloat = 0
- var labelsSpacing: CGFloat = 5
- var labelsToAxisSpacingX: CGFloat = 5
- var labelsToAxisSpacingY: CGFloat = 5
- var axisTitleLabelsToLabelsSpacing: CGFloat = 5
- var lineColor:UIColor = UIColor.black
- var axisStrokeWidth: CGFloat = 2.0
- var isAxisLineVisible: Bool = true
-
- convenience init(_ chartSettings: ChartSettings) {
- self.init()
- self.labelsSpacing = chartSettings.labelsSpacing
- self.labelsToAxisSpacingX = chartSettings.labelsToAxisSpacingX
- self.labelsToAxisSpacingY = chartSettings.labelsToAxisSpacingY
- self.axisTitleLabelsToLabelsSpacing = chartSettings.axisTitleLabelsToLabelsSpacing
- self.screenLeading = chartSettings.leading
- self.screenTop = chartSettings.top
- self.screenTrailing = chartSettings.trailing
- self.screenBottom = chartSettings.bottom
- self.axisStrokeWidth = chartSettings.axisStrokeWidth
- }
-}
-
-public typealias ChartAxisValueLabelDrawers = (scalar: Double, drawers: [ChartLabelDrawer])
-
-/// Helper class to notify other layers about frame changes which affect content available space
-public final class ChartAxisLayerWithFrameDelta {
- let layer: ChartAxisLayer
- let delta: CGFloat
- init(layer: ChartAxisLayer, delta: CGFloat) {
- self.layer = layer
- self.delta = delta
- }
-}
-
-extension Optional where Wrapped: ChartAxisLayerWithFrameDelta {
- var deltaDefault0: CGFloat {
- return self?.delta ?? 0
- }
-}
-
-public enum AxisLabelsSpaceReservationMode {
- case minPresentedSize /// Doesn't reserve less space than the min presented label width/height so far
- case maxPresentedSize /// Doesn't reserve less space than the max presented label width/height so far
- case fixed(CGFloat) /// Fixed value, ignores labels width/height
- case current /// Reserves space for currently visible labels
-}
-
-public typealias ChartAxisValueLabelDrawersWithAxisLayer = (valueLabelDrawers: ChartAxisValueLabelDrawers, layer: ChartAxisLayer)
-public struct ChartAxisLayerTapSettings {
- public let expandArea: CGSize
- let handler: ((ChartAxisValueLabelDrawersWithAxisLayer) -> Void)?
-
- public init(expandArea: CGSize = CGSize(width: 10, height: 10), handler: ((ChartAxisValueLabelDrawersWithAxisLayer) -> Void)? = nil) {
- self.expandArea = expandArea
- self.handler = handler
- }
-}
-
-
-/// A default implementation of ChartAxisLayer, which delegates drawing of the axis line and labels to the appropriate Drawers
-open class ChartAxisLayerDefault: ChartAxisLayer {
-
- open var axis: ChartAxis
-
- var origin: CGPoint {
- fatalError("Override")
- }
-
- var end: CGPoint {
- fatalError("Override")
- }
-
- open var frame: CGRect {
- return CGRect(x: origin.x, y: origin.y, width: width, height: height)
- }
-
- open var frameWithoutLabels: CGRect {
- return CGRect(x: origin.x, y: origin.y, width: widthWithoutLabels, height: heightWithoutLabels)
- }
-
- open var visibleFrame: CGRect {
- fatalError("Override")
- }
-
- /// Constant dimension between origin and end
- var offset: CGFloat
-
- open var currentAxisValues: [Double] = []
-
- public let valuesGenerator: ChartAxisValuesGenerator
- open var labelsGenerator: ChartAxisLabelsGenerator
-
- let axisTitleLabels: [ChartAxisLabel]
- let settings: ChartAxisSettings
-
- // exposed for subclasses
- var lineDrawer: ChartLineDrawer?
- var labelDrawers: [ChartAxisValueLabelDrawers] = []
- var axisTitleLabelDrawers: [ChartLabelDrawer] = []
-
- let labelsConflictSolver: ChartAxisLabelsConflictSolver?
-
- open weak var chart: Chart?
-
- let labelSpaceReservationMode: AxisLabelsSpaceReservationMode
-
- let clipContents: Bool
-
- open var tapSettings: ChartAxisLayerTapSettings?
-
- public var canChangeFrameSize: Bool = true
-
- var widthWithoutLabels: CGFloat {
- return width
- }
-
- var heightWithoutLabels: CGFloat {
- return settings.axisStrokeWidth + settings.labelsToAxisSpacingX + settings.axisTitleLabelsToLabelsSpacing + axisTitleLabelsHeight
- }
-
- open var axisValuesScreenLocs: [CGFloat] {
- return self.currentAxisValues.map{axis.screenLocForScalar($0)}
- }
-
- open var axisValuesWithFrames: [(axisValue: Double, frames: [CGRect])] {
- return labelDrawers.map { axisValue, drawers in
- (axisValue: axisValue, frames: drawers.map{$0.frame})
- }
- }
-
- var visibleAxisValuesScreenLocs: [CGFloat] {
- return currentAxisValues.reduce(Array