[GRASS-SVN] r67792 - grass/branches/releasebranch_7_0/scripts/i.pansharpen

[svn_grass at osgeo.org]

Author: neteler
Date: 2016-02-09 08:51:49 -0800 (Tue, 09 Feb 2016)
New Revision: 67792

Modified:
   grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.html
   grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py
   grass/branches/releasebranch_7_0/scripts/i.pansharpen/rgb_brovey321.jpg
   grass/branches/releasebranch_7_0/scripts/i.pansharpen/rgb_ihs321.jpg
   grass/branches/releasebranch_7_0/scripts/i.pansharpen/rgb_landsat321.jpg
   grass/branches/releasebranch_7_0/scripts/i.pansharpen/rgb_pca321.jpg
Log:
i.pansharpen: fix r.colors call; HTML cosmetics; shrink screenshots to 600px width as per documentation rules (trunk, r67791)

Modified: grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.html
===================================================================
--- grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.html	2016-02-09 16:51:03 UTC (rev 67791)
+++ grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.html	2016-02-09 16:51:49 UTC (rev 67792)
@@ -80,6 +80,8 @@
 
 <h2>EXAMPLES</h2>
 
+<h3>Pan sharpening comparison example</h3>
+
 Pan sharpening of a Landsat image from Boulder, Colorado, USA:
 
 <div class="code"><pre>
@@ -93,12 +95,14 @@
     blue=p034r032_7dt20010924_z13_10 pan=p034r032_7dp20010924_z13_80 
     output=ihs321 method=ihs
 
+# ... likewise with method=brovey and method=pca
+
 # display at 15m
 g.region raster=ihs321_blue -p
 d.rgb b=ihs321_blue g=ihs321_green r=ihs321_red
 </pre></div>
 
-
+<p>
 <b><em>Results:</em></b>
 
 <p><center>
@@ -139,8 +143,9 @@
 </center>
 <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>
 # original at 28m

Modified: grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py	2016-02-09 16:51:03 UTC (rev 67791)
+++ grass/branches/releasebranch_7_0/scripts/i.pansharpen/i.pansharpen.py	2016-02-09 16:51:49 UTC (rev 67792)
@@ -316,7 +316,7 @@
     # equalized grey scales give best contrast
     for ch in ['red', 'green', 'blue']:
         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
     # light, so output blue channed can be modified

Modified: grass/branches/releasebranch_7_0/scripts/i.pansharpen/rgb_brovey321.jpg
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_7_0/scripts/i.pansharpen/rgb_ihs321.jpg
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_7_0/scripts/i.pansharpen/rgb_landsat321.jpg
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_7_0/scripts/i.pansharpen/rgb_pca321.jpg
===================================================================
(Binary files differ)