ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/px/falsecolor.pl
(Generate patch)

Comparing ray/src/px/falsecolor.pl (file contents):
Revision 2.1 by greg, Tue Oct 5 00:59:39 2010 UTC vs.
Revision 2.18 by greg, Fri Nov 11 02:50:26 2022 UTC

# Line 1 | Line 1
1   #!/usr/bin/perl -w
2   # RCSid $Id$
3  
4 + use warnings;
5   use strict;
6   use File::Temp qw/ tempdir /;
7   use POSIX qw/ floor /;
8  
9 < my $mult = 179.0;    # Multiplier. Default W/sr/m2 -> cd/m2
10 < my $label = 'cd/m2';    # Units shown in legend
11 < my $scale = 1000;    # Top of the scale
12 < my $decades = 0;    # Default is linear mapping
13 < my $redv = 'def_red(v)';    # Mapping function for R,G,B
14 < my $grnv = 'def_grn(v)';
15 < my $bluv = 'def_blu(v)';
16 < my $ndivs = 8;    # Number of lines in legend
9 > my @palettes = ('def', 'spec', 'pm3d', 'hot', 'eco', 'tbo');
10 >
11 > my $mult = 179.0;              # Multiplier. Default W/sr/m2 -> cd/m2
12 > my $label = 'cd/m2';           # Units shown in legend
13 > my $scale = 1000;              # Top of the scale
14 > my $scaledigits = 3;           # Number of maximum digits for numbers in legend
15 > my $decades = 0;               # Default is linear mapping
16 > my $pal = 'def';               # Palette
17 > my $redv = "${pal}_red(v)";    # Mapping functions for R,G,B
18 > my $grnv = "${pal}_grn(v)";
19 > my $bluv = "${pal}_blu(v)";
20 > my $ndivs = 8;                 # Number of lines in legend
21   my $picture = '-';
22   my $cpict = '';
23 < my $legwidth = 100;   # Legend width and height
23 > my $legwidth = 100;            # Legend width and height
24   my $legheight = 200;
25 < my $docont = '';    # Contours
26 < my $loff = 0;    # Offset for drop-shadow
27 < my $doextrem = 0;    # Don't mark extrema
25 > my $haszero = 1;               # print 0 in scale for falsecolor images only
26 > my $docont = '';               # Contours: -cl and -cb
27 > my $doposter = 0;              # Posterization: -cp
28 > my $doextrem = 0;              # Don't mark extrema
29   my $needfile = 0;
30 + my $showpal = 0;               # Show available colour palettes
31  
32   while ($#ARGV >= 0) {
33 <        # Options with qualifiers
34 <    if ("$ARGV[0]" eq '-lw') {    # Legend width
35 <        $legwidth = $ARGV[1];
36 <        shift @ARGV;
37 <    } elsif ("$ARGV[0]" eq '-lh') {    # Legend height
38 <        $legheight = $ARGV[1];
39 <        shift @ARGV;
40 <    } elsif ("$ARGV[0]" eq '-m') {    # Multiplier
41 <        $mult = $ARGV[1];
42 <        shift @ARGV;
43 <    } elsif ("$ARGV[0]" eq '-s') {    # Scale
44 <        $scale = $ARGV[1];
38 <        shift @ARGV;
33 >    $_ = shift;
34 >    # Options with qualifiers
35 >    if (m/-lw/) {              # Legend width
36 >        $legwidth = shift;
37 >    } elsif (m/-lh/) {         # Legend height
38 >        $legheight = shift;
39 >    } elsif (m/-m/) {          # Multiplier
40 >        $mult = shift;
41 >    } elsif (m/-spec/) {
42 >        die("depricated option '-spec'. Please use '-pal spec' instead.");
43 >    } elsif (m/-s/) {          # Scale
44 >        $scale = shift;
45          if ($scale =~ m/[aA].*/) {
46              $needfile = 1;
47 +       }
48 +    } elsif (m/-d/) {          # Number of maximum digits for numbers in legend
49 +        $scaledigits = shift;
50 +    } elsif (m/-l$/) {         # Label
51 +        $label = shift;
52 +    } elsif (m/-log/) {        # Logarithmic mapping
53 +        $decades = shift;
54 +    } elsif (m/-r/) {          # Custom palette functions for R,G,B
55 +        $redv = shift;
56 +    } elsif (m/-g/) {
57 +        $grnv = shift;
58 +    } elsif (m/-b/) {
59 +        $bluv = shift;
60 +    } elsif (m/-pal$/) {        # Color palette
61 +        $pal = shift;
62 +        if (! grep $_ eq $pal, @palettes) {
63 +            die("invalid palette '$pal'.\n");
64          }
65 <    } elsif ("$ARGV[0]" eq '-l') {    # Label
66 <        $label = $ARGV[1];
67 <        shift @ARGV;
68 <    } elsif ("$ARGV[0]" eq '-log') {    # Logarithmic mapping
69 <        $decades = $ARGV[1];
70 <        shift @ARGV;
71 <    } elsif ("$ARGV[0]" eq '-r') {
72 <        $redv = $ARGV[1];
73 <        shift @ARGV;
74 <    } elsif ("$ARGV[0]" eq '-g') {
75 <        $grnv = $ARGV[1];
76 <        shift @ARGV;
54 <    } elsif ("$ARGV[0]" eq '-b') {
55 <        $bluv = $ARGV[1];
56 <        shift @ARGV;
57 <    } elsif ("$ARGV[0]" eq '-pal') {
58 <        $redv = "$ARGV[1]_red(v)";
59 <        $grnv = "$ARGV[1]_grn(v)";
60 <        $bluv = "$ARGV[1]_blu(v)";
61 <        shift @ARGV;
62 <    } elsif ("$ARGV[0]" eq '-i') {    # Image for intensity mapping
63 <        $picture = $ARGV[1];
64 <        shift @ARGV;
65 <    } elsif ("$ARGV[0]" eq '-p') {    # Image for background
66 <        $cpict = $ARGV[1];
67 <        shift @ARGV;
68 <    } elsif ("$ARGV[0]" eq '-ip' || "$ARGV[0]" eq '-pi') {
69 <        $picture = $ARGV[1];
70 <        $cpict = $ARGV[1];
71 <        shift @ARGV;
72 <    } elsif ("$ARGV[0]" eq '-n') {    # Number of contour lines
73 <        $ndivs = $ARGV[1];
74 <        shift @ARGV;
65 >        $redv = "${pal}_red(v)";
66 >        $grnv = "${pal}_grn(v)";
67 >        $bluv = "${pal}_blu(v)";
68 >    } elsif (m/-i$/) {          # Image for intensity mapping
69 >        $picture = shift;
70 >    } elsif (m/-p$/) {         # Image for background
71 >        $cpict = shift;
72 >    } elsif (m/-ip/ || m/-pi/) {
73 >        $picture = shift;
74 >        $cpict = $picture;
75 >    } elsif (m/-n/) {          # Number of contour lines
76 >        $ndivs = shift;
77  
78 <        # Switches
79 <    } elsif ("$ARGV[0]" eq '-cl') {    # Contour lines
78 >    # Switches
79 >    } elsif (m/-cl/) {         # Contour lines
80          $docont = 'a';
81 <        $loff = 12;
82 <    } elsif ("$ARGV[0]" eq '-cb') {    # Contour bands
81 >        $haszero = 0;
82 >    } elsif (m/-cb/) {         # Contour bands
83          $docont = 'b';
84 <        $loff = 13;
85 <    } elsif ("$ARGV[0]" eq '-e') {
84 >        $haszero = 0;
85 >    } elsif (m/-cp/) {              # Posterize
86 >        $doposter = 1;
87 >        $haszero = 0;
88 >    } elsif (m/-palettes/) {        # Show all available palettes
89 >        $scale   = 45824;           # 256 * 179
90 >        $showpal = 1;
91 >    } elsif (m/-e/) {
92          $doextrem = 1;
93          $needfile = 1;
94 <
87 <        # Oops! Illegal option
94 >    # Oops! Illegal option
95      } else {
96 <        die("bad option \"$ARGV[0]\"\n");
96 >        die("bad option \"$_\"\n");
97      }
91    shift @ARGV;
98   }
99  
100 + if (($legwidth <= 20) || ($legheight <= 40)) {
101 +    # Legend is too small to be legible. Don't bother doing one.
102 +    $legwidth = 0;
103 +    $legheight = 0;
104 + }
105 +
106   # Temporary directory. Will be removed upon successful program exit.
107   my $td = tempdir( CLEANUP => 1 );
108  
109   if ($needfile == 1 && $picture eq '-') {
110 <    $picture = $td . '/' . $picture;
110 >    # Pretend that $td/stdin.rad is the actual filename.
111 >    $picture = "$td/stdin.hdr";
112      open(FHpic, ">$picture") or
113              die("Unable to write to file $picture\n");
114 +    # Input is from STDIN: Capture to file.
115 +    while (<>) {
116 +        print FHpic;
117 +    }
118      close(FHpic);
119 +
120 +    if ($cpict eq '-') {
121 +        $cpict = "$td/stdin.hdr";
122 +    }
123   }
124  
125   # Find a good scale for auto mode.
126   if ($scale =~ m/[aA].*/) {
127 <    my $LogLmax = `phisto $picture| tail -2| sed -n '1s/[0-9]*\$//p'`;
127 >    my @histo = split(/\s/, `phisto $picture`);
128 >    # e.g. $ phisto tests/richmond.hdr| tail -2
129 >    # 3.91267   14
130 >    # 3.94282   6
131 >    my $LogLmax = $histo[-4];
132      $scale = $mult / 179 * 10**$LogLmax;
133   }
134  
135 < my $pc0 = $td . '/pc0.cal';
135 > if ($docont ne '') {
136 >    # -cl -> $docont = a
137 >    # -cb -> $docont = b
138 >    my $newv = join( "(v-1/ndivs)*ndivs/(ndivs-1)", split("v", $redv) );
139 >    $redv = $newv;
140 >    $newv = join( "(v-1/ndivs)*ndivs/(ndivs-1)", split("v", $bluv) );
141 >    $bluv = $newv;
142 >    $newv = join( "(v-1/ndivs)*ndivs/(ndivs-1)", split("v", $grnv) );
143 >    $grnv = $newv;
144 > } elsif ($doposter == 1) {
145 >    # -cp -> $doposter = 1
146 >    my $newv = join( "seg2(v)", split("v", $redv) );
147 >    $redv = $newv;
148 >    $newv = join( "seg2(v)", split("v", $bluv) );
149 >    $bluv = $newv;
150 >    $newv = join( "seg2(v)", split("v", $grnv) );
151 >    $grnv = $newv;
152 > }
153 >
154 > my $pc0 = "$td/pc0.cal";
155   open(FHpc0, ">$pc0");
156   print FHpc0 <<EndOfPC0;
157   PI : 3.14159265358979323846 ;
# Line 120 | Line 164 | or(a,b) : if(a,a,b);
164   EPS : 1e-7;
165   neq(a,b) : if(a-b-EPS,1,b-a-EPS);
166   btwn(a,x,b) : if(a-x,-1,b-x);
167 < clip(x) : if(x-1,1,if(x,x,0));
167 > clip(x) : min(1,max(x,0));
168   frac(x) : x - floor(x);
169 < boundary(a,b) : neq(floor(ndivs*a+.5),floor(ndivs*b+.5));
169 > boundary(a,b) : neq(floor(ndivs*a),floor(ndivs*b));
170 > round(x) : floor(x+.5);
171  
172   spec_red(x) = 1.6*x - .6;
173   spec_grn(x) = if(x-.375, 1.6-1.6*x, 8/3*x);
174   spec_blu(x) = 1 - 8/3*x;
175  
176 < pm3d_red(x) = sqrt(x) ^ gamma;
177 < pm3d_grn(x) = x*x*x ^ gamma;
178 < pm3d_blu(x) = clip(sin(2*PI*x)) ^ gamma;
176 > pm3d_red(x) = sqrt(clip(x)) ^ gamma;
177 > pm3d_grn(x) = clip(x*x*x) ^ gamma;
178 > pm3d_blu(x) = clip(sin(2*PI*clip(x))) ^ gamma;
179  
180   hot_red(x) = clip(3*x) ^ gamma;
181   hot_grn(x) = clip(3*x - 1) ^ gamma;
182   hot_blu(x) = clip(3*x - 2) ^ gamma;
183  
184 + eco_red(x) = clip(2*x) ^ gamma;
185 + eco_grn(x) = clip(2*(x-0.5)) ^ gamma;
186 + eco_blu(x) = clip(2*(0.5-x)) ^ gamma;
187 +
188   interp_arr2(i,x,f):(i+1-x)*f(i)+(x-i)*f(i+1);
189   interp_arr(x,f):if(x-1,if(f(0)-x,interp_arr2(floor(x),x,f),f(f(0))),f(1));
190  
191 + interp_tbo2(x,f):f(round(x*255)+1)+(f(min(255,round(x*255)+1)+1)-f(round(x*255)+1))*(x*255-round(x*255));
192 + interp_tbo(x,f):if(x-1,f(256),if(x,interp_tbo2(x,f),f(1)));
193 +
194   def_redp(i):select(i,0.18848,0.05468174,
195   0.00103547,8.311144e-08,7.449763e-06,0.0004390987,0.001367254,
196   0.003076,0.01376382,0.06170773,0.1739422,0.2881156,0.3299725,
# Line 160 | Line 212 | def_blup(i):select(i,0.2666,0.3638662,0.4770437,
212   2.432735e-05,1.212949e-05,0.006659406,0.02539);
213   def_blu(x):interp_arr(x/0.0454545+1,def_blup);
214  
215 < isconta = if(btwn(0,v,1),or(boundary(vleft,vright),boundary(vabove,vbelow)),-1);
216 < iscontb = if(btwn(0,v,1),btwn(.4,frac(ndivs*v),.6),-1);
215 > tbo_redp(i):select(i,0.18995,0.19483,0.19956,0.20415,0.2086,0.21291,0.21708,0.22111,0.225,0.22875,0.23236,0.23582,0.23915,0.24234,0.24539,0.2483,0.25107,0.25369,0.25618,0.25853,0.26074,0.2628,0.26473,0.26652,0.26816,0.26967,0.27103,0.27226,0.27334,0.27429,0.27509,0.27576,0.27628,0.27667,0.27691,0.27701,0.27698,0.2768,0.27648,0.27603,0.27543,0.27469,0.27381,0.27273,0.27106,0.26878,0.26592,0.26252,0.25862,0.25425,0.24946,0.24427,0.23874,0.23288,0.22676,0.22039,0.21382,0.20708,0.20021,0.19326,0.18625,0.17923,0.17223,0.16529,0.15844,0.15173,0.14519,0.13886,0.13278,0.12698,0.12151,0.11639,0.11167,0.10738,0.10357,0.10026,0.0975,0.09532,0.09377,0.09287,0.09267,0.0932,0.09451,0.09662,0.09958,0.10342,0.10815,0.11374,0.12014,0.12733,0.13526,0.14391,0.15323,0.16319,0.17377,0.18491,0.19659,0.20877,0.22142,0.23449,0.24797,0.2618,0.27597,0.29042,0.30513,0.32006,0.33517,0.35043,0.36581,0.38127,0.39678,0.41229,0.42778,0.44321,0.45854,0.47375,0.48879,0.50362,0.51822,0.53255,0.54658,0.56026,0.57357,0.58646,0.59891,0.61088,0.62233,0.63323,0.64362,0.65394,0.66428,0.67462,0.68494,0.69525,0.70553,0.71577,0.72596,0.7361,0.74617,0.75617,0.76608,0.77591,0.78563,0.79524,0.80473,0.8141,0.82333,0.83241,0.84133,0.8501,0.85868,0.86709,0.8753,0.88331,0.89112,0.8987,0.90605,0.91317,0.92004,0.92666,0.93301,0.93909,0.94489,0.95039,0.9556,0.96049,0.96507,0.96931,0.97323,0.97679,0.98,0.98289,0.98549,0.98781,0.98986,0.99163,0.99314,0.99438,0.99535,0.99607,0.99654,0.99675,0.99672,0.99644,0.99593,0.99517,0.99419,0.99297,0.99153,0.98987,0.98799,0.9859,0.9836,0.98108,0.97837,0.97545,0.97234,0.96904,0.96555,0.96187,0.95801,0.95398,0.94977,0.94538,0.94084,0.93612,0.93125,0.92623,0.92105,0.91572,0.91024,0.90463,0.89888,0.89298,0.88691,0.88066,0.87422,0.8676,0.86079,0.8538,0.84662,0.83926,0.83172,0.82399,0.81608,0.80799,0.79971,0.79125,0.7826,0.77377,0.76476,0.75556,0.74617,0.73661,0.72686,0.71692,0.7068,0.6965,0.68602,0.67535,0.66449,0.65345,0.64223,0.63082,0.61923,0.60746,0.5955,0.58336,0.57103,0.55852,0.54583,0.53295,0.51989,0.50664,0.49321,0.4796);
216 > tbo_red(x):interp_tbo(x,tbo_redp) ^ gamma;
217  
218 + tbo_grnp(i):select(i,0.07176,0.08339,0.09498,0.10652,0.11802,0.12947,0.14087,0.15223,0.16354,0.17481,0.18603,0.1972,0.20833,0.21941,0.23044,0.24143,0.25237,0.26327,0.27412,0.28492,0.29568,0.30639,0.31706,0.32768,0.33825,0.34878,0.35926,0.3697,0.38008,0.39043,0.40072,0.41097,0.42118,0.43134,0.44145,0.45152,0.46153,0.47151,0.48144,0.49132,0.50115,0.51094,0.52069,0.5304,0.54015,0.54995,0.55979,0.56967,0.57958,0.5895,0.59943,0.60937,0.61931,0.62923,0.63913,0.64901,0.65886,0.66866,0.67842,0.68812,0.69775,0.70732,0.7168,0.7262,0.73551,0.74472,0.75381,0.76279,0.77165,0.78037,0.78896,0.7974,0.80569,0.81381,0.82177,0.82955,0.83714,0.84455,0.85175,0.85875,0.86554,0.87211,0.87844,0.88454,0.8904,0.896,0.90142,0.90673,0.91193,0.91701,0.92197,0.9268,0.93151,0.93609,0.94053,0.94484,0.94901,0.95304,0.95692,0.96065,0.96423,0.96765,0.97092,0.97403,0.97697,0.97974,0.98234,0.98477,0.98702,0.98909,0.99098,0.99268,0.99419,0.99551,0.99663,0.99755,0.99828,0.99879,0.9991,0.99919,0.99907,0.99873,0.99817,0.99739,0.99638,0.99514,0.99366,0.99195,0.98999,0.98775,0.98524,0.98246,0.97941,0.9761,0.97255,0.96875,0.9647,0.96043,0.95593,0.95121,0.94627,0.94113,0.93579,0.93025,0.92452,0.91861,0.91253,0.90627,0.89986,0.89328,0.88655,0.87968,0.87267,0.86553,0.85826,0.85087,0.84337,0.83576,0.82806,0.82025,0.81236,0.80439,0.79634,0.78823,0.78005,0.77181,0.76352,0.75519,0.74682,0.73842,0.73,0.7214,0.7125,0.7033,0.69382,0.68408,0.67408,0.66386,0.65341,0.64277,0.63193,0.62093,0.60977,0.59846,0.58703,0.57549,0.56386,0.55214,0.54036,0.52854,0.51667,0.50479,0.49291,0.48104,0.4692,0.4574,0.44565,0.43399,0.42241,0.41093,0.39958,0.38836,0.37729,0.36638,0.35566,0.34513,0.33482,0.32473,0.31489,0.3053,0.29599,0.28696,0.27824,0.26981,0.26152,0.25334,0.24526,0.2373,0.22945,0.2217,0.21407,0.20654,0.19912,0.19182,0.18462,0.17753,0.17055,0.16368,0.15693,0.15028,0.14374,0.13731,0.13098,0.12477,0.11867,0.11268,0.1068,0.10102,0.09536,0.0898,0.08436,0.07902,0.0738,0.06868,0.06367,0.05878,0.05399,0.04931,0.04474,0.04028,0.03593,0.03169,0.02756,0.02354,0.01963,0.01583);
219 + tbo_grn(x):interp_tbo(x,tbo_grnp) ^ gamma;
220 +
221 + tbo_blup(i):select(i,0.23217,0.26149,0.29024,0.31844,0.34607,0.37314,0.39964,0.42558,0.45096,0.47578,0.50004,0.52373,0.54686,0.56942,0.59142,0.61286,0.63374,0.65406,0.67381,0.693,0.71162,0.72968,0.74718,0.76412,0.7805,0.79631,0.81156,0.82624,0.84037,0.85393,0.86692,0.87936,0.89123,0.90254,0.91328,0.92347,0.93309,0.94214,0.95064,0.95857,0.96594,0.97275,0.97899,0.98461,0.9893,0.99303,0.99583,0.99773,0.99876,0.99896,0.99835,0.99697,0.99485,0.99202,0.98851,0.98436,0.97959,0.97423,0.96833,0.9619,0.95498,0.94761,0.93981,0.93161,0.92305,0.91416,0.90496,0.8955,0.8858,0.8759,0.86581,0.85559,0.84525,0.83484,0.82437,0.81389,0.80342,0.79299,0.78264,0.7724,0.7623,0.75237,0.74265,0.73316,0.72393,0.715,0.70599,0.69651,0.6866,0.67627,0.66556,0.65448,0.64308,0.63137,0.61938,0.60713,0.59466,0.58199,0.56914,0.55614,0.54303,0.52981,0.51653,0.50321,0.48987,0.47654,0.46325,0.45002,0.43688,0.42386,0.41098,0.39826,0.38575,0.37345,0.3614,0.34963,0.33816,0.32701,0.31622,0.30581,0.29581,0.28623,0.27712,0.26849,0.26038,0.2528,0.24579,0.23937,0.23356,0.22835,0.2237,0.2196,0.21602,0.21294,0.21032,0.20815,0.2064,0.20504,0.20406,0.20343,0.20311,0.2031,0.20336,0.20386,0.20459,0.20552,0.20663,0.20788,0.20926,0.21074,0.2123,0.21391,0.21555,0.21719,0.2188,0.22038,0.22188,0.22328,0.22456,0.2257,0.22667,0.22744,0.228,0.22831,0.22836,0.22811,0.22754,0.22663,0.22536,0.22369,0.22161,0.21918,0.2165,0.21358,0.21043,0.20706,0.20348,0.19971,0.19577,0.19165,0.18738,0.18297,0.17842,0.17376,0.16899,0.16412,0.15918,0.15417,0.1491,0.14398,0.13883,0.13367,0.12849,0.12332,0.11817,0.11305,0.10797,0.10294,0.09798,0.0931,0.08831,0.08362,0.07905,0.07461,0.07031,0.06616,0.06218,0.05837,0.05475,0.05134,0.04814,0.04516,0.04243,0.03993,0.03753,0.03521,0.03297,0.03082,0.02875,0.02677,0.02487,0.02305,0.02131,0.01966,0.01809,0.0166,0.0152,0.01387,0.01264,0.01148,0.01041,0.00942,0.00851,0.00769,0.00695,0.00629,0.00571,0.00522,0.00481,0.00449,0.00424,0.00408,0.00401,0.00401,0.0041,0.00427,0.00453,0.00486,0.00529,0.00579,0.00638,0.00705,0.0078,0.00863,0.00955,0.01055);
222 + tbo_blu(x):interp_tbo(x,tbo_blup) ^ gamma;
223 +
224 + isconta = if(btwn(1/ndivs/2,v,1+1/ndivs/2),or(boundary(vleft,vright),boundary(vabove,vbelow)),-1);
225 + iscontb = if(btwn(1/ndivs/2,v,1+1/ndivs/2),-btwn(.1,frac(ndivs*v),.9),-1);
226 +
227 + seg(x)=(floor(v*ndivs)+.5)/ndivs;
228 + seg2(x)=(seg(x)-1/ndivs)*ndivs/(ndivs-1);
229 +
230   ra = 0;
231   ga = 0;
232   ba = 0;
# Line 173 | Line 237 | ro = if(in,clip($redv),ra);
237   go = if(in,clip($grnv),ga);
238   bo = if(in,clip($bluv),ba);
239   EndOfPC0
240 + close FHpc0;
241  
242 < my $pc1 = $td . '/pc1.cal';
242 > my $pc1 = "$td/pc1.cal";
243   open(FHpc1, ">$pc1");
244   print FHpc1 <<EndOfPC1;
245   norm : mult/scale/le(1);
# Line 188 | Line 253 | vbelow = map(li(1,0,-1)*norm);
253  
254   map(x) = x;
255  
256 +
257   ra = ri(nfiles);
258   ga = gi(nfiles);
259   ba = bi(nfiles);
260   EndOfPC1
261 + close FHpc1;
262  
263   my $pc0args = "-f $pc0";
264   my $pc1args = "-f $pc1";
265  
266 < # Contour lines or bands
266 > if ($showpal == 1) {
267 >    my $pc = "pcompos -a 1";
268 >    foreach my $pal (@palettes) {
269 >        my $fcimg = "$td/$pal.hdr";
270 >        my $lbimg = "$td/${pal}_label.hdr";
271 >        system "psign -cb 0 0 0 -cf 1 1 1 -h 20 $pal > $lbimg";
272 >
273 >        my $cmd = qq[pcomb $pc0args -e "v=x/256"];
274 >        $cmd .= qq[ -e "ro=clip(${pal}_red(v));go=clip(${pal}_grn(v));bo=clip(${pal}_blu(v))"];
275 >        $cmd .= qq[ -x 256 -y 30 > $fcimg];
276 >        system "$cmd";
277 >        $pc .= " $fcimg $lbimg";
278 >    }
279 >    system "$pc";
280 >    exit 0;
281 > }
282 >
283 > # Contours
284   if ($docont ne '') {
285 <    $pc0args .= " -e 'in=iscont$docont'";
285 >    # -cl -> $docont = a
286 >    # -cb -> $docont = b
287 >    $pc0args .= qq[ -e "in=iscont$docont"];
288   }
289  
290   if ($cpict eq '') {
291 <    $pc1args .= " -e 'ra=0;ga=0;ba=0'";
291 >    $pc1args .= qq[ -e "ra=0;ga=0;ba=0"];
292   } elsif ($cpict eq $picture) {
293      $cpict = '';
294   }
295  
296   # Logarithmic mapping
297   if ($decades > 0) {
298 <    $pc1args .= " -e 'map(x)=if(x-10^-$decades,log10(x)/$decades+1,0)'";
298 >    $pc1args .= qq[ -e "map(x)=if(x-10^-$decades,log10(x)/$decades+1,0)"];
299   }
300  
301   # Colours in the legend
302 < my $scolpic = $td . '/scol.hdr';
302 > my $scolpic = "$td/scol.hdr";
303 >
304   # Labels in the legend
305 < my $slabpic = $td . '/slab.hdr';
305 > my $slabpic = "$td/slab.hdr";
306   my $cmd;
307 <
308 < if ($legwidth > 20 && $legheight > 40) {
309 <        # Legend: Create the background colours
310 <    $cmd = "pcomb $pc0args -e 'v=(y+.5)/yres;vleft=v;vright=v'";
311 <    $cmd .= " -e 'vbelow=(y-.5)/yres;vabove=(y+1.5)/yres'";
312 <    $cmd .= " -x $legwidth -y $legheight > $scolpic";
313 <    system $cmd;
314 <
315 <        # Legend: Create the text labels
316 <    my $sheight = floor($legheight / $ndivs + 0.5);
317 <    my $text = "$label";
318 <    my $value;
319 <    my $i;
320 <    for ($i=0; $i<$ndivs; $i++) {
234 <        my $imap = ($ndivs - 0.5 - $i) / $ndivs;
307 > if ($legwidth > 0) {
308 >    # Legend: Create the text labels
309 >    my $sheight = floor($legheight / $ndivs );
310 >    my $theight = floor($legwidth/(8/1.67));
311 >    my $stheight = $sheight <= $theight ? $sheight : $theight;
312 >    my $vlegheight = $sheight * $ndivs * (1+1.5/$ndivs);
313 >    my $tslabpic = "$td/slabT.hdr";
314 >    system "psign -s -.15 -cf 1 1 1 -cb 0 0 0 -h $stheight $label > $tslabpic";
315 >    my $loop = $ndivs+$haszero;
316 >    my $hlegheight = $sheight * ($loop) + $sheight * .5;
317 >    my $pcompost = qq[pcompos -h -b 0 0 0 =-0 $tslabpic 0 $hlegheight ];
318 >    for (my $i=0; $i<$loop; $i++) {
319 >        my $imap = ($ndivs - $i) / $ndivs;
320 >        my $value = $scale;
321          if ($decades > 0) {
322 <            $value = $scale * 10**(($imap - 1) * $decades);
322 >            $value *= 10**(($imap - 1) * $decades);
323          } else {
324 <            $value = $scale * $imap;
324 >            $value *= $imap;
325          }
326          # Have no more than 3 decimal places
327 <        $value =~ s/(\.[0-9]{3})[0-9]*/$1/;
328 <        $text .= "\n$value";
327 >        $value =~ s/(\.[0-9]{$scaledigits})[0-9]*/$1/;
328 >        $tslabpic = "$td/slab$i.hdr";
329 >        system "psign -s -.15 -cf 1 1 1 -cb 0 0 0 -h $stheight $value > $tslabpic";
330 >        $hlegheight = $sheight * ($loop - $i - 1) + $sheight * .5;
331 >        $pcompost .= qq[=-0 $tslabpic 0 $hlegheight ];
332      }
333 <    $cmd = "echo '$text' | psign -s -.15 -cf 1 1 1 -cb 0 0 0";
334 <    $cmd .= " -h $sheight > $slabpic";
333 >    $pcompost .= qq[ > $slabpic];
334 >    system $pcompost;
335 >
336 >    # Legend: Create the background colours
337 >    $cmd = qq[pcomb $pc0args];
338 >    $cmd .= qq[ -x $legwidth -y $vlegheight];
339 >    $cmd .= qq[ -e "v=(y+.5-$sheight)/(yres/(1+1.5/$ndivs));vleft=v;vright=v"];
340 >    $cmd .= qq[ -e "vbelow=(y-.5-$sheight)/(yres/(1+1.5/$ndivs));vabove=(y+1.5-$sheight)/(yres/(1+1.5/$ndivs))"];
341 >    $cmd .= qq[ -e "ra=0;ga=0;ba=0;"];
342 >    $cmd .= qq[ > $scolpic];
343      system $cmd;
344   } else {
345 <        # Legend is too small to be legible. Don't bother doing one.
346 <    $legwidth = 0;
347 <    $legheight = 0;
348 <    open(FHscolpic, ">$scolpic");
252 <    print FHscolpic '\n-Y 1 +X 1\naaa\n';
253 <    close(FHscolpic);
254 <    open(FHslabpic, ">$slabpic");
255 <    print FHslabpic '\n-Y 1 +X 1\naaa\n';
256 <    close(FHslabpic);
345 >    # Create dummy colour scale and legend labels so we don't
346 >    # need to change the final command line.
347 >    system "pcomb -x 1 -y 1 -e lo=1 > $scolpic";
348 >    system "pcomb -x 1 -y 1 -e lo=1 > $slabpic";
349   }
350  
351 < my $loff1 = $loff - 1;
351 > # Legend: Invert the text labels (for dropshadow)
352 > my $slabinvpic = "$td/slabinv.hdr";
353 > $cmd = qq[pcomb -e "lo=1-gi(1)" $slabpic > $slabinvpic];
354 > system $cmd;
355 >
356 >
357 > my $sh0 = -floor($legheight / $ndivs / 2);
358 > if ($haszero < 1) {
359 >    $sh0 = -floor($legheight / ($ndivs)*1.5);
360 > }
361 >
362   # Command line without extrema
261 $cmd = "pcomb $pc0args $pc1args $picture $cpict";
262 $cmd .= "| pcompos $scolpic 0 0 +t .1";
263 $cmd .= " \"\!pcomb -e 'lo=1-gi(1)' $slabpic\" 2 $loff1";
264 $cmd .= " -t .5 $slabpic 0 $loff - $legwidth 0";
363  
364 +    $cmd = qq[pcomb $pc0args $pc1args "$picture"];
365 +    $cmd .= qq[ "$cpict"] if ($cpict);
366 +    $cmd .= qq[ | pcompos -b 0 0 0 $scolpic 0 $sh0 +t .1 $slabinvpic 2 -1 ];
367 +    $cmd .= qq[ -t .5 $slabpic 0 0 - $legwidth 0];
368 +
369   if ($doextrem == 1) {
370 <        # Get min/max image luminance
370 >    # Get min/max image luminance
371      my $cmd1 = 'pextrem -o ' . $picture;
372      my $retval = `$cmd1`;
373      # e.g.
# Line 273 | Line 376 | if ($doextrem == 1) {
376      # 211 202 1.292969e+00 1.308594e+00 1.300781e+00
377  
378      my @extrema = split(/\s/, $retval);
379 <    my $lxmin = $extrema[0] + $legwidth;
380 <    my $ymin = $extrema[1];
381 <    my $rmin = $extrema[2];
279 <    my $gmin = $extrema[3];
280 <    my $bmin = $extrema[4];
281 <    my $lxmax = $extrema[5] + $legwidth;
282 <    my $ymax = $extrema[6];
283 <    my $rmax = $extrema[7];
284 <    my $gmax = $extrema[8];
285 <    my $bmax = $extrema[9];
379 >    my ($lxmin, $ymin, $rmin, $gmin, $bmin, $lxmax, $ymax, $rmax, $gmax, $bmax) = @extrema;
380 >    $lxmin += $legwidth;
381 >    $lxmax += $legwidth;
382  
383 <        # Weighted average of R,G,B
383 >    # Weighted average of R,G,B
384      my $minpos = "$lxmin $ymin";
385      my $minval = ($rmin * .27 + $gmin * .67 + $bmin * .06) * $mult;
386 <    $minval =~ s/(\.[0-9]{3})[0-9]*/$1/;
291 <    my $maxpos = "$lxmax $ymax";
386 >    $minval =~ s/(\.[0-9]{$scaledigits})[0-9]*/$1/;
387      my $maxval = ($rmax * .27 + $gmax * .67 + $bmax * .06) * $mult;
388 <    $maxval =~ s/(\.[0-9]{3})[0-9]*/$1/;
388 >    $maxval =~ s/(\.[0-9]{$scaledigits})[0-9]*/$1/;
389  
390 <        # Create the labels for min/max intensity
391 <    my $minvpic = $td . '/minv.hdr';
392 <    $cmd1 = "psign -s -.15 -a 2 -h 16 $minval > $minvpic";
393 <    system $cmd1;
394 <    my $maxvpic = $td . '/maxv.hdr';
300 <    $cmd1 = "psign -s -.15 -a 2 -h 16 $maxval > $maxvpic";
301 <    system $cmd1;
390 >    # Create the labels for min/max intensity
391 >    my $minvpic = "$td/minv.hdr";
392 >    system "psign -s -.15 -a 2 -h 16 $minval > $minvpic";
393 >    my $maxvpic = "$td/maxv.hdr";
394 >    system "psign -s -.15 -a 2 -h 16 $maxval > $maxvpic";
395  
396 <        # Add extrema labels to command line
397 <    $cmd .= " $minvpic $minpos $maxvpic $maxpos";
396 >    # Add extrema labels to command line
397 >    $cmd .= qq[ $minvpic $minpos $maxvpic $lxmax $ymax];
398   }
399 +
400 +
401 +
402  
403   # Process image and combine with legend
404   system "$cmd";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines