Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed problems with missing example scripts folder
Restructured gdal tools (now gdal/ogr) Added new OTB segmentation algos
- Loading branch information
Showing
54 changed files
with
2,778 additions
and
127 deletions.
There are no files selected for viewing
181 changes: 181 additions & 0 deletions
181
python/plugins/sextante/add_OTB_segmentation_algs.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| diff --git a/otb/description/EdisonMeanShiftSegmentation.txt b/otb/description/EdisonMeanShiftSegmentation.txt | ||
| new file mode 100644 | ||
| index 0000000..8fa331c | ||
| --- /dev/null | ||
| +++ b/otb/description/EdisonMeanShiftSegmentation.txt | ||
| @@ -0,0 +1,11 @@ | ||
| +EdisonMeanShiftSegmentation | ||
| +otbcli_Segmentation | ||
| +Edison Mean Shift segmentation (labeled raster output) | ||
| +Segmentation | ||
| +ParameterRaster|-filter edison -in|Input Image|False | ||
| +ParameterNumber|-filter.edison.spatialr|Spatial radius|None|None|5 | ||
| +ParameterNumber|-filter.edison.ranger|Range radius|None|None|15.0 | ||
| +ParameterNumber|-filter.edison.minsize|Min region size|0|None|100 | ||
| +ParameterNumber|-filter.edison.scale|Scale Factor|0|None|1.0 | ||
| +OutputRaster|-mode raster -mode.raster.out|Output labeled image | ||
| + | ||
| diff --git a/otb/description/EdisonMeanShiftSegmentation_vector.txt b/otb/description/EdisonMeanShiftSegmentation_vector.txt | ||
| new file mode 100644 | ||
| index 0000000..462c288 | ||
| --- /dev/null | ||
| +++ b/otb/description/EdisonMeanShiftSegmentation_vector.txt | ||
| @@ -0,0 +1,21 @@ | ||
| +EdisonMeanShiftSegmentationVector | ||
| +otbcli_Segmentation | ||
| +Edison Mean Shift segmentation (large-scale, vector output) | ||
| +Segmentation | ||
| +ParameterRaster|-filter edison -in|Input Image|False | ||
| +ParameterNumber|-filter.edison.spatialr|Spatial radius|None|None|5 | ||
| +ParameterNumber|-filter.edison.ranger|Range radius|None|None|15.0 | ||
| +ParameterNumber|-filter.edison.minsize|Min region size|0|None|100 | ||
| +ParameterNumber|-filter.edison.scale|Scale Factor|0|None|1.0 | ||
| +OutputVector|-mode vector -mode.vector.out|Output vector file | ||
| +ParameterVector|-mode.vector.inmask|Mask Image|-1|True | ||
| +ParameterBoolean|-mode.vector.neighbor|8-neighbor connectivity|False | ||
| +ParameterBoolean|-mode.vector.stitch|Stitch polygons|True | ||
| +ParameterNumber|-mode.vector.minsize|Minimum object size|1|None|1 | ||
| +ParameterNumber|-mode.vector.simplify|Simplify polygons|None|None|0.0 | ||
| +ParameterString|-mode.vector.layername|Layer name |layer | ||
| +ParemeterString|-mode.vector.fieldname|Geometry index field name|DN | ||
| +ParameterNumber|-mode.vector.tilesize|Tile size|0|None|1024 | ||
| +ParameterNumber|-mode.vector.startlabel|Starting geometry index|1|None|1 | ||
| +ParameterSelection|-mode.vector.outmode|Writing mode (update file/overwrite file/overwrite layer/update layer)|ulco;ovw;ulovw;ulu|0 | ||
| +ParameterString|-mode.vector.ogroptions|OGR options for layer creation| | ||
| \ No newline at end of file | ||
| diff --git a/otb/description/MeanShiftSegmentation.txt b/otb/description/MeanShiftSegmentation.txt | ||
| index 333299e..a8ad1cd 100644 | ||
| --- a/otb/description/MeanShiftSegmentation.txt | ||
| +++ b/otb/description/MeanShiftSegmentation.txt | ||
| @@ -1,13 +1,12 @@ | ||
| MeanShiftSegmentation | ||
| -otbcli_MeanShiftSegmentation | ||
| -Mean Shift segmentation | ||
| +otbcli_Segmentation | ||
| +Mean Shift segmentation (labeled raster output) | ||
| Segmentation | ||
| -ParameterRaster|-in|Input Image|False | ||
| -OutputRaster|-fout|Filtered output | ||
| -OutputRaster|-cout|Clustered output | ||
| -OutputRaster|-lout|Label output | ||
| -OutputRaster|-cbout|Cluster Boundaries output | ||
| -ParameterNumber|-spatialr|Spatial radius|None|None|5 | ||
| -ParameterNumber|-ranger|Range radius|None|None|15.0 | ||
| -ParameterNumber|-minsize|Min region size|None|None|100 | ||
| -ParameterNumber|-scale|Scale|None|None|100000.0 | ||
| +ParameterRaster|-filter meanshift -in|Input Image|False | ||
| +ParameterNumber|-filter.meanshift.spatialr|Spatial radius|None|None|5 | ||
| +ParameterNumber|-filter.meanshift.thres|Mode convergence threshold|None|None|0.1 | ||
| +ParameterNumber|-filter.meanshift.ranger|Range radius|None|None|15.0 | ||
| +ParameterNumber|-filter.meanshift.minsize|Min region size|0|None|100 | ||
| +ParameterNumber|-filter.meanshift.maxiter|Maximum number of iterations|0|None|100 | ||
| +OutputRaster|-mode raster -mode.raster.out|Output labeled image | ||
| + | ||
| diff --git a/otb/description/MeanShiftSegmentation_vector.txt b/otb/description/MeanShiftSegmentation_vector.txt | ||
| new file mode 100644 | ||
| index 0000000..0798c1a | ||
| --- /dev/null | ||
| +++ b/otb/description/MeanShiftSegmentation_vector.txt | ||
| @@ -0,0 +1,22 @@ | ||
| +MeanShiftSegmentationVector | ||
| +otbcli_Segmentation | ||
| +Mean Shift segmentation (large-scale, vector output) | ||
| +Segmentation | ||
| +ParameterRaster|-filter meanshift -in|Input Image|False | ||
| +ParameterNumber|-filter.meanshift.spatialr|Spatial radius|None|None|5 | ||
| +ParameterNumber|-filter.meanshift.thres|Mode convergence threshold|None|None|0.1 | ||
| +ParameterNumber|-filter.meanshift.ranger|Range radius|None|None|15.0 | ||
| +ParameterNumber|-filter.meanshift.minsize|Min region size|0|None|100 | ||
| +ParameterNumber|-filter.meanshift.maxiter|Maximum number of iterations|0|None|100 | ||
| +OutputVector|-mode vector -mode.vector.out|Output vector file | ||
| +ParameterVector|-mode.vector.inmask|Mask Image|-1|True | ||
| +ParameterBoolean|-mode.vector.neighbor|8-neighbor connectivity|False | ||
| +ParameterBoolean|-mode.vector.stitch|Stitch polygons|True | ||
| +ParameterNumber|-mode.vector.minsize|Minimum object size|1|None|1 | ||
| +ParameterNumber|-mode.vector.simplify|Simplify polygons|None|None|0.0 | ||
| +ParameterString|-mode.vector.layername|Layer name |layer | ||
| +ParemeterString|-mode.vector.fieldname|Geometry index field name|DN | ||
| +ParameterNumber|-mode.vector.tilesize|Tile size|0|None|1024 | ||
| +ParameterNumber|-mode.vector.startlabel|Starting geometry index|1|None|1 | ||
| +ParameterSelection|-mode.vector.outmode|Writing mode (update file/overwrite file/overwrite layer/update layer)|ulco;ovw;ulovw;ulu|0 | ||
| +ParameterString|-mode.vector.ogroptions|OGR options for layer creation| | ||
| \ No newline at end of file | ||
| diff --git a/otb/description/SimpleConnectedComponentsSegmentation.txt b/otb/description/SimpleConnectedComponentsSegmentation.txt | ||
| new file mode 100644 | ||
| index 0000000..73c0ad2 | ||
| --- /dev/null | ||
| +++ b/otb/description/SimpleConnectedComponentsSegmentation.txt | ||
| @@ -0,0 +1,8 @@ | ||
| +SimpleConnectedComponentsSegmentation | ||
| +otbcli_Segmentation | ||
| +Simple Connected Components segmentation (labeled raster output) | ||
| +Segmentation | ||
| +ParameterRaster|-filter cc -in|Input Image|False | ||
| +ParameterString|-filter.cc.expr|Condition| | ||
| +OutputRaster|-mode raster -mode.raster.out|Output labeled image | ||
| + | ||
| diff --git a/otb/description/SimpleConnectedComponentsSegmentation_vector.txt b/otb/description/SimpleConnectedComponentsSegmentation_vector.txt | ||
| new file mode 100644 | ||
| index 0000000..77ec4b5 | ||
| --- /dev/null | ||
| +++ b/otb/description/SimpleConnectedComponentsSegmentation_vector.txt | ||
| @@ -0,0 +1,18 @@ | ||
| +SimpleConnectedComponentsSegmentationVector | ||
| +otbcli_Segmentation | ||
| +Simple Connected Components segmentation (large-scale, vector output) | ||
| +Segmentation | ||
| +ParameterRaster|-filter cc -in|Input Image|False | ||
| +ParameterString|-filter.cc.expr|Condition| | ||
| +OutputVector|-mode vector -mode.vector.out|Output vector file | ||
| +ParameterVector|-mode.vector.inmask|Mask Image|-1|True | ||
| +ParameterBoolean|-mode.vector.neighbor|8-neighbor connectivity|False | ||
| +ParameterBoolean|-mode.vector.stitch|Stitch polygons|True | ||
| +ParameterNumber|-mode.vector.minsize|Minimum object size|1|None|1 | ||
| +ParameterNumber|-mode.vector.simplify|Simplify polygons|None|None|0.0 | ||
| +ParameterString|-mode.vector.layername|Layer name |layer | ||
| +ParemeterString|-mode.vector.fieldname|Geometry index field name|DN | ||
| +ParameterNumber|-mode.vector.tilesize|Tile size|0|None|1024 | ||
| +ParameterNumber|-mode.vector.startlabel|Starting geometry index|1|None|1 | ||
| +ParameterSelection|-mode.vector.outmode|Writing mode (update file/overwrite file/overwrite layer/update layer)|ulco;ovw;ulovw;ulu|0 | ||
| +ParameterString|-mode.vector.ogroptions|OGR options for layer creation| | ||
| diff --git a/otb/description/WatershedSegmentation.txt b/otb/description/WatershedSegmentation.txt | ||
| new file mode 100644 | ||
| index 0000000..79b062e | ||
| --- /dev/null | ||
| +++ b/otb/description/WatershedSegmentation.txt | ||
| @@ -0,0 +1,9 @@ | ||
| +WatershedSegmentation | ||
| +otbcli_Segmentation | ||
| +Watershed segmentation (labeled raster output) | ||
| +Segmentation | ||
| +ParameterRaster|-filter watershed -in|Input Image|False | ||
| +ParameterNumber|-filter.watershed.threshold|Depth Threshold|0|None|0.01 | ||
| +ParameterNumber|-filter.watershed.level|Flood level|0|None|0.1 | ||
| +OutputRaster|-mode raster -mode.raster.out|Output labeled image | ||
| + | ||
| diff --git a/otb/description/WatershedSegmentation_vector.txt b/otb/description/WatershedSegmentation_vector.txt | ||
| new file mode 100644 | ||
| index 0000000..0f7e76b | ||
| --- /dev/null | ||
| +++ b/otb/description/WatershedSegmentation_vector.txt | ||
| @@ -0,0 +1,19 @@ | ||
| +WatershedSegmentationVector | ||
| +otbcli_Segmentation | ||
| +Watershed segmentation (large-scale, vector output) | ||
| +Segmentation | ||
| +ParameterRaster|-filter watershed -in|Input Image|False | ||
| +ParameterNumber|-filter.watershed.threshold|Depth Threshold|0|None|0.01 | ||
| +ParameterNumber|-filter.watershed.level|Flood level|0|None|0.1 | ||
| +OutputVector|-mode vector -mode.vector.out|Output vector file | ||
| +ParameterVector|-mode.vector.inmask|Mask Image|-1|True | ||
| +ParameterBoolean|-mode.vector.neighbor|8-neighbor connectivity|False | ||
| +ParameterBoolean|-mode.vector.stitch|Stitch polygons|True | ||
| +ParameterNumber|-mode.vector.minsize|Minimum object size|1|None|1 | ||
| +ParameterNumber|-mode.vector.simplify|Simplify polygons|None|None|0.0 | ||
| +ParameterString|-mode.vector.layername|Layer name |layer | ||
| +ParemeterString|-mode.vector.fieldname|Geometry index field name|DN | ||
| +ParameterNumber|-mode.vector.tilesize|Tile size|0|None|1024 | ||
| +ParameterNumber|-mode.vector.startlabel|Starting geometry index|1|None|1 | ||
| +ParameterSelection|-mode.vector.outmode|Writing mode (update file/overwrite file/overwrite layer/update layer)|ulco;ovw;ulovw;ulu|0 | ||
| +ParameterString|-mode.vector.ogroptions|OGR options for layer creation| | ||
| \ No newline at end of file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| # -*- coding: utf-8 -*- | ||
|
|
||
| """ | ||
| *************************************************************************** | ||
| ImportIntoPostGIS.py | ||
| --------------------- | ||
| Date : October 2012 | ||
| Copyright : (C) 2012 by Victor Olaya | ||
| Email : volayaf at gmail dot com | ||
| *************************************************************************** | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| *************************************************************************** | ||
| """ | ||
| from sextante.parameters.ParameterVector import ParameterVector | ||
| from sextante.core.GeoAlgorithm import GeoAlgorithm | ||
|
|
||
| __author__ = 'Victor Olaya' | ||
| __date__ = 'October 2012' | ||
| __copyright__ = '(C) 2012, Victor Olaya' | ||
| # This will get replaced with a git SHA1 when you do a git archive | ||
| __revision__ = '$Format:%H$' | ||
|
|
||
| import os | ||
| from qgis.core import * | ||
| from PyQt4.QtCore import * | ||
| from PyQt4.QtGui import * | ||
| from sextante.parameters.ParameterString import ParameterString | ||
| from sextante.admintools import postgis_utils | ||
| import PyQt4 | ||
|
|
||
| class ImportIntoPostGIS(GeoAlgorithm): | ||
|
|
||
| DATABASE = "DATABASE" | ||
| TABLENAME = "TABLENAME" | ||
| INPUT = "INPUT" | ||
|
|
||
| def getIcon(self): | ||
| return QIcon(os.path.dirname(__file__) + "/../images/postgis.png") | ||
|
|
||
| def processAlgorithm(self, progress): | ||
| pass | ||
|
|
||
| def defineCharacteristics(self): | ||
| self.name = "Import into PostGIS" | ||
| self.group = "PostGIS management tools" | ||
| self.addParameter(ParameterVector(self.INPUT, "Layer to import")) | ||
| self.addParameter(ParameterString(self.DATABASE, "Database")) | ||
| self.addParameter(ParameterString(self.TABLENAME, "Name for new table")) | ||
|
|
||
|
|
||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| FILE(GLOB PY_FILES *.py) | ||
|
|
||
| PLUGIN_INSTALL(sextante admintools/geoserver ${PY_FILES}) | ||
| PLUGIN_INSTALL(sextante ./admintools/geoserver ${PY_FILES}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| FILE(GLOB PY_FILES *.py) | ||
|
|
||
| PLUGIN_INSTALL(sextante admintools/httplib2 ${PY_FILES}) | ||
| PLUGIN_INSTALL(sextante ./admintools/httplib2 ${PY_FILES}) |
Oops, something went wrong.