diff options
author | Thomas White <taw@physics.org> | 2012-05-31 13:48:42 +0200 |
---|---|---|
committer | Thomas White <taw@physics.org> | 2012-05-31 13:48:42 +0200 |
commit | 13770d8553f9696c1c4c0c56703717524c028d86 (patch) | |
tree | 23c9f11f0407207ad24a8f7a4f6c72d52d0e7822 /libcrystfel/src/render.c | |
parent | 6ff1bbbd0deeac54175fc862a6e1b53374ae6306 (diff) | |
parent | b6e0b7972e3dbdace0034d439b992faf3ac8c454 (diff) |
Merge branch 'master' into tom/speed
Conflicts:
.gitignore
Diffstat (limited to 'libcrystfel/src/render.c')
-rw-r--r-- | libcrystfel/src/render.c | 69 |
1 files changed, 37 insertions, 32 deletions
diff --git a/libcrystfel/src/render.c b/libcrystfel/src/render.c index c9e1f01e..5d0cf9e8 100644 --- a/libcrystfel/src/render.c +++ b/libcrystfel/src/render.c @@ -64,34 +64,35 @@ static void render_rgb(double val, double max, s = 6; } switch ( s ) { - case 0 : { /* Black to blue */ - r = 0; g = 0; b = p; - break; - } - case 1 : { /* Blue to pink */ - r = p; g = 0; b = 1.0; - break; - } - case 2 : { /* Pink to red */ - r = 1.0; g = 0; b = (1.0-p)*1.0; - break; - } - case 3 : { /* Red to Orange */ - r = 1.0; g = 0.5*p; b = 0; - break; - } - case 4 : { /* Orange to Yellow */ - r = 1.0; g = 0.5 + 0.5*p; b = 0; - break; - } - case 5 : { /* Yellow to White */ - r = 1.0; g = 1.0; b = 1.0*p; - break; - } - case 6 : { /* Pixel has hit the maximum value */ - r = 1.0; g = 1.0; b = 1.0; - break; - } + + case 0 : /* Black to blue */ + r = 0; g = 0; b = p; + break; + + case 1 : /* Blue to pink */ + r = p; g = 0; b = 1.0; + break; + + case 2 : /* Pink to red */ + r = 1.0; g = 0; b = (1.0-p)*1.0; + break; + + case 3 : /* Red to Orange */ + r = 1.0; g = 0.5*p; b = 0; + break; + + case 4 : /* Orange to Yellow */ + r = 1.0; g = 0.5 + 0.5*p; b = 0; + break; + + case 5 : /* Yellow to White */ + r = 1.0; g = 1.0; b = 1.0*p; + break; + + case 6 : /* Pixel has hit the maximum value */ + r = 1.0; g = 1.0; b = 1.0; + break; + } *rp = r; @@ -144,16 +145,20 @@ void render_scale(double val, double max, int scale, double *rp, double *gp, double *bp) { switch ( scale ) { - case SCALE_COLOUR : + + case SCALE_COLOUR : render_rgb(val, max, rp, gp, bp); break; - case SCALE_MONO : + + case SCALE_MONO : render_mono(val, max, rp, gp, bp); break; - case SCALE_INVMONO : + + case SCALE_INVMONO : render_invmono(val, max, rp, gp, bp); break; - case SCALE_RATIO : + + case SCALE_RATIO : render_ratio(val, max, rp, gp, bp); break; } |