This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch upstream-master
in repository pktools.
commit 48b1600f545c131b120548d05210b21a872c561c
Author: Pieter Kempeneers <kempe...@gmail.com>
Date: Sun Jun 8 12:23:34 2014 +0200
changed option from rb to cb in pkcomposite
---
ChangeLog | 4 ++++
doc/faq_pkcomposite.dox | 4 ++--
doc/mainpage.dox | 20 +++++++++++++-------
src/apps/pkann.cc | 4 ++--
src/apps/pkcomposite.cc | 6 +++---
src/apps/pkcrop.cc | 4 ++--
src/apps/pkdiff.cc | 4 ++--
src/apps/pkfillnodata.cc | 4 ++--
src/apps/pksieve.cc | 2 +-
src/apps/pksvm.cc | 4 ++--
10 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 159086e..92902ef 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -286,6 +286,7 @@ version 2.5.2
- pkmosaic -> pkcomposite
name was confusing as also compositing is supported (unlike
gdal_merge.py and gdalwarp)
resample option similar to pkcrop
+ option cb|cband (composite band) instead of rb|rband (ruleband)
- version control for libraries
thanks to suggestion of Francesco Paolo Lovergine
- subdirectory pktools for include headers
@@ -297,3 +298,6 @@ version 2.5.2
redesign to optimize vector polygon processing
removed option for masking, introduced srcnodata and bndnodata
(more testing is needed)
+Next versions:
+ - todo for API: ImgReaderGdal (ImgWriterGdal) open in update mode (check
gdal_edit.py: http://searchcode.com/codesearch/view/18938404)
+
diff --git a/doc/faq_pkcomposite.dox b/doc/faq_pkcomposite.dox
index 070b18f..d13efbe 100644
--- a/doc/faq_pkcomposite.dox
+++ b/doc/faq_pkcomposite.dox
@@ -3,7 +3,7 @@
Q1. First questiona
A1. For individual invalid value(s) in input image, use -t (–invalid)
- Usage: use unique value for each invalid bands set in -vb (–validBand) or use
a single value that will be applied to all invalid bands
+ Usage: use unique value for each invalid bands set in -vb (–bndnodata) or use
a single value that will be applied to all invalid bands
Example:
@@ -17,7 +17,7 @@ pkcomposite -i input1.tif -i input2.tif -o output.tif -t 0
-vb 0 -vb 1
\endcode
will consider 0 in both bands 0 and 1 of input images as no value
-For range(s) of invalid values in input images: use -min (–min) and -max
(–max) Usage: use unique range set for each invalid bands set in -vb
(–validBand)
+For range(s) of invalid values in input images: use -min (–min) and -max
(–max) Usage: use unique range set for each invalid bands set in -vb
(–bndnodata)
Example:
\code
diff --git a/doc/mainpage.dox b/doc/mainpage.dox
index dba08e2..8b6125d 100644
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -41,7 +41,18 @@ Please refer to pktools as: http://pktools.nongnu.org
(Pieter Kempeneers)
contact: kempenep at gmail.com
\section pktools_installation Installation
-Download the latest release from
http://download.savannah.gnu.org/releases/pktools/ (pktools-latest.tar.gz)
+
+\subsection Installation script for Debian based distributions
+
+Users working with Debian based distributions (e.g., Ubuntu) can download
install_pktools.sh from http://download.savannah.gnu.org/releases/pktools/.
This script will automatically download the latest release of pktools and
dependencies. You need an internet connection when running the script (as root
or sudo):
+
+\code
+sudo bash install_pktools.sh
+\endcode
+
+\subsection Manual installation
+
+For a manual installation, download the latest release pktools-latest.tar.gz
from http://download.savannah.gnu.org/releases/pktools/
Optionally: check the release md5sum to ensure originality.
@@ -51,13 +62,8 @@ md5sum pktools-latest.tar.gz
The result should be identical to the content of the corresponding md5 file
you can also download.
-Ubuntu users can download and run the installation script install_pktools.sh:
-
-\code
-sudo bash install_pktools.sh
-\endcode
+Unpack the tar zip file
-For a manual installation, download and unpack the latest release
\code
tar xzvf pktools-latest.tar.gz
cd pktools-*
diff --git a/src/apps/pkann.cc b/src/apps/pkann.cc
index bc9980a..bccd66d 100644
--- a/src/apps/pkann.cc
+++ b/src/apps/pkann.cc
@@ -63,14 +63,14 @@ int main(int argc, char *argv[])
Optionpk<unsigned short> bag_opt("bag", "bag", "Number of bootstrap
aggregations (default is no bagging: 1)", 1);
Optionpk<int> bagSize_opt("bs", "bsize", "Percentage of features used from
available training features for each bootstrap aggregation (one size for all
classes, or a different size for each class respectively", 100);
Optionpk<string> classBag_opt("cb", "classbag", "output for each individual
bootstrap aggregation (default is blank)");
- Optionpk<string> mask_opt("m", "mask", "mask image (support for single mask
only, see also msknodata option)");
+ Optionpk<string> mask_opt("m", "mask", "Use the first band of the specified
file as a validity mask. Nodata values can be set with the option msknodata.");
Optionpk<short> msknodata_opt("msknodata", "msknodata", "mask value(s) not
to consider for classification (use negative values if only these values should
be taken into account). Values will be taken over in classification image.
Default is 0", 0);
Optionpk<unsigned short> nodata_opt("nodata", "nodata", "nodata value to put
where image is masked as nodata", 0);
Optionpk<string> output_opt("o", "output", "output classification image");
Optionpk<string> otype_opt("ot", "otype", "Data type for output image
({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}).
Empty string: inherit type from input image");
Optionpk<string> oformat_opt("of", "oformat", "Output image format (see
also gdal_translate). Empty string: inherit from input image");
Optionpk<string> option_opt("co", "co", "Creation option for output file.
Multiple options can be specified.");
- Optionpk<string> colorTable_opt("ct", "ct", "colour table in ascii format
having 5 columns: id R G B ALFA (0: transparent, 255: solid)");
+ Optionpk<string> colorTable_opt("ct", "ct", "colour table in ASCII format
having 5 columns: id R G B ALFA (0: transparent, 255: solid)");
Optionpk<string> prob_opt("\0", "prob", "probability image. Default is no
probability image");
Optionpk<string> entropy_opt("entropy", "entropy", "entropy image (measure
for uncertainty of classifier output","",2);
Optionpk<string> active_opt("active", "active", "ogr output for active
training sample.","",2);
diff --git a/src/apps/pkcomposite.cc b/src/apps/pkcomposite.cc
index 335a266..f39ca56 100644
--- a/src/apps/pkcomposite.cc
+++ b/src/apps/pkcomposite.cc
@@ -47,13 +47,13 @@ int main(int argc, char *argv[])
Optionpk<double> lrx_opt("lrx", "lrx", "Lower right x value bounding box",
0.0);
Optionpk<double> lry_opt("lry", "lry", "Lower right y value bounding box",
0.0);
Optionpk<string> crule_opt("cr", "crule", "Composite rule for mosaic
(overwrite, maxndvi, maxband, minband, mean, mode (only for byte images),
median, sum", "overwrite");
- Optionpk<int> ruleBand_opt("rb", "rband", "band index used for the rule (for
ndvi, use --ruleBand=redBand --ruleBand=nirBand", 0);
+ Optionpk<int> ruleBand_opt("cb", "cband", "band index used for the composite
rule (e.g., for ndvi, use --cband=0 --cband=1 with 0 and 1 indices for red and
nir band respectively", 0);
Optionpk<double> srcnodata_opt("srcnodata", "srcnodata", "invalid value for
input image", 0);
Optionpk<int> bndnodata_opt("bndnodata", "bndnodata", "Bands in input image
to check if pixel is valid (used for srcnodata, min and max options)", 0);
Optionpk<double> minValue_opt("min", "min", "flag values smaller or equal to
this value as invalid.");
Optionpk<double> maxValue_opt("max", "max", "flag values larger or equal to
this value as invalid.");
Optionpk<double> dstnodata_opt("dstnodata", "dstnodata", "nodata value to
put in output image if not valid or out of bounds.", 0);
- Optionpk<string> resample_opt("r", "resampling-method", "Resampling method
(near: nearest neighbour, bilinear: bi-linear interpolation).", "near");
+ Optionpk<string> resample_opt("r", "resampling-method", "Resampling method
(near: nearest neighbor, bilinear: bi-linear interpolation).", "near");
Optionpk<string> otype_opt("ot", "otype", "Data type for output image
({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}).
Empty string: inherit type from input image", "");
Optionpk<string> oformat_opt("of", "oformat", "Output image format (see
also gdal_translate). Empty string: inherit from input image");
Optionpk<string> option_opt("co", "co", "Creation option for output file.
Multiple options can be specified.");
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
if(resample_opt[0]=="near"){
theResample=NEAR;
if(verbose_opt[0])
- cout << "resampling: nearest neighbour" << endl;
+ cout << "resampling: nearest neighbor" << endl;
}
else if(resample_opt[0]=="bilinear"){
theResample=BILINEAR;
diff --git a/src/apps/pkcrop.cc b/src/apps/pkcrop.cc
index e7466a5..2684cd8 100644
--- a/src/apps/pkcrop.cc
+++ b/src/apps/pkcrop.cc
@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
Optionpk<string> option_opt("co", "co", "Creation option for output file.
Multiple options can be specified.");
Optionpk<string> colorTable_opt("ct", "ct", "color table (file with 5
columns: id R G B ALFA (0: transparent, 255: solid)");
Optionpk<double> nodata_opt("nodata", "nodata", "Nodata value to put in
image if out of bounds.");
- Optionpk<string> resample_opt("r", "resampling-method", "Resampling method
(near: nearest neighbour, bilinear: bi-linear interpolation).", "near");
+ Optionpk<string> resample_opt("r", "resampling-method", "Resampling method
(near: nearest neighbor, bilinear: bi-linear interpolation).", "near");
Optionpk<string> description_opt("d", "description", "Set image
description");
Optionpk<bool> verbose_opt("v", "verbose", "verbose", false);
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
if(resample_opt[0]=="near"){
theResample=NEAR;
if(verbose_opt[0])
- cout << "resampling: nearest neighbour" << endl;
+ cout << "resampling: nearest neighbor" << endl;
}
else if(resample_opt[0]=="bilinear"){
theResample=BILINEAR;
diff --git a/src/apps/pkdiff.cc b/src/apps/pkdiff.cc
index 2eb469c..27964e9 100644
--- a/src/apps/pkdiff.cc
+++ b/src/apps/pkdiff.cc
@@ -34,7 +34,7 @@ int main(int argc, char *argv[])
Optionpk<string> layer_opt("ln", "ln", "layer name(s) in sample. Leave empty
to select all (for vector reference datasets only)");
Optionpk<string> output_opt("o", "output", "Output dataset (optional)");
Optionpk<string> ogrformat_opt("f", "f", "OGR format for output vector (for
vector reference datasets only)","SQLite");
- Optionpk<string> mask_opt("m", "mask", "Mask image file. A single mask is
supported only, but several mask values can be used. See also msknodata option.
(default is empty)");
+ Optionpk<string> mask_opt("m", "mask", "Use the first band of the specified
file as a validity mask. Nodata values can be set with the option msknodata.");
Optionpk<int> masknodata_opt("msknodata", "msknodata", "Mask value(s) where
image is invalid. Use negative value for valid data (example: use -t -1: if
only -1 is valid value)", 0);
Optionpk<short> valueE_opt("\0", "correct", "Value for correct pixels", 0,2);
Optionpk<short> valueO_opt("\0", "omission", "Value for omission errors:
input label > reference label", 1,2);
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
Optionpk<bool> disc_opt("circ", "circular", "use circular boundary (for
vector reference datasets only)", false,1);
Optionpk<string> classname_opt("c", "class", "list of class names.");
Optionpk<short> classvalue_opt("r", "reclass", "list of class values (use
same order as in classname opt.");
- Optionpk<string> colorTable_opt("ct", "ct", "color table in ascii format
having 5 columns: id R G B ALFA (0: transparent, 255: solid).");
+ Optionpk<string> colorTable_opt("ct", "ct", "color table in ASCII format
having 5 columns: id R G B ALFA (0: transparent, 255: solid).");
Optionpk<string> option_opt("co", "co", "Creation option for output file.
Multiple options can be specified.");
Optionpk<short> verbose_opt("v", "verbose", "verbose", 0);
diff --git a/src/apps/pkfillnodata.cc b/src/apps/pkfillnodata.cc
index ba6f97b..1f003a8 100644
--- a/src/apps/pkfillnodata.cc
+++ b/src/apps/pkfillnodata.cc
@@ -27,9 +27,9 @@ extern "C" {
#include "base/Optionpk.h"
int main(int argc,char **argv) {
- Optionpk<std::string> input_opt("i", "input", "Input image file");
+ Optionpk<std::string> input_opt("i", "input", "Input raster dataset");
Optionpk<int> band_opt("b", "band", "band(s) to process (Default is -1:
process all bands)");
- Optionpk<std::string> mask_opt("m", "mask", "Mask band indicating pixels to
be interpolated (zero valued) ");
+ Optionpk<std::string> mask_opt("m", "mask", "Mask raster dataset indicating
pixels to be interpolated (zero valued) ");
Optionpk<std::string> output_opt("o", "output", "Output image file");
Optionpk<double> distance_opt("d", "distance", "Maximum number of pixels to
search in all directions to find values to interpolate from", 0);
Optionpk<int> iteration_opt("it", "iteration", "Number of 3x3 smoothing
filter passes to run (default 0)", 0);
diff --git a/src/apps/pksieve.cc b/src/apps/pksieve.cc
index 13673a3..60e3588 100644
--- a/src/apps/pksieve.cc
+++ b/src/apps/pksieve.cc
@@ -34,7 +34,7 @@ using namespace std;
int main(int argc,char **argv) {
Optionpk<string> input_opt("i", "input", "Input image file");
- Optionpk<string> mask_opt("m", "mask", "Mask band indicating pixels to be
interpolated (zero valued) ");
+ Optionpk<string> mask_opt("m", "mask", "Use the first band of the specified
file as a validity mask (zero is invalid, non-zero is valid).");
Optionpk<string> output_opt("o", "output", "Output image file");
Optionpk<int> band_opt("b", "band", "the band to be used from input file",
0);
Optionpk<int> connect_opt("c", "connect", "the connectedness: 4 directions
or 8 directions", 8);
diff --git a/src/apps/pksvm.cc b/src/apps/pksvm.cc
index 23a2e0c..17716eb 100644
--- a/src/apps/pksvm.cc
+++ b/src/apps/pksvm.cc
@@ -80,13 +80,13 @@ int main(int argc, char *argv[])
Optionpk<unsigned short> bag_opt("bag", "bag", "Number of bootstrap
aggregations", 1);
Optionpk<int> bagSize_opt("bs", "bsize", "Percentage of features used from
available training features for each bootstrap aggregation (one size for all
classes, or a different size for each class respectively", 100);
Optionpk<string> classBag_opt("cb", "classbag", "output for each individual
bootstrap aggregation");
- Optionpk<string> mask_opt("m", "mask", "mask image (support for single mask
only, see also msknodata option)");
+ Optionpk<string> mask_opt("m", "mask", "Use the first band of the specified
file as a validity mask. Nodata values can be set with the option msknodata.");
Optionpk<short> msknodata_opt("msknodata", "msknodata", "mask value(s) not
to consider for classification (use negative values if only these values should
be taken into account). Values will be taken over in classification image.", 0);
Optionpk<unsigned short> nodata_opt("nodata", "nodata", "nodata value to put
where image is masked as nodata", 0);
Optionpk<string> output_opt("o", "output", "output classification image");
Optionpk<string> oformat_opt("of", "oformat", "Output image format (see
also gdal_translate). Empty string: inherit from input image");
Optionpk<string> option_opt("co", "co", "Creation option for output file.
Multiple options can be specified.");
- Optionpk<string> colorTable_opt("ct", "ct", "color table in ascii format
having 5 columns: id R G B ALFA (0: transparent, 255: solid)");
+ Optionpk<string> colorTable_opt("ct", "ct", "color table in ASCII format
having 5 columns: id R G B ALFA (0: transparent, 255: solid)");
Optionpk<string> prob_opt("prob", "prob", "probability image.");
Optionpk<string> entropy_opt("entropy", "entropy", "entropy image (measure
for uncertainty of classifier output","",2);
Optionpk<string> active_opt("active", "active", "ogr output for active
training sample.","",2);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
