microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 19:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve chord highlighting

Browse Source
This commit is contained in:
Matthias Neeracher 2006-10-09 07:28:49 +00:00
parent e28e10045b
commit 9307064a22
5 changed files with 695 additions and 824 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/VLSheetView.h
View File

@ -81,6 +81,8 @@ enum VLRecalc {
- (float) noteYInMeasure:(int)measure withPitch:(int)pitch; - (float) noteYInMeasure:(int)measure withPitch:(int)pitch;
- (float) noteXInMeasure:(int)measure at:(VLFraction)at; - (float) noteXInMeasure:(int)measure at:(VLFraction)at;
- (void) scrollMeasureToVisible:(int)measure;
- (void) mouseMoved:(NSEvent *)event; - (void) mouseMoved:(NSEvent *)event;
- (void) mouseDown:(NSEvent *)event; - (void) mouseDown:(NSEvent *)event;
- (void) mouseEntered:(NSEvent *)event; - (void) mouseEntered:(NSEvent *)event;

11
Sources/VLSheetView.mm
View File

@ -162,12 +162,20 @@ static float sFlatPos[] = {
const VLProperties & prop = [self song]->fProperties.front(); const VLProperties & prop = [self song]->fProperties.front();
const float mx = fClefKeyW+(measure%fMeasPerSystem)*fMeasureW; const float mx = fClefKeyW+(measure%fMeasPerSystem)*fMeasureW;
at /= prop.fTime / (4 * prop.fDivisions); at *= 4 * prop.fDivisions;
int div = at.fNum / at.fDenom; int div = at.fNum / at.fDenom;
return mx + (div + (div / fDivPerGroup) + 1)*kNoteW; return mx + (div + (div / fDivPerGroup) + 1)*kNoteW;
} }
- (void) scrollMeasureToVisible:(int)measure
{
NSRect r = NSMakeRect(fClefKeyW+(measure%fMeasPerSystem)*fMeasureW,
[self systemY:measure/fMeasPerSystem]-kSystemY,
fMeasureW, kSystemH);
[self scrollRectToVisible:r];
}
- (void) recalculateDimensions - (void) recalculateDimensions
{ {
NSScrollView * scroll = [self enclosingScrollView]; NSScrollView * scroll = [self enclosingScrollView];
@ -512,6 +520,7 @@ static int sSemiToPitch[] = {
[[self window] performSelectorOnMainThread:@selector(makeFirstResponder:) [[self window] performSelectorOnMainThread:@selector(makeFirstResponder:)
withObject:(editable ? fFieldEditor : self) withObject:(editable ? fFieldEditor : self)
waitUntilDone:NO]; waitUntilDone:NO];
[self setNeedsDisplay: YES];
} }
@end @end

7
Sources/VLSheetViewChords.mm
View File

@ -143,6 +143,7 @@ std::string NormalizeName(NSString* rawName)
if (fAt >= prop.fTime) { if (fAt >= prop.fTime) {
fAt = VLFraction(0,4); fAt = VLFraction(0,4);
fMeasure = (fMeasure+1) % fSong->CountMeasures(); fMeasure = (fMeasure+1) % fSong->CountMeasures();
[fView scrollMeasureToVisible:fMeasure];
} }
} }
@ -153,6 +154,7 @@ std::string NormalizeName(NSString* rawName)
fAt = prop.fTime - VLFraction(1,4); fAt = prop.fTime - VLFraction(1,4);
fMeasure = fMeasure =
(fMeasure+fSong->CountMeasures()-1) % fSong->CountMeasures(); (fMeasure+fSong->CountMeasures()-1) % fSong->CountMeasures();
[fView scrollMeasureToVisible:fMeasure];
} else } else
fAt = fAt-VLFraction(1,4); fAt = fAt-VLFraction(1,4);
} }
@ -252,10 +254,11 @@ std::string NormalizeName(NSString* rawName)
- (void) highlightChordInMeasure:(int)measure at:(VLFraction)at - (void) highlightChordInMeasure:(int)measure at:(VLFraction)at
{ {
const VLProperties & prop = [self song]->fProperties.front();
const float kSystemY = [self systemY:measure / fMeasPerSystem]; const float kSystemY = [self systemY:measure / fMeasPerSystem];
NSRect r = NSRect r =
NSMakeRect([self noteXInMeasure:measure at:at], NSMakeRect([self noteXInMeasure:measure at:at]-kNoteW*0.5f,
kSystemY+kChordY, 3.0f*kNoteW, 20.0f); kSystemY+kChordY, prop.fDivisions*kNoteW, kChordH);
[[NSColor colorWithCalibratedWhite:0.8f alpha:1.0f] setFill]; [[NSColor colorWithCalibratedWhite:0.8f alpha:1.0f] setFill];
NSRectFillUsingOperation(r, NSCompositePlusDarker); NSRectFillUsingOperation(r, NSCompositePlusDarker);
} }

1259
Vocalese.xcodeproj/neeri.mode1v3
View File

File diff suppressed because it is too large Load Diff

236
Vocalese.xcodeproj/neeri.pbxuser
View File

@ -85,29 +85,12 @@
PBXFileDataSource_Warnings_ColumnID, PBXFileDataSource_Warnings_ColumnID,
); );
}; };
PBXPerProjectTemplateStateSaveDate = 181966504; PBXPerProjectTemplateStateSaveDate = 182068920;
PBXWorkspaceStateSaveDate = 181966504; PBXWorkspaceStateSaveDate = 182068920;
}; };
perUserProjectItems = { perUserProjectItems = {
9514A0410AD78D3E00B21A41 = 9514A0410AD78D3E00B21A41 /* PBXBookmark */; 953EABE50ADA2E68008C3391 /* PBXTextBookmark */ = 953EABE50ADA2E68008C3391 /* PBXTextBookmark */;
9514A05D0AD78F3700B21A41 = 9514A05D0AD78F3700B21A41 /* PBXTextBookmark */; 953EABF40ADA3187008C3391 /* PBXTextBookmark */ = 953EABF40ADA3187008C3391 /* PBXTextBookmark */;
95D44D230AD8C1BE00384FE5 /* PBXBookmark */ = 95D44D230AD8C1BE00384FE5 /* PBXBookmark */;
95D44D290AD8C1E800384FE5 /* PBXTextBookmark */ = 95D44D290AD8C1E800384FE5 /* PBXTextBookmark */;
95D44D370AD8C24800384FE5 /* PBXBookmark */ = 95D44D370AD8C24800384FE5 /* PBXBookmark */;
95D44D3B0AD8C25200384FE5 /* PBXTextBookmark */ = 95D44D3B0AD8C25200384FE5 /* PBXTextBookmark */;
95D44D3C0AD8C25200384FE5 /* PBXTextBookmark */ = 95D44D3C0AD8C25200384FE5 /* PBXTextBookmark */;
95D44D3F0AD8C2BB00384FE5 /* PBXTextBookmark */ = 95D44D3F0AD8C2BB00384FE5 /* PBXTextBookmark */;
95D44D400AD8C2BB00384FE5 /* PBXTextBookmark */ = 95D44D400AD8C2BB00384FE5 /* PBXTextBookmark */;
95D44D430AD8C34600384FE5 /* PBXTextBookmark */ = 95D44D430AD8C34600384FE5 /* PBXTextBookmark */;
95D44D440AD8C34600384FE5 /* PBXTextBookmark */ = 95D44D440AD8C34600384FE5 /* PBXTextBookmark */;
95D44D4D0AD8C47000384FE5 /* PBXTextBookmark */ = 95D44D4D0AD8C47000384FE5 /* PBXTextBookmark */;
95D44D4E0AD8C47000384FE5 /* PBXTextBookmark */ = 95D44D4E0AD8C47000384FE5 /* PBXTextBookmark */;
95D44D520AD8C60C00384FE5 /* PBXTextBookmark */ = 95D44D520AD8C60C00384FE5 /* PBXTextBookmark */;
95D44D530AD8C60C00384FE5 /* PBXTextBookmark */ = 95D44D530AD8C60C00384FE5 /* PBXTextBookmark */;
95D44D590AD8C75700384FE5 /* PBXTextBookmark */ = 95D44D590AD8C75700384FE5 /* PBXTextBookmark */;
95D44D5A0AD8C75700384FE5 /* PBXTextBookmark */ = 95D44D5A0AD8C75700384FE5 /* PBXTextBookmark */;
95D44D600AD8C85600384FE5 /* PBXTextBookmark */ = 95D44D600AD8C85600384FE5 /* PBXTextBookmark */;
95D44D610AD8C85600384FE5 /* PBXTextBookmark */ = 95D44D610AD8C85600384FE5 /* PBXTextBookmark */;
}; };
sourceControlManager = 954D7413095406B2007D9571 /* Source Control */; sourceControlManager = 954D7413095406B2007D9571 /* Source Control */;
userBuildSettings = { userBuildSettings = {
@ -134,6 +117,7 @@
sepNavIntBoundsRect = "{{0, 0}, {704, 520}}"; sepNavIntBoundsRect = "{{0, 0}, {704, 520}}";
sepNavSelRange = "{248, 0}"; sepNavSelRange = "{248, 0}";
sepNavVisRect = "{{0, 0}, {704, 520}}"; sepNavVisRect = "{{0, 0}, {704, 520}}";
sepNavWindowFrame = "{{84, 29}, {763, 649}}";
}; };
}; };
2A37F4BAFDCFA73011CA2CEA /* English */ = { 2A37F4BAFDCFA73011CA2CEA /* English */ = {
@ -150,20 +134,6 @@
954D740509540691007D9571 /* Vocalese */, 954D740509540691007D9571 /* Vocalese */,
); );
}; };
9514A0410AD78D3E00B21A41 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */;
};
9514A05D0AD78F3700B21A41 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */;
name = "VLSheetView.mm: 334";
rLen = 0;
rLoc = 8167;
rType = 0;
vrLen = 969;
vrLoc = 7454;
};
952CBB97095FD19D00434E43 /* TVLSoundOut */ = { 952CBB97095FD19D00434E43 /* TVLSoundOut */ = {
activeExec = 0; activeExec = 0;
executables = ( executables = (
@ -228,12 +198,32 @@
}; };
952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */ = { 952DCD77096BBB11001C2316 /* VLSheetViewChords.mm */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {703, 3374}}"; sepNavIntBoundsRect = "{{0, 0}, {703, 2142}}";
sepNavSelRange = "{6151, 0}"; sepNavSelRange = "{6059, 0}";
sepNavVisRect = "{{0, 3113}, {703, 261}}"; sepNavVisRect = "{{0, 1881}, {703, 261}}";
sepNavWindowFrame = "{{164, 35}, {763, 649}}"; sepNavWindowFrame = "{{164, 35}, {763, 649}}";
}; };
}; };
953EABE50ADA2E68008C3391 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */;
name = "VLSheetView.mm: 160";
rLen = 55;
rLoc = 3092;
rType = 0;
vrLen = 931;
vrLoc = 2721;
};
953EABF40ADA3187008C3391 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 95BDA15809540BF1009F9D65 /* VLSheetView.mm */;
name = "VLSheetView.mm: 160";
rLen = 55;
rLoc = 3092;
rType = 0;
vrLen = 949;
vrLoc = 2721;
};
954D740509540691007D9571 /* Vocalese */ = { 954D740509540691007D9571 /* Vocalese */ = {
isa = PBXExecutable; isa = PBXExecutable;
activeArgIndex = 2147483647; activeArgIndex = 2147483647;
@ -441,10 +431,10 @@
}; };
95BDA15809540BF1009F9D65 /* VLSheetView.mm */ = { 95BDA15809540BF1009F9D65 /* VLSheetView.mm */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {704, 5250}}"; sepNavIntBoundsRect = "{{0, 0}, {704, 6790}}";
sepNavSelRange = "{8167, 0}"; sepNavSelRange = "{3092, 55}";
sepNavVisRect = "{{0, 2336}, {704, 520}}"; sepNavVisRect = "{{0, 1973}, {704, 520}}";
sepNavWindowFrame = "{{15, 92}, {763, 649}}"; sepNavWindowFrame = "{{42, 94}, {763, 649}}";
}; };
}; };
95D44D1D0AD8BFEF00384FE5 /* VLSoundSched.h */ = { 95D44D1D0AD8BFEF00384FE5 /* VLSoundSched.h */ = {
@ -458,167 +448,9 @@
95D44D1E0AD8BFEF00384FE5 /* VLSoundSched.mm */ = { 95D44D1E0AD8BFEF00384FE5 /* VLSoundSched.mm */ = {
uiCtxt = { uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {867, 504}}"; sepNavIntBoundsRect = "{{0, 0}, {867, 504}}";
sepNavSelRange = "{710, 0}"; sepNavSelRange = "{725, 0}";
sepNavVisRect = "{{0, 326}, {867, 178}}"; sepNavVisRect = "{{0, 256}, {867, 178}}";
sepNavWindowFrame = "{{38, 71}, {763, 649}}"; sepNavWindowFrame = "{{38, 71}, {763, 649}}";
}; };
}; };
95D44D230AD8C1BE00384FE5 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */;
};
95D44D290AD8C1E800384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */;
name = "main.m: 14";
rLen = 0;
rLoc = 248;
rType = 0;
vrLen = 309;
vrLoc = 0;
};
95D44D370AD8C24800384FE5 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */;
};
95D44D3B0AD8C25200384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */;
name = "VLSoundOut.h: 23";
rLen = 0;
rLoc = 345;
rType = 0;
vrLen = 664;
vrLoc = 0;
};
95D44D3C0AD8C25200384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */;
name = "main.m: 14";
rLen = 0;
rLoc = 248;
rType = 0;
vrLen = 309;
vrLoc = 0;
};
95D44D3F0AD8C2BB00384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */;
name = "VLSoundOut.h: 23";
rLen = 0;
rLoc = 345;
rType = 0;
vrLen = 664;
vrLoc = 0;
};
95D44D400AD8C2BB00384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */;
name = "main.m: 14";
rLen = 0;
rLoc = 248;
rType = 0;
vrLen = 309;
vrLoc = 0;
};
95D44D430AD8C34600384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */;
name = "VLSoundOut.h: 42";
rLen = 0;
rLoc = 706;
rType = 0;
vrLen = 666;
vrLoc = 0;
};
95D44D440AD8C34600384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */;
name = "main.m: 14";
rLen = 0;
rLoc = 248;
rType = 0;
vrLen = 309;
vrLoc = 0;
};
95D44D4D0AD8C47000384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */;
name = "VLSoundOut.h: 42";
rLen = 0;
rLoc = 706;
rType = 0;
vrLen = 662;
vrLoc = 0;
};
95D44D4E0AD8C47000384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */;
name = "main.m: 14";
rLen = 0;
rLoc = 248;
rType = 0;
vrLen = 309;
vrLoc = 0;
};
95D44D520AD8C60C00384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */;
name = "VLSoundOut.h: 42";
rLen = 0;
rLoc = 706;
rType = 0;
vrLen = 662;
vrLoc = 0;
};
95D44D530AD8C60C00384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */;
name = "main.m: 14";
rLen = 0;
rLoc = 248;
rType = 0;
vrLen = 309;
vrLoc = 0;
};
95D44D590AD8C75700384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */;
name = "VLSoundOut.h: 42";
rLen = 0;
rLoc = 706;
rType = 0;
vrLen = 662;
vrLoc = 0;
};
95D44D5A0AD8C75700384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */;
name = "main.m: 14";
rLen = 0;
rLoc = 248;
rType = 0;
vrLen = 309;
vrLoc = 0;
};
95D44D600AD8C85600384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 2A37F4B0FDCFA73011CA2CEA /* main.m */;
name = "main.m: 14";
rLen = 0;
rLoc = 248;
rType = 0;
vrLen = 309;
vrLoc = 0;
};
95D44D610AD8C85600384FE5 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 952CBB9B095FD1CA00434E43 /* VLSoundOut.h */;
name = "VLSoundOut.h: 42";
rLen = 0;
rLoc = 706;
rType = 0;
vrLen = 666;
vrLoc = 0;
};
} }