fdsfdsfds

keithloughnane · Aug 15, 2011 · 34c03e8 · 34c03e8
1 parent e614b76
commit 34c03e8
Show file tree

Hide file tree

Showing 16 changed files with 296 additions and 42 deletions.
diff --git a/TaxaApp.xcodeproj/project.pbxproj b/TaxaApp.xcodeproj/project.pbxproj
@@ -41,7 +41,6 @@
 		6C62E94513D8977C0010ED11 /* MapControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C62E94413D8977C0010ED11 /* MapControl.m */; };
 		6C62E94B13D897C70010ED11 /* SettingsHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C62E94A13D897C70010ED11 /* SettingsHandler.m */; };
 		6C62E94E13D897D80010ED11 /* CurrentPickup.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C62E94D13D897D80010ED11 /* CurrentPickup.m */; };
-		6C81979E13DDCB1000F1EFEE /* good in Resources */ = {isa = PBXBuildFile; fileRef = 6C81979D13DDCB1000F1EFEE /* good */; };
 		6CDCD1AD13E9843B009D0451 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6CDCD1AC13E9843B009D0451 /* Info.plist */; };
 		6CDCD1B613E98614009D0451 /* options.plist in Resources */ = {isa = PBXBuildFile; fileRef = 6CDCD1B513E98614009D0451 /* options.plist */; };
 /* End PBXBuildFile section */
@@ -104,7 +103,6 @@
 		6C62E94A13D897C70010ED11 /* SettingsHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsHandler.m; sourceTree = "<group>"; };
 		6C62E94C13D897D80010ED11 /* CurrentPickup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CurrentPickup.h; sourceTree = "<group>"; };
 		6C62E94D13D897D80010ED11 /* CurrentPickup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CurrentPickup.m; sourceTree = "<group>"; };
-		6C81979D13DDCB1000F1EFEE /* good */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = good; path = ../../../../../../../good; sourceTree = "<group>"; };
 		6CDCD1AC13E9843B009D0451 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		6CDCD1B513E98614009D0451 /* options.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = options.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -184,7 +182,6 @@
 				6C15851B13D9AC7D005C3697 /* LocationGetter.m */,
 				6C15851C13D9AC7D005C3697 /* netCon.h */,
 				6C15851D13D9AC7D005C3697 /* netCon.m */,
-				6C81979D13DDCB1000F1EFEE /* good */,
 				6C62E8FC13D880A90010ED11 /* MainWindow.xib */,
 				6C62E90213D880A90010ED11 /* MainView.xib */,
 				6C62E8FF13D880A90010ED11 /* MainViewController.h */,
@@ -319,7 +316,6 @@
 				6C62E93B13D894DF0010ED11 /* logo.png in Resources */,
 				6C15852F13D9BA8C005C3697 /* config.con in Resources */,
 				6C15853113D9BAA8005C3697 /* config.plist in Resources */,
-				6C81979E13DDCB1000F1EFEE /* good in Resources */,
 				6CDCD1AD13E9843B009D0451 /* Info.plist in Resources */,
 				6CDCD1B613E98614009D0451 /* options.plist in Resources */,
 			);

diff --git a/TaxaApp/CurrentPickup.m b/TaxaApp/CurrentPickup.m
@@ -16,6 +16,10 @@ -(int)initWithOwner : (id) iowner
         NSLog(@"Initing CurrentPickup");
 	owner  = iowner;
 
+    pickupId = -2;
+
+    NSLog(@"CurrentPickup ID set to %d",[self getID]);
+
 	return 0;
 }
 -(int) setUpMasterModeID:(int)ID llong:(double)ilong llat:(double)ilat
@@ -36,7 +40,7 @@ -(int) getStatus
 }
 -(int) setStatus:(int)iStatus
 {
-    pickupId = iStatus;
+    pickupStatus = iStatus;
     return 0;
 }
 
@@ -60,7 +64,11 @@ -(double)getLLat
 {
     return llat;
 }
-
+-(int)getID
+{
+    NSLog(@"Getting Pickup ID %d",pickupId);
+    return pickupId;
+}
 
 
 

diff --git a/TaxaApp/FlipsideView.xib b/TaxaApp/FlipsideView.xib
@@ -52,6 +52,8 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrameSize">{320, 44}</string>
 						<reference key="NSSuperview" ref="249263867"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1069858653"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -76,14 +78,16 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{57, 332}, {207, 44}}</string>
 						<reference key="NSSuperview" ref="249263867"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="116556756"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBNumberOfSegments">2</int>
 						<int key="IBSelectedSegmentIndex">0</int>
 						<object class="NSArray" key="IBSegmentTitles">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>First</string>
-							<string>Second</string>
+							<string>Customer</string>
+							<string>Taxi</string>
 						</object>
 						<object class="NSMutableArray" key="IBSegmentWidths">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -108,9 +112,11 @@
 					</object>
 					<object class="IBUITextField" id="116556756">
 						<reference key="NSNextResponder" ref="249263867"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{54, 383}, {212, 31}}</string>
 						<reference key="NSSuperview" ref="249263867"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="444669977"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -132,9 +138,11 @@
 					</object>
 					<object class="IBUITextField" id="444669977">
 						<reference key="NSNextResponder" ref="249263867"/>
-						<int key="NSvFlags">292</int>
+						<int key="NSvFlags">-2147483356</int>
 						<string key="NSFrame">{{54, 422}, {212, 31}}</string>
 						<reference key="NSSuperview" ref="249263867"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -157,12 +165,16 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 44}, {320, 269}}</string>
 						<reference key="NSSuperview" ref="249263867"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="6132498"/>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 					</object>
 				</object>
 				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="871675769"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MC4yNQA</bytes>
@@ -302,6 +314,7 @@
 					<string>43.IBPluginDependency</string>
 					<string>44.IBPluginDependency</string>
 					<string>47.IBPluginDependency</string>
+					<string>47.IUISegmentedControlInspectorSelectedSegmentMetadataKey</string>
 					<string>48.IBPluginDependency</string>
 					<string>49.IBPluginDependency</string>
 					<string>50.IBPluginDependency</string>
@@ -316,6 +329,7 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<integer value="0"/>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -335,7 +349,62 @@
 			<nil key="sourceID"/>
 			<int key="maxID">52</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">FlipsideViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>done:</string>
+							<string>segChange:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>done:</string>
+							<string>segChange:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">done:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">segChange:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">mySegBtn</string>
+						<string key="NS.object.0">UISegmentedControl</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">mySegBtn</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">mySegBtn</string>
+							<string key="candidateClassName">UISegmentedControl</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/FlipsideViewController.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">

diff --git a/TaxaApp/FlipsideViewController.h b/TaxaApp/FlipsideViewController.h
@@ -7,16 +7,17 @@
 //
 
 #import <UIKit/UIKit.h>
+//#import "SettingsHandler.h"
 
 @protocol FlipsideViewControllerDelegate;
 
 @interface FlipsideViewController : UIViewController {
 	id owner;
-
+    //SettingsHandler *mySettingsHandler;
     IBOutlet UISegmentedControl *mySegBtn;
 }
 @property (nonatomic,retain) UIButton *btnCan;
-
+//@property (retain, nonatomic) SettingsHandler *mySettingsHandler;
 -(IBAction)segChange:(id)sender;
 
 -(int)initWithOwner : (id) owner;

diff --git a/TaxaApp/FlipsideViewController.m b/TaxaApp/FlipsideViewController.m
@@ -12,13 +12,22 @@
 @implementation FlipsideViewController
 //@synthesize owner;
 @synthesize delegate=_delegate;
+//@synthesize mySettingsHandler;
 -(int)initWithOwner : (id) iowner
 {
         NSLog(@"Initing Flipside");
 	owner  = iowner;
+   // mySettingsHandler = [SettingsHandler alloc];
+   // [mySettingsHandler initWithOwner:self];
 
 	return 0;
 }
+-(int)setOwner: (id) iowner
+{
+    NSLog(@"setting owner in flip");
+    owner  = iowner;
+    return 0;
+}
 - (void)dealloc
 {
     [super dealloc];
@@ -35,6 +44,10 @@ -(IBAction)segChange:(id)sender
 {
     NSLog(@"MySegBTn = %d",[mySegBtn selectedSegmentIndex]);
     [owner setMode:[mySegBtn selectedSegmentIndex]];
+    //[mySettingsHandler setMode:[mySegBtn selectedSegmentIndex]];
+    //[mySettingsHandler SaveOptions];
+
+   // [owner setMode:[mySegBtn selectedSegmentIndex]];
 }
 #pragma mark - View lifecycle
 

diff --git a/TaxaApp/LocationGetter.m b/TaxaApp/LocationGetter.m
@@ -33,8 +33,10 @@ -(int)initWithOwner : (id) ownerl
 
 - (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation 
 {
-
-	self.startingPoint = newLocation;
+    NSLog(@"didUpdateLoc called");
+	//#if TARGET_ IPHONE_SIMULATOR
+	//NSLog(@"is in sim");
+    self.startingPoint = newLocation;
 	//owner statusText.text = [[NSString alloc] initWithFormat:@"LOC \nlat:%g\nlong:%g\nalt:%f",newLocation.coordinate.latitude,newLocation.coordinate.longitude,newLocation.altitude];
 	////NSLog([[NSString alloc] initWithFormat:@"LOC \nlat:%g\nlong:%g\nalt:%f",newLocation.coordinate.latitude,newLocation.coordinate.longitude,newLocation.altitude]);
 	//NSLog(@"LOC RECEIVED >> %@", temp);

diff --git a/TaxaApp/MainControl.h b/TaxaApp/MainControl.h
@@ -20,6 +20,8 @@
     //DataBaseControler *myDBControler;
     int mode;//0=cleint; 1=master/taxi
 
+
+
     LocationGetter *myLocGetter;
     netCon *myNetCon;
     id owner;
@@ -29,6 +31,8 @@
     SettingsHandler *mySettingsHandler;
     MapControl *myMapControl;
     double curLong, curLat, curVerr;
+
+    int userID;
 
 }
 
@@ -41,7 +45,7 @@
 @property (retain, nonatomic) CurrentPickup *myCurrentPickup;
 @property (retain, nonatomic) SettingsHandler *mySettingsHandler;
 @property (retain, nonatomic) MapControl *myMapControl;
-
+@property  int userID;
 -(int)init:(id *) iMainView;
 -(int) reqPickup;
 -(int) sendToNet:(NSString *)msg;