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.12 by greg, Mon Sep 25 18:48:11 2017 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');
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 availabel 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| tail -2`);
128 >    # e.g. $ phisto tests/richmond.hdr| tail -2
129 >    # 3.91267   14
130 >    # 3.94282   6
131 >    my $LogLmax = $histo[0];
132      $scale = $mult / 179 * 10**$LogLmax;
133 + }  
134 +
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';
154 > my $pc0 = "$td/pc0.cal";
155   open(FHpc0, ">$pc0");
156   print FHpc0 <<EndOfPC0;
157   PI : 3.14159265358979323846 ;
# Line 122 | Line 166 | 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));
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  
171   spec_red(x) = 1.6*x - .6;
172   spec_grn(x) = if(x-.375, 1.6-1.6*x, 8/3*x);
173   spec_blu(x) = 1 - 8/3*x;
174  
175 < pm3d_red(x) = sqrt(x) ^ gamma;
176 < pm3d_grn(x) = x*x*x ^ gamma;
177 < pm3d_blu(x) = clip(sin(2*PI*x)) ^ gamma;
175 > pm3d_red(x) = sqrt(clip(x)) ^ gamma;
176 > pm3d_grn(x) = clip(x*x*x) ^ gamma;
177 > pm3d_blu(x) = clip(sin(2*PI*clip(x))) ^ gamma;
178  
179   hot_red(x) = clip(3*x) ^ gamma;
180   hot_grn(x) = clip(3*x - 1) ^ gamma;
181   hot_blu(x) = clip(3*x - 2) ^ gamma;
182  
183 + eco_red(x) = clip(2*x) ^ gamma;
184 + eco_grn(x) = clip(2*(x-0.5)) ^ gamma;
185 + eco_blu(x) = clip(2*(0.5-x)) ^ gamma;
186 +
187   interp_arr2(i,x,f):(i+1-x)*f(i)+(x-i)*f(i+1);
188   interp_arr(x,f):if(x-1,if(f(0)-x,interp_arr2(floor(x),x,f),f(f(0))),f(1));
189  
# Line 160 | Line 208 | def_blup(i):select(i,0.2666,0.3638662,0.4770437,
208   2.432735e-05,1.212949e-05,0.006659406,0.02539);
209   def_blu(x):interp_arr(x/0.0454545+1,def_blup);
210  
211 < isconta = if(btwn(0,v,1),or(boundary(vleft,vright),boundary(vabove,vbelow)),-1);
212 < iscontb = if(btwn(0,v,1),btwn(.4,frac(ndivs*v),.6),-1);
211 > isconta = if(btwn(1/ndivs/2,v,1+1/ndivs/2),or(boundary(vleft,vright),boundary(vabove,vbelow)),-1);
212 > iscontb = if(btwn(1/ndivs/2,v,1+1/ndivs/2),-btwn(.1,frac(ndivs*v),.9),-1);
213  
214 + seg(x)=(floor(v*ndivs)+.5)/ndivs;
215 + seg2(x)=(seg(x)-1/ndivs)*ndivs/(ndivs-1);
216 +
217   ra = 0;
218   ga = 0;
219   ba = 0;
# Line 173 | Line 224 | ro = if(in,clip($redv),ra);
224   go = if(in,clip($grnv),ga);
225   bo = if(in,clip($bluv),ba);
226   EndOfPC0
227 + close FHpc0;
228  
229 < my $pc1 = $td . '/pc1.cal';
229 > my $pc1 = "$td/pc1.cal";
230   open(FHpc1, ">$pc1");
231   print FHpc1 <<EndOfPC1;
232   norm : mult/scale/le(1);
# Line 188 | Line 240 | vbelow = map(li(1,0,-1)*norm);
240  
241   map(x) = x;
242  
243 +
244   ra = ri(nfiles);
245   ga = gi(nfiles);
246   ba = bi(nfiles);
247   EndOfPC1
248 + close FHpc1;
249  
250   my $pc0args = "-f $pc0";
251   my $pc1args = "-f $pc1";
252  
253 < # Contour lines or bands
253 > if ($showpal == 1) {
254 >    my $pc = "pcompos -a 1";
255 >    foreach my $pal (@palettes) {
256 >        my $fcimg = "$td/$pal.hdr";
257 >        my $lbimg = "$td/${pal}_label.hdr";
258 >        system "psign -cb 0 0 0 -cf 1 1 1 -h 20 $pal > $lbimg";
259 >
260 >        my $cmd = qq[pcomb $pc0args -e "v=x/256"];
261 >        $cmd .= qq[ -e "ro=clip(${pal}_red(v));go=clip(${pal}_grn(v));bo=clip(${pal}_blu(v))"];
262 >        $cmd .= qq[ -x 256 -y 30 > $fcimg];
263 >        system "$cmd";
264 >        $pc .= " $fcimg $lbimg";
265 >    }
266 >    system "$pc";
267 >    exit 0;
268 > }
269 >
270 > # Contours
271   if ($docont ne '') {
272 <    $pc0args .= " -e 'in=iscont$docont'";
272 >    # -cl -> $docont = a
273 >    # -cb -> $docont = b
274 >    $pc0args .= qq[ -e "in=iscont$docont"];
275   }
276  
277   if ($cpict eq '') {
278 <    $pc1args .= " -e 'ra=0;ga=0;ba=0'";
278 >    $pc1args .= qq[ -e "ra=0;ga=0;ba=0"];
279   } elsif ($cpict eq $picture) {
280      $cpict = '';
281   }
282  
283   # Logarithmic mapping
284   if ($decades > 0) {
285 <    $pc1args .= " -e 'map(x)=if(x-10^-$decades,log10(x)/$decades+1,0)'";
285 >    $pc1args .= qq[ -e "map(x)=if(x-10^-$decades,log10(x)/$decades+1,0)"];
286   }
287  
288   # Colours in the legend
289 < my $scolpic = $td . '/scol.hdr';
289 > my $scolpic = "$td/scol.hdr";
290 >
291   # Labels in the legend
292 < my $slabpic = $td . '/slab.hdr';
292 > my $slabpic = "$td/slab.hdr";
293   my $cmd;
294 <
295 < if ($legwidth > 20 && $legheight > 40) {
296 <        # Legend: Create the background colours
297 <    $cmd = "pcomb $pc0args -e 'v=(y+.5)/yres;vleft=v;vright=v'";
298 <    $cmd .= " -e 'vbelow=(y-.5)/yres;vabove=(y+1.5)/yres'";
299 <    $cmd .= " -x $legwidth -y $legheight > $scolpic";
300 <    system $cmd;
301 <
302 <        # Legend: Create the text labels
303 <    my $sheight = floor($legheight / $ndivs + 0.5);
304 <    my $text = "$label";
305 <    my $value;
306 <    my $i;
307 <    for ($i=0; $i<$ndivs; $i++) {
308 <        my $imap = ($ndivs - 0.5 - $i) / $ndivs;
294 > if ($legwidth > 0) {
295 >    # Legend: Create the text labels
296 >    my $sheight = floor($legheight / $ndivs );
297 >    my $theight = floor($legwidth/(8/1.67));
298 >    my $stheight = $sheight <= $theight ? $sheight : $theight;
299 >    my $vlegheight = $sheight * $ndivs * (1+1.5/$ndivs);
300 >    my $text = "$label\n";
301 >    my $tslabpic = "$td/slabT.hdr";
302 >    open PSIGN, "| psign -s -.15 -cf 1 1 1 -cb 0 0 0 -h $stheight > $tslabpic";
303 >    print PSIGN "$text";
304 >    close PSIGN;
305 >    my $loop = $ndivs+$haszero;
306 >    my $hlegheight = $sheight * ($loop) + $sheight * .5;
307 >    my $pcompost = qq[pcompos -b 0 0 0 =-0 $tslabpic 0 $hlegheight ];
308 >    for (my $i=0; $i<$loop; $i++) {
309 >        my $imap = ($ndivs - $i) / $ndivs;
310 >        my $value = $scale;
311          if ($decades > 0) {
312 <            $value = $scale * 10**(($imap - 1) * $decades);
312 >            $value *= 10**(($imap - 1) * $decades);
313          } else {
314 <            $value = $scale * $imap;
314 >            $value *= $imap;
315          }
316          # Have no more than 3 decimal places
317 <        $value =~ s/(\.[0-9]{3})[0-9]*/$1/;
318 <        $text .= "\n$value";
317 >        $value =~ s/(\.[0-9]{$scaledigits})[0-9]*/$1/;
318 >        $text = "$value\n";
319 >        $tslabpic = "$td/slab$i.hdr";
320 >        open PSIGN, "| psign -s -.15 -cf 1 1 1 -cb 0 0 0 -h $stheight > $tslabpic";
321 >        print PSIGN "$text";
322 >        close PSIGN;
323 >        $hlegheight = $sheight * ($loop - $i - 1) + $sheight * .5;
324 >        $pcompost .= qq[=-0 $tslabpic 0 $hlegheight ];
325      }
326 <    $cmd = "echo '$text' | psign -s -.15 -cf 1 1 1 -cb 0 0 0";
327 <    $cmd .= " -h $sheight > $slabpic";
326 >    $pcompost .= qq[ > $slabpic];
327 >    system $pcompost;
328 >
329 >    # Legend: Create the background colours
330 >    $cmd = qq[pcomb $pc0args];
331 >    $cmd .= qq[ -e "v=(y+.5-$sheight)/(yres/(1+1.5/$ndivs));;vleft=v;vright=v"];
332 >    $cmd .= qq[ -e "vbelow=(y-.5-$sheight)/(yres/(1+1.5/$ndivs));vabove=(y+1.5-$sheight)/(yres/(1+1.5/$ndivs))"];
333 >    $cmd .= qq[ -e "ra=0;ga=0;ba=0;"];
334 >    $cmd .= qq[ -x $legwidth -y $vlegheight > $scolpic];
335      system $cmd;
336   } else {
337 <        # Legend is too small to be legible. Don't bother doing one.
338 <    $legwidth = 0;
250 <    $legheight = 0;
337 >    # Create dummy colour scale and legend labels so we don't
338 >    # need to change the final command line.
339      open(FHscolpic, ">$scolpic");
340 <    print FHscolpic '\n-Y 1 +X 1\naaa\n';
340 >    print FHscolpic "\n-Y 1 +X 1\naaa\n";
341      close(FHscolpic);
342      open(FHslabpic, ">$slabpic");
343 <    print FHslabpic '\n-Y 1 +X 1\naaa\n';
343 >    print FHslabpic "\n-Y 1 +X 1\naaa\n";
344      close(FHslabpic);
345   }
346  
347 < my $loff1 = $loff - 1;
347 > # Legend: Invert the text labels (for dropshadow)
348 > my $slabinvpic = "$td/slabinv.hdr";
349 > $cmd = qq[pcomb -e "lo=1-gi(1)" $slabpic > $slabinvpic];
350 > system $cmd;
351 >
352 >
353 > my $sh0 = -floor($legheight / $ndivs / 2);
354 > if ($haszero < 1) {
355 >    $sh0 = -floor($legheight / ($ndivs)*1.5);
356 > }
357 >
358   # 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";
359  
360 +    $cmd = qq[pcomb $pc0args $pc1args "$picture"];
361 +    $cmd .= qq[ "$cpict"] if ($cpict);
362 +    $cmd .= qq[ | pcompos -b 0 0 0 $scolpic 0 $sh0 +t .1 $slabinvpic 2 -1 ];
363 +    $cmd .= qq[ -t .5 $slabpic 0 0 - $legwidth 0];
364 +
365   if ($doextrem == 1) {
366 <        # Get min/max image luminance
366 >    # Get min/max image luminance
367      my $cmd1 = 'pextrem -o ' . $picture;
368      my $retval = `$cmd1`;
369      # e.g.
# Line 273 | Line 372 | if ($doextrem == 1) {
372      # 211 202 1.292969e+00 1.308594e+00 1.300781e+00
373  
374      my @extrema = split(/\s/, $retval);
375 <    my $lxmin = $extrema[0] + $legwidth;
376 <    my $ymin = $extrema[1];
377 <    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];
375 >    my ($lxmin, $ymin, $rmin, $gmin, $bmin, $lxmax, $ymax, $rmax, $gmax, $bmax) = @extrema;
376 >    $lxmin += $legwidth;
377 >    $lxmax += $legwidth;
378  
379 <        # Weighted average of R,G,B
379 >    # Weighted average of R,G,B
380      my $minpos = "$lxmin $ymin";
381      my $minval = ($rmin * .27 + $gmin * .67 + $bmin * .06) * $mult;
382 <    $minval =~ s/(\.[0-9]{3})[0-9]*/$1/;
291 <    my $maxpos = "$lxmax $ymax";
382 >    $minval =~ s/(\.[0-9]{$scaledigits})[0-9]*/$1/;
383      my $maxval = ($rmax * .27 + $gmax * .67 + $bmax * .06) * $mult;
384 <    $maxval =~ s/(\.[0-9]{3})[0-9]*/$1/;
384 >    $maxval =~ s/(\.[0-9]{$scaledigits})[0-9]*/$1/;
385  
386 <        # Create the labels for min/max intensity
387 <    my $minvpic = $td . '/minv.hdr';
388 <    $cmd1 = "psign -s -.15 -a 2 -h 16 $minval > $minvpic";
389 <    system $cmd1;
390 <    my $maxvpic = $td . '/maxv.hdr';
300 <    $cmd1 = "psign -s -.15 -a 2 -h 16 $maxval > $maxvpic";
301 <    system $cmd1;
386 >    # Create the labels for min/max intensity
387 >    my $minvpic = "$td/minv.hdr";
388 >    system "psign -s -.15 -a 2 -h 16 $minval > $minvpic";
389 >    my $maxvpic = "$td/maxv.hdr";
390 >    system "psign -s -.15 -a 2 -h 16 $maxval > $maxvpic";
391  
392 <        # Add extrema labels to command line
393 <    $cmd .= " $minvpic $minpos $maxvpic $maxpos";
392 >    # Add extrema labels to command line
393 >    $cmd .= qq[ $minvpic $minpos $maxvpic $lxmax $ymax];
394   }
395 +
396 +
397 +
398  
399   # Process image and combine with legend
400   system "$cmd";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines