ソースを参照

i.pansharpen: fix r.colors call; HTML cosmetics; shrink screenshots to 600px width as per documentation rules (trunk, https://trac.osgeo.org/grass/changeset/67791)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@67792 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 9 年 前
コミット
f074d6ca8d

+ 7 - 2
scripts/i.pansharpen/i.pansharpen.html

@@ -80,6 +80,8 @@ the 3 pan sharpening algorithms differ in terms of spectral response.
 
 
 <h2>EXAMPLES</h2>
 <h2>EXAMPLES</h2>
 
 
+<h3>Pan sharpening comparison example</h3>
+
 Pan sharpening of a Landsat image from Boulder, Colorado, USA:
 Pan sharpening of a Landsat image from Boulder, Colorado, USA:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
@@ -93,12 +95,14 @@ i.pansharpen red=p034r032_7dt20010924_z13_30 green=p034r032_7dt20010924_z13_20
     blue=p034r032_7dt20010924_z13_10 pan=p034r032_7dp20010924_z13_80 
     blue=p034r032_7dt20010924_z13_10 pan=p034r032_7dp20010924_z13_80 
     output=ihs321 method=ihs
     output=ihs321 method=ihs
 
 
+# ... likewise with method=brovey and method=pca
+
 # display at 15m
 # display at 15m
 g.region raster=ihs321_blue -p
 g.region raster=ihs321_blue -p
 d.rgb b=ihs321_blue g=ihs321_green r=ihs321_red
 d.rgb b=ihs321_blue g=ihs321_green r=ihs321_red
 </pre></div>
 </pre></div>
 
 
-
+<p>
 <b><em>Results:</em></b>
 <b><em>Results:</em></b>
 
 
 <p><center>
 <p><center>
@@ -139,8 +143,9 @@ d.rgb b=ihs321_blue g=ihs321_green r=ihs321_red
 </center>
 </center>
 <br>
 <br>
 
 
+<h3>Pan sharpening of LANDSAT ETM+ (Landsat 7)</h3>
 
 
-Example: LANDSAT ETM+ (Landsat 7), North Carolina sample dataset:
+LANDSAT ETM+ (Landsat 7), North Carolina sample dataset:
 
 
 <div class="code"><pre>
 <div class="code"><pre>
 # original at 28m
 # original at 28m

+ 1 - 1
scripts/i.pansharpen/i.pansharpen.py

@@ -316,7 +316,7 @@ def main():
     # equalized grey scales give best contrast
     # equalized grey scales give best contrast
     for ch in ['red', 'green', 'blue']:
     for ch in ['red', 'green', 'blue']:
         grass.run_command('r.colors', quiet=True, map="%s_%s" % (out, ch),
         grass.run_command('r.colors', quiet=True, map="%s_%s" % (out, ch),
-                          flags="e", col='grey')
+                          flags="e", color='grey')
 
 
     # Landsat too blue-ish because panchromatic band less sensitive to blue
     # Landsat too blue-ish because panchromatic band less sensitive to blue
     # light, so output blue channed can be modified
     # light, so output blue channed can be modified

BIN
scripts/i.pansharpen/rgb_brovey321.jpg


BIN
scripts/i.pansharpen/rgb_ihs321.jpg


BIN
scripts/i.pansharpen/rgb_landsat321.jpg


BIN
scripts/i.pansharpen/rgb_pca321.jpg