Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Performance Enhancements #29 - candle chart #192

Merged
merged 2 commits into from
Aug 27, 2015
Merged

Performance Enhancements #29 - candle chart #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fefa1e
Performance Enhancements #29 - candle chart
Jul 8, 2015
3865f54
some more candle chart performance enhancments
Jul 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Charts/Classes/Data/CandleChartDataSet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public class CandleChartDataSet: BarLineScatterCandleChartDataSet
}
else
{
endValue = end
endValue = end > (entries.count - 1) ? (entries.count - 1) : end
}

_lastStart = start
Expand Down
14 changes: 4 additions & 10 deletions Charts/Classes/Renderers/CandleStickChartRenderer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,8 @@ public class CandleStickChartRenderer: ChartDataRendererBase

var entries = dataSet.yVals as! [CandleChartDataEntry]

var entryFrom = dataSet.entryForXIndex(_minX)
var entryTo = dataSet.entryForXIndex(_maxX)

var minx = max(dataSet.entryIndex(entry: entryFrom!, isEqual: true), 0)
var maxx = min(dataSet.entryIndex(entry: entryTo!, isEqual: true) + 1, entries.count)
var minx = max(_minX, 0)
var maxx = min(_maxX + 1, entries.count)

CGContextSaveGState(context)

Expand Down Expand Up @@ -191,11 +188,8 @@ public class CandleStickChartRenderer: ChartDataRendererBase

var entries = dataSet.yVals as! [CandleChartDataEntry]

var entryFrom = dataSet.entryForXIndex(_minX)
var entryTo = dataSet.entryForXIndex(_maxX)

var minx = max(dataSet.entryIndex(entry: entryFrom!, isEqual: true), 0)
var maxx = min(dataSet.entryIndex(entry: entryTo!, isEqual: true) + 1, entries.count)
var minx = max(_minX, 0)
var maxx = min(_maxX + 1, entries.count)

var positions = trans.generateTransformedValuesCandle(entries, phaseY: _animator.phaseY)

Expand Down
8 changes: 4 additions & 4 deletions ChartsDemo/Classes/Demos/CandleStickChartViewController.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7519.1" systemVersion="14C1510" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7513.1"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CandleStickChartViewController">
Expand Down Expand Up @@ -34,13 +34,13 @@
<rect key="frame" x="0.0" y="47" width="375" height="501"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>
<slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
<slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="2500" translatesAutoresizingMaskIntoConstraints="NO" id="Xhn-cI-Tqm">
<rect key="frame" x="6" y="573" width="285" height="31"/>
<connections>
<action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="VlG-hf-e0E"/>
</connections>
</slider>
<slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="200" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
<slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minValue="1" maxValue="2500" translatesAutoresizingMaskIntoConstraints="NO" id="IuK-nU-ZPT">
<rect key="frame" x="6" y="611" width="285" height="31"/>
<connections>
<action selector="slidersValueChanged:" destination="-1" eventType="valueChanged" id="y5C-Ny-GVF"/>
Expand Down