From 2515d2fbc29c283f3db96f85a0a6a7bb721b11ee Mon Sep 17 00:00:00 2001 From: Brent Marohnic Date: Thu, 14 Feb 2013 22:48:07 -0500 Subject: [PATCH] Final Commit. That was fun --- .../UserInterfaceState.xcuserstate | Bin 21524 -> 21736 bytes Week2/APLOCWeek2/APLOCWeek2/ViewController.m | 43 ++- Week2/APLOCWeek2/APLOCWeek2/bikeEvent.m | 2 +- .../en.lproj/ViewController_iPhone.xib | 359 +++++++++--------- 4 files changed, 221 insertions(+), 183 deletions(-) diff --git a/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate b/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate index dceb15941fc0f6a58d3a586882c1301c5dfca366..423360f179b09e4f2c73b64340fdeaabb9b2928e 100644 GIT binary patch delta 11042 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%0AgG0GPfo0~y^QcKtYZ8k0%d<42+TB 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 R!7%@CdbIy{<^Ne*{|}KRwUYn< delta 11073 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 diff --git a/Week2/APLOCWeek2/APLOCWeek2/ViewController.m b/Week2/APLOCWeek2/APLOCWeek2/ViewController.m index d3c74f1..92f95fd 100644 --- a/Week2/APLOCWeek2/APLOCWeek2/ViewController.m +++ b/Week2/APLOCWeek2/APLOCWeek2/ViewController.m @@ -17,10 +17,44 @@ -(IBAction)onCompeteClick:(id)sender { - swimEvent *newSwimEvent = (swimEvent*)[eventFactory createNewEvent:SWIM]; - [newSwimEvent setWaterTemp: 70]; - textBox.text = [NSString stringWithFormat:@"Event Time of %.2f Minutes", [newSwimEvent calculateEventTime]]; + if (swimButton.enabled == FALSE) + { + swimEvent *newSwimEvent = (swimEvent*)[eventFactory createNewEvent:SWIM]; + [newSwimEvent setWaterTemp: 70]; + [newSwimEvent setEventDistance:stepperControl.value]; + + textBox.text = [NSString stringWithFormat:@"Event Time ~ %.4f Minutes", [newSwimEvent calculateEventTime]]; + + swimButton.enabled = TRUE; + stepperControl.enabled = FALSE; + } + else if (bikeButton.enabled == FALSE) + { + bikeEvent *newBikeEvent = (bikeEvent*)[eventFactory createNewEvent:BIKE]; + [newBikeEvent setElevationInFeet:2375]; + [newBikeEvent setEventDistance:stepperControl.value]; + + + textBox.text = [NSString stringWithFormat:@"Event Time ~ %.4f Minutes", [newBikeEvent calculateEventTime]]; + + bikeButton.enabled = TRUE; + stepperControl.enabled = FALSE; + } + else + { + runEvent *newRunEvent = (runEvent*)[eventFactory createNewEvent:RUN]; + [newRunEvent setTerrainType:PAVEDESTREETS]; + [newRunEvent setEventDistance:stepperControl.value]; + + + textBox.text = [NSString stringWithFormat:@"Event Time ~ %.4f Minutes", [newRunEvent calculateEventTime]]; + + runButton.enabled = TRUE; + stepperControl.enabled = FALSE; + } + + competeButton.enabled = FALSE; } @@ -36,6 +70,7 @@ runButton.enabled = TRUE; bikeButton.enabled = TRUE; stepperControl.value = 0; + competeButton.enabled = TRUE; } else if (classButton.tag == 1) { @@ -46,6 +81,7 @@ runButton.enabled = TRUE; swimButton.enabled = TRUE; stepperControl.value = 0; + competeButton.enabled = TRUE; } else if (classButton.tag == 2) @@ -57,6 +93,7 @@ swimButton.enabled = TRUE; bikeButton.enabled = TRUE; stepperControl.value = 0; + competeButton.enabled = TRUE; } } diff --git a/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.m b/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.m index 30c1efc..30ce690 100644 --- a/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.m +++ b/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.m @@ -35,7 +35,7 @@ float handicap; float distanceHandicap; - handicap = abs(25 - elevationInFeet) * 0.01 * abs(25 - elevationInFeet); + handicap = abs(25 - elevationInFeet) * 0.001; distanceHandicap = 2 * (eventDistance * 1.05); [self setEventTimeInMinutes:(handicap + distanceHandicap)]; diff --git a/Week2/APLOCWeek2/APLOCWeek2/en.lproj/ViewController_iPhone.xib b/Week2/APLOCWeek2/APLOCWeek2/en.lproj/ViewController_iPhone.xib index 0958a9e..d404a34 100644 --- a/Week2/APLOCWeek2/APLOCWeek2/en.lproj/ViewController_iPhone.xib +++ b/Week2/APLOCWeek2/APLOCWeek2/en.lproj/ViewController_iPhone.xib @@ -39,7 +39,7 @@ 274 - + 292 {{0, 519}, {320, 30}} @@ -77,13 +77,13 @@ - + 292 {{247, 0}, {73, 33}} - + _NS:9 NO IBCocoaTouchFramework @@ -91,7 +91,7 @@ 0 1 Info - + 3 MQA @@ -99,27 +99,27 @@ 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + 3 MC41AA - + 2 15 - + Helvetica-Bold 15 16 - + 292 {{20, 80}, {280, 30}} - + _NS:9 NO YES @@ -132,7 +132,7 @@ 3 MAA - + 2 @@ -151,13 +151,13 @@ 16 - + 268 {{109, 118}, {94, 27}} - + _NS:9 NO YES @@ -170,13 +170,13 @@ 1 10 - + 292 {{20, 164}, {86, 44}} - + _NS:9 NO IBCocoaTouchFramework @@ -184,22 +184,22 @@ 0 1 Swim - + 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - + + + - + 292 {{207, 164}, {85, 44}} - + _NS:9 NO 2 @@ -208,22 +208,22 @@ 0 1 Run - + 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - + + + - + 292 {{114, 164}, {85, 44}} - + _NS:9 NO 1 @@ -232,46 +232,47 @@ 0 1 Bike - + 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - + + + - + 292 {{20, 416}, {280, 44}} - + _NS:9 NO IBCocoaTouchFramework + NO 0 0 1 Compete - + 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - + + {{0, 20}, {320, 548}} - + 3 MC43NQA - + NO @@ -309,7 +310,7 @@ segmentControl - + 15 @@ -317,7 +318,7 @@ stepperControl - + 85 @@ -325,7 +326,7 @@ textBox - + 93 @@ -333,7 +334,7 @@ swimButton - + 105 @@ -341,7 +342,7 @@ runButton - + 106 @@ -349,7 +350,7 @@ bikeButton - + 107 @@ -357,14 +358,14 @@ competeButton - + 108 onChange: - + 13 @@ -373,7 +374,7 @@ onClick: - + 7 @@ -382,7 +383,7 @@ onStepChange: - + 13 @@ -391,7 +392,7 @@ onClassButtonClick: - + 7 @@ -400,7 +401,7 @@ onClassButtonClick: - + 7 @@ -409,7 +410,7 @@ onClassButtonClick: - + 7 @@ -418,7 +419,7 @@ onCompeteClick: - + 7 @@ -448,8 +449,8 @@ 6 - - + + 6 0 @@ -464,8 +465,8 @@ 29 3 - - + + 5 0 @@ -480,8 +481,8 @@ 29 3 - - + + 4 0 @@ -496,8 +497,8 @@ 29 3 - - + + 5 0 @@ -512,11 +513,11 @@ 29 3 - + 6 0 - + 6 1 @@ -528,11 +529,11 @@ 29 3 - + 4 0 - + 4 1 @@ -544,11 +545,11 @@ 9 3 - - + + 5 0 - + 6 1 @@ -560,11 +561,11 @@ 24 3 - - + + 11 0 - + 11 1 @@ -576,8 +577,8 @@ 24 2 - - + + 3 0 @@ -592,8 +593,8 @@ 29 3 - - + + 6 0 @@ -608,11 +609,11 @@ 29 3 - - + + 9 0 - + 9 1 @@ -624,11 +625,11 @@ 24 2 - - + + 11 0 - + 11 1 @@ -640,11 +641,11 @@ 24 2 - - + + 5 0 - + 6 1 @@ -656,8 +657,8 @@ 24 3 - - + + 3 0 @@ -672,8 +673,8 @@ 9 3 - - + + 5 0 @@ -688,11 +689,11 @@ 29 3 - - + + 3 0 - + 4 1 @@ -704,8 +705,8 @@ 24 3 - - + + 5 0 @@ -720,8 +721,8 @@ 29 3 - - + + 3 0 @@ -736,11 +737,11 @@ 9 3 - + 6 0 - + 6 1 @@ -752,43 +753,43 @@ 29 3 - - - - - - - - + + + + + + + + 8 - + 14 - + 13 - + 11 - + 18 - + - - + + 8 0 @@ -798,13 +799,13 @@ 32 1000 - + 3 9 1 - - + + 7 0 @@ -814,7 +815,7 @@ 73 1000 - + 3 9 1 @@ -824,52 +825,52 @@ 21 - + 22 - + 24 - - + + 26 - - + + 28 - + 36 - + 37 - + 38 - + 46 - + - - + + 7 0 @@ -879,7 +880,7 @@ 86 1000 - + 3 9 1 @@ -889,20 +890,20 @@ 49 - + 50 - + 51 - + - - + + 7 0 @@ -912,7 +913,7 @@ 85 1000 - + 3 9 1 @@ -922,10 +923,10 @@ 54 - + - - + + 7 0 @@ -935,7 +936,7 @@ 85 1000 - + 3 9 1 @@ -945,73 +946,73 @@ 65 - + 72 - + 74 - + 81 - + 83 - + 78 - + 66 - + 100 - - + + 102 - + 103 - - + + 104 - - + + 110 - + 111 - + 113 - + @@ -1033,8 +1034,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -1049,42 +1050,42 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin