i.pansharpen: use standardized options

    ms1->blue
    ms2->green
    ms3->red
    output_prefix->basename
    sharpen->method

    be less verbose

    (merge r61791-2 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@61877 15284696-431f-4ddb-bdfa-cd5b030d7da7

scripts/i.pansharpen/i.pansharpen.py

@@ -46,34 +46,30 @@
 #%  keywords: PCA
 #%  overwrite: yes
 #%End
-#%option
-#%  key: sharpen
-#%  description: Choose pan sharpening method
-#%  options: brovey,ihs,pca
-#%  answer: ihs
-#%  required: yes
-#%end
 #%option G_OPT_R_INPUT
-#%  key: ms3
-#%  description: Input raster map for red channel
+#%  key: red
+#%  description: Name of raster map to be used for <red>
 #%end
 #%option G_OPT_R_INPUT
-#%  key: ms2
-#%  description: Input raster map for green channel
+#%  key: green
+#%  description: Name of raster map to be used for <green>
 #%end
 #%option G_OPT_R_INPUT
-#%  key: ms1
-#%  description: Input raster map for blue channel
+#%  key: blue
+#%  description: Name of raster map to be used for <blue>
 #%end
 #%  option G_OPT_R_INPUT
 #%  key: pan
-#%  description: Input raster map for high resolution panchromatic channel
+#%  description: Name of raster map to be used for high resolution panchromatic channel
+#%end
+#%option G_OPT_R_BASENAME_OUTPUT
 #%end
 #%option
-#%  key: output_prefix
-#%  type: string
-#%  description: Prefix for output raster maps
-#%  required : yes
+#%  key: method
+#%  description: Method for pan sharpening
+#%  options: brovey,ihs,pca
+#%  answer: ihs
+#%  required: yes
 #%end
 #%flag
 #%  key: s
@@ -81,7 +77,7 @@
 #%end
 #%flag
 #%  key: l
-#%  description: Rebalance blue channel for landsat maps
+#%  description: Rebalance blue channel for LANDSAT
 #%end
 
 import sys
@@ -90,12 +86,12 @@ import numpy as np
 import grass.script as grass
 
 def main():
-    sharpen   = options['sharpen'] # sharpening algorithm
-    ms1       = options['ms1'] # blue channel
-    ms2       = options['ms2'] # green channel
-    ms3       = options['ms3'] # red channel
+    sharpen   = options['method'] # sharpening algorithm
+    ms1       = options['blue'] # blue channel
+    ms2       = options['green'] # green channel
+    ms3       = options['red'] # red channel
     pan       = options['pan'] # high res pan channel
-    out       = options['output_prefix'] # prefix for output RGB maps
+    out       = options['basename'] # prefix for output RGB maps
     bladjust  = flags['l'] # adjust blue channel
     sproc     = flags['s'] # serial processing
     
@@ -121,11 +117,10 @@ def main():
 
     grass.run_command('g.region', res = panres, align = pan)
     
-    grass.message('\n ')
     grass.message(_("Performing pan sharpening with hi res pan image: %f" % panres))
 
     if sharpen == "brovey":
-        grass.message(_("Using Brovey algorithm"))
+        grass.verbose(_("Using Brovey algorithm"))
 
         #pan/intensity histogram matching using linear regression
         outname = 'tmp%s_pan1' % pid
@@ -142,7 +137,6 @@ def main():
         outb = '%s_blue' % out
 
         #calculate brovey transformation
-        grass.message('\n ')
         grass.message(_("Calculating Brovey transformation..."))
         
         if sproc:
@@ -175,9 +169,8 @@ def main():
         grass.run_command('g.remove', quiet=True, rast='%s,%s,%s' % (panmatch1, panmatch2, panmatch3))
 
     elif sharpen == "ihs":
-        grass.message(_("Using IHS<->RGB algorithm"))
+        grass.verbose(_("Using IHS<->RGB algorithm"))
         #transform RGB channels into IHS color space
-        grass.message('\n ')
         grass.message(_("Transforming to IHS color space..."))
         grass.run_command('i.rgb.his', overwrite=True,
                           red_input=ms3, 
@@ -193,7 +186,6 @@ def main():
         panmatch = matchhist(pan, target, outname)
         
         #substitute pan for intensity channel and transform back to RGB color space
-        grass.message('\n ')
         grass.message(_("Transforming back to RGB color space and sharpening..."))
         grass.run_command('i.his.rgb', overwrite=True, 
                           hue_input="tmp%s_hue" % pid, 
@@ -207,8 +199,7 @@ def main():
         grass.run_command('g.remove', quiet=True, rast=panmatch)
         
     elif sharpen == "pca":
-        grass.message(_("Using PCA/inverse PCA algorithm"))
-        grass.message('\n ')
+        grass.verbose(_("Using PCA/inverse PCA algorithm"))
         grass.message(_("Creating PCA images and calculating eigenvectors..."))
 
         #initial PCA with RGB channels
@@ -241,7 +232,6 @@ def main():
         outname = 'tmp%s_pan' % pid
         panmatch = matchhist(pan, ms1, outname)
         
-        grass.message('\n ')
         grass.message(_("Performing inverse PCA ..."))
                 
         stats1 = grass.parse_command("r.univar", map=ms1, flags='g', 
@@ -304,7 +294,6 @@ def main():
         
     #Could add other sharpening algorithms here, e.g. wavelet transformation
 
-    grass.message('\n ')
     grass.message(_("Assigning grey equalized color tables to output images..."))
     #equalized grey scales give best contrast
     for ch in ['red', 'green', 'blue']:
@@ -313,7 +302,6 @@ def main():
     #Landsat too blue-ish because panchromatic band less sensitive to blue light, 
     #  so output blue channed can be modified
     if bladjust:
-        grass.message('\n ')
         grass.message(_("Adjusting blue channel color table..."))
         rules = grass.tempfile()
         colors = open(rules, 'w')
@@ -324,17 +312,14 @@ def main():
         os.remove(rules)
 
     #output notice
-    grass.message('\n ')
-    grass.message(_("The following pan-sharpened output maps have been generated:"))
+    grass.verbose(_("The following pan-sharpened output maps have been generated:"))
     for ch in ['red', 'green', 'blue']:
-        grass.message(_("%s_%s") % (out, ch))
+        grass.verbose(_("%s_%s") % (out, ch))
 
-    grass.message('\n ')
-    grass.message(_("To visualize output, run: g.region -p rast=%s_red" % out))
-    grass.message(_("d.rgb r=%s_red g=%s_green b=%s_blue" % (out, out, out)))
-    grass.message('\n ')
-    grass.message(_("If desired, combine channels into a single RGB map with 'r.composite'."))
-    grass.message(_("Channel colors can be rebalanced using i.colors.enhance."))
+    grass.verbose(_("To visualize output, run: g.region -p rast=%s_red" % out))
+    grass.verbose(_("d.rgb r=%s_red g=%s_green b=%s_blue" % (out, out, out)))
+    grass.verbose(_("If desired, combine channels into a single RGB map with 'r.composite'."))
+    grass.verbose(_("Channel colors can be rebalanced using i.colors.enhance."))
 
     # write cmd history:
     for ch in ['red', 'green', 'blue']:
@@ -346,7 +331,6 @@ def main():
         
 def matchhist(original, target, matched):
     #pan/intensity histogram matching using numpy arrays
-    grass.message('\n ')
     grass.message(_("Histogram matching..."))
 
     # input images