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.

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

LineChart: drawing image on nodal points [Dup #624?] #629

Closed
wants to merge 2 commits into from
Closed
Changes from 1 commit
Commits
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
Prev Previous commit
Added: Demo view of nodal images on LineChart.
Fixed: image now is not drawn upside down.
Anatoly Rosencrantz committed Dec 28, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 33de7d7b75897f65f9bf45f143b3bf22c09b7ec1
2 changes: 1 addition & 1 deletion Charts/Classes/Renderers/LineChartRenderer.swift
Original file line number Diff line number Diff line change
@@ -520,7 +520,7 @@ public class LineChartRenderer: LineScatterCandleRadarChartRenderer
rect.size.width = nodalImage.size.height
rect.size.height = nodalImage.size.height

CGContextDrawImage(context, rect, dataSet.nodalImage?.CGImage)
nodalImage.drawInRect(rect)
}
}

50 changes: 45 additions & 5 deletions ChartsDemo/ChartsDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -26,10 +26,9 @@
5B57BBB51A9B26AA0036A6CC /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB41A9B26AA0036A6CC /* main.m */; };
5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB71A9B26AA0036A6CC /* AppDelegate.m */; };
5B57BBBB1A9B26AA0036A6CC /* DemoListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBBA1A9B26AA0036A6CC /* DemoListViewController.m */; };
5B6654D11BB0A36F00890030 /* MyCustomXValueFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D01BB0A36F00890030 /* MyCustomXValueFormatter.m */; settings = {ASSET_TAGS = (); }; };
5B6654D11BB0A36F00890030 /* MyCustomXValueFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B6654D01BB0A36F00890030 /* MyCustomXValueFormatter.m */; };
5B8EAF241AB3271B009697AA /* DemoListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF231AB3271B009697AA /* DemoListViewController.xib */; };
5B8EAF281AB32CF5009697AA /* DemoBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B8EAF261AB32CF5009697AA /* DemoBaseViewController.m */; };
5B8EAF301AB32E15009697AA /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF2F1AB32E15009697AA /* Images.xcassets */; };
5B8EAF3D1AB32F27009697AA /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B8EAF371AB32EA1009697AA /* Charts.framework */; };
5B9624411B38608C007763E2 /* NegativeStackedBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */; };
5B9624421B38608C007763E2 /* NegativeStackedBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */; };
@@ -65,6 +64,9 @@
5BEAED3C1ABC199F0013F194 /* ColoredLineChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED3A1ABC199F0013F194 /* ColoredLineChartViewController.xib */; };
5BEAED401ABC1AC60013F194 /* SinusBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BEAED3E1ABC1AC60013F194 /* SinusBarChartViewController.m */; };
5BEAED411ABC1AC60013F194 /* SinusBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */; };
D8DBF35D1C312FDF000E030E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D8DBF35C1C312FDF000E030E /* Images.xcassets */; };
D8DBF3601C3131A5000E030E /* LineChart3ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D8DBF35F1C3131A5000E030E /* LineChart3ViewController.m */; };
D8DBF3621C3132B9000E030E /* LineChart3ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D8DBF3611C3132B9000E030E /* LineChart3ViewController.xib */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
@@ -82,6 +84,20 @@
remoteGlobalIDString = 5BA8EC3F1A9D14DC00CE82E1;
remoteInfo = Charts;
};
D8DBF3581C312FBC000E030E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5B8EAF321AB32EA0009697AA /* Charts.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A52C5C371BAC5CA400594CDD;
remoteInfo = "Charts-TV";
};
D8DBF35A1C312FBC000E030E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5B8EAF321AB32EA0009697AA /* Charts.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 06AEE7A21BDC3F8B009875AE;
remoteInfo = ChartsTests;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
@@ -129,7 +145,6 @@
5B8EAF231AB3271B009697AA /* DemoListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoListViewController.xib; sourceTree = "<group>"; };
5B8EAF251AB32CF5009697AA /* DemoBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoBaseViewController.h; sourceTree = "<group>"; };
5B8EAF261AB32CF5009697AA /* DemoBaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DemoBaseViewController.m; sourceTree = "<group>"; };
5B8EAF2F1AB32E15009697AA /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
5B8EAF321AB32EA0009697AA /* Charts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Charts.xcodeproj; path = ../Charts/Charts.xcodeproj; sourceTree = "<group>"; };
5B96243E1B38608C007763E2 /* NegativeStackedBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NegativeStackedBarChartViewController.h; sourceTree = "<group>"; };
5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NegativeStackedBarChartViewController.m; sourceTree = "<group>"; };
@@ -181,6 +196,10 @@
5BEAED3D1ABC1AC60013F194 /* SinusBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SinusBarChartViewController.h; sourceTree = "<group>"; };
5BEAED3E1ABC1AC60013F194 /* SinusBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SinusBarChartViewController.m; sourceTree = "<group>"; };
5BEAED3F1ABC1AC60013F194 /* SinusBarChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SinusBarChartViewController.xib; sourceTree = "<group>"; };
D8DBF35C1C312FDF000E030E /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
D8DBF35E1C3131A5000E030E /* LineChart3ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineChart3ViewController.h; sourceTree = "<group>"; };
D8DBF35F1C3131A5000E030E /* LineChart3ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LineChart3ViewController.m; sourceTree = "<group>"; };
D8DBF3611C3132B9000E030E /* LineChart3ViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LineChart3ViewController.xib; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
@@ -269,7 +288,7 @@
5B8EAF2E1AB32E15009697AA /* Resources */ = {
isa = PBXGroup;
children = (
5B8EAF2F1AB32E15009697AA /* Images.xcassets */,
D8DBF35C1C312FDF000E030E /* Images.xcassets */,
5B43161E1AB8D8AE0009FCAA /* app-icon */,
5B4316301AB8D8B70009FCAA /* launch-image */,
);
@@ -280,6 +299,8 @@
isa = PBXGroup;
children = (
5B8EAF371AB32EA1009697AA /* Charts.framework */,
D8DBF3591C312FBC000E030E /* Charts.framework */,
D8DBF35B1C312FBC000E030E /* ChartsTests.xctest */,
);
name = Products;
sourceTree = "<group>";
@@ -327,6 +348,9 @@
5BD47E5D1ABB3C91008FCEC6 /* LineChart2ViewController.h */,
5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */,
5BD47E5F1ABB3C91008FCEC6 /* LineChart2ViewController.xib */,
D8DBF35E1C3131A5000E030E /* LineChart3ViewController.h */,
D8DBF35F1C3131A5000E030E /* LineChart3ViewController.m */,
D8DBF3611C3132B9000E030E /* LineChart3ViewController.xib */,
5BEAED1F1ABC0BE20013F194 /* MultipleBarChartViewController.h */,
5BEAED201ABC0BE20013F194 /* MultipleBarChartViewController.m */,
5BEAED211ABC0BE20013F194 /* MultipleBarChartViewController.xib */,
@@ -425,15 +449,29 @@
remoteRef = 5B8EAF361AB32EA1009697AA /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D8DBF3591C312FBC000E030E /* Charts.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Charts.framework;
remoteRef = D8DBF3581C312FBC000E030E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D8DBF35B1C312FBC000E030E /* ChartsTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = ChartsTests.xctest;
remoteRef = D8DBF35A1C312FBC000E030E /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
5B57BBAD1A9B26AA0036A6CC /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5B8EAF301AB32E15009697AA /* Images.xcassets in Resources */,
5B43162B1AB8D8AE0009FCAA /* Icon-60@2x.png in Resources */,
D8DBF35D1C312FDF000E030E /* Images.xcassets in Resources */,
5B43162E1AB8D8AE0009FCAA /* iTunesArtwork@2x in Resources */,
5B4316281AB8D8AE0009FCAA /* Icon-29@3x.png in Resources */,
5B4316361AB8D8B70009FCAA /* Default-667h@2x.png in Resources */,
@@ -461,6 +499,7 @@
5B4316371AB8D8B70009FCAA /* Default-736h@3x.png in Resources */,
5B4316291AB8D8AE0009FCAA /* Icon-40@2x.png in Resources */,
5BEAED1E1ABBFB340013F194 /* StackedBarChartViewController.xib in Resources */,
D8DBF3621C3132B9000E030E /* LineChart3ViewController.xib in Resources */,
5B4316271AB8D8AE0009FCAA /* Icon-29@2x.png in Resources */,
55E356501ADC638F00A57971 /* BubbleChartViewController.xib in Resources */,
5B43162C1AB8D8AE0009FCAA /* Icon-60@3x.png in Resources */,
@@ -478,6 +517,7 @@
5B0CC7851ABB875400665592 /* PieChartViewController.m in Sources */,
5B57BBBB1A9B26AA0036A6CC /* DemoListViewController.m in Sources */,
5BD47E651ABB424E008FCEC6 /* BarChartViewController.m in Sources */,
D8DBF3601C3131A5000E030E /* LineChart3ViewController.m in Sources */,
5BDEDC471ABB871E007D3A60 /* CombinedChartViewController.m in Sources */,
5BD8F0741AB89CE500566E05 /* LineChart1ViewController.m in Sources */,
5BEAED401ABC1AC60013F194 /* SinusBarChartViewController.m in Sources */,
6 changes: 6 additions & 0 deletions ChartsDemo/Classes/DemoListViewController.m
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
#import "DemoListViewController.h"
#import "LineChart1ViewController.h"
#import "LineChart2ViewController.h"
#import "LineChart3ViewController.h"
#import "BarChartViewController.h"
#import "HorizontalBarChartViewController.h"
#import "CombinedChartViewController.h"
@@ -56,6 +57,11 @@ - (void)viewDidLoad
@"subtitle": @"Demonstration of the linechart with dual y-axis.",
@"class": LineChart2ViewController.class
},
@{
@"title": @"Line Chart (Image in nodes)",
@"subtitle": @"Demonstration of the linechart with dual y-axis and nodal images.",
@"class": LineChart3ViewController.class
},
@{
@"title": @"Bar Chart",
@"subtitle": @"A simple demonstration of the bar chart.",
2 changes: 2 additions & 0 deletions ChartsDemo/Classes/Demos/LineChart2ViewController.m
Original file line number Diff line number Diff line change
@@ -124,6 +124,8 @@ - (void)setDataCount:(int)count range:(double)range
set1.fillColor = [UIColor colorWithRed:51/255.f green:181/255.f blue:229/255.f alpha:1.f];
set1.highlightColor = [UIColor colorWithRed:244/255.f green:117/255.f blue:117/255.f alpha:1.f];
set1.drawCircleHoleEnabled = NO;
set1.drawNodalImageEnabled = NO;
set1.nodalImage = [UIImage imageNamed:@"node"];

NSMutableArray *yVals2 = [[NSMutableArray alloc] init];

5 changes: 3 additions & 2 deletions ChartsDemo/Classes/Demos/LineChart2ViewController.xib
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?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="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7513.1"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LineChart2ViewController">
20 changes: 20 additions & 0 deletions ChartsDemo/Classes/Demos/LineChart3ViewController.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// LineChart3ViewController.h
// ChartsDemo
//
// Created by Anatoly Rosencrantz on 28/12/2015.
//
// Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
// A port of MPAndroidChart for iOS
// Licensed under Apache License 2.0
//
// https://github.com/danielgindi/ios-charts
//

#import <UIKit/UIKit.h>
#import "DemoBaseViewController.h"
#import <Charts/Charts.h>

@interface LineChart3ViewController : DemoBaseViewController

@end
Loading