Changeset 1098

Timestamp:

07/15/09 13:37:20 (4 years ago)

Author:

buleth

Message:

initial import

Location:

trunk/mpdb-iphone/mpdb-iphone/Classes

Files:

• MapController.m (modified) (2 diffs)
• MetamorphicGradeController.m (modified) (2 diffs)
• MineralsController.m (modified) (2 diffs)
• PublicStatusController.m (modified) (2 diffs)
• RockTypeController.m (modified) (3 diffs)
• SearchCriteriaController.m (modified) (2 diffs)
• SingleImageView.m (modified) (2 diffs)
• TableController.m (modified) (4 diffs)

trunk/mpdb-iphone/mpdb-iphone/Classes/MapController.m

@@ -111 +111 @@
         //before making a pin, make sure the annotation does not have the same lat and long a sample
         //if it does, move the pin slightly
-/*      for(int w=0; w<[mySamples count]; w++)
+        for(int w=0; w<[mySamples count]; w++)
         {
                 uniqueSamples *tempSample= [mySamples objectAtIndex:w];
-                if((tempSample.coordinate.latitude == maxLat))
-                {
-                        if(coord.latitude >= 0)
-                        {
-                                coord.latitude+= .001;
-                        }
-                        else
-                        {
-                                coord.latitude -= .001;
-                        }
-                        if(coord.longitude > 0)
-                        {
-                                coord.longitude+= .001;
-                        }
-                        else
-                        {
-                                coord.longitude-=.001;
-                        }
-                        annotation.coordinate= coord;
-                        break;
-                }
-        }*/
-        
-        for(int z=0; z< 4; z++)
+                if(tempSample.coordinate.latitude == maxLat)
+                {
+                        maxLat+= .0001;
+                }
+                if(tempSample.coordinate.latitude== minLat)
+                {
+                        minLat-=.0001;
+                }
+                if(tempSample.coordinate.longitude== maxLong)
+                {
+                        maxLong+= .0001;
+                }
+                if(tempSample.coordinate.longitude == minLong)
+                {
+                        minLong-= .0001;
+                }
+        }
+                for(int z=0; z< 4; z++)
         {
                 uniqueSamples *newGroup=[uniqueSamples new];
@@ -240 +234 @@
         
         SearchCriteriaController *viewController= [[SearchCriteriaController alloc] initWithNibName:@"SearchCriteriaSummary" bundle:nil];
-        [viewController setData:originalData:mySamples:mapType];
+        [viewController setData:originalData:mySamples:mapType:points];
         [viewController setCurrentSearchData:currentRockTypes :currentMinerals :currentMetamorphicGrades :currentPublicStatus:region:myLocation];
         self.criteriaController=viewController;

trunk/mpdb-iphone/mpdb-iphone/Classes/MetamorphicGradeController.m

@@ -41 +41 @@
 {
         SearchCriteriaController *viewController= [[SearchCriteriaController alloc] initWithNibName:@"SearchCriteriaSummary" bundle:nil];
-        [viewController setData:original:modifiedLocations:mapType];
+        [viewController setData:original:modifiedLocations:mapType:points];
         [viewController setCurrentSearchData:currentRockTypes :currentMinerals :currentMetamorphicGrades :currentPublicStatus:region:myCoordinate];
         self.criteriaController=viewController;
@@ -167 +167 @@
         gradeName= [myMetamorphicGrades objectAtIndex:row];
 }
--(void)setData:(NSMutableArray*)originalData: (NSMutableArray*)locations:(NSString*)type
+-(void)setData:(NSMutableArray*)originalData: (NSMutableArray*)locations:(NSString*)type:(NSMutableArray*)LatLongPoints
 {
         mapType=type;
         original=originalData;
         mylocations=locations;
+        points=LatLongPoints;
         bool added;
         int x, y, z, w;

trunk/mpdb-iphone/mpdb-iphone/Classes/MineralsController.m

@@ -64 +64 @@
 {
         SearchCriteriaController *viewController= [[SearchCriteriaController alloc] initWithNibName:@"SearchCriteriaSummary" bundle:nil];
-        [viewController setData:original:modifiedLocations:mapType];
+        [viewController setData:original:modifiedLocations:mapType:points];
         [viewController setCurrentSearchData:currentRockTypes :currentMinerals :currentMetamorphicGrades :currentPublicStatus:region:myCoordinate];
         self.criteriaController=viewController;
@@ -175 +175 @@
 }
 
--(void)setData:(NSMutableArray*)originalData: (NSMutableArray*)locations:(NSString*)type
+-(void)setData:(NSMutableArray*)originalData: (NSMutableArray*)locations:(NSString*)type:(NSMutableArray*)LatLongPoints
 {
         mapType=type;
         original=originalData; //pass the array with the original search results so the map can be reset
         myLocations=locations;
+        points= LatLongPoints;
 
         //create an array containing the minerals that are in the remaining samples after some search criteria have been provided

trunk/mpdb-iphone/mpdb-iphone/Classes/PublicStatusController.m

@@ -31 +31 @@
 {
         SearchCriteriaController *viewController= [[SearchCriteriaController alloc] initWithNibName:@"SearchCriteriaSummary" bundle:nil];
-        [viewController setData:original:modifiedLocations:mapType];
+        [viewController setData:original:modifiedLocations:mapType:points];
         [viewController setCurrentSearchData:currentRockTypes :currentMinerals :currentMetamorphicGrades :currentPublicStatus:region:myCoordinate];
         self.criteriaController=viewController;
@@ -150 +150 @@
 //the only array that needs to be passed is the one containing all the pin annotations since the 
 //public status string is a member of the annotation class
--(void)setData:(NSMutableArray*)originalData:(NSMutableArray*)locations:(NSString*)type
+-(void)setData:(NSMutableArray*)originalData:(NSMutableArray*)locations:(NSString*)type:(NSMutableArray*)LatLongPoints
 {
         mapType=type;
+        points=LatLongPoints;
         original=originalData; //we must pass the original search results so the map can be reset to its original values
         myLocations=locations;

trunk/mpdb-iphone/mpdb-iphone/Classes/RockTypeController.m

@@ -55 +55 @@
 {
         SearchCriteriaController *viewController= [[SearchCriteriaController alloc] initWithNibName:@"SearchCriteriaSummary" bundle:nil];
-        [viewController setData:original:modifiedLocations:mapType];
+        [viewController setData:original:modifiedLocations:mapType:points];
         [viewController setCurrentSearchData:currentRockTypes :currentMinerals :currentMetamorphicGrades :currentPublicStatus:region:myCoordinate];
         self.criteriaController=viewController;
@@ -160 +160 @@
 //if the sample has the correct rock type, add it to the new array
 //[modifiedLocations addObject:[myLocations objectAtIndex:x]];
--(void)setData:(NSMutableArray*) originalData:(NSMutableArray*)locations:(NSString*)type
+-(void)setData:(NSMutableArray*) originalData:(NSMutableArray*)locations:(NSString*)type:(NSMutableArray*)LatLongPoints
 {
         mapType=type;
@@ -166 +166 @@
         myLocations=locations;
         myRockTypes=[[NSMutableArray alloc] init];
+        points=LatLongPoints;
         
         //initially add a blank line so the user is forced to move the scroll wheel

trunk/mpdb-iphone/mpdb-iphone/Classes/SearchCriteriaController.m

@@ -446 +446 @@
         //load the table containing the choices for search criteria so the user can add more
         TableController *viewController = [[TableController alloc] initWithNibName:@"TableView" bundle:nil];
-        [viewController setData:original:remainingLocations:mapType];
+        [viewController setData:original:remainingLocations:mapType:points];
         [viewController setCurrentSearchData:currentRockTypes :currentMinerals :currentMetamorphicGrades :currentPublicStatus:region:myCoordinate];
          self.tableController = viewController;
@@ -564 +564 @@
 //this is the data of the annotations from the original search result and the current annotations that are left
 //this information needs to be passed to the table controller where more search criteria can be added
--(void)setData:(NSMutableArray*)originalData:(NSMutableArray*)sampleLocations:(NSString*)type
+-(void)setData:(NSMutableArray*)originalData:(NSMutableArray*)sampleLocations:(NSString*)type:(NSMutableArray*)LatLongPoints
 {
         mapType=type;
         original=originalData;
         remainingLocations= sampleLocations;
+        points= LatLongPoints;
+        
 }
 

trunk/mpdb-iphone/mpdb-iphone/Classes/SingleImageView.m

@@ -24 +24 @@
         [imageView setUserInteractionEnabled:YES];
         //make a toolbar at the bottom of the view
-        NSMutableArray *buttons=[[NSMutableArray alloc] init];
+        /*NSMutableArray *buttons=[[NSMutableArray alloc] init];
         UIBarButtonItem *barButton=[[UIBarButtonItem alloc] initWithTitle:@"Add Image To My Library" style:UIBarButtonItemStyleBordered target:self action:@selector(addToLibrary)];
         [buttons addObject:barButton];
@@ -31 +31 @@
         toolbar.frame = toolBarFrame;
         toolbar.items=buttons;  
-        [toolbar setBarStyle:1];
+        [toolbar setBarStyle:1];*/
         //CGRect rect= CGRectMake(0, 0, imageView.frame.size.width, imageView.frame.size.height);
         //scrollView.frame=rect;//[[UIScreen mainScreen] applicationFrame]; 

trunk/mpdb-iphone/mpdb-iphone/Classes/TableController.m

@@ -93 +93 @@
 
         MetamorphicGradeController *viewController=[[MetamorphicGradeController alloc] initWithNibName:@"MetamorphicGradeView" bundle:nil];
-        [viewController setData:original:locations:mapType];
+        [viewController setData:original:locations:mapType:points];
         [viewController setCurrentSearchData:currentRockTypes :currentMinerals :currentMetamorphicGrades :currentPublicStatus:region:myCoordinate];
         self.metamorphicGradeController= viewController;
@@ -106 +106 @@
                 RockTypeController *viewController = [[RockTypeController alloc] initWithNibName:@"RockTypeView" bundle:nil];
         //all of the following values must be passed so they can be passed back to the map straight from the rock view
-        [viewController setData:original:locations:mapType];
+        [viewController setData:original:locations:mapType:points];
         [viewController setCurrentSearchData:currentRockTypes :currentMinerals :currentMetamorphicGrades :currentPublicStatus:region:myCoordinate];
                 self.rockTypeController = viewController;
@@ -117 +117 @@
 {
         PublicStatusController *viewController = [[PublicStatusController alloc] initWithNibName:@"PublicStatusView" bundle:nil];
-        [viewController setData:original:locations:mapType];
+        [viewController setData:original:locations:mapType:points];
         [viewController setCurrentSearchData:currentRockTypes :currentMinerals :currentMetamorphicGrades :currentPublicStatus:region:myCoordinate];
         self.publicStatusController=viewController;
@@ -211 +211 @@
 
 //set the various arrays in this controller with the information about the samples
--(void)setData:(NSMutableArray*)originalData:(NSMutableArray*)sampleLocations:(NSString*)type
+-(void)setData:(NSMutableArray*)originalData:(NSMutableArray*)sampleLocations:(NSString*)type:(NSMutableArray*)LatLongPoints
 {
         original=originalData;
         locations= sampleLocations;
         mapType=type;
+        points=LatLongPoints;
 }
 -(void)setCurrentSearchData:(NSMutableArray*)rocks:(NSMutableArray*)mins:(NSMutableArray*)metgrades:(NSMutableArray*)public:(NSString*)aregion:(CLLocationCoordinate2D)coord