Permalink
Browse files

added treble clef

  • Loading branch information...
1 parent 1b4d308 commit 8a12b279335c8ba1f7daaf52a281dbf24044dd2a @cnharris10 cnharris10 committed May 8, 2012
View
4 Staff.xcodeproj/project.pbxproj
@@ -47,6 +47,7 @@
08E8DF0B155738600051F1E8 /* blackFrame_140pixels.png in Resources */ = {isa = PBXBuildFile; fileRef = 08E8DF0A155738600051F1E8 /* blackFrame_140pixels.png */; };
2A94A4D61542517F00766EAF /* graybutton.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A94A4D51542517F00766EAF /* graybutton.png */; };
2A94A4E01542622000766EAF /* AccidentalsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A94A4DF1542622000766EAF /* AccidentalsController.m */; };
+ 2AA9E35A1558AABB007A271A /* trebleclef.png in Resources */ = {isa = PBXBuildFile; fileRef = 2AA9E3591558AABB007A271A /* trebleclef.png */; };
2AAF8E811555B39C00F31082 /* notassmallflat.png in Resources */ = {isa = PBXBuildFile; fileRef = 2AAF8E7F1555B39C00F31082 /* notassmallflat.png */; };
2AAF8E821555B39C00F31082 /* notassmallsharp.png in Resources */ = {isa = PBXBuildFile; fileRef = 2AAF8E801555B39C00F31082 /* notassmallsharp.png */; };
2AAF8E861555B9F900F31082 /* scaledot.png in Resources */ = {isa = PBXBuildFile; fileRef = 2AAF8E851555B9F900F31082 /* scaledot.png */; };
@@ -127,6 +128,7 @@
2A94A4D51542517F00766EAF /* graybutton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = graybutton.png; sourceTree = "<group>"; };
2A94A4DE1542622000766EAF /* AccidentalsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccidentalsController.h; sourceTree = "<group>"; };
2A94A4DF1542622000766EAF /* AccidentalsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccidentalsController.m; sourceTree = "<group>"; };
+ 2AA9E3591558AABB007A271A /* trebleclef.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = trebleclef.png; sourceTree = "<group>"; };
2AAF8E7F1555B39C00F31082 /* notassmallflat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = notassmallflat.png; sourceTree = "<group>"; };
2AAF8E801555B39C00F31082 /* notassmallsharp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = notassmallsharp.png; sourceTree = "<group>"; };
2AAF8E851555B9F900F31082 /* scaledot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = scaledot.png; sourceTree = "<group>"; };
@@ -324,6 +326,7 @@
0826BDC61523E5C2004A9B22 /* MainController.m */,
0826BDC71523E5C2004A9B22 /* MainController.xib */,
2AAF8E7F1555B39C00F31082 /* notassmallflat.png */,
+ 2AA9E3591558AABB007A271A /* trebleclef.png */,
2AAF8E801555B39C00F31082 /* notassmallsharp.png */,
08AACA6615562AB100738394 /* pause.png */,
08AACA6715562AB100738394 /* play.png */,
@@ -500,6 +503,7 @@
08ADDEFD1557697D000C5DD2 /* strippedBackground.png in Resources */,
2AAF8ECA15580D6D00F31082 /* crsynth.dlsc in Resources */,
2AAF8ECF15580D6D00F31082 /* sample.mid in Resources */,
+ 2AA9E35A1558AABB007A271A /* trebleclef.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
BIN ...oject.xcworkspace/xcuserdata/christopherharris.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
View
14 Staff/StaffController.m
@@ -55,12 +55,13 @@ - (void)buildStaff
self.staffView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 400, 748)];
[self.staffView setBackgroundColor:[UIColor clearColor]];
[[staffView layer] setZPosition:1];
- //[self.staffView setBackgroundColor:[UIColor colorWithPatternImage:[UIImage imageNamed:@"wrinkledPaper.png"]]];
- //[self.staffView.layer setBorderWidth:1];
- //[self.staffView.layer setBorderColor:[UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:1.0].CGColor];
self.view = self.canvas;
+ UIImageView *trebleclef = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"trebleclef.png"]];
+ [trebleclef setFrame:CGRectMake(81, 227, 131, 367)];
+ [[trebleclef layer] setZPosition:1];
[self.canvas setBackgroundColor:[UIColor colorWithPatternImage:[UIImage imageNamed:@"papyrus.jpg"]]];
+ [self.canvas addSubview:trebleclef];
[self.canvas addSubview:staffView];
//wrinkledPaper = [UIImage imageNamed:@"CrinkledPaper.png"];
@@ -161,30 +162,37 @@ - (void)buildLines
dashedlineAccidental *dashedLineAccidental = [[dashedlineAccidental alloc] initWithFrame:CGRectMake(300, 0, 100, 28)];
dashedLine *aline = [[dashedLine alloc] initWithFrame:CGRectMake(0, 123, 400, 28)];
+ [[aline layer] setZPosition:2];
[aline addSubview:[self deepCopyDashedAccidentalView:dashedLineAccidental]];
[lines setObject:aline forKey:@"aline"];
solidLine *fline = [[solidLine alloc] initWithFrame:CGRectMake(0, 214, 400, 28)];
+ [[fline layer] setZPosition:2];
[fline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
[lines setObject:fline forKey:@"fline"];
solidLine *dline = [[solidLine alloc] initWithFrame:CGRectMake(0, 305, 400, 28)];
+ [[dline layer] setZPosition:2];
[dline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
[lines setObject:dline forKey:@"dline"];
solidLine *bline = [[solidLine alloc] initWithFrame:CGRectMake(0, 396, 400, 28)];
+ [[bline layer] setZPosition:2];
[bline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
[lines setObject:bline forKey:@"bline"];
solidLine *gline = [[solidLine alloc] initWithFrame:CGRectMake(0, 487, 400, 28)];
+ [[gline layer] setZPosition:2];
[gline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
[lines setObject:gline forKey:@"gline"];
solidLine *eline = [[solidLine alloc] initWithFrame:CGRectMake(0, 578, 400, 28)];
+ [[eline layer] setZPosition:2];
[eline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
[lines setObject:eline forKey:@"eline"];
dashedLine *cline = [[dashedLine alloc] initWithFrame:CGRectMake(0, 669, 400, 28)];
+ [[cline layer] setZPosition:2];
[cline addSubview:[self deepCopyDashedAccidentalView:dashedLineAccidental]];
[lines setObject:cline forKey:@"cline"];
View
BIN Staff/trebleclef.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8a12b27

Please sign in to comment.