del OKKLineMinVC

ccworld1000 · Mar 27, 2018 · 6d4e84e · 6d4e84e
1 parent c15ef1d
commit 6d4e84e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 118 deletions.
diff --git a/OKKLineMin.xcodeproj/project.pbxproj b/OKKLineMin.xcodeproj/project.pbxproj
@@ -33,7 +33,6 @@
 		0012EE862019C6F600EEED92 /* OKValueView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0012EE712019C6F600EEED92 /* OKValueView.swift */; };
 		0012EE872019C6F600EEED92 /* OKSegmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0012EE732019C6F600EEED92 /* OKSegmentView.swift */; };
 		0012EE882019C6F600EEED92 /* OKKLineVolumeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0012EE752019C6F600EEED92 /* OKKLineVolumeView.swift */; };
-		0012EE8A2019C78700EEED92 /* OKKLineMinVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0012EE892019C78700EEED92 /* OKKLineMinVC.swift */; };
 		006D8FCF20625C17008168AA /* CCKlineVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 006D8FCE20625C17008168AA /* CCKlineVC.swift */; };
 		009ECEDF204FC8F200558BC0 /* CCSQLiteData.sqlite-shm in Resources */ = {isa = PBXBuildFile; fileRef = 009ECEDD204FC8F200558BC0 /* CCSQLiteData.sqlite-shm */; };
 		009ECEE0204FC8F200558BC0 /* CCSQLiteData.sqlite-wal in Resources */ = {isa = PBXBuildFile; fileRef = 009ECEDE204FC8F200558BC0 /* CCSQLiteData.sqlite-wal */; };
@@ -73,7 +72,6 @@
 		0012EE712019C6F600EEED92 /* OKValueView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OKValueView.swift; sourceTree = "<group>"; };
 		0012EE732019C6F600EEED92 /* OKSegmentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OKSegmentView.swift; sourceTree = "<group>"; };
 		0012EE752019C6F600EEED92 /* OKKLineVolumeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OKKLineVolumeView.swift; sourceTree = "<group>"; };
-		0012EE892019C78700EEED92 /* OKKLineMinVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OKKLineMinVC.swift; sourceTree = "<group>"; };
 		006D8FCE20625C17008168AA /* CCKlineVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CCKlineVC.swift; sourceTree = "<group>"; };
 		009ECEDD204FC8F200558BC0 /* CCSQLiteData.sqlite-shm */ = {isa = PBXFileReference; lastKnownFileType = file; path = "CCSQLiteData.sqlite-shm"; sourceTree = "<group>"; };
 		009ECEDE204FC8F200558BC0 /* CCSQLiteData.sqlite-wal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "CCSQLiteData.sqlite-wal"; sourceTree = "<group>"; };
@@ -121,7 +119,6 @@
 				0012EE532019C5CB00EEED92 /* CCSQLiteData */,
 				0012EDFB2019C45200EEED92 /* AppDelegate.swift */,
 				0012EDFD2019C45200EEED92 /* ViewController.swift */,
-				0012EE892019C78700EEED92 /* OKKLineMinVC.swift */,
 				0012EDFF2019C45200EEED92 /* Main.storyboard */,
 				0012EE022019C45200EEED92 /* Assets.xcassets */,
 				0012EE042019C45200EEED92 /* LaunchScreen.storyboard */,
@@ -405,7 +402,6 @@
 				0012EE872019C6F600EEED92 /* OKSegmentView.swift in Sources */,
 				0012EE782019C6F600EEED92 /* OKBOLLModel.swift in Sources */,
 				0012EE7C2019C6F600EEED92 /* OKMACDModel.swift in Sources */,
-				0012EE8A2019C78700EEED92 /* OKKLineMinVC.swift in Sources */,
 				0012EE842019C6F600EEED92 /* OKKLineDrawView.swift in Sources */,
 				0012EE572019C5CB00EEED92 /* CCSQLiteData.m in Sources */,
 				006D8FCF20625C17008168AA /* CCKlineVC.swift in Sources */,

diff --git a/OKKLineMin/Base.lproj/Main.storyboard b/OKKLineMin/Base.lproj/Main.storyboard
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="CCI-Xi-A1j">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="CCI-Xi-A1j">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -53,7 +53,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="aFF-dH-SXr" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-588" y="1100"/>
+            <point key="canvasLocation" x="-588" y="1227"/>
         </scene>
         <!--one-->
         <scene sceneID="yAr-be-F2M">
@@ -71,7 +71,7 @@
                                 </constraints>
                                 <state key="normal" title="OKKLineMin Full"/>
                                 <connections>
-                                    <segue destination="71J-Yr-dKi" kind="presentation" id="Bax-EI-XZg"/>
+                                    <segue destination="g0H-98-Tuw" kind="presentation" identifier="one" id="Nje-3d-Ee2"/>
                                 </connections>
                             </button>
                         </subviews>
@@ -86,7 +86,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="tsu-Kt-AqR" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-588" y="429"/>
+            <point key="canvasLocation" x="-588" y="455"/>
         </scene>
         <!--Tab Bar Controller-->
         <scene sceneID="7uh-r4-tmT">
@@ -106,36 +106,6 @@
             </objects>
             <point key="canvasLocation" x="-1385" y="765"/>
         </scene>
-        <!--Line MinVC-->
-        <scene sceneID="fBc-19-bvq">
-            <objects>
-                <viewController id="71J-Yr-dKi" customClass="OKKLineMinVC" customModule="OKKLineMin" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="PXo-2u-k1q">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EMG-BC-WTH">
-                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
-                                <color key="backgroundColor" red="0.50196078430000002" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="R2a-4K-8bU" firstAttribute="bottom" secondItem="EMG-BC-WTH" secondAttribute="bottom" id="521-Af-3Ww"/>
-                            <constraint firstItem="EMG-BC-WTH" firstAttribute="leading" secondItem="R2a-4K-8bU" secondAttribute="leading" id="PLw-Zp-bAU"/>
-                            <constraint firstItem="R2a-4K-8bU" firstAttribute="trailing" secondItem="EMG-BC-WTH" secondAttribute="trailing" id="gIj-8t-H7V"/>
-                            <constraint firstItem="EMG-BC-WTH" firstAttribute="top" secondItem="R2a-4K-8bU" secondAttribute="top" id="nyW-lk-yQP"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="R2a-4K-8bU"/>
-                    </view>
-                    <connections>
-                        <outlet property="backgroundView" destination="EMG-BC-WTH" id="mLh-xm-fxh"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="zUN-ah-eEZ" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="263" y="429"/>
-        </scene>
         <!--KlineVC-->
         <scene sceneID="PQm-8u-taF">
             <objects>
@@ -163,10 +133,10 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="NfK-RD-kuI" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="263" y="1100"/>
+            <point key="canvasLocation" x="273" y="1227"/>
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="HW6-ce-NE4"/>
+        <segue reference="Nje-3d-Ee2"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/OKKLineMin/CCOneVC.swift b/OKKLineMin/CCOneVC.swift
@@ -16,4 +16,19 @@ class CCOneVC: UIViewController {
 
         // Do any additional setup after loading the view.
     }
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destinationViewController.
+        // Pass the selected object to the new view controller.
+
+        if  segue.destination != nil {
+            let vc : CCKlineVC = segue.destination as! CCKlineVC
+            if let vcString = segue.identifier {
+                if vcString == "one" {
+                    vc.isFull = true;
+                }
+            }
+        }
+    }
 }
diff --git a/OKKLineMin/OKKLineMinVC.swift b/OKKLineMin/OKKLineMinVC.swift