[Macattrick-commit] macattrick LineUpController.m,1.23,1.24

[Geisschaes <gei...@us...>]

Update of /cvsroot/macattrick/macattrick
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22493

Modified Files:
	LineUpController.m 
Log Message:
alert when not enough players in group for lineup. ready for beta testing

Index: LineUpController.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/LineUpController.m,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** LineUpController.m	1 Oct 2005 12:50:36 -0000	1.23
--- LineUpController.m	1 Oct 2005 13:22:59 -0000	1.24
***************
*** 53,57 ****
  - (NSArray *) specWingbackList;
  - (NSArray *) specCentralDefenderList;
! 
  @end
  
--- 53,57 ----
  - (NSArray *) specWingbackList;
  - (NSArray *) specCentralDefenderList;
! -(void) cleanLineUp;
  @end
  
***************
*** 86,105 ****
  	float threshold = [[NSUserDefaults standardUserDefaults] floatForKey:@"lineUpAccuracy"] / 100.0;
  	NSArray *playerList = [[team playerList] playersWithInjured:[[NSUserDefaults standardUserDefaults]boolForKey:@"lineUpIncludeInjured"] diqualified: [[NSUserDefaults standardUserDefaults]boolForKey:@"lineUpIncludeDisqualified"]];
! 	[lineUpTree buildTree:threshold playerList:[NSSet setWithArray:playerList]];
! 	NSArray *lineUp = [lineUpTree bestLineUp];
! 	[self displayLineUp: lineUp];
! 	[self displayPointsInSpecs: lineUp];
! 	[self setPiecesPlayer:[self teamFromLineUp: lineUp]];	
! 	[self teamCaptainPlayer:[self teamFromLineUp: lineUp]];		
! 	NSSet *unusedPlayers = [lineUpTree unusedPlayersByBestLineUp];
! 	LineUpTree *subLineUpTree = [[LineUpTree alloc] initWithPositions:[self substitutesPositions]];
! 	[subLineUpTree buildTree:threshold playerList:unusedPlayers];
! 	NSArray *substitutes = [subLineUpTree bestLineUp];	
! 	[self displaySubstitutes: substitutes];
! 	[self displayStrenght:lineUpTree];
! 	[lineUpTree release];
! 	[subLineUpTree release];
  }
  
  - (NSArray*) teamFromLineUp: (NSArray*) lineUp {
  	NSMutableArray *team = [NSMutableArray arrayWithCapacity:[lineUp count]];
--- 86,116 ----
  	float threshold = [[NSUserDefaults standardUserDefaults] floatForKey:@"lineUpAccuracy"] / 100.0;
  	NSArray *playerList = [[team playerList] playersWithInjured:[[NSUserDefaults standardUserDefaults]boolForKey:@"lineUpIncludeInjured"] diqualified: [[NSUserDefaults standardUserDefaults]boolForKey:@"lineUpIncludeDisqualified"]];
!     if([playerList count] < 11) {
!         NSRunAlertPanel(NSLocalizedString(@"Line Up Error",@"Line Up Error"),
!                         NSLocalizedString(@"Not enough players in the current group", @"Not enough players in the current group"), 
!                         NSLocalizedString(@"Ok",@"Ok"),nil, nil);
!     }
!     else {
!         [self cleanLineUp];
!         [lineUpTree buildTree:threshold playerList:[NSSet setWithArray:playerList]];
!         NSArray *lineUp = [lineUpTree bestLineUp];
!         [self displayLineUp: lineUp];
!         [self displayPointsInSpecs: lineUp];
!         [self setPiecesPlayer:[self teamFromLineUp: lineUp]];	
!         [self teamCaptainPlayer:[self teamFromLineUp: lineUp]];		
!         NSSet *unusedPlayers = [lineUpTree unusedPlayersByBestLineUp];
!         if([unusedPlayers count] > 5) {
!             LineUpTree *subLineUpTree = [[LineUpTree alloc] initWithPositions:[self substitutesPositions]];
!             [subLineUpTree buildTree:threshold playerList:unusedPlayers];
!             NSArray *substitutes = [subLineUpTree bestLineUp];	
!             [self displaySubstitutes: substitutes];
!             [subLineUpTree release];
!         }
!         [self displayStrenght:lineUpTree];
!         [lineUpTree release];
!     }
  }
  
+ 
  - (NSArray*) teamFromLineUp: (NSArray*) lineUp {
  	NSMutableArray *team = [NSMutableArray arrayWithCapacity:[lineUp count]];
***************
*** 139,142 ****
--- 150,172 ----
  }
  
+ -(void) cleanLineUp {
+     [forward2 setStringValue:@""];
+ 	[forward1 setStringValue:@""];
+ 	[leftWinger setStringValue:@""];
+ 	[rightWinger setStringValue:@""];
+ 	[innerMidfield2 setStringValue:@""];
+ 	[innerMidfield1 setStringValue:@""];
+ 	[leftBack setStringValue:@""];
+ 	[rightBack setStringValue:@""];
+ 	[centralDefender2 setStringValue:@""];
+ 	[centralDefender1 setStringValue:@""];
+ 	[keeper setStringValue:@""];    
+ 	[subKeeper setStringValue:@""];  
+ 	[subDef setStringValue:@""];  
+ 	[subInnerMidfield setStringValue:@""];  
+ 	[subWinger setStringValue:@""];  
+ 	[subForward setStringValue:@""];  
+ }
+ 
  - (void) displayPointsInSpecs: (NSArray*) lineUp {
  	[self display:[[lineUp objectAtIndex:0] player] inSpec: specForward2 list: (NSArray*) specForwardList contentList: specForwardContentList];
***************
*** 167,170 ****
--- 197,201 ----
  
  
+ 
  -(void) displaySubstitutes: (NSArray*) substitutes {
  	[subKeeper setStringValue: [[substitutes objectAtIndex:4] playerNameWithPointsForPosition]];