Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 00:20:06 +02:00
Code Issues Releases Wiki Activity

Refactor AColor.cpp

Browse Source
This commit is contained in:
dofuuz 2021-06-11 16:30:10 +09:00 committed by Paul Licameli
parent d6d486000a
commit ca58443644
1 changed files with 91 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/AColor.cpp
View File

@ -638,21 +638,10 @@ void AColor::DarkMIDIChannel(wxDC * dc, int channel /* 1 - 16 */ )
unsigned char AColor::gradient_pre[ColorGradientTotal][2][gradientSteps][3]; unsigned char AColor::gradient_pre[ColorGradientTotal][2][gradientSteps][3];
void AColor::PreComputeGradient() { void AColor::PreComputeGradient() {
{ if (gradient_inited) return;
if (!gradient_inited) {
gradient_inited = 1; gradient_inited = 1;
for (int selected = 0; selected < ColorGradientTotal; selected++) for (int selected = 0; selected < ColorGradientTotal; selected++) {
for (int grayscale = 0; grayscale <= 1; grayscale++) {
float r, g, b;
int i;
for (i=0; i<gradientSteps; i++) {
float value = float(i)/gradientSteps;
if (grayscale) {
r = g = b = 0.84 - 0.84 * value;
} else {
const int gsteps = 4; const int gsteps = 4;
float gradient[gsteps + 1][3]; float gradient[gsteps + 1][3];
theTheme.Colour( clrSpectro1 ) = theTheme.Colour( clrUnselected ); theTheme.Colour( clrSpectro1 ) = theTheme.Colour( clrUnselected );
@ -665,6 +654,10 @@ void AColor::PreComputeGradient() {
gradient[ j] [2] = c.Blue()/255.0; gradient[ j] [2] = c.Blue()/255.0;
} }
// Color
for (int i = 0; i<gradientSteps; i++) {
float r, g, b;
float value = float(i)/gradientSteps;
int left = (int)(value * gsteps); int left = (int)(value * gsteps);
int right = (left == gsteps ? gsteps : left + 1); int right = (left == gsteps ? gsteps : left + 1);
@ -675,7 +668,6 @@ void AColor::PreComputeGradient() {
r = (gradient[left][0] * lweight) + (gradient[right][0] * rweight); r = (gradient[left][0] * lweight) + (gradient[right][0] * rweight);
g = (gradient[left][1] * lweight) + (gradient[right][1] * rweight); g = (gradient[left][1] * lweight) + (gradient[right][1] * rweight);
b = (gradient[left][2] * lweight) + (gradient[right][2] * rweight); b = (gradient[left][2] * lweight) + (gradient[right][2] * rweight);
}
switch (selected) { switch (selected) {
case ColorGradientUnselected: case ColorGradientUnselected:
@ -683,15 +675,48 @@ void AColor::PreComputeGradient() {
break; break;
case ColorGradientTimeAndFrequencySelected: case ColorGradientTimeAndFrequencySelected:
if( !grayscale )
{
float temp; float temp;
temp = r; temp = r;
r = g; r = g;
g = b; g = b;
b = temp; b = temp;
break; break;
case ColorGradientTimeSelected:
// partly dimmed
r *= 0.75f;
g *= 0.75f;
b *= 0.75f;
break;
// For now edge colour is just black (or white if grey-scale)
// Later we might invert or something else funky.
case ColorGradientEdge:
// fully dimmed
r = 0;
g = 0;
b = 0;
break;
} }
gradient_pre[selected][0][i][0] = (unsigned char) (255 * r);
gradient_pre[selected][0][i][1] = (unsigned char) (255 * g);
gradient_pre[selected][0][i][2] = (unsigned char) (255 * b);
}
// Grayscale
for (int i = 0; i<gradientSteps; i++) {
float r, g, b;
float value = float(i)/gradientSteps;
r = g = b = 0.84 - 0.84 * value;
switch (selected) {
case ColorGradientUnselected:
// not dimmed
break;
case ColorGradientTimeAndFrequencySelected:
// else fall through to SAME grayscale colour as normal selection. // else fall through to SAME grayscale colour as normal selection.
// The white lines show it up clearly enough. // The white lines show it up clearly enough.
@ -707,16 +732,14 @@ void AColor::PreComputeGradient() {
// Later we might invert or something else funky. // Later we might invert or something else funky.
case ColorGradientEdge: case ColorGradientEdge:
// fully dimmed // fully dimmed
r = 1.0f * grayscale; r = 1.0f;
g = 1.0f * grayscale; g = 1.0f;
b = 1.0f * grayscale; b = 1.0f;
break; break;
} }
gradient_pre[selected][grayscale][i][0] = (unsigned char) (255 * r); gradient_pre[selected][1][i][0] = (unsigned char) (255 * r);
gradient_pre[selected][grayscale][i][1] = (unsigned char) (255 * g); gradient_pre[selected][1][i][1] = (unsigned char) (255 * g);
gradient_pre[selected][grayscale][i][2] = (unsigned char) (255 * b); gradient_pre[selected][1][i][2] = (unsigned char) (255 * b);
}
}
} }
} }
} }