1.1 Release #1

highcharts · Aug 21, 2017 · 8deeb2d · 8deeb2d
1 parent 6901631
commit 8deeb2d
Show file tree

Hide file tree

Showing 1,058 changed files with 229,328 additions and 3,630 deletions.
diff --git a/Highcharts/DevGround/DevGround.xcodeproj/project.pbxproj b/Highcharts/DevGround/DevGround.xcodeproj/project.pbxproj
@@ -109,14 +109,14 @@
 				34352A0B1D687C29003E48AA /* AppDelegate.m */,
 				2052FED61E5DA740004B96B2 /* RootViewController.h */,
 				2052FED71E5DA75B004B96B2 /* RootViewController.m */,
+				20A0EA6F1ECB07B900F609E0 /* TestViewController.h */,
+				20A0EA701ECB07B900F609E0 /* TestViewController.m */,
 				20F288121E5C536500D9695D /* ChartType.h */,
 				34352A101D687C29003E48AA /* Main.storyboard */,
 				34352A131D687C29003E48AA /* Assets.xcassets */,
 				34352A151D687C29003E48AA /* LaunchScreen.storyboard */,
 				34352A181D687C29003E48AA /* Info.plist */,
 				34352A071D687C29003E48AA /* Supporting Files */,
-				20A0EA6F1ECB07B900F609E0 /* TestViewController.h */,
-				20A0EA701ECB07B900F609E0 /* TestViewController.m */,
 			);
 			path = DevGround;
 			sourceTree = "<group>";
@@ -171,7 +171,7 @@
 				TargetAttributes = {
 					34352A031D687C29003E48AA = {
 						CreatedOnToolsVersion = 7.1;
-						DevelopmentTeam = YBXVGN2JB2;
+						DevelopmentTeam = FYYW4F45T7;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -361,7 +361,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = YBXVGN2JB2;
+				DEVELOPMENT_TEAM = FYYW4F45T7;
 				INFOPLIST_FILE = DevGround/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.highsoft.DevGround;
@@ -374,7 +374,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = YBXVGN2JB2;
+				DEVELOPMENT_TEAM = FYYW4F45T7;
 				INFOPLIST_FILE = DevGround/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.highsoft.DevGround;

diff --git a/Highcharts/DevGround/DevGround/AppDelegate.m b/Highcharts/DevGround/DevGround/AppDelegate.m
@@ -18,9 +18,7 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
-
-    [HIGChartView preload];
-
+    [HIChartView preload];
     return YES;
 }
 

diff --git a/Highcharts/DevGround/DevGround/Base.lproj/Main.storyboard b/Highcharts/DevGround/DevGround/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="niD-U1-t3v">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="niD-U1-t3v">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -125,16 +125,74 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kLG-BN-1oE" customClass="HIGChartView">
-                                <rect key="frame" x="16" y="20" width="343" height="627"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kLG-BN-1oE" customClass="HIGChartView">
+                                <rect key="frame" x="0.0" y="20" width="375" height="607"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                            </view>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EPp-Zk-kG8">
+                                <rect key="frame" x="90" y="629" width="45" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="45" id="N68-fo-peY"/>
+                                    <constraint firstAttribute="height" constant="30" id="sSk-fL-9G4"/>
+                                </constraints>
+                                <state key="normal" title="Resize"/>
+                                <connections>
+                                    <action selector="resizeAction:" destination="niD-U1-t3v" eventType="touchUpInside" id="i7a-6R-0Th"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gYe-Md-d8y">
+                                <rect key="frame" x="232.5" y="629" width="53" height="30"/>
+                                <state key="normal" title="Refresh"/>
+                                <connections>
+                                    <action selector="refreshAction:" destination="niD-U1-t3v" eventType="touchUpInside" id="1lH-WE-95e"/>
+                                </connections>
+                            </button>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ao9-qR-WmU">
+                                <rect key="frame" x="293" y="628" width="82" height="39"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="39" id="QeA-4M-qD0"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Lls-ye-ECY">
+                                <rect key="frame" x="143" y="624" width="81.5" height="35"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="35" id="0P1-AO-Kko"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NfK-7w-hIg">
+                                <rect key="frame" x="0.0" y="620" width="82" height="47"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="47" id="lsy-K6-Fxu"/>
+                                </constraints>
                             </view>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="kLG-BN-1oE" firstAttribute="leading" secondItem="uAe-sg-r4r" secondAttribute="leading" id="5X1-YN-dnx"/>
+                            <constraint firstItem="ycu-NR-ZdH" firstAttribute="top" secondItem="Lls-ye-ECY" secondAttribute="bottom" constant="8" id="7Kr-LQ-YvW"/>
+                            <constraint firstAttribute="trailing" secondItem="ao9-qR-WmU" secondAttribute="trailing" id="87D-0t-Sg5"/>
+                            <constraint firstItem="gYe-Md-d8y" firstAttribute="leading" secondItem="Lls-ye-ECY" secondAttribute="trailing" constant="8" id="8bU-Eb-Xg6"/>
+                            <constraint firstAttribute="bottom" secondItem="ao9-qR-WmU" secondAttribute="bottom" id="Ah0-Q0-mDc"/>
+                            <constraint firstItem="NfK-7w-hIg" firstAttribute="width" secondItem="Lls-ye-ECY" secondAttribute="width" id="ElG-L0-K7x"/>
+                            <constraint firstItem="Lls-ye-ECY" firstAttribute="leading" secondItem="EPp-Zk-kG8" secondAttribute="trailing" constant="8" id="JbN-dP-TdG"/>
+                            <constraint firstItem="ycu-NR-ZdH" firstAttribute="top" secondItem="gYe-Md-d8y" secondAttribute="bottom" constant="8" id="KE2-9H-kki"/>
+                            <constraint firstItem="NfK-7w-hIg" firstAttribute="leading" secondItem="uAe-sg-r4r" secondAttribute="leading" id="Lhy-SW-7QZ"/>
+                            <constraint firstItem="kLG-BN-1oE" firstAttribute="trailing" secondItem="uAe-sg-r4r" secondAttribute="trailing" id="PIq-Mb-kJv"/>
+                            <constraint firstItem="ao9-qR-WmU" firstAttribute="leading" secondItem="gYe-Md-d8y" secondAttribute="trailing" constant="8" id="PPm-hA-fRH"/>
+                            <constraint firstItem="Lls-ye-ECY" firstAttribute="width" secondItem="ao9-qR-WmU" secondAttribute="width" id="Q1y-J0-AnF"/>
+                            <constraint firstItem="ycu-NR-ZdH" firstAttribute="top" secondItem="kLG-BN-1oE" secondAttribute="bottom" constant="40" id="XYK-eZ-MOm"/>
+                            <constraint firstItem="ycu-NR-ZdH" firstAttribute="top" secondItem="EPp-Zk-kG8" secondAttribute="bottom" constant="8" id="bMR-gl-m7Y"/>
+                            <constraint firstItem="ycu-NR-ZdH" firstAttribute="top" secondItem="NfK-7w-hIg" secondAttribute="bottom" id="d9J-Gi-OGy"/>
+                            <constraint firstItem="kLG-BN-1oE" firstAttribute="top" secondItem="0ki-uJ-4T0" secondAttribute="bottom" id="gzr-7A-ep6"/>
+                            <constraint firstItem="EPp-Zk-kG8" firstAttribute="leading" secondItem="NfK-7w-hIg" secondAttribute="trailing" constant="8" id="xLA-1b-4DM"/>
+                        </constraints>
                     </view>
                     <connections>
                         <outlet property="chartView" destination="kLG-BN-1oE" id="W2o-zD-KLO"/>
+                        <outlet property="leadingConstraint" destination="5X1-YN-dnx" id="048-SI-2hE"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="lKS-p8-7lM" userLabel="First Responder" sceneMemberID="firstResponder"/>

diff --git a/Highcharts/DevGround/DevGround/ChartType.h b/Highcharts/DevGround/DevGround/ChartType.h
@@ -8310,11 +8310,11 @@
         yaxis1.lineColor = [[HIColor alloc]initWithHexValue:@"339"];
         yaxis1.tickColor = [[HIColor alloc]initWithHexValue:@"339"];
         yaxis1.minorTickColor = [[HIColor alloc]initWithHexValue:@"339"];
-        yaxis1.offset = @-25;
+        yaxis1.offset = @(-25);
         yaxis1.lineWidth = @2;
         yaxis1.labels = [[HIYAxisLabels alloc]init];
         yaxis1.labels.distance = @-20;
-        yaxis1.labels.rotation = @"auto";
+        yaxis1.labels.rotation = @0;
         yaxis1.tickLength = @5;
         yaxis1.minorTickLength = @5;
         yaxis1.endOnTick = @false;
@@ -8331,7 +8331,7 @@
         yaxis2.offset = @-20;
         yaxis2.labels = [[HIYAxisLabels alloc]init];
         yaxis2.labels.distance = @12;
-        yaxis2.labels.rotation = @"auto";
+        yaxis2.labels.rotation = @0;
         yaxis2.tickLength = @5;
         yaxis2.minorTickLength = @5;
         yaxis2.endOnTick = @false;
@@ -8425,7 +8425,7 @@
         yaxis.tickColor = [[HIColor alloc]initWithHexValue:@"666"];
         yaxis.labels = [[HIYAxisLabels alloc]init];
         yaxis.labels.step = @2;
-        yaxis.labels.rotation = @"auto";
+        yaxis.labels.rotation = @0;
         yaxis.title = [[HIYAxisTitle alloc]init];
         yaxis.title.text = @"km/h";
         HIYAxisPlotBands *plotband1 = [[HIYAxisPlotBands alloc]init];
@@ -8505,7 +8505,7 @@
         yaxis.tickPosition = @"outside";
         yaxis.labels = [[HIYAxisLabels alloc]init];
         yaxis.labels.distance = @20;
-        yaxis.labels.rotation = @"auto";
+        yaxis.labels.rotation = @0;
         yaxis.title = [[HIYAxisTitle alloc]init];
         yaxis.title.text = @"VU<br/><span style=\"font-size:8px\">Channel</span>";
         yaxis.title.y = @-40;

diff --git a/Highcharts/DevGround/DevGround/Info.plist b/Highcharts/DevGround/DevGround/Info.plist
@@ -30,6 +30,8 @@
 	<array>
 		<string>armv7</string>
 	</array>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>We need access to your photo library to allow you to save your charts.</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

diff --git a/Highcharts/DevGround/DevGround/RootViewController.h b/Highcharts/DevGround/DevGround/RootViewController.h
@@ -16,6 +16,6 @@
 @property (weak, nonatomic) IBOutlet UIPickerView *chartTypePicker;
 @property (weak, nonatomic) IBOutlet UIButton *proceedButton;
 @property (weak, nonatomic) IBOutlet UIView *myChartView;
-@property (strong, nonatomic) HIGChartView *chartView;
+@property (strong, nonatomic) HIChartView *chartView;
 
 @end
diff --git a/Highcharts/DevGround/DevGround/RootViewController.m b/Highcharts/DevGround/DevGround/RootViewController.m
@@ -38,7 +38,7 @@ -(void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
 
     //Initializing chartView with defined frame
-    self.chartView = [[HIGChartView alloc] initWithFrame:CGRectMake(self.myChartView.bounds.origin.x, self.myChartView.bounds.origin.y , self.myChartView.bounds.size.width, 300.0f)];
+    self.chartView = [[HIChartView alloc] initWithFrame:CGRectMake(self.myChartView.bounds.origin.x, self.myChartView.bounds.origin.y , self.myChartView.bounds.size.width, 300.0f)];
 
     // Here you add additional plugins - if you use one of the charts listed below, you should add plugin before addSubview
     // In demo app we add all of them, because we use all types of charts. Remember that Pyramid also uses funnel plugin.
@@ -53,12 +53,8 @@ -(void)viewDidLayoutSubviews {
 }
 
 -(void)proceedButtonTapped:(UIButton *)sender {
-
-
     NSString *yourSelectedTitle = [_pickerData objectAtIndex:[self.chartTypePicker selectedRowInComponent:0]];
-    self.chartView.options = nil;
     self.chartView.options = [ChartType getChartByType: yourSelectedTitle];
-    [self.chartView reload];
 }
 
 - (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView

diff --git a/Highcharts/DevGround/DevGround/TestViewController.m b/Highcharts/DevGround/DevGround/TestViewController.m
@@ -9,8 +9,9 @@
 #import "TestViewController.h"
 #import <Highcharts/Highcharts.h>
 
-@interface TestViewController ()
-@property (strong, nonatomic)HIGChartView *chartView;
+@interface TestViewController ()<HIChartViewDelegate>
+@property (strong, nonatomic)HIChartView *chartView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *leadingConstraint;
 @end
 
 @implementation TestViewController
@@ -22,16 +23,22 @@ - (void)viewDidLoad {
 
     HIChart *chart = [[HIChart alloc]init];
     chart.type = @"column";
+    chart.animation = @NO;
+    chart.backgroundColor = [[HIColor alloc] initWithRGBA:255 green:255 blue:255 alpha:0.02];
 
     HITitle *title = [[HITitle alloc]init];
     title.text = @"Column chart with negative values";
 
     HIXAxis *xaxis = [[HIXAxis alloc]init];
     xaxis.categories = [NSMutableArray arrayWithObjects:@"Apples",
-                        @"Oranges",
-                        @"Pears",
-                        @"Grapes",
-                        @"Bananas", nil];
+                        @"Orange",
+                        @"Pear",
+                        @"Grape",
+                        @"Banana", nil];
+    xaxis.labels = [HIXAxisLabels new];
+    xaxis.labels.rotation = @0;
+    xaxis.labels.useHTML = @NO;
+    xaxis.labels.formatter = @"function() {  return this.value + 's';}";
 
     HICredits *credits = [[HICredits alloc]init];
     credits.enabled = @false;
@@ -65,23 +72,27 @@ - (void)viewDidLoad {
     options.xAxis = [NSMutableArray arrayWithObjects:xaxis, nil];
     options.credits = credits;
     options.series = [NSMutableArray arrayWithObjects: column1, column2, column3,  nil];
+
+    self.chartView.viewController = self;
     self.chartView.options = options;
-    [self.chartView loadChart];
+    self.chartView.delegate = self;
 }
 
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
+
+- (void)chartViewDidLoad:(HIChartView *)chart {
+
 }
 
-/*
-#pragma mark - Navigation
+- (IBAction)refreshAction:(id)sender {
+
+}
 
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
+- (IBAction)resizeAction:(id)sender {
+    self.leadingConstraint.constant = self.leadingConstraint.constant + 100;
+    [UIView animateWithDuration:0.5 animations:^{
+        [self.view layoutIfNeeded];
+    }];
 }
-*/
+
 
 @end