Permalink
Browse files

Merge branch 'master' of https://github.com/hhuang05/CAHStaff2

  • Loading branch information...
2 parents 8a78169 + 6781723 commit a290a8d50d8b37b5291adb00d25555a72f9f5d8f @cnharris10 cnharris10 committed Apr 21, 2012
@@ -462,24 +462,25 @@ -(void)fillNotesInKeySignatureDictionary{
-(void) fillChordsDictionary{
+ Chord *rest = [[Chord alloc] initWithName:@"rest" Notes:nil andID:0];
+
NSArray *FMzero = [[NSArray alloc] initWithObjects:@"65", @"69", @"72", nil];
- Chord* zero = [[Chord alloc] initWithName:@"F Major" Notes:FMzero andID:0];
+ Chord* zero = [[Chord alloc] initWithName:@"F Maj" Notes:FMzero andID:0];
NSArray *FMone = [[NSArray alloc] initWithObjects:@"65", @"68", @"72", nil];
- Chord* one = [[Chord alloc] initWithName:@"F Minor" Notes:FMone andID:1];
+ Chord* one = [[Chord alloc] initWithName:@"F min" Notes:FMone andID:1];
NSArray *FMtwo = [[NSArray alloc] initWithObjects:@"65", @"69", @"73", nil];
- Chord* two = [[Chord alloc] initWithName:@"F Augmented" Notes:FMtwo andID:2];
+ Chord* two = [[Chord alloc] initWithName:@"F Aug" Notes:FMtwo andID:2];
NSArray *FMthree = [[NSArray alloc] initWithObjects:@"65", @"68", @"71", nil];
- Chord* three = [[Chord alloc] initWithName:@"F diminshed" Notes:FMthree andID:3];
+ Chord* three = [[Chord alloc] initWithName:@"F Dim" Notes:FMthree andID:3];
NSArray *FMfour = [[NSArray alloc] initWithObjects:@"65", @"70", @"72", nil];
- Chord* four = [[Chord alloc] initWithName:@"F suspended 4" Notes:FMfour andID:4];
+ Chord* four = [[Chord alloc] initWithName:@"F Sus 4" Notes:FMfour andID:4];
NSArray *FMfive = [[NSArray alloc] initWithObjects:@"65", @"69", @"72", @"74", nil];
- Chord* five = [[Chord alloc] initWithName:@"F Major 6" Notes:FMfive andID:5];
+ Chord* five = [[Chord alloc] initWithName:@"F Maj 6" Notes:FMfive andID:5];
NSArray *FMsix = [[NSArray alloc] initWithObjects:@"65", @"68", @"72", @"74", nil];
- Chord* six = [[Chord alloc] initWithName:@"F Minor 6" Notes:FMsix andID:6];
+ Chord* six = [[Chord alloc] initWithName:@"F min 6" Notes:FMsix andID:6];
NSArray *FMseven = [[NSArray alloc] initWithObjects:@"65", @"69", @"72", @"75", nil];
- Chord* seven = [[Chord alloc] initWithName:@"F Dominant 7" Notes:FMseven andID:7];
- NSArray *FMajor = [[NSArray alloc]initWithObjects:zero, one, two, three, four, five, six, seven , nil];
+ NSArray *FMajor = [[NSArray alloc]initWithObjects:zero, one, two, three, four, five, six, rest , nil];
_chordsForKeySignatures = [[NSDictionary alloc] initWithObjectsAndKeys: FMajor, @"F", nil];
}
@@ -25,9 +25,9 @@ - (id)init
[self addSubview:theImage];
// added adjustsFontSizetoWidth and changed 3rd arg (width) from 46-70), 1st from 17 to 5
- theChord = [[UILabel alloc] initWithFrame:CGRectMake(5, 30, 70, 15)];
- // theChord.adjustsFontSizeToFitWidth = TRUE;
- [theChord setFont:[UIFont systemFontOfSize:10]];
+ theChord = [[UILabel alloc] initWithFrame:CGRectMake(5, 20, 70, 40)];
+ // theChord.adjustsFontSizeToFitWidth = TRUE;
+ // [theChord setFont:[UIFont systemFontOfSize:10]];
[theChord setTextAlignment:UITextAlignmentCenter];
[theChord setBackgroundColor:[UIColor clearColor]];
[theImage addSubview:theChord];
@@ -316,7 +316,7 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
{
if(touch.view.tag > 0)
{
- //NSLog(@"Began - Tag: %d",touch.view.tag);
+ NSLog(@"Began - Tag: %d",touch.view.tag);
AppDelegate *mainDelegate = (AppDelegate*)[[UIApplication sharedApplication]delegate];
[mainDelegate.viewController.dataController playNoteAt:(touch.view.tag -1) WithHalfStepAlteration:FALSE];
}

0 comments on commit a290a8d

Please sign in to comment.