From 8046b98e134b5fb256c5b62981600162b85eb18c Mon Sep 17 00:00:00 2001 From: liuxuan30 Date: Fri, 5 Aug 2016 21:00:55 +0800 Subject: [PATCH] just fix all Xcode beta 4 complains, except for Realm bug --- Charts/Charts.xcodeproj/project.pbxproj | 15 +++- .../ChartsDemo.xcodeproj/project.pbxproj | 20 ++++++ .../Classes/Components/BalloonMarker.swift | 64 ++++++++--------- .../ChartsRealm.xcodeproj/project.pbxproj | 3 + .../xcschemes/ChartsRealm-OSX.xcscheme | 2 +- .../xcschemes/ChartsRealm-TV.xcscheme | 2 +- .../xcschemes/ChartsRealm-iOS.xcscheme | 2 +- ChartsRealm/Classes/Data/RealmBarData.swift | 4 +- .../Classes/Data/RealmBarDataSet.swift | 24 +++---- ...almBarLineScatterCandleBubbleDataSet.swift | 4 +- .../Classes/Data/RealmBaseDataSet.swift | 72 +++++++++---------- .../Classes/Data/RealmBubbleData.swift | 4 +- .../Classes/Data/RealmBubbleDataSet.swift | 24 +++---- .../Classes/Data/RealmCandleData.swift | 4 +- .../Classes/Data/RealmCandleDataSet.swift | 12 ++-- ChartsRealm/Classes/Data/RealmLineData.swift | 4 +- .../Classes/Data/RealmLineDataSet.swift | 36 +++++----- .../Classes/Data/RealmLineRadarDataSet.swift | 4 +- .../RealmLineScatterCandleRadarDataSet.swift | 6 +- ChartsRealm/Classes/Data/RealmPieData.swift | 4 +- .../Classes/Data/RealmPieDataSet.swift | 14 ++-- ChartsRealm/Classes/Data/RealmRadarData.swift | 4 +- .../Classes/Data/RealmRadarDataSet.swift | 6 +- .../Classes/Data/RealmScatterData.swift | 4 +- .../Classes/Data/RealmScatterDataSet.swift | 6 +- .../Classes/Utils/RealmChartUtils.swift | 22 +++--- 26 files changed, 197 insertions(+), 169 deletions(-) diff --git a/Charts/Charts.xcodeproj/project.pbxproj b/Charts/Charts.xcodeproj/project.pbxproj index 656bb85ce3..751ef01dd1 100644 --- a/Charts/Charts.xcodeproj/project.pbxproj +++ b/Charts/Charts.xcodeproj/project.pbxproj @@ -953,7 +953,7 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0710; - LastUpgradeCheck = 0730; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = dcg; TargetAttributes = { 06AEE7A11BDC3F8B009875AE = { @@ -961,6 +961,7 @@ }; 5BA8EC3F1A9D14DC00CE82E1 = { CreatedOnToolsVersion = 6.1.1; + LastSwiftMigration = 0800; }; 65B3F5BE1C7370BE000983D0 = { CreatedOnToolsVersion = 7.2.1; @@ -1437,6 +1438,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.pierremarcairoldi.ChartsTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; }; name = Release; }; @@ -1454,8 +1456,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; @@ -1464,6 +1468,7 @@ ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1501,8 +1506,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = YES; @@ -1510,6 +1517,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1544,6 +1552,7 @@ PRODUCT_NAME = Charts; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -1564,6 +1573,8 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = Charts; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 3.0; }; name = Release; }; @@ -1608,6 +1619,7 @@ PRODUCT_NAME = Charts; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 3.0; }; name = Release; @@ -1653,6 +1665,7 @@ PRODUCT_NAME = Charts; SDKROOT = appletvos; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.0; }; diff --git a/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj b/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj index 314d7ec2a3..63a5639781 100644 --- a/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj +++ b/ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj @@ -100,6 +100,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 132E0D6C1D54C2000054EE93 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 5B8E088D1C635B6D00438BAF /* ChartsRealm.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 5BA899431CADB7F20012ED64; + remoteInfo = "ChartsRealm-OSX"; + }; 5B8E087D1C635B5200438BAF /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 5B8E08771C635B5200438BAF /* Charts.xcodeproj */; @@ -413,6 +420,7 @@ children = ( 5B8E08941C635B6D00438BAF /* ChartsRealm.framework */, 5B8E08961C635B6D00438BAF /* ChartsRealm.framework */, + 132E0D6D1D54C2000054EE93 /* ChartsRealm.framework */, ); name = Products; sourceTree = ""; @@ -597,6 +605,7 @@ TargetAttributes = { 5B57BBAE1A9B26AA0036A6CC = { CreatedOnToolsVersion = 6.1.1; + LastSwiftMigration = 0800; }; }; }; @@ -629,6 +638,13 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 132E0D6D1D54C2000054EE93 /* ChartsRealm.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = ChartsRealm.framework; + remoteRef = 132E0D6C1D54C2000054EE93 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 5B8E087E1C635B5200438BAF /* Charts.framework */ = { isa = PBXReferenceProxy; fileType = wrapper.framework; @@ -808,6 +824,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -850,6 +867,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; @@ -882,6 +900,7 @@ PRODUCT_NAME = ChartsDemo; SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -898,6 +917,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.dcg.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = ChartsDemo; SWIFT_OBJC_BRIDGING_HEADER = "Supporting Files/ChartsDemo-Bridging-Header.h"; + SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/ChartsDemo/Classes/Components/BalloonMarker.swift b/ChartsDemo/Classes/Components/BalloonMarker.swift index 57fb29e031..4389ec702e 100644 --- a/ChartsDemo/Classes/Components/BalloonMarker.swift +++ b/ChartsDemo/Classes/Components/BalloonMarker.swift @@ -37,13 +37,13 @@ public class BalloonMarker: ChartMarker self.font = font self.insets = insets - _paragraphStyle = NSParagraphStyle.defaultParagraphStyle().mutableCopy() as? NSMutableParagraphStyle - _paragraphStyle?.alignment = .Center + _paragraphStyle = NSParagraphStyle.default.mutableCopy() as? NSMutableParagraphStyle + _paragraphStyle?.alignment = .center } public override var size: CGSize { return _size; } - public override func draw(context context: CGContext, point: CGPoint) + public override func draw(context: CGContext, point: CGPoint) { if (labelns == nil) { @@ -60,49 +60,41 @@ public class BalloonMarker: ChartMarker rect.origin.x -= _size.width / 2.0 rect.origin.y -= _size.height - CGContextSaveGState(context) + context.saveGState() - CGContextSetFillColorWithColor(context, color?.CGColor) - CGContextBeginPath(context) - CGContextMoveToPoint(context, - rect.origin.x, - rect.origin.y) - CGContextAddLineToPoint(context, - rect.origin.x + rect.size.width, - rect.origin.y) - CGContextAddLineToPoint(context, - rect.origin.x + rect.size.width, - rect.origin.y + rect.size.height - arrowSize.height) - CGContextAddLineToPoint(context, - rect.origin.x + (rect.size.width + arrowSize.width) / 2.0, - rect.origin.y + rect.size.height - arrowSize.height) - CGContextAddLineToPoint(context, - rect.origin.x + rect.size.width / 2.0, - rect.origin.y + rect.size.height) - CGContextAddLineToPoint(context, - rect.origin.x + (rect.size.width - arrowSize.width) / 2.0, - rect.origin.y + rect.size.height - arrowSize.height) - CGContextAddLineToPoint(context, - rect.origin.x, - rect.origin.y + rect.size.height - arrowSize.height) - CGContextAddLineToPoint(context, - rect.origin.x, - rect.origin.y) - CGContextFillPath(context) + context.setFillColor((color?.cgColor)!) + context.beginPath() + context.moveTo(x: rect.origin.x, + y: rect.origin.y) + context.addLineTo(x: rect.origin.x + rect.size.width, + y: rect.origin.y) + context.addLineTo(x: rect.origin.x + rect.size.width, + y: rect.origin.y + rect.size.height - arrowSize.height) + context.addLineTo(x: rect.origin.x + (rect.size.width + arrowSize.width) / 2.0, + y: rect.origin.y + rect.size.height - arrowSize.height) + context.addLineTo(x: rect.origin.x + rect.size.width / 2.0, + y: rect.origin.y + rect.size.height) + context.addLineTo(x: rect.origin.x + (rect.size.width - arrowSize.width) / 2.0, + y: rect.origin.y + rect.size.height - arrowSize.height) + context.addLineTo(x: rect.origin.x, + y: rect.origin.y + rect.size.height - arrowSize.height) + context.addLineTo(x: rect.origin.x, + y: rect.origin.y) + context.fillPath() rect.origin.y += self.insets.top rect.size.height -= self.insets.top + self.insets.bottom UIGraphicsPushContext(context) - labelns?.drawInRect(rect, withAttributes: _drawAttributes) + labelns?.draw(in: rect, withAttributes: _drawAttributes) UIGraphicsPopContext() - CGContextRestoreGState(context) + context.restoreGState() } - public override func refreshContent(entry entry: ChartDataEntry, highlight: ChartHighlight) + public override func refreshContent(entry: ChartDataEntry, highlight: ChartHighlight) { let label = entry.value.description labelns = label as NSString @@ -111,10 +103,10 @@ public class BalloonMarker: ChartMarker _drawAttributes[NSFontAttributeName] = self.font _drawAttributes[NSParagraphStyleAttributeName] = _paragraphStyle - _labelSize = labelns?.sizeWithAttributes(_drawAttributes) ?? CGSizeZero + _labelSize = labelns?.size(attributes: _drawAttributes) ?? CGSize.zero _size.width = _labelSize.width + self.insets.left + self.insets.right _size.height = _labelSize.height + self.insets.top + self.insets.bottom _size.width = max(minimumSize.width, _size.width) _size.height = max(minimumSize.height, _size.height) } -} \ No newline at end of file +} diff --git a/ChartsRealm/ChartsRealm.xcodeproj/project.pbxproj b/ChartsRealm/ChartsRealm.xcodeproj/project.pbxproj index a6e49c4fec..d5e1e655e2 100644 --- a/ChartsRealm/ChartsRealm.xcodeproj/project.pbxproj +++ b/ChartsRealm/ChartsRealm.xcodeproj/project.pbxproj @@ -404,6 +404,7 @@ 5BA8EC3F1A9D14DC00CE82E1 = { CreatedOnToolsVersion = 6.1.1; DevelopmentTeam = EF7AZ55H5Q; + LastSwiftMigration = 0800; }; A52C5C361BAC5CA400594CDD = { CreatedOnToolsVersion = 7.1; @@ -736,6 +737,7 @@ PROVISIONING_PROFILE = ""; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 3.0; }; name = Debug; }; @@ -760,6 +762,7 @@ PRODUCT_NAME = ChartsRealm; PROVISIONING_PROFILE = ""; SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; }; name = Release; }; diff --git a/ChartsRealm/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm-OSX.xcscheme b/ChartsRealm/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm-OSX.xcscheme index 322596942c..b6c417915b 100644 --- a/ChartsRealm/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm-OSX.xcscheme +++ b/ChartsRealm/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm-OSX.xcscheme @@ -1,6 +1,6 @@ ?, xValueField: String, dataSets: [IChartDataSet]?) { if results == nil { @@ -31,4 +31,4 @@ public class RealmBarData: BarChartData super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets) } } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmBarDataSet.swift b/ChartsRealm/Classes/Data/RealmBarDataSet.swift index a8dfb60452..21d6fa42a1 100644 --- a/ChartsRealm/Classes/Data/RealmBarDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmBarDataSet.swift @@ -23,7 +23,7 @@ public class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartD { public override func initialize() { - self.highlightColor = NSUIColor.blackColor() + self.highlightColor = NSUIColor.black } public required init() @@ -31,29 +31,29 @@ public class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartD super.init() } - public override init(results: RLMResults?, yValueField: String, xIndexField: String?, label: String?) + public override init(results: RLMResults?, yValueField: String, xIndexField: String?, label: String?) { super.init(results: results, yValueField: yValueField, xIndexField: xIndexField, label: label) } - public init(results: RLMResults?, yValueField: String, xIndexField: String?, stackValueField: String, label: String?) + public init(results: RLMResults?, yValueField: String, xIndexField: String?, stackValueField: String, label: String?) { _stackValueField = stackValueField super.init(results: results, yValueField: yValueField, xIndexField: xIndexField, label: label) } - public convenience init(results: RLMResults?, yValueField: String, xIndexField: String?, stackValueField: String) + public convenience init(results: RLMResults?, yValueField: String, xIndexField: String?, stackValueField: String) { self.init(results: results, yValueField: yValueField, xIndexField: xIndexField, stackValueField: stackValueField, label: "DataSet") } - public convenience init(results: RLMResults?, yValueField: String, stackValueField: String, label: String) + public convenience init(results: RLMResults?, yValueField: String, stackValueField: String, label: String) { self.init(results: results, yValueField: yValueField, xIndexField: nil, stackValueField: stackValueField, label: label) } - public convenience init(results: RLMResults?, yValueField: String, stackValueField: String) + public convenience init(results: RLMResults?, yValueField: String, stackValueField: String) { self.init(results: results, yValueField: yValueField, xIndexField: nil, stackValueField: stackValueField) } @@ -102,7 +102,7 @@ public class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartD /// is calculated from the Entries that are added to the DataSet private var _stackSize = 1 - internal override func buildEntryFromResultObject(object: RLMObject, atIndex: UInt) -> ChartDataEntry + internal override func buildEntryFromResultObject(_ object: RLMObject, atIndex: UInt) -> ChartDataEntry { let value = object[_yValueField!] let entry: BarChartDataEntry @@ -125,7 +125,7 @@ public class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartD } /// calculates the maximum stacksize that occurs in the Entries array of this DataSet - private func calcStackSize(yVals: [BarChartDataEntry]!) + private func calcStackSize(_ yVals: [BarChartDataEntry]!) { for i in 0 ..< yVals.count { @@ -139,7 +139,7 @@ public class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartD } } - public override func calcMinMax(start start : Int, end: Int) + public override func calcMinMax(start : Int, end: Int) { let yValCount = self.entryCount @@ -172,7 +172,7 @@ public class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartD _yMin = DBL_MAX _yMax = -DBL_MAX - for i in start.stride(through: endValue, by: 1) + for i in stride(from: start, through: endValue, by: 1) { if let e = _cache[i - _cacheFirst] as? BarChartDataEntry { @@ -247,7 +247,7 @@ public class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartD // MARK: - NSCopying - public override func copyWithZone(zone: NSZone) -> AnyObject + public override func copyWithZone(_ zone: NSZone?) -> AnyObject { let copy = super.copyWithZone(zone) as! RealmBarDataSet copy._stackSize = _stackSize @@ -257,4 +257,4 @@ public class RealmBarDataSet: RealmBarLineScatterCandleBubbleDataSet, IBarChartD copy.highlightAlpha = highlightAlpha return copy } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmBarLineScatterCandleBubbleDataSet.swift b/ChartsRealm/Classes/Data/RealmBarLineScatterCandleBubbleDataSet.swift index 105401c63e..bc07bbf77c 100644 --- a/ChartsRealm/Classes/Data/RealmBarLineScatterCandleBubbleDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmBarLineScatterCandleBubbleDataSet.swift @@ -31,7 +31,7 @@ public class RealmBarLineScatterCandleBubbleDataSet: RealmBaseDataSet, IBarLineS // MARK: - NSCopying - public override func copyWithZone(zone: NSZone) -> AnyObject + public override func copyWithZone(_ zone: NSZone?) -> AnyObject { let copy = super.copyWithZone(zone) as! RealmBarLineScatterCandleBubbleDataSet copy.highlightColor = highlightColor @@ -40,4 +40,4 @@ public class RealmBarLineScatterCandleBubbleDataSet: RealmBaseDataSet, IBarLineS copy.highlightLineDashLengths = highlightLineDashLengths return copy } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmBaseDataSet.swift b/ChartsRealm/Classes/Data/RealmBaseDataSet.swift index 2357392365..3dec04b4c6 100644 --- a/ChartsRealm/Classes/Data/RealmBaseDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmBaseDataSet.swift @@ -47,7 +47,7 @@ public class RealmBaseDataSet: ChartBaseDataSet initialize() } - public init(results: RLMResults?, yValueField: String, xIndexField: String?, label: String?) + public init(results: RLMResults?, yValueField: String, xIndexField: String?, label: String?) { super.init() @@ -59,24 +59,24 @@ public class RealmBaseDataSet: ChartBaseDataSet _results = results _yValueField = yValueField _xIndexField = xIndexField - _results = _results?.sortedResultsUsingProperty(_xIndexField!, ascending: true) + _results = _results?.sortedResults(usingProperty: _xIndexField!, ascending: true) notifyDataSetChanged() initialize() } - public convenience init(results: RLMResults?, yValueField: String, label: String?) + public convenience init(results: RLMResults?, yValueField: String, label: String?) { self.init(results: results, yValueField: yValueField, xIndexField: nil, label: label) } - public convenience init(results: RLMResults?, yValueField: String, xIndexField: String?) + public convenience init(results: RLMResults?, yValueField: String, xIndexField: String?) { self.init(results: results, yValueField: yValueField, xIndexField: xIndexField, label: "DataSet") } - public convenience init(results: RLMResults?, yValueField: String) + public convenience init(results: RLMResults?, yValueField: String) { self.init(results: results, yValueField: yValueField) } @@ -106,12 +106,12 @@ public class RealmBaseDataSet: ChartBaseDataSet self.init(realm: realm, modelName: modelName, resultsWhere: resultsWhere, yValueField: yValueField, xIndexField: nil, label: label) } - public func loadResults(realm realm: RLMRealm, modelName: String) + public func loadResults(realm: RLMRealm, modelName: String) { loadResults(realm: realm, modelName: modelName, predicate: nil) } - public func loadResults(realm realm: RLMRealm, modelName: String, predicate: NSPredicate?) + public func loadResults(realm: RLMRealm, modelName: String, predicate: NSPredicate?) { if predicate == nil { @@ -119,12 +119,12 @@ public class RealmBaseDataSet: ChartBaseDataSet } else { - _results = realm.objects(modelName, withPredicate: predicate) + _results = realm.objects(modelName, with: predicate) } if _xIndexField != nil { - _results = _results?.sortedResultsUsingProperty(_xIndexField!, ascending: true) + _results = _results?.sortedResults(usingProperty: _xIndexField!, ascending: true) } notifyDataSetChanged() @@ -132,7 +132,7 @@ public class RealmBaseDataSet: ChartBaseDataSet // MARK: - Data functions and accessors - internal var _results: RLMResults? + internal var _results: RLMResults? internal var _yValueField: String? internal var _xIndexField: String? internal var _cache = [ChartDataEntry]() @@ -149,7 +149,7 @@ public class RealmBaseDataSet: ChartBaseDataSet internal var _lastEnd: Int = 0 /// Makes sure that the cache is populated for the specified range - internal func ensureCache(start start: Int, end: Int) + internal func ensureCache(start: Int, end: Int) { if start <= _cacheLast && end >= _cacheFirst { @@ -165,7 +165,7 @@ public class RealmBaseDataSet: ChartBaseDataSet for i in UInt(start) ..< UInt(end + 1) { - _cache.append(buildEntryFromResultObject(results.objectAtIndex(i), atIndex: i)) + _cache.append(buildEntryFromResultObject(results.object(at: i), atIndex: i)) } _cacheFirst = start @@ -179,10 +179,10 @@ public class RealmBaseDataSet: ChartBaseDataSet for i in UInt(start) ..< UInt(_cacheFirst) { - newEntries.append(buildEntryFromResultObject(results.objectAtIndex(i), atIndex: i)) + newEntries.append(buildEntryFromResultObject(results.object(at: i), atIndex: i)) } - _cache.insertContentsOf(newEntries, at: 0) + _cache.insert(contentsOf: newEntries, at: 0) _cacheFirst = start } @@ -191,14 +191,14 @@ public class RealmBaseDataSet: ChartBaseDataSet { for i in UInt(_cacheLast + 1) ..< UInt(end + 1) { - _cache.append(buildEntryFromResultObject(results.objectAtIndex(i), atIndex: i)) + _cache.append(buildEntryFromResultObject(results.object(at: i), atIndex: i)) } _cacheLast = end } } - internal func buildEntryFromResultObject(object: RLMObject, atIndex: UInt) -> ChartDataEntry + internal func buildEntryFromResultObject(_ object: RLMObject, atIndex: UInt) -> ChartDataEntry { let entry = ChartDataEntry(value: object[_yValueField!] as! Double, xIndex: _xIndexField == nil ? Int(atIndex) : object[_xIndexField!] as! Int) @@ -219,7 +219,7 @@ public class RealmBaseDataSet: ChartBaseDataSet calcMinMax(start: _lastStart, end: _lastEnd) } - public override func calcMinMax(start start: Int, end: Int) + public override func calcMinMax(start: Int, end: Int) { let yValCount = self.entryCount @@ -252,7 +252,7 @@ public class RealmBaseDataSet: ChartBaseDataSet _yMin = DBL_MAX _yMax = -DBL_MAX - for i in start.stride(through: endValue, by: 1) + for i in stride(from: start, through: endValue, by: 1) { let e = _cache[i - _cacheFirst] @@ -286,16 +286,16 @@ public class RealmBaseDataSet: ChartBaseDataSet public override var entryCount: Int { return Int(_results?.count ?? 0) } /// - returns: the value of the Entry object at the given xIndex. Returns NaN if no value is at the given x-index. - public override func yValForXIndex(x: Int) -> Double + public override func yValForXIndex(_ x: Int) -> Double { let e = self.entryForXIndex(x) if (e !== nil && e!.xIndex == x) { return e!.value } - else { return Double.NaN } + else { return Double.nan } } /// - returns: all of the y values of the Entry objects at the given xIndex. Returns NaN if no value is at the given x-index. - public override func yValsForXIndex(x: Int) -> [Double] + public override func yValsForXIndex(_ x: Int) -> [Double] { let entries = self.entriesForXIndex(x) @@ -311,7 +311,7 @@ public class RealmBaseDataSet: ChartBaseDataSet /// - returns: the entry object found at the given index (not x-index!) /// - throws: out of bounds /// if `i` is out of bounds, it may throw an out-of-bounds exception - public override func entryForIndex(i: Int) -> ChartDataEntry? + public override func entryForIndex(_ i: Int) -> ChartDataEntry? { if i < _lastStart || i > _lastEnd { @@ -323,7 +323,7 @@ public class RealmBaseDataSet: ChartBaseDataSet /// - returns: the first Entry object found at the given xIndex with binary search. /// If the no Entry at the specifed x-index is found, this method returns the Entry at the closest x-index. /// nil if no Entry object at that index. - public override func entryForXIndex(x: Int, rounding: ChartDataSetRounding) -> ChartDataEntry? + public override func entryForXIndex(_ x: Int, rounding: ChartDataSetRounding) -> ChartDataEntry? { let index = self.entryIndex(xIndex: x, rounding: rounding) if (index > -1) @@ -336,14 +336,14 @@ public class RealmBaseDataSet: ChartBaseDataSet /// - returns: the first Entry object found at the given xIndex with binary search. /// If the no Entry at the specifed x-index is found, this method returns the Entry at the closest x-index. /// nil if no Entry object at that index. - public override func entryForXIndex(x: Int) -> ChartDataEntry? + public override func entryForXIndex(_ x: Int) -> ChartDataEntry? { - return entryForXIndex(x, rounding: .Closest) + return entryForXIndex(x, rounding: .closest) } /// - returns: all Entry objects found at the given xIndex with binary search. /// An empty array if no Entry object at that index. - public override func entriesForXIndex(x: Int) -> [ChartDataEntry] + public override func entriesForXIndex(_ x: Int) -> [ChartDataEntry] { var entries = [ChartDataEntry]() @@ -353,13 +353,13 @@ public class RealmBaseDataSet: ChartBaseDataSet { if results.count > UInt(x) { - entries.append(buildEntryFromResultObject(results.objectAtIndex(UInt(x)), atIndex: UInt(x))) + entries.append(buildEntryFromResultObject(results.object(at: UInt(x)), atIndex: UInt(x))) } } else { - let foundObjects = results.objectsWithPredicate( - NSPredicate(format: "%K == %d", _xIndexField!, x) + let foundObjects = results.objects( + with: NSPredicate(format: "%K == %d", _xIndexField!, x) ) for e in foundObjects @@ -378,8 +378,8 @@ public class RealmBaseDataSet: ChartBaseDataSet { guard let results = _results else { return -1 } - let foundIndex = results.indexOfObjectWithPredicate( - NSPredicate(format: "%K == %d", _xIndexField!, x) + let foundIndex = results.indexOfObject( + with: NSPredicate(format: "%K == %d", _xIndexField!, x) ) // TODO: Figure out a way to quickly find the closest index @@ -404,26 +404,26 @@ public class RealmBaseDataSet: ChartBaseDataSet } /// Not supported on Realm datasets - public override func addEntry(e: ChartDataEntry) -> Bool + public override func addEntry(_ e: ChartDataEntry) -> Bool { return false } /// Not supported on Realm datasets - public override func addEntryOrdered(e: ChartDataEntry) -> Bool + public override func addEntryOrdered(_ e: ChartDataEntry) -> Bool { return false } /// Not supported on Realm datasets - public override func removeEntry(entry: ChartDataEntry) -> Bool + public override func removeEntry(_ entry: ChartDataEntry) -> Bool { return false } /// Checks if this DataSet contains the specified Entry. /// - returns: true if contains the entry, false if not. - public override func contains(e: ChartDataEntry) -> Bool + public override func contains(_ e: ChartDataEntry) -> Bool { for entry in _cache { @@ -456,7 +456,7 @@ public class RealmBaseDataSet: ChartBaseDataSet // MARK: - NSCopying - public override func copyWithZone(zone: NSZone) -> AnyObject + public override func copyWithZone(_ zone: NSZone?) -> AnyObject { let copy = super.copyWithZone(zone) as! RealmBaseDataSet diff --git a/ChartsRealm/Classes/Data/RealmBubbleData.swift b/ChartsRealm/Classes/Data/RealmBubbleData.swift index 703f5f656f..577491b345 100644 --- a/ChartsRealm/Classes/Data/RealmBubbleData.swift +++ b/ChartsRealm/Classes/Data/RealmBubbleData.swift @@ -20,7 +20,7 @@ import Realm.Dynamic public class RealmBubbleData: BubbleChartData { - public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) + public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) { if results == nil { @@ -31,4 +31,4 @@ public class RealmBubbleData: BubbleChartData super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets) } } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmBubbleDataSet.swift b/ChartsRealm/Classes/Data/RealmBubbleDataSet.swift index 6bde4a72e9..ba4618e127 100644 --- a/ChartsRealm/Classes/Data/RealmBubbleDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmBubbleDataSet.swift @@ -30,14 +30,14 @@ public class RealmBubbleDataSet: RealmBarLineScatterCandleBubbleDataSet, IBubble super.init() } - public init(results: RLMResults?, yValueField: String, xIndexField: String, sizeField: String, label: String?) + public init(results: RLMResults?, yValueField: String, xIndexField: String, sizeField: String, label: String?) { _sizeField = sizeField super.init(results: results, yValueField: yValueField, xIndexField: xIndexField, label: label) } - public convenience init(results: RLMResults?, yValueField: String, xIndexField: String, sizeField: String) + public convenience init(results: RLMResults?, yValueField: String, xIndexField: String, sizeField: String) { self.init(results: results, yValueField: yValueField, xIndexField: xIndexField, sizeField: sizeField, label: "DataSet") } @@ -63,14 +63,14 @@ public class RealmBubbleDataSet: RealmBarLineScatterCandleBubbleDataSet, IBubble public var normalizeSizeEnabled: Bool = true public var isNormalizeSizeEnabled: Bool { return normalizeSizeEnabled } - internal override func buildEntryFromResultObject(object: RLMObject, atIndex: UInt) -> ChartDataEntry + internal override func buildEntryFromResultObject(_ object: RLMObject, atIndex: UInt) -> ChartDataEntry { let entry = BubbleChartDataEntry(xIndex: _xIndexField == nil ? Int(atIndex) : object[_xIndexField!] as! Int, value: object[_yValueField!] as! Double, size: object[_sizeField!] as! CGFloat) return entry } - public override func calcMinMax(start start: Int, end: Int) + public override func calcMinMax(start: Int, end: Int) { let yValCount = self.entryCount @@ -103,7 +103,7 @@ public class RealmBubbleDataSet: RealmBarLineScatterCandleBubbleDataSet, IBubble _yMin = yMin(_cache[start - _cacheFirst] as! BubbleChartDataEntry) _yMax = yMax(_cache[start - _cacheFirst] as! BubbleChartDataEntry) - for i in start.stride(through: endValue, by: 1) + for i in stride(from: start, through: endValue, by: 1) { let entry = _cache[i - _cacheFirst] as! BubbleChartDataEntry @@ -142,27 +142,27 @@ public class RealmBubbleDataSet: RealmBarLineScatterCandleBubbleDataSet, IBubble } } - private func yMin(entry: BubbleChartDataEntry) -> Double + private func yMin(_ entry: BubbleChartDataEntry) -> Double { return entry.value } - private func yMax(entry: BubbleChartDataEntry) -> Double + private func yMax(_ entry: BubbleChartDataEntry) -> Double { return entry.value } - private func xMin(entry: BubbleChartDataEntry) -> Double + private func xMin(_ entry: BubbleChartDataEntry) -> Double { return Double(entry.xIndex) } - private func xMax(entry: BubbleChartDataEntry) -> Double + private func xMax(_ entry: BubbleChartDataEntry) -> Double { return Double(entry.xIndex) } - private func largestSize(entry: BubbleChartDataEntry) -> CGFloat + private func largestSize(_ entry: BubbleChartDataEntry) -> CGFloat { return entry.size } @@ -174,7 +174,7 @@ public class RealmBubbleDataSet: RealmBarLineScatterCandleBubbleDataSet, IBubble // MARK: - NSCopying - public override func copyWithZone(zone: NSZone) -> AnyObject + public override func copyWithZone(_ zone: NSZone?) -> AnyObject { let copy = super.copyWithZone(zone) as! RealmBubbleDataSet copy._xMin = _xMin @@ -183,4 +183,4 @@ public class RealmBubbleDataSet: RealmBarLineScatterCandleBubbleDataSet, IBubble copy.highlightCircleWidth = highlightCircleWidth return copy } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmCandleData.swift b/ChartsRealm/Classes/Data/RealmCandleData.swift index 4a3190a5b5..9aa43fbf15 100644 --- a/ChartsRealm/Classes/Data/RealmCandleData.swift +++ b/ChartsRealm/Classes/Data/RealmCandleData.swift @@ -20,7 +20,7 @@ import Realm.Dynamic public class RealmCandleData: CandleChartData { - public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) + public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) { if results == nil { @@ -31,4 +31,4 @@ public class RealmCandleData: CandleChartData super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets) } } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmCandleDataSet.swift b/ChartsRealm/Classes/Data/RealmCandleDataSet.swift index aa9ed13361..c8e81ec9e5 100644 --- a/ChartsRealm/Classes/Data/RealmCandleDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmCandleDataSet.swift @@ -31,7 +31,7 @@ public class RealmCandleDataSet: RealmLineScatterCandleRadarDataSet, ICandleChar super.init() } - public init(results: RLMResults?, highField: String, lowField: String, openField: String, closeField: String, xIndexField: String, label: String?) + public init(results: RLMResults?, highField: String, lowField: String, openField: String, closeField: String, xIndexField: String, label: String?) { _highField = highField _lowField = lowField @@ -41,7 +41,7 @@ public class RealmCandleDataSet: RealmLineScatterCandleRadarDataSet, ICandleChar super.init(results: results, yValueField: "", xIndexField: xIndexField, label: label) } - public convenience init(results: RLMResults?, highField: String, lowField: String, openField: String, closeField: String, xIndexField: String) + public convenience init(results: RLMResults?, highField: String, lowField: String, openField: String, closeField: String, xIndexField: String) { self.init(results: results, highField: highField, lowField: lowField, openField: openField, closeField: closeField, xIndexField: xIndexField, label: "DataSet") } @@ -63,7 +63,7 @@ public class RealmCandleDataSet: RealmLineScatterCandleRadarDataSet, ICandleChar internal var _openField: String? internal var _closeField: String? - internal override func buildEntryFromResultObject(object: RLMObject, atIndex: UInt) -> ChartDataEntry + internal override func buildEntryFromResultObject(_ object: RLMObject, atIndex: UInt) -> ChartDataEntry { let entry = CandleChartDataEntry( xIndex: _xIndexField == nil ? Int(atIndex) : object[_xIndexField!] as! Int, @@ -75,7 +75,7 @@ public class RealmCandleDataSet: RealmLineScatterCandleRadarDataSet, ICandleChar return entry } - public override func calcMinMax(start start: Int, end: Int) + public override func calcMinMax(start: Int, end: Int) { let yValCount = self.entryCount @@ -108,7 +108,7 @@ public class RealmCandleDataSet: RealmLineScatterCandleRadarDataSet, ICandleChar _yMin = DBL_MAX _yMax = -DBL_MAX - for i in start.stride(through: endValue, by: 1) + for i in stride(from: start, through: endValue, by: 1) { let e = _cache[i - _cacheFirst] as! CandleChartDataEntry @@ -198,4 +198,4 @@ public class RealmCandleDataSet: RealmLineScatterCandleRadarDataSet, ICandleChar /// Are decreasing values drawn as filled? public var isDecreasingFilled: Bool { return decreasingFilled } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmLineData.swift b/ChartsRealm/Classes/Data/RealmLineData.swift index 4e36ee096e..029ccab9e2 100644 --- a/ChartsRealm/Classes/Data/RealmLineData.swift +++ b/ChartsRealm/Classes/Data/RealmLineData.swift @@ -20,7 +20,7 @@ import Realm.Dynamic public class RealmLineData: LineChartData { - public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) + public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) { if results == nil { @@ -31,4 +31,4 @@ public class RealmLineData: LineChartData super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets) } } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmLineDataSet.swift b/ChartsRealm/Classes/Data/RealmLineDataSet.swift index 31c4cb45b1..309bb39740 100644 --- a/ChartsRealm/Classes/Data/RealmLineDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmLineDataSet.swift @@ -32,7 +32,7 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet /// The drawing mode for this line dataset /// /// **default**: Linear - public var mode: LineChartDataSet.Mode = LineChartDataSet.Mode.Linear + public var mode: LineChartDataSet.Mode = LineChartDataSet.Mode.linear private var _cubicIntensity = CGFloat(0.2) @@ -59,36 +59,36 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet } } - @available(*, deprecated=1.0, message="Use `mode` instead.") + @available(*, deprecated: 1.0, message: "Use `mode` instead.") public var drawCubicEnabled: Bool { get { - return mode == .CubicBezier + return mode == .cubicBezier } set { - mode = newValue ? LineChartDataSet.Mode.CubicBezier : LineChartDataSet.Mode.Linear + mode = newValue ? .cubicBezier : .linear } } - @available(*, deprecated=1.0, message="Use `mode` instead.") + @available(*, deprecated: 1.0, message: "Use `mode` instead.") public var isDrawCubicEnabled: Bool { return drawCubicEnabled } - @available(*, deprecated=1.0, message="Use `mode` instead.") + @available(*, deprecated: 1.0, message: "Use `mode` instead.") public var drawSteppedEnabled: Bool { get { - return mode == .Stepped + return mode == .stepped } set { - mode = newValue ? LineChartDataSet.Mode.Stepped : LineChartDataSet.Mode.Linear + mode = newValue ? .stepped : .linear } } - @available(*, deprecated=1.0, message="Use `mode` instead.") + @available(*, deprecated: 1.0, message: "Use `mode` instead.") public var isDrawSteppedEnabled: Bool { return drawSteppedEnabled } /// The radius of the drawn circles. @@ -101,7 +101,7 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet /// - returns: the color at the given index of the DataSet's circle-color array. /// Performs a IndexOutOfBounds check by modulus. - public func getCircleColor(index: Int) -> NSUIColor? + public func getCircleColor(_ index: Int) -> NSUIColor? { let size = circleColors.count let index = index % size @@ -114,16 +114,16 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet /// Sets the one and ONLY color that should be used for this DataSet. /// Internally, this recreates the colors array and adds the specified color. - public func setCircleColor(color: NSUIColor) + public func setCircleColor(_ color: NSUIColor) { - circleColors.removeAll(keepCapacity: false) + circleColors.removeAll(keepingCapacity: false) circleColors.append(color) } /// Resets the circle-colors array and creates a new one - public func resetCircleColors(index: Int) + public func resetCircleColors(_ index: Int) { - circleColors.removeAll(keepCapacity: false) + circleColors.removeAll(keepingCapacity: false) } /// If true, drawing circles is enabled @@ -133,7 +133,7 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet public var isDrawCirclesEnabled: Bool { return drawCirclesEnabled } /// The color of the inner circle (the circle-hole). - public var circleHoleColor: NSUIColor? = NSUIColor.whiteColor() + public var circleHoleColor: NSUIColor? = NSUIColor.white /// True if drawing circles for this DataSet is enabled, false if not public var drawCircleHoleEnabled = true @@ -150,7 +150,7 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet public var lineDashLengths: [CGFloat]? /// Line cap type, default is CGLineCap.Butt - public var lineCapType = CGLineCap.Butt + public var lineCapType = CGLineCap.butt /// formatter for customizing the position of the fill-line private var _fillFormatter: ChartFillFormatter = ChartDefaultFillFormatter() @@ -177,7 +177,7 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet // MARK: NSCopying - public override func copyWithZone(zone: NSZone) -> AnyObject + public override func copyWithZone(_ zone: NSZone?) -> AnyObject { let copy = super.copyWithZone(zone) as! RealmLineDataSet copy.circleRadius = circleRadius @@ -194,4 +194,4 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet return copy } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmLineRadarDataSet.swift b/ChartsRealm/Classes/Data/RealmLineRadarDataSet.swift index c047975879..81013e3ce9 100644 --- a/ChartsRealm/Classes/Data/RealmLineRadarDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmLineRadarDataSet.swift @@ -84,7 +84,7 @@ public class RealmLineRadarDataSet: RealmLineScatterCandleRadarDataSet, ILineRad // MARK: NSCopying - public override func copyWithZone(zone: NSZone) -> AnyObject + public override func copyWithZone(_ zone: NSZone?) -> AnyObject { let copy = super.copyWithZone(zone) as! RealmLineRadarDataSet copy.fillColor = fillColor @@ -93,4 +93,4 @@ public class RealmLineRadarDataSet: RealmLineScatterCandleRadarDataSet, ILineRad return copy } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmLineScatterCandleRadarDataSet.swift b/ChartsRealm/Classes/Data/RealmLineScatterCandleRadarDataSet.swift index 6b3db4f61a..a1b9b34d4c 100644 --- a/ChartsRealm/Classes/Data/RealmLineScatterCandleRadarDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmLineScatterCandleRadarDataSet.swift @@ -38,7 +38,7 @@ public class RealmLineScatterCandleRadarDataSet: RealmBarLineScatterCandleBubble /// Enables / disables both vertical and horizontal highlight-indicators. /// :param: enabled - public func setDrawHighlightIndicators(enabled: Bool) + public func setDrawHighlightIndicators(_ enabled: Bool) { drawHorizontalHighlightIndicatorEnabled = enabled drawVerticalHighlightIndicatorEnabled = enabled @@ -46,7 +46,7 @@ public class RealmLineScatterCandleRadarDataSet: RealmBarLineScatterCandleBubble // MARK: NSCopying - public override func copyWithZone(zone: NSZone) -> AnyObject + public override func copyWithZone(_ zone: NSZone?) -> AnyObject { let copy = super.copyWithZone(zone) as! RealmLineScatterCandleRadarDataSet copy.drawHorizontalHighlightIndicatorEnabled = drawHorizontalHighlightIndicatorEnabled @@ -54,4 +54,4 @@ public class RealmLineScatterCandleRadarDataSet: RealmBarLineScatterCandleBubble return copy } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmPieData.swift b/ChartsRealm/Classes/Data/RealmPieData.swift index 2cfb40dbd0..9e0b1b9305 100644 --- a/ChartsRealm/Classes/Data/RealmPieData.swift +++ b/ChartsRealm/Classes/Data/RealmPieData.swift @@ -20,7 +20,7 @@ import Realm.Dynamic public class RealmPieData: PieChartData { - public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) + public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) { if results == nil { @@ -31,4 +31,4 @@ public class RealmPieData: PieChartData super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets) } } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmPieDataSet.swift b/ChartsRealm/Classes/Data/RealmPieDataSet.swift index 5a359c21fe..164f21d07c 100644 --- a/ChartsRealm/Classes/Data/RealmPieDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmPieDataSet.swift @@ -23,8 +23,8 @@ public class RealmPieDataSet: RealmBaseDataSet, IPieChartDataSet { public override func initialize() { - self.valueTextColor = NSUIColor.whiteColor() - self.valueFont = NSUIFont.systemFontOfSize(13.0) + self.valueTextColor = NSUIColor.white + self.valueFont = NSUIFont.systemFont(ofSize: 13.0) } // MARK: - Styling functions and accessors @@ -58,11 +58,11 @@ public class RealmPieDataSet: RealmBaseDataSet, IPieChartDataSet /// indicates the selection distance of a pie slice public var selectionShift = CGFloat(18.0) - public var xValuePosition: PieChartDataSet.ValuePosition = .InsideSlice - public var yValuePosition: PieChartDataSet.ValuePosition = .InsideSlice + public var xValuePosition: PieChartDataSet.ValuePosition = .insideSlice + public var yValuePosition: PieChartDataSet.ValuePosition = .insideSlice /// When valuePosition is OutsideSlice, indicates line color - public var valueLineColor: NSUIColor? = NSUIColor.blackColor() + public var valueLineColor: NSUIColor? = NSUIColor.black /// When valuePosition is OutsideSlice, indicates line width public var valueLineWidth: CGFloat = 1.0 @@ -81,11 +81,11 @@ public class RealmPieDataSet: RealmBaseDataSet, IPieChartDataSet // MARK: - NSCopying - public override func copyWithZone(zone: NSZone) -> AnyObject + public override func copyWithZone(_ zone: NSZone?) -> AnyObject { let copy = super.copyWithZone(zone) as! RealmPieDataSet copy._sliceSpace = _sliceSpace copy.selectionShift = selectionShift return copy } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmRadarData.swift b/ChartsRealm/Classes/Data/RealmRadarData.swift index 7a0a352fbd..26592a00f9 100644 --- a/ChartsRealm/Classes/Data/RealmRadarData.swift +++ b/ChartsRealm/Classes/Data/RealmRadarData.swift @@ -20,7 +20,7 @@ import Realm.Dynamic public class RealmRadarData: RadarChartData { - public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) + public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) { if results == nil { @@ -31,4 +31,4 @@ public class RealmRadarData: RadarChartData super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets) } } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmRadarDataSet.swift b/ChartsRealm/Classes/Data/RealmRadarDataSet.swift index 8c4f51a934..ae21ed0b32 100644 --- a/ChartsRealm/Classes/Data/RealmRadarDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmRadarDataSet.swift @@ -23,7 +23,7 @@ public class RealmRadarDataSet: RealmLineRadarDataSet, IRadarChartDataSet { public override func initialize() { - self.valueFont = NSUIFont.systemFontOfSize(13.0) + self.valueFont = NSUIFont.systemFont(ofSize: 13.0) } // MARK: - Data functions and accessors @@ -37,7 +37,7 @@ public class RealmRadarDataSet: RealmLineRadarDataSet, IRadarChartDataSet /// - returns: true if highlight circle should be drawn, false if not public var isDrawHighlightCircleEnabled: Bool { return drawHighlightCircleEnabled } - public var highlightCircleFillColor: NSUIColor? = NSUIColor.whiteColor() + public var highlightCircleFillColor: NSUIColor? = NSUIColor.white /// The stroke color for highlight circle. /// If `nil`, the color of the dataset is taken. @@ -50,4 +50,4 @@ public class RealmRadarDataSet: RealmLineRadarDataSet, IRadarChartDataSet public var highlightCircleOuterRadius: CGFloat = 4.0 public var highlightCircleStrokeWidth: CGFloat = 2.0 -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmScatterData.swift b/ChartsRealm/Classes/Data/RealmScatterData.swift index 6a0f5b5d82..8d8b01384a 100644 --- a/ChartsRealm/Classes/Data/RealmScatterData.swift +++ b/ChartsRealm/Classes/Data/RealmScatterData.swift @@ -20,7 +20,7 @@ import Realm.Dynamic public class RealmScatterData: ScatterChartData { - public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) + public init(results: RLMResults?, xValueField: String, dataSets: [IChartDataSet]?) { if results == nil { @@ -31,4 +31,4 @@ public class RealmScatterData: ScatterChartData super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets) } } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Data/RealmScatterDataSet.swift b/ChartsRealm/Classes/Data/RealmScatterDataSet.swift index ff1b8b57b6..62a8d5bd85 100644 --- a/ChartsRealm/Classes/Data/RealmScatterDataSet.swift +++ b/ChartsRealm/Classes/Data/RealmScatterDataSet.swift @@ -26,7 +26,7 @@ public class RealmScatterDataSet: RealmLineScatterCandleRadarDataSet, IScatterCh // The type of shape that is set to be drawn where the values are at // **default**: .Square - public var scatterShape = ScatterChartDataSet.Shape.Square + public var scatterShape = ScatterChartDataSet.Shape.square // The radius of the hole in the shape (applies to Square, Circle and Triangle) // **default**: 0.0 @@ -47,7 +47,7 @@ public class RealmScatterDataSet: RealmLineScatterCandleRadarDataSet, IScatterCh // MARK: NSCopying - public override func copyWithZone(zone: NSZone) -> AnyObject + public override func copyWithZone(_ zone: NSZone?) -> AnyObject { let copy = super.copyWithZone(zone) as! RealmScatterDataSet copy.scatterShapeSize = scatterShapeSize @@ -56,4 +56,4 @@ public class RealmScatterDataSet: RealmLineScatterCandleRadarDataSet, IScatterCh return copy } -} \ No newline at end of file +} diff --git a/ChartsRealm/Classes/Utils/RealmChartUtils.swift b/ChartsRealm/Classes/Utils/RealmChartUtils.swift index fea543abb5..8672366a82 100644 --- a/ChartsRealm/Classes/Utils/RealmChartUtils.swift +++ b/ChartsRealm/Classes/Utils/RealmChartUtils.swift @@ -17,7 +17,7 @@ import Realm public class RealmChartUtils: NSObject { /// Transforms the given Realm-ResultSet into an xValue array, using the specified xValueField - public static func toXVals(results results: RLMResults, xValueField: String) -> [String] + public static func toXVals(results: RLMResults, xValueField: String) -> [String] { let addedValues = NSMutableSet() var xVals = [String]() @@ -25,10 +25,10 @@ public class RealmChartUtils: NSObject for object in results { let xVal = (object as! RLMObject)[xValueField] as! String! - if !addedValues.containsObject(xVal) + if !addedValues.contains(xVal!) { - addedValues.addObject(xVal) - xVals.append(xVal) + addedValues.add(xVal!) + xVals.append(xVal!) } } @@ -36,18 +36,18 @@ public class RealmChartUtils: NSObject } } -extension RLMResults: SequenceType +extension RLMResults: Sequence { - public func generate() -> NSFastGenerator + public func makeIterator() -> NSFastEnumerationIterator { - return NSFastGenerator(self) + return NSFastEnumerationIterator(self) } } -extension RLMArray: SequenceType +extension RLMArray: Sequence { - public func generate() -> NSFastGenerator + public func makeIterator() -> NSFastEnumerationIterator { - return NSFastGenerator(self) + return NSFastEnumerationIterator(self) } -} \ No newline at end of file +}