[Macattrick-commit] macattrick LineUpController.h,1.6,1.7 LineUpController.m,1.21,1.22

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

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

Modified Files:
	LineUpController.h LineUpController.m 
Log Message:
point are now diplayed in pop up buttons. implementational improvement of the lineup controller

Index: LineUpController.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/LineUpController.m,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** LineUpController.m	16 May 2005 14:26:58 -0000	1.21
--- LineUpController.m	16 May 2005 15:43:36 -0000	1.22
***************
*** 45,49 ****
--- 45,57 ----
  - (void) loadCentralDefender;
  - (void) displayStrenght: (LineUpTree*) tree;
+ - (void) displayPointsInSpecs: (NSArray*) lineUp;
+ - (void) display: (Player*) player inSpec: (NSPopUpButton*) spec list: (NSArray*) specList contentList: (NSArray*)specContentList;
  - (void) dispatchAndInsert: (int) selectedIndex forIndex: (int) insertIndex list: (NSArray*) list;
+ - (NSArray *) specForwardList;
+ - (NSArray *) specWingerList;
+ - (NSArray *) specInnerMidfieldList;
+ - (NSArray *) specWingbackList;
+ - (NSArray *) specCentralDefenderList;
+ 
  @end
  
***************
*** 53,57 ****
  -(LineUpController*) init {
  	self = [super init];
! 	[NSBundle loadNibNamed:@"LineUpView" owner: self];
  	return self;
  }
--- 61,77 ----
  -(LineUpController*) init {
  	self = [super init];
! 	if(self) {
! 		[NSBundle loadNibNamed:@"LineUpView" owner: self];
! 		specForwardList =  [[NSArray alloc] initWithObjects: @"Forward", @"Forward Defensive", @"Inner Midfield", @"Central Defender", nil];
! 		specForwardContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Defensive", @"Defensive"), NSLocalizedString(@"Extra Inner Midfield", @"Extra Inner Midfield"), NSLocalizedString(@"Extra Central Defender", @"Extra Central Defender"), nil];
! 		specWingerList = [[NSArray alloc] initWithObjects: @"Winger", @"Winger Offensive", @"Winger Defensive",@"Winger Towards Middle",  @"Forward", @"Central Defender", nil];
! 		specWingerContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Offensive", @"Offensive"), NSLocalizedString(@"Defensive", @"Defensive"),NSLocalizedString(@"Towards Middle", @"Towards Middle"), NSLocalizedString(@"Extra Forward", @"Extra Forward"), NSLocalizedString(@"Extra Central Defender", @"Extra Central Defender"), nil];
! 		specInnerMidfieldList = [[NSArray alloc] initWithObjects: @"Inner Midfield", @"Inner Midfield Offensive", @"Inner Midfield Defensive" ,@"Inner Midfield Towards Wing",  @"Forward", @"Central Defender", nil];
! 		specInnerMidfieldContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Offensive", @"Offensive"), NSLocalizedString(@"Defensive", @"Defensive"),NSLocalizedString(@"Towards Wing", @"Towards Wing"), NSLocalizedString(@"Extra Forward", @"Extra Forward"), NSLocalizedString(@"Extra Central Defender", @"Extra Central Defender"), nil];
! 		specWingbackList = [[NSArray alloc] initWithObjects: @"Wingback", @"Wingback Offensive", @"Wingback Defensive",@"Wingback Towards Middle",  @"Forward", @"Inner Midfield", nil];
! 		specWingbackContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Offensive", @"Offensive"), NSLocalizedString(@"Defensive", @"Defensive"),NSLocalizedString(@"Towards Middle", @"Towards Middle"), NSLocalizedString(@"Extra Forward", @"Extra Forward"), NSLocalizedString(@"Extra Inner Midfield", @"Extra Inner Midfield"), nil];		
! 		specCentralDefenderList =  [[NSArray alloc] initWithObjects: @"Central Defender", @"Central Defender Offensive", @"Central Defender Towards Wing",  @"Forward", @"Inner Midfield", nil];
! 		specCentralDefenderContentList =  [[NSArray alloc] initWithObjects: NSLocalizedString(@"Normal", @"Normal"), NSLocalizedString(@"Offensive", @"Offensive"),NSLocalizedString(@"Towards Wing", @"Towards Wing"), NSLocalizedString(@"Extra Forward", @"Extra Forward"), NSLocalizedString(@"Extra Inner Midfield", @"Extra Inner Midfield"), nil];
! 	}
  	return self;
  }
***************
*** 69,72 ****
--- 89,93 ----
  	NSArray *lineUp = [lineUpTree bestLineUp];
  	[self displayLineUp: lineUp];
+ 	[self displayPointsInSpecs: lineUp];
  	[self setPiecesPlayer:[self teamFromLineUp: lineUp]];	
  	[self teamCaptainPlayer:[self teamFromLineUp: lineUp]];		
***************
*** 118,121 ****
--- 139,170 ----
  }
  
+ - (void) displayPointsInSpecs: (NSArray*) lineUp {
+ 	[self display:[[lineUp objectAtIndex:0] player] inSpec: specForward2 list: (NSArray*) specForwardList contentList: specForwardContentList];
+ 	[self display:[[lineUp objectAtIndex:1] player] inSpec: specForward1 list: (NSArray*) specForwardList contentList: specForwardContentList];
+ 	[self display:[[lineUp objectAtIndex:2] player] inSpec: specLeftWinger list: (NSArray*) specWingerList contentList: specWingerContentList];
+ 	[self display:[[lineUp objectAtIndex:3] player] inSpec: specRightWinger list: (NSArray*) specWingerList contentList: specWingerContentList];
+ 	[self display:[[lineUp objectAtIndex:4] player] inSpec: specInnerMidfield2 list: (NSArray*) specInnerMidfieldList contentList: specInnerMidfieldContentList];
+ 	[self display:[[lineUp objectAtIndex:5] player] inSpec: specInnerMidfield1 list: (NSArray*) specInnerMidfieldList contentList: specInnerMidfieldContentList];
+ 	[self display:[[lineUp objectAtIndex:6] player] inSpec: specLeftBack list: (NSArray*) specWingbackList contentList: specWingbackContentList];
+ 	[self display:[[lineUp objectAtIndex:7] player] inSpec: specRightBack list: (NSArray*) specWingbackList contentList: specWingbackContentList];
+ 	[self display:[[lineUp objectAtIndex:8] player] inSpec: specCentralDefender2 list: (NSArray*) specCentralDefenderList contentList: specCentralDefenderContentList];
+ 	[self display:[[lineUp objectAtIndex:9] player] inSpec: specCentralDefender1 list: (NSArray*) specCentralDefenderList contentList: specCentralDefenderContentList];
+ }
+ 
+ - (void) display: (Player*) player inSpec: (NSPopUpButton*) spec list: (NSArray*) specList contentList: (NSArray*)specContentList{
+ 	int size = [specList count];
+ 	int selected = [spec indexOfSelectedItem];
+ 	[spec removeAllItems];
+ 	int i = 0;
+ 	for (i=0; i<size; i++) {
+ 		Position *pos = [[PositionHeap uniqueInstance] positionWithIdentifier: [specList objectAtIndex:i]];
+ 		NSString *str = [[NSString alloc] initWithFormat:@"%@ (%.2f)", [specContentList objectAtIndex:i], [player calculatePositionValue:pos]];
+ 		[spec insertItemWithTitle:str atIndex:i];
+ 		[str release];
+ 	}
+ 	[spec selectItemAtIndex:selected];
+ }
+ 
+ 
  -(void) displaySubstitutes: (NSArray*) substitutes {
  	[subKeeper setStringValue: [[substitutes objectAtIndex:4] playerNameWithPointsForPosition]];
***************
*** 141,156 ****
  - (void) loadPositions {
  	positions = [NSMutableArray arrayWithCapacity:11];
- 	// keeper at index 0
  	[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"] atIndex:0];
! 	// central defenders at index 1 and 2
! 	[self loadCentralDefender];
! 	// backwing at index 3 and 4
! 	[self loadBackWings];
! 	// inner midfield at index 5 and 6
! 	[self loadInnerMidfield];
! 	// winger at index 7 and 8
! 	[self loadWinger];
! 	// finally forwards at index 9 and 10
! 	[self loadForward];
  }
  
--- 190,205 ----
  - (void) loadPositions {
  	positions = [NSMutableArray arrayWithCapacity:11];
  	[positions insertObject:[[PositionHeap uniqueInstance] positionWithIdentifier:@"Keeper"] atIndex:0];
! 	[self dispatchAndInsert:[specCentralDefender1 indexOfSelectedItem] forIndex: 1 list: specCentralDefenderList];
! 	[self dispatchAndInsert:[specCentralDefender2 indexOfSelectedItem] forIndex: 2 list: specCentralDefenderList];
! 	[self dispatchAndInsert:[specRightBack indexOfSelectedItem] forIndex: 3 list: specWingbackList];
! 	[self dispatchAndInsert:[specLeftBack indexOfSelectedItem] forIndex: 4 list: specWingbackList];
! 	[self dispatchAndInsert:[specInnerMidfield1 indexOfSelectedItem] forIndex: 5 list: specInnerMidfieldList];
! 	[self dispatchAndInsert:[specInnerMidfield2 indexOfSelectedItem] forIndex: 6 list: specInnerMidfieldList];
! 	[self dispatchAndInsert:[specRightWinger indexOfSelectedItem] forIndex: 7 list: specWingerList];
! 	[self dispatchAndInsert:[specLeftWinger indexOfSelectedItem] forIndex: 8 list: specWingerList];
! 	[self dispatchAndInsert:[specForward1 indexOfSelectedItem] forIndex: 9 list: specForwardList];
! 	[self dispatchAndInsert:[specForward2 indexOfSelectedItem] forIndex: 10 list: specForwardList];
! 
  }
  
***************
*** 165,197 ****
  }
  
! - (void) loadForward {
! 	NSArray *list = [[NSArray alloc] initWithObjects: @"Forward", @"Forward Defensive", @"Inner Midfield", @"Central Defender", nil];
! 	[self dispatchAndInsert:[specForward1 indexOfSelectedItem] forIndex: 9 list: list];
! 	[self dispatchAndInsert:[specForward2 indexOfSelectedItem] forIndex: 10 list: list];
! }
  
! - (void) loadWinger {
! 	NSArray *list = [[NSArray alloc] initWithObjects: @"Winger", @"Winger Offensive", @"Winger Defensive",@"Winger Towards Middle",  @"Forward", @"Central Defender", nil];
! 	[self dispatchAndInsert:[specRightWinger indexOfSelectedItem] forIndex: 7 list: list];
! 	[self dispatchAndInsert:[specLeftWinger indexOfSelectedItem] forIndex: 8 list: list];
! }
  
! - (void) loadInnerMidfield {
! 	NSArray *list = [[NSArray alloc] initWithObjects: @"Inner Midfield", @"Inner Midfield Offensive", @"Inner Midfield Defensive" ,@"Inner Midfield Towards Wing",  @"Forward", @"Central Defender", nil];
! 	[self dispatchAndInsert:[specInnerMidfield1 indexOfSelectedItem] forIndex: 5 list: list];
! 	[self dispatchAndInsert:[specInnerMidfield2 indexOfSelectedItem] forIndex: 6 list: list];
! }
  
! - (void) loadBackWings {
! 	NSArray *list = [[NSArray alloc] initWithObjects: @"Wingback", @"Wingback Offensive", @"Wingback Defensive",@"Wingback Towards Middle",  @"Forward", @"Inner Midfield", nil];
! 	[self dispatchAndInsert:[specRightBack indexOfSelectedItem] forIndex: 3 list: list];
! 	[self dispatchAndInsert:[specLeftBack indexOfSelectedItem] forIndex: 4 list: list];
! }
  
! - (void) loadCentralDefender {
! 	NSArray *list = [[NSArray alloc] initWithObjects: @"Central Defender", @"Central Defender Offensive", @"Central Defender Towards Wing",  @"Forward", @"Inner Midfield", nil];
! 	[self dispatchAndInsert:[specCentralDefender1 indexOfSelectedItem] forIndex: 1 list: list];
! 	[self dispatchAndInsert:[specCentralDefender2 indexOfSelectedItem] forIndex: 2 list: list];
! }
  
  
--- 214,226 ----
  }
  
! - (NSArray *) specForwardList { return specForwardList; }
  
! - (NSArray *) specWingerList { return specWingerList; }
  
! - (NSArray *) specInnerMidfieldList { return specInnerMidfieldList; }
  
! - (NSArray *) specWingbackList { return specWingbackList; }
  
! - (NSArray *) specCentralDefenderList { return specCentralDefenderList; }
  
  
***************
*** 200,202 ****
--- 229,251 ----
  }
  
+ 
+ 
+ - (void) dealloc {
+     [positions release];
+     [specForwardList release];
+     [specWingerList release];
+     [specInnerMidfieldList release];
+     [specWingbackList release];
+     [specCentralDefenderList release];
+     [specForwardContentList release];
+     [specWingerContentList release];
+     [specInnerMidfieldContentList release];
+     [specWingbackContentList release];
+     [specCentralDefenderContentList release];
+     [super dealloc];
+ }
+ 
+ 
+ 
+ 
  @end

Index: LineUpController.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/LineUpController.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LineUpController.h	25 Apr 2005 20:22:37 -0000	1.6
--- LineUpController.h	16 May 2005 15:43:36 -0000	1.7
***************
*** 43,47 ****
  {
  	IBOutlet NSView *lineUpView;
! 	NSMutableArray *positions;
      IBOutlet NSTextField *centralDefender1;
      IBOutlet NSTextField *centralDefender2;
--- 43,47 ----
  {
  	IBOutlet NSView *lineUpView;
! 
      IBOutlet NSTextField *centralDefender1;
      IBOutlet NSTextField *centralDefender2;
***************
*** 77,81 ****
      IBOutlet NSPopUpButton *specRightWinger;
  
! 
  }
  
--- 77,92 ----
      IBOutlet NSPopUpButton *specRightWinger;
  
! 	NSMutableArray *positions;
! 	NSArray *specForwardList;
! 	NSArray *specWingerList;
! 	NSArray *specInnerMidfieldList;
! 	NSArray *specWingbackList;
! 	NSArray *specCentralDefenderList;
! 	NSArray *specForwardContentList;
! 	NSArray *specWingerContentList;
! 	NSArray *specInnerMidfieldContentList;
! 	NSArray *specWingbackContentList;
! 	NSArray *specCentralDefenderContentList;
! 		
  }