Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

latest changes

  • Loading branch information...
commit b6bd81517bb2c17395a6e6dcc387014e29ce9f81 2 parents 928d352 + f5ed49c
cnharris authored
View
10 Staff.xcodeproj/project.pbxproj
@@ -318,7 +318,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 5.1;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 2;
};
@@ -337,7 +337,7 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 5.1;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = 2;
@@ -362,14 +362,15 @@
"\"$(SRCROOT)/../20110708_crsynth_sdk_ios_v2.2.2/crsynth/Release-iphonesimulator\"",
);
"OTHER_LDFLAGS[sdk=iphoneos5.1]" = (
- "./crsynth/Release-iphoneos/libcrse.a",
- "./crsynth/Release-iphoneos/libcrmpd.a",
+ "./crsynth/Release-iphonesimulator/libcrse.a",
+ "./crsynth/Release-iphonesimulator/libcrmpd.a",
);
"OTHER_LDFLAGS[sdk=iphonesimulator5.1]" = (
"./crsynth/Release-iphonesimulator/libcrse.a",
"./crsynth/Release-iphonesimulator/libcrmpd.a",
);
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "";
WARNING_LDFLAGS = (
"./crsynth/Release-iphonesimulator/libcrse.a",
@@ -403,6 +404,7 @@
"./crsynth/Release-iphonesimulator/libcrmpd.a",
);
PRODUCT_NAME = "$(TARGET_NAME)";
+ SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "";
VALIDATE_PRODUCT = YES;
WARNING_LDFLAGS = (
View
BIN  Staff.xcodeproj/project.xcworkspace/xcuserdata/aarontietz.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown
View
BIN  Staff.xcodeproj/project.xcworkspace/xcuserdata/christopherharris.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown
View
1  Staff/ChordViewController.m
@@ -110,6 +110,7 @@ -(void) layoutChordsToBePlayed
// Coordinates are relative to the parent container
chordChosen1 = [UIButton buttonWithType: UIButtonTypeRoundedRect];
chordChosen1.frame = CGRectMake(50, 20, 80, 80);
+ //chordChosen1.titleLabel.font = [UIFont systemFontOfSize:10];
[chordChosen1 addTarget:self action:@selector(chordChosen_onTouchUpInside:) forControlEvents:UIControlEventTouchUpInside];
chordChosen2 = [UIButton buttonWithType: UIButtonTypeRoundedRect];
View
5 Staff/Circleof5thsController.h
@@ -19,12 +19,7 @@
@property (nonatomic, retain) IBOutlet UIView *circleOf5thsView;
@property (nonatomic, retain) IBOutlet UIView *circleOf5thsTab;
@property (nonatomic, retain) IBOutlet UIPickerView *circleOf5thsPicker;
-<<<<<<< HEAD
@property NSArray *circleOf5thsPickerElements;
-=======
-@property (nonatomic, retain) IBOutlet UIButton *circleOf5thsButton;
-@property (retain) NSArray *circleOf5thsPickerElements;
->>>>>>> 5bc7e90170fb30c48fce32f36763a6209b1081b8
- (void)setup;
- (void)circleOf5thsTabTapped:(UITapGestureRecognizer *)recognizer;
View
5 Staff/DraggedChord.m
@@ -24,7 +24,10 @@ - (id)init
[theImage setFrame:CGRectMake(0, 0, 80, 80)];
[self addSubview:theImage];
- theChord = [[UILabel alloc] initWithFrame:CGRectMake(17, 30, 46, 15)];
+ // 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 setTextAlignment:UITextAlignmentCenter];
[theChord setBackgroundColor:[UIColor clearColor]];
[theImage addSubview:theChord];
View
39 Staff/StaffController.m
@@ -16,6 +16,10 @@ @implementation StaffController
@synthesize spaces;
@synthesize notes;
+const float PERCENTAGE_OF_FULL_SCREEN_HEIGHT = 0.9;
+const int SCREEN_HEIGHT = 748;
+
+
-(id)init{
[self viewDidLoad];
return self;
@@ -62,14 +66,15 @@ - (void)buildStaff
- (void)buildLines
{
+
lines = [[NSMutableDictionary alloc] initWithCapacity:7];
- [lines setObject:[[dashedLine alloc] initWithFrame:CGRectMake(0, 58, 400, 32)] forKey:@"aline"];
- [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, 158, 400, 32)] forKey:@"fline"];
- [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, 258, 400, 32)] forKey:@"dline"];
- [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, 358, 400, 32)] forKey:@"bline"];
- [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, 458, 400, 32)] forKey:@"gline"];
- [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, 558, 400, 32)] forKey:@"eline"];
- [lines setObject:[[dashedLine alloc] initWithFrame:CGRectMake(0, 658, 400, 32)] forKey:@"cline"];
+ [lines setObject:[[dashedLine alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (58 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT), 400, (int)(32 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"aline"];
+ [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT )) + (158 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(32 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"fline"];
+ [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT )) + (258 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(32 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"dline"];
+ [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT )) + (358 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(32 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"bline"];
+ [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT *PERCENTAGE_OF_FULL_SCREEN_HEIGHT )) + (458 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(32 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"gline"];
+ [lines setObject:[[solidLine alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT )) + (558 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(32 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"eline"];
+ [lines setObject:[[dashedLine alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (658 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(32 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"cline"];
[self setLineTags];
@@ -95,14 +100,14 @@ -(void)setLineTags
- (void)buildSpaces
{
spaces = [[NSMutableDictionary alloc] initWithCapacity:8];
- [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, 0, 400, 58)] forKey:@"b2space"];
- [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, 90, 400, 68)] forKey:@"gspace"];
- [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, 190, 400, 68)] forKey:@"espace"];
- [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, 290, 400, 68)] forKey:@"cspace"];
- [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, 390, 400, 68)] forKey:@"aspace"];
- [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, 490, 400, 68)] forKey:@"fspace"];
- [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, 590, 400, 68)] forKey:@"dspace"];
- [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, 690, 400, 58)] forKey:@"bspace"];
+ [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (0 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(58 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"b2space"];
+ [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (90 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(68 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"gspace"];
+ [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (190 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(68 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"espace"];
+ [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (290 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(68 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"cspace"];
+ [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (390 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(68 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"aspace"];
+ [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (490 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(68 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"fspace"];
+ [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (590 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(68 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"dspace"];
+ [spaces setObject:[[UIView alloc] initWithFrame:CGRectMake(0, (int)(SCREEN_HEIGHT - (SCREEN_HEIGHT * PERCENTAGE_OF_FULL_SCREEN_HEIGHT)) + (690 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT) , 400, (int)(58 * PERCENTAGE_OF_FULL_SCREEN_HEIGHT))] forKey:@"bspace"];
[self setSpaceTags];
NSEnumerator *enumerator = [spaces keyEnumerator];
@@ -159,8 +164,12 @@ - (BOOL)changeScale:(NSArray *)notesFromDataController
for(int pos = 1; pos <= NUMBER_OF_NOTES; pos++)
{
<<<<<<< HEAD
+<<<<<<< HEAD
=======
NSLog(@"note value: %d",[[notesFromDataController objectAtIndex:pos] intValue]);
+=======
+ //NSLog(@"note value: %d",[[notesFromDataController objectAtIndex:pos] intValue]);
+>>>>>>> f5ed49c40e650bb16463ed1d9712028f24f44d5f
>>>>>>> 5bc7e90170fb30c48fce32f36763a6209b1081b8
num = [[notesFromDataController objectAtIndex:pos] intValue];
Please sign in to comment.
Something went wrong with that request. Please try again.