Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

added treble clef

  • Loading branch information...
commit 8a12b279335c8ba1f7daaf52a281dbf24044dd2a 1 parent 1b4d308
cnharris authored
4 Staff.xcodeproj/project.pbxproj
@@ -47,6 +47,7 @@
47 47 08E8DF0B155738600051F1E8 /* blackFrame_140pixels.png in Resources */ = {isa = PBXBuildFile; fileRef = 08E8DF0A155738600051F1E8 /* blackFrame_140pixels.png */; };
48 48 2A94A4D61542517F00766EAF /* graybutton.png in Resources */ = {isa = PBXBuildFile; fileRef = 2A94A4D51542517F00766EAF /* graybutton.png */; };
49 49 2A94A4E01542622000766EAF /* AccidentalsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A94A4DF1542622000766EAF /* AccidentalsController.m */; };
  50 + 2AA9E35A1558AABB007A271A /* trebleclef.png in Resources */ = {isa = PBXBuildFile; fileRef = 2AA9E3591558AABB007A271A /* trebleclef.png */; };
50 51 2AAF8E811555B39C00F31082 /* notassmallflat.png in Resources */ = {isa = PBXBuildFile; fileRef = 2AAF8E7F1555B39C00F31082 /* notassmallflat.png */; };
51 52 2AAF8E821555B39C00F31082 /* notassmallsharp.png in Resources */ = {isa = PBXBuildFile; fileRef = 2AAF8E801555B39C00F31082 /* notassmallsharp.png */; };
52 53 2AAF8E861555B9F900F31082 /* scaledot.png in Resources */ = {isa = PBXBuildFile; fileRef = 2AAF8E851555B9F900F31082 /* scaledot.png */; };
@@ -127,6 +128,7 @@
127 128 2A94A4D51542517F00766EAF /* graybutton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = graybutton.png; sourceTree = "<group>"; };
128 129 2A94A4DE1542622000766EAF /* AccidentalsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccidentalsController.h; sourceTree = "<group>"; };
129 130 2A94A4DF1542622000766EAF /* AccidentalsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AccidentalsController.m; sourceTree = "<group>"; };
  131 + 2AA9E3591558AABB007A271A /* trebleclef.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = trebleclef.png; sourceTree = "<group>"; };
130 132 2AAF8E7F1555B39C00F31082 /* notassmallflat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = notassmallflat.png; sourceTree = "<group>"; };
131 133 2AAF8E801555B39C00F31082 /* notassmallsharp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = notassmallsharp.png; sourceTree = "<group>"; };
132 134 2AAF8E851555B9F900F31082 /* scaledot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = scaledot.png; sourceTree = "<group>"; };
@@ -324,6 +326,7 @@
324 326 0826BDC61523E5C2004A9B22 /* MainController.m */,
325 327 0826BDC71523E5C2004A9B22 /* MainController.xib */,
326 328 2AAF8E7F1555B39C00F31082 /* notassmallflat.png */,
  329 + 2AA9E3591558AABB007A271A /* trebleclef.png */,
327 330 2AAF8E801555B39C00F31082 /* notassmallsharp.png */,
328 331 08AACA6615562AB100738394 /* pause.png */,
329 332 08AACA6715562AB100738394 /* play.png */,
@@ -500,6 +503,7 @@
500 503 08ADDEFD1557697D000C5DD2 /* strippedBackground.png in Resources */,
501 504 2AAF8ECA15580D6D00F31082 /* crsynth.dlsc in Resources */,
502 505 2AAF8ECF15580D6D00F31082 /* sample.mid in Resources */,
  506 + 2AA9E35A1558AABB007A271A /* trebleclef.png in Resources */,
503 507 );
504 508 runOnlyForDeploymentPostprocessing = 0;
505 509 };
BIN  Staff.xcodeproj/project.xcworkspace/xcuserdata/christopherharris.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown
14 Staff/StaffController.m
@@ -55,12 +55,13 @@ - (void)buildStaff
55 55 self.staffView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 400, 748)];
56 56 [self.staffView setBackgroundColor:[UIColor clearColor]];
57 57 [[staffView layer] setZPosition:1];
58   - //[self.staffView setBackgroundColor:[UIColor colorWithPatternImage:[UIImage imageNamed:@"wrinkledPaper.png"]]];
59   - //[self.staffView.layer setBorderWidth:1];
60   - //[self.staffView.layer setBorderColor:[UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:1.0].CGColor];
61 58 self.view = self.canvas;
62 59
  60 + UIImageView *trebleclef = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"trebleclef.png"]];
  61 + [trebleclef setFrame:CGRectMake(81, 227, 131, 367)];
  62 + [[trebleclef layer] setZPosition:1];
63 63 [self.canvas setBackgroundColor:[UIColor colorWithPatternImage:[UIImage imageNamed:@"papyrus.jpg"]]];
  64 + [self.canvas addSubview:trebleclef];
64 65 [self.canvas addSubview:staffView];
65 66
66 67 //wrinkledPaper = [UIImage imageNamed:@"CrinkledPaper.png"];
@@ -161,30 +162,37 @@ - (void)buildLines
161 162 dashedlineAccidental *dashedLineAccidental = [[dashedlineAccidental alloc] initWithFrame:CGRectMake(300, 0, 100, 28)];
162 163
163 164 dashedLine *aline = [[dashedLine alloc] initWithFrame:CGRectMake(0, 123, 400, 28)];
  165 + [[aline layer] setZPosition:2];
164 166 [aline addSubview:[self deepCopyDashedAccidentalView:dashedLineAccidental]];
165 167 [lines setObject:aline forKey:@"aline"];
166 168
167 169 solidLine *fline = [[solidLine alloc] initWithFrame:CGRectMake(0, 214, 400, 28)];
  170 + [[fline layer] setZPosition:2];
168 171 [fline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
169 172 [lines setObject:fline forKey:@"fline"];
170 173
171 174 solidLine *dline = [[solidLine alloc] initWithFrame:CGRectMake(0, 305, 400, 28)];
  175 + [[dline layer] setZPosition:2];
172 176 [dline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
173 177 [lines setObject:dline forKey:@"dline"];
174 178
175 179 solidLine *bline = [[solidLine alloc] initWithFrame:CGRectMake(0, 396, 400, 28)];
  180 + [[bline layer] setZPosition:2];
176 181 [bline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
177 182 [lines setObject:bline forKey:@"bline"];
178 183
179 184 solidLine *gline = [[solidLine alloc] initWithFrame:CGRectMake(0, 487, 400, 28)];
  185 + [[gline layer] setZPosition:2];
180 186 [gline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
181 187 [lines setObject:gline forKey:@"gline"];
182 188
183 189 solidLine *eline = [[solidLine alloc] initWithFrame:CGRectMake(0, 578, 400, 28)];
  190 + [[eline layer] setZPosition:2];
184 191 [eline addSubview:[self deepCopySolidAccidentalView:solidLineAccidental]];
185 192 [lines setObject:eline forKey:@"eline"];
186 193
187 194 dashedLine *cline = [[dashedLine alloc] initWithFrame:CGRectMake(0, 669, 400, 28)];
  195 + [[cline layer] setZPosition:2];
188 196 [cline addSubview:[self deepCopyDashedAccidentalView:dashedLineAccidental]];
189 197 [lines setObject:cline forKey:@"cline"];
190 198
BIN  Staff/trebleclef.png

0 comments on commit 8a12b27

Please sign in to comment.
Something went wrong with that request. Please try again.