f

casparwylie · 5a90c451072fabdd1db07b28aeda86538bb1522d · casparwylie committed Apr 21, 2017 · Apr 21, 2017 · 5a90c45
2 parents 2b8c9f0 + be06a0c
commit 5a90c451072fabdd1db07b28aeda86538bb1522d
diff --git a/Strands.xcodeproj/project.pbxproj → Astral.xcodeproj/project.pbxproj b/Strands.xcodeproj/project.pbxproj → Astral.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...space/xcshareddata/Strands.xcscmblueprint → ...space/xcshareddata/Strands.xcscmblueprint b/...space/xcshareddata/Strands.xcscmblueprint → ...space/xcshareddata/Strands.xcscmblueprint
@@ -1,18 +1,18 @@
 {
-  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "8381484DD32D43BC41F2FB3413EB5AFA834EFB5F",
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "E21098224036A3BEF7D8C72B51F8239D224C53F3",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
 
   },
   "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
     "01C4019DAB2F13C7FB458F088D0A991884C46F1A" : 9223372036854775807,
     "C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D" : 9223372036854775807,
-    "8381484DD32D43BC41F2FB3413EB5AFA834EFB5F" : 9223372036854775807
+    "E21098224036A3BEF7D8C72B51F8239D224C53F3" : 9223372036854775807
   },
-  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "117B1917-BEC4-43D7-A0E7-FB5D7980E258",
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "218D7884-8F4E-419F-B5E6-D3EEB123C3A7",
   "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
     "01C4019DAB2F13C7FB458F088D0A991884C46F1A" : "Strands\/socket.io-client-swift\/",
     "C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D" : "..\/startest\/Starscream",
-    "8381484DD32D43BC41F2FB3413EB5AFA834EFB5F" : "Strands\/"
+    "E21098224036A3BEF7D8C72B51F8239D224C53F3" : "Strands\/"
   },
   "DVTSourceControlWorkspaceBlueprintNameKey" : "Strands",
   "DVTSourceControlWorkspaceBlueprintVersion" : 204,
@@ -24,14 +24,14 @@
       "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "01C4019DAB2F13C7FB458F088D0A991884C46F1A"
     },
     {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/bitbucket.org\/casparwylie\/strands.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/daltoniam\/Starscream.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "8381484DD32D43BC41F2FB3413EB5AFA834EFB5F"
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D"
     },
     {
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/daltoniam\/Starscream.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/bitbucket.org\/casparwylie\/strands.git",
       "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
-      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D"
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "E21098224036A3BEF7D8C72B51F8239D224C53F3"
     }
   ]
 }
diff --git a/...roj/project.xcworkspace/xcuserdata/casparwylie.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/casparwylie.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...atad/xcdebugger/Breakpoints_v2.xcbkptlist → ...atad/xcdebugger/Breakpoints_v2.xcbkptlist b/...atad/xcdebugger/Breakpoints_v2.xcbkptlist → ...atad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -10,12 +10,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Scene.swift"
-            timestampString = "501960668.020464"
+            timestampString = "504198406.312313"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "90"
             endingLineNumber = "90"
-            landmarkName = "DAEtoSCNNodeWithText(_:strandDisplayInfo:)"
+            landmarkName = "DAEtoSCNNodeWithText(_:focalDisplayInfo:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
diff --git a/...ie.xcuserdatad/xcschemes/Strands.xcscheme → ...ie.xcuserdatad/xcschemes/Strands.xcscheme b/...ie.xcuserdatad/xcschemes/Strands.xcscheme → ...ie.xcuserdatad/xcschemes/Strands.xcscheme
diff --git a/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist b/...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist
diff --git a/Astralpost.dae b/Astralpost.dae
diff --git a/strandpost/Cladding_Stucco_White(1).jpg → Astralpost/Cladding_Stucco_White(1).jpg b/strandpost/Cladding_Stucco_White(1).jpg → Astralpost/Cladding_Stucco_White(1).jpg
diff --git a/strandpost/Cladding_Stucco_White.jpg → Astralpost/Cladding_Stucco_White.jpg b/strandpost/Cladding_Stucco_White.jpg → Astralpost/Cladding_Stucco_White.jpg
diff --git a/strandpost/Polished_Concrete_New(1).jpg → Astralpost/Polished_Concrete_New(1).jpg b/strandpost/Polished_Concrete_New(1).jpg → Astralpost/Polished_Concrete_New(1).jpg
diff --git a/strandpost/Polished_Concrete_New(2).jpg → Astralpost/Polished_Concrete_New(2).jpg b/strandpost/Polished_Concrete_New(2).jpg → Astralpost/Polished_Concrete_New(2).jpg
diff --git a/strandpost/Polished_Concrete_New.jpg → Astralpost/Polished_Concrete_New.jpg b/strandpost/Polished_Concrete_New.jpg → Astralpost/Polished_Concrete_New.jpg
diff --git a/Camera.swift b/Camera.swift
@@ -1,6 +1,6 @@
 //
 //  Camera.swift
-//  Strands
+//  Astral
 //
 //  Created by Caspar Wylie on 05/08/2016.
 //  Copyright © 2016 Caspar Wylie. All rights reserved.
diff --git a/Location.swift b/Location.swift
@@ -1,6 +1,6 @@
 //
 //  Location.swift
-//  Strands
+//  Astral
 //
 //  Created by Caspar Wylie on 05/08/2016.
 //  Copyright © 2016 Caspar Wylie. All rights reserved.
@@ -128,7 +128,7 @@ class Location: NSObject, CLLocationManagerDelegate{
         return distMetres;
     }
     
-    func collectStrandToUserData(_ point1X: Double, point1Y:  Double, point2X:  Double, point2Y: Double) -> (Int, Int){
+    func collectFocalToUserData(_ point1X: Double, point1Y:  Double, point2X:  Double, point2Y: Double) -> (Int, Int){
         
         let lineBetweenBearing = getBearingFromTwo2dPoints(point1X, point1Y: point1Y, point2X: point2X, point2Y: point2Y);
         
diff --git a/Map.swift b/Map.swift
@@ -1,6 +1,6 @@
 //
 //  Map.swift
-//  Strands
+//  Focals
 //
 //  Created by Caspar Wylie on 06/08/2016.
 //  Copyright © 2016 Caspar Wylie. All rights reserved.
@@ -18,7 +18,7 @@ import Darwin
 
 
 @objc protocol mapActionDelegate {
-    @objc optional func renderTempStrandFromMap(_ mapTapCoord: CLLocationCoordinate2D);
+    @objc optional func renderTempFocalFromMap(_ mapTapCoord: CLLocationCoordinate2D);
 }
 
 class Map: NSObject, MKMapViewDelegate{
@@ -38,7 +38,7 @@ class Map: NSObject, MKMapViewDelegate{
         mapView.delegate = self;
         mapView.tag = 3;
         mapView.showsUserLocation = true;
-        addStrandMapTapRecognizer();
+        addFocalMapTapRecognizer();
         view.addSubview(mapView);
     }
     
@@ -50,8 +50,8 @@ class Map: NSObject, MKMapViewDelegate{
         return coordinateRegion;
     }
     
-    //MARK: add strand map tap
-    func addStrandMapTapRecognizer(){
+    //MARK: add focal map tap
+    func addFocalMapTapRecognizer(){
         let tapRec: UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(wrapTappedMap));
         tapRec.numberOfTapsRequired = 1;
         mapView.addGestureRecognizer(tapRec);
@@ -62,19 +62,19 @@ class Map: NSObject, MKMapViewDelegate{
         let tapPoint = touch.location(in: mapView);
         let tapCoords = mapView.convert(tapPoint, toCoordinateFrom: mapView);
         if(self.tapMapToPost == true){
-            mapActionDelegate?.renderTempStrandFromMap!(tapCoords);
+            mapActionDelegate?.renderTempFocalFromMap!(tapCoords);
         }else{
-            //get strandinfo
+            //get focalinfo
         }
     }
     
-    func cancelTempStrand(){
+    func cancelTempFocal(){
         if(tempPin != nil){
             mapView.removeAnnotation(tempPin);
         }
     }
     
-    //MARK: update pins that represent strand
+    //MARK: update pins that represent focal
     var pcount = 0;
     func updateSinglePin(_ coord: CLLocation, temp: Bool){
         let CLLCoordType = CLLocationCoordinate2D(latitude: coord.coordinate.latitude,
@@ -144,7 +144,7 @@ class Map: NSObject, MKMapViewDelegate{
     
     //MARK: get all map points as px in preparation for openCV wrapper
     func collectPXfromMapPoints(_ mapPoints: [MKMapPoint], currMapPoint: MKMapPoint)
-        -> (strandValsPX: [(Double,Double)], currPointPX:[Double], pxLength: Int){
+        -> (focalValsPX: [(Double,Double)], currPointPX:[Double], pxLength: Int){
         
         var pixelsXY: [(Double,Double)] = [];
 
@@ -155,7 +155,7 @@ class Map: NSObject, MKMapViewDelegate{
             pixelsXY.append(resultsPX);
         }
         
-            return (strandValsPX: pixelsXY, currPointPX: resultsCurrPointXY, pxLength: mapPoints.count);
+            return (focalValsPX: pixelsXY, currPointPX: resultsCurrPointXY, pxLength: mapPoints.count);
     }
     
     
diff --git a/Misc.swift b/Misc.swift
@@ -1,6 +1,6 @@
 //
 //  Misc.swift
-//  Strands
+//  Focals
 //
 //  Created by Caspar Wylie on 05/08/2016.
 //  Copyright © 2016 Caspar Wylie. All rights reserved.
diff --git a/Network.swift b/Network.swift
@@ -1,6 +1,6 @@
 //
 //  Network.swift
-//  Strands
+//  Focals
 //
 //  Created by Caspar Wylie on 29/09/2016.
 //  Copyright © 2016 Caspar Wylie. All rights reserved.
@@ -22,10 +22,10 @@ import SwiftyJSON
     
     @objc optional func regionDataResponse(_ responseStr: String);
     @objc optional func userLoggedinResponse(_ responseStr: String);
-    @objc optional func addedStrandResponse(_ responseStr: String);
-    @objc optional func userStrandsResponse(_ responseStr: String);
-    @objc optional func deletedStrandResponse(_ responseStr: String);
-    @objc optional func strandCommentsResponse(_ responseStr: String);
+    @objc optional func addedFocalResponse(_ responseStr: String);
+    @objc optional func userFocalsResponse(_ responseStr: String);
+    @objc optional func deletedFocalResponse(_ responseStr: String);
+    @objc optional func focalCommentsResponse(_ responseStr: String);
     @objc optional func postedCommentResponse(_ responseStr: String);
     @objc optional func updatedUserDataResponse(_ responseStr: String);
     
@@ -36,6 +36,7 @@ import SwiftyJSON
 class NetworkSocketHandler{
     
     let socket = WebSocket(url: URL(string: "ws://casparwylie.me:3000/")!);
+    var ui: UserInterface1!;
     var networkResponseDelegate: NetworkResponseDelegate?;
     func connectWebSocket() -> WebSocket{
         socket.connect();
@@ -67,24 +68,24 @@ class NetworkSocketHandler{
     
     func setResponseRouteHandler(){
         socket.onText = { (responseString: String) in
-            let responseJSON = self.processResponseAsJSON(responseData: responseString);
+            let responseJSON = self.processResponseAsJSON(responseString);
             switch(responseJSON["response"].string!){
                 case "regionData":
-                    self.networkResponseDelegate?.regionDataResponse!(responseStr: responseString);
+                    self.networkResponseDelegate?.regionDataResponse!(responseString);
                 case "userLoggedin":
-                    self.networkResponseDelegate?.userLoggedinResponse!(responseStr: responseString);
-                case "addedStrand":
-                    self.networkResponseDelegate?.addedStrandResponse!(responseStr: responseString);
-                case "userStrands":
-                    self.networkResponseDelegate?.userStrandsResponse!(responseStr: responseString);
-                case "deletedStrand":
-                    self.networkResponseDelegate?.deletedStrandResponse!(responseStr: responseString);
-                case "strandComments":
-                    self.networkResponseDelegate?.strandCommentsResponse!(responseStr: responseString);
+                    self.networkResponseDelegate?.userLoggedinResponse!(responseString);
+                case "addedFocal":
+                    self.networkResponseDelegate?.addedFocalResponse!(responseString);
+                case "userFocals":
+                    self.networkResponseDelegate?.userFocalsResponse!(responseString);
+                case "deletedFocal":
+                    self.networkResponseDelegate?.deletedFocalResponse!(responseString);
+                case "focalComments":
+                    self.networkResponseDelegate?.focalCommentsResponse!(responseString);
                 case "postedComment":
-                    self.networkResponseDelegate?.postedCommentResponse!(responseStr: responseString);
+                    self.networkResponseDelegate?.postedCommentResponse!(responseString);
                 case "updatedUserData":
-                    self.networkResponseDelegate?.updatedUserDataResponse!(responseStr: responseString);
+                    self.networkResponseDelegate?.updatedUserDataResponse!(responseString);
                 default:
                     print("failed");
 
@@ -100,15 +101,15 @@ class NetworkRequestHandler{
     
     func loginUserRequest(_ socket: WebSocket, username: String, password: String){
         let organisedRelevantData = ["username": username, "password": password];
-        NetworkSocketHandler().sendRelevantJsonRequest(socket: socket,requestName: "loginUserRequest", relevantData: organisedRelevantData);
+        NetworkSocketHandler().sendRelevantJsonRequest(socket,requestName: "loginUserRequest", relevantData: organisedRelevantData);
 
     }
     
     func updateUserDataRequest(_ socket: WebSocket, username: String, password: String, fullname: String, email: String, userID: Int){
         
         let updateType = (userID > 0 ? "userUpdate" : "userSignUp");
         let organisedRelevantData = ["username":username, "password": password, "email": email, "fullname": fullname, "userID": String(userID), "updateType" : updateType];
-        NetworkSocketHandler().sendRelevantJsonRequest(socket: socket,requestName: "updateUserDataRequest", relevantData: organisedRelevantData);
+        NetworkSocketHandler().sendRelevantJsonRequest(socket,requestName: "updateUserDataRequest", relevantData: organisedRelevantData);
         
     }
 
@@ -118,49 +119,49 @@ class NetworkRequestHandler{
         let currentLon = currLocation.coordinate.longitude;
         
        let organisedRelevantData = ["longitude": String(currentLon), "latitude": String(currentLat)];
-        NetworkSocketHandler().sendRelevantJsonRequest(socket: socket,requestName: "regionDataRequest", relevantData: organisedRelevantData);
+        NetworkSocketHandler().sendRelevantJsonRequest(socket,requestName: "regionDataRequest", relevantData: organisedRelevantData);
 
     }
     
-    func addStrand(_ socket: WebSocket, strandLocation: CLLocation,strandDisplayInfo: (comment: String, author: String, userID: Int, areaName: String)){
+    func addFocal(_ socket: WebSocket, focalLocation: CLLocation,focalDisplayInfo: (comment: String, author: String, userID: Int, areaName: String)){
         
-        let strandLat = strandLocation.coordinate.latitude;
-        let strandLon = strandLocation.coordinate.longitude;
+        let focalLat = focalLocation.coordinate.latitude;
+        let focalLon = focalLocation.coordinate.longitude;
         
         
-       let organisedRelevantData = ["longitude": String(strandLon),
-                                     "latitude": String(strandLat),
-                                     "postText": strandDisplayInfo.comment,
-                                     "author": strandDisplayInfo.author,
-                                     "userID": String(strandDisplayInfo.userID),
-                                     "areaName": strandDisplayInfo.areaName];
+       let organisedRelevantData = ["longitude": String(focalLon),
+                                     "latitude": String(focalLat),
+                                     "postText": focalDisplayInfo.comment,
+                                     "author": focalDisplayInfo.author,
+                                     "userID": String(focalDisplayInfo.userID),
+                                     "areaName": focalDisplayInfo.areaName];
         
-        NetworkSocketHandler().sendRelevantJsonRequest(socket: socket,requestName: "addStrandRequest", relevantData: organisedRelevantData);
+        NetworkSocketHandler().sendRelevantJsonRequest(socket,requestName: "addFocalRequest", relevantData: organisedRelevantData);
     }
     
-    func getUserStrands(_ socket: WebSocket,userID: Int){
+    func getUserFocals(_ socket: WebSocket,userID: Int){
         
         let organisedRelevantData = ["userID": String(userID)];
-        NetworkSocketHandler().sendRelevantJsonRequest(socket: socket,requestName: "userStrandsRequest", relevantData: organisedRelevantData);
+        NetworkSocketHandler().sendRelevantJsonRequest(socket,requestName: "userFocalsRequest", relevantData: organisedRelevantData);
     }
     
-    func deleteStrand(_ socket: WebSocket,strandID: Int){
+    func deleteFocal(_ socket: WebSocket,focalID: Int){
         
-        let organisedRelevantData = ["strandID": String(strandID)];
-        NetworkSocketHandler().sendRelevantJsonRequest(socket: socket,requestName: "deleteStrandRequest", relevantData: organisedRelevantData);
+        let organisedRelevantData = ["focalID": String(focalID)];
+        NetworkSocketHandler().sendRelevantJsonRequest(socket,requestName: "deleteFocalRequest", relevantData: organisedRelevantData);
 
     }
     
-    func getStrandComments(_ socket: WebSocket, strandID: Int){
+    func getFocalComments(_ socket: WebSocket, focalID: Int){
 
-        let organisedRelevantData = ["strandID": String(strandID)];
-        NetworkSocketHandler().sendRelevantJsonRequest(socket: socket,requestName: "strandCommentsRequest", relevantData: organisedRelevantData);
+        let organisedRelevantData = ["focalID": String(focalID)];
+        NetworkSocketHandler().sendRelevantJsonRequest(socket,requestName: "focalCommentsRequest", relevantData: organisedRelevantData);
     }
     
-    func postComment(_ socket: WebSocket, strandID: Int, username: String, commentText: String){
+    func postComment(_ socket: WebSocket, focalID: Int, username: String, commentText: String){
         
-        let organisedRelevantData = ["strandID": String(strandID), "username": username, "postText": commentText];
-        NetworkSocketHandler().sendRelevantJsonRequest(socket: socket,requestName: "postStrandCommentRequest", relevantData: organisedRelevantData);
+        let organisedRelevantData = ["focalID": String(focalID), "username": username, "postText": commentText];
+        NetworkSocketHandler().sendRelevantJsonRequest(socket,requestName: "postFocalCommentRequest", relevantData: organisedRelevantData);
         
     }
     
diff --git a/OpenCVWrapper.h b/OpenCVWrapper.h
@@ -1,6 +1,6 @@
 //
 //  OpenCVWrapper.h
-//  Strands1
+//  Focals1
 //
 //  Created by Caspar Wylie on 17/09/2016.
 //  Copyright © 2016 Caspar Wylie. All rights reserved.
@@ -20,6 +20,6 @@
 
 +(NSString*) buildingDetect: (double[][2])pxVals image:(UIImage*)UIMap currPoint:(double[2])currPointPX pxLength:(int) pxLength forTapLimit:(bool)forTapLimit;
 
-//+(NSString*) limitNewStrandDist: (double[2])currPoint image:(UIImage*)UIMap desPoint:(double[2])desPoint;
+//+(NSString*) limitNewFocalDist: (double[2])currPoint image:(UIImage*)UIMap desPoint:(double[2])desPoint;
 
 @end
diff --git a/OpenCVWrapper.mm b/OpenCVWrapper.mm
@@ -1,6 +1,6 @@
 //
 //  OpenCVWrapper.m
-//  Strands1
+//  Focals1
 //
 //  Created by Caspar Wylie on 17/09/2016.
 //  Copyright © 2016 Caspar Wylie. All rights reserved.
@@ -28,7 +28,7 @@ int buildingFoundInLine(cv::Mat frame,cv::Mat testFrame, cv::Point point1, cv::P
     bool testing = false;
     int buildingFoundAt = -1;
     vector<int>  buildingColorBounds = {232,235};
-    int buildingDectectThicknessOffset = 4;
+    int buildingDectectThicknessOffset = 7;
     
     cv::LineIterator lineIter(frame, point1, point2);
     int buildingProb = 0;
@@ -39,7 +39,7 @@ int buildingFoundInLine(cv::Mat frame,cv::Mat testFrame, cv::Point point1, cv::P
             if(buildingDectectThicknessOffset <= buildingProb){
                 buildingFoundAt = i;
                // if(testing == false){
-                    break;
+                break;
                 //}
             }
             
diff --git a/Podfile b/Podfile
@@ -2,7 +2,7 @@
 platform :ios, '9.0'
 use_frameworks!
 
-target 'Strands' do
+target 'Astral' do
   pod 'Starscream', '~> 2.0.0'
   pod 'SwiftyJSON'
 end