Merge branch 'development/WMM2015'

Conflicts: ObjectiveWMM/WMM/GeomagnetismHeader.h ObjectiveWMM/WMM/WMM.COF ObjectiveWMMTests/DeclinationTests.m
NasH5169 · Jun 19, 2015 · 3997354 · 3997354
2 parents 4680cc1 + 0eb3982
commit 3997354
Show file tree

Hide file tree

Showing 66 changed files with 429 additions and 4,587 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/ObjectiveWMM.xcodeproj/project.pbxproj b/ObjectiveWMM.xcodeproj/project.pbxproj
diff --git a/ObjectiveWMM.xcodeproj/xcuserdata/stephen.xcuserdatad/xcschemes/ObjectiveWMM.xcscheme b/ObjectiveWMM.xcodeproj/xcuserdata/stephen.xcuserdatad/xcschemes/ObjectiveWMM.xcscheme
diff --git a/ObjectiveWMM.xcodeproj/xcuserdata/stephen.xcuserdatad/xcschemes/ObjectiveWMMTests.xcscheme b/ObjectiveWMM.xcodeproj/xcuserdata/stephen.xcuserdatad/xcschemes/ObjectiveWMMTests.xcscheme
diff --git a/ObjectiveWMM.xcodeproj/xcuserdata/stephen.xcuserdatad/xcschemes/xcschememanagement.plist b/ObjectiveWMM.xcodeproj/xcuserdata/stephen.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -9,20 +9,15 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
-		<key>ObjectiveWMMTests.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
-		<key>DC846C25169F66C10074A10B</key>
+		<key>DC71D8D0197E067F00C665CB</key>
 		<dict>
 			<key>primary</key>
 			<true/>
 		</dict>
-		<key>DC846C8C169F81590074A10B</key>
+		<key>DC71D8DB197E067F00C665CB</key>
 		<dict>
 			<key>primary</key>
 			<true/>

diff --git a/ObjectiveWMM/CCAppDelegate.h b/ObjectiveWMM/CCAppDelegate.h
diff --git a/ObjectiveWMM/CCAppDelegate.m b/ObjectiveWMM/CCAppDelegate.m
diff --git a/ObjectiveWMM/CCMagneticModel.m b/ObjectiveWMM/CCMagneticModel.m
@@ -24,6 +24,7 @@
 
     NSString *fn = [NSString stringWithCString:fileName encoding:NSUTF8StringEncoding];
     NSString *fe = [NSString stringWithCString:fileExtension encoding:NSUTF8StringEncoding];
+
     NSString *path = [[NSBundle mainBundle] pathForResource:fn ofType:fe];
 
     return [path cStringUsingEncoding:NSUTF8StringEncoding];
@@ -63,7 +64,10 @@ - (id) init {
         int epochs = 1;
         int numTerms, nMax = 0;
 
-        char *filename = (char *) getPathForResource("WMM", "COF");
+        NSBundle *bundle = [NSBundle bundleWithIdentifier:@"com.crookneckconsulting.ObjectiveWMM"];
+        NSString *path = [bundle pathForResource:@"WMM" ofType:@"COF"];
+
+        char *filename = (char *) [path cStringUsingEncoding:NSUTF8StringEncoding];
 
         MAG_robustReadMagModels(filename, &_magneticModels, epochs);
 
@@ -197,7 +201,7 @@ - (NSDate *) dateForYear:(NSInteger)year month:(NSInteger)month day:(NSInteger)d
 	[comps setDay:day];
 	[comps setMonth:month];
 	[comps setYear:year];
-	NSCalendar *gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+	NSCalendar *gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
 	NSDate *date = [gregorian dateFromComponents:comps];
 
     return date;

diff --git a/ObjectiveWMM/CCViewController.h b/ObjectiveWMM/CCViewController.h
diff --git a/ObjectiveWMM/CCViewController.m b/ObjectiveWMM/CCViewController.m
diff --git a/ObjectiveWMM/[email protected] b/ObjectiveWMM/[email protected]
diff --git a/ObjectiveWMM/Default.png b/ObjectiveWMM/Default.png
diff --git a/ObjectiveWMM/[email protected] b/ObjectiveWMM/[email protected]
diff --git a/ObjectiveWMM/GHUnitIOS.framework/GHUnitIOS b/ObjectiveWMM/GHUnitIOS.framework/GHUnitIOS
diff --git a/ObjectiveWMM/GHUnitIOS.framework/Headers b/ObjectiveWMM/GHUnitIOS.framework/Headers
diff --git a/ObjectiveWMM/GHUnitIOS.framework/Resources b/ObjectiveWMM/GHUnitIOS.framework/Resources
diff --git a/ObjectiveWMM/GHUnitIOS.framework/Versions/A/GHUnitIOS b/ObjectiveWMM/GHUnitIOS.framework/Versions/A/GHUnitIOS