Skip to content

Commit 4553891

Browse files
semiautomaticgitsemiautomaticgit
committed
7.10.6
1 parent 3e7c9f4 commit 4553891

6 files changed

Lines changed: 23152 additions & 23148 deletions

File tree

‎__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def description():
4242

4343

4444
def version():
45-
return 'Version 7.10.5 - Matera'
45+
return 'Version 7.10.6 - Matera'
4646

4747

4848
def icon():

‎core/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@
698698
satQuickBird = 'QuickBird [bands 1, 2, 3, 4]'
699699
satWorldView23 = 'WorldView-2 -3 Multispectral [bands 1, 2, 3, 4, 5, 6, 7, 8]'
700700
satWlList = ['', NoSatellite, satASTER, satGeoEye1, satGOES, satLandsat8, satLandsat7, satLandsat45, satLandsat13, satMODIS, satMODIS2, satPleiades, satQuickBird, satRapidEye, satSentinel2, satSentinel3, satSPOT4, satSPOT5, satSPOT6, satWorldView23]
701-
usgsLandsat8 = 'L8 OLI/TIRS'
701+
usgsLandsat8 = 'L8 L9 OLI/TIRS'
702702
usgsLandsat7 = 'L7 ETM+'
703703
usgsLandsat45 = 'L4-5 TM'
704704
usgsLandsat15 = 'L1-5 MSS'

‎docs/repository.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version = '1.0' encoding = 'UTF-8'?>
22
<plugins>
3-
<pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="7.10.5" plugin_id="284">
3+
<pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="7.10.6" plugin_id="284">
44
<description><![CDATA[The Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images.]]></description>
55
<about><![CDATA[Developed by Luca Congedo, the Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images. Search and download is available for ASTER, GOES, Landsat, MODIS, Sentinel-1, Sentinel-2, and Sentinel-3 images. Several algorithms are available for the land cover classification. This plugin requires the installation of GDAL, OGR, Numpy, SciPy, and Matplotlib. Some tools require also the installation of SNAP (ESA Sentinel Application Platform). For more information please visit https://fromgistors.blogspot.com .]]></about>
6-
<version>7.10.5</version>
6+
<version>7.10.6</version>
77
<qgis_minimum_version>3.0.0</qgis_minimum_version>
88
<qgis_maximum_version>3.99.0</qgis_maximum_version>
99
<homepage><![CDATA[https://fromgistors.blogspot.com/p/semi-automatic-classification-plugin.html]]></homepage>

‎maininterface/landsatTab.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def landsat(self, inputDirectory, outputDirectory, batch = 'No', bandSetNumber =
273273
elif str(nm[len(nm) - 8: len(nm) - 1]) == '6_VCID_' and nm[len(nm) - 1].isdigit():
274274
e = self.landsat457Temperature(sat, RADIANCE_MULT, RADIANCE_ADD)
275275
temperatureList.append([inputRaster, e, outputRaster])
276-
elif str(sat).lower() in ['landsat8', 'landsat_8']:
276+
elif str(sat).lower() in ['landsat8', 'landsat_8', 'landsat9', 'landsat_9']:
277277
# landsat thermal bands
278278
if nm[len(nm) - 2: len(nm) - 0] in ['10', '11']:
279279
e = self.landsat8Temperature(RADIANCE_MULT, RADIANCE_ADD, K1_CONSTANT, K2_CONSTANT)
@@ -432,7 +432,7 @@ def landsat(self, inputDirectory, outputDirectory, batch = 'No', bandSetNumber =
432432
cfg.utls.logCondition(str(__name__) + '-' + (cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), 'WARNING: unable to load raster' + str(outR))
433433
# create band set
434434
if cfg.ui.create_bandset_checkBox.isChecked() is True:
435-
if str(sat).lower() in ['landsat8', 'landsat_8', 'landsat_8_sr']:
435+
if str(sat).lower() in ['landsat8', 'landsat_8', 'landsat_8_sr', 'landsat9', 'landsat_9', 'landsat_9_sr']:
436436
satName = cfg.satLandsat8
437437
elif str(sat).lower() in ['landsat_7','landsat_7_sr', 'landsat7']:
438438
satName = cfg.satLandsat7
@@ -464,7 +464,7 @@ def landsat(self, inputDirectory, outputDirectory, batch = 'No', bandSetNumber =
464464
# pansharpening expressions
465465
def pansharpeningExpressions(self, satellite):
466466
e = []
467-
if satellite in ['landsat8', 'landsat_8']:
467+
if satellite in ['landsat8', 'landsat_8', 'landsat9', 'landsat_9']:
468468
# Intensity (SCP weights)
469469
for oR in ['"blue"', '"green"', '"red"']:
470470
o = oR + '* "pan" / ((0.42* "blue" + 0.98 * "green" + 0.6 * "red") / 2)'
@@ -581,7 +581,7 @@ def landsat1_7reflectance(self, satellite, bandNumber, RADIANCE_MULT_BAND, RADIA
581581
return 'No'
582582
# TOA reflectance
583583
if cfg.ui.DOS1_checkBox.isChecked() is False:
584-
e = 'cfg.np.where("raster" == ' + str(nD) + ', ' + str(self.nodataCalc) + ', cfg.np.clip( ( "raster" *' + str('%.16f' % m) + '+ (' + str('%.16f' % a) + ') * ' + str('%.16f' % cfg.np.pi) + ' * ' + str('%.16f' % self.eSD) + ' * ' + str('%.16f' % self.eSD) + ') / ( ' + str('%.16f' % eS)+ ' * (' + str(self.sA) + ') ) , 0, 1))'
584+
e = 'cfg.np.where("raster" == ' + str(nD) + ', ' + str(self.nodataCalc) + ', cfg.np.clip( (( "raster" *' + str('%.16f' % m) + '+ (' + str('%.16f' % a) + ')) * ' + str('%.16f' % cfg.np.pi) + ' * ' + str('%.16f' % self.eSD) + ' * ' + str('%.16f' % self.eSD) + ') / ( ' + str('%.16f' % eS)+ ' * (' + str(self.sA) + ') ) , 0, 1))'
585585
# DOS atmospheric correction
586586
elif cfg.ui.DOS1_checkBox.isChecked() is True:
587587
# No data value
@@ -774,7 +774,7 @@ def populateTable(self, input, batch = 'No'):
774774
elif str(nm[len(nm) - 8: len(nm) - 1]) == '6_VCID_' and nm[len(nm) - 1].isdigit():
775775
dBs['BAND_6_VCID_{0}'.format(nm[len(nm) - 1])] = str(f)
776776
bandNames.append(f)
777-
elif str(sat).lower() in ['landsat_8', 'landsat8']:
777+
elif str(sat).lower() in ['landsat_8', 'landsat8', 'landsat_9', 'landsat9']:
778778
# for bands > 9
779779
if nm[len(nm) - 2: len(nm) - 0] in ['10', '11']:
780780
dBs['BAND_' + nm[len(nm) - 2: len(nm) - 0]] = str(f)
@@ -969,7 +969,7 @@ def removeHighlightedBand(self):
969969

970970
def editedSatellite(self):
971971
sat = cfg.ui.satellite_lineEdit.text()
972-
if str(sat).lower() in ['landsat_1', 'landsat1','landsat_2', 'landsat2','landsat_3', 'landsat3','landsat_4', 'landsat4', 'landsat_5', 'landsat5', 'landsat_7', 'landsat7', 'landsat_8', 'landsat8', 'landsat_1_sr', 'landsat_2_sr', 'landsat_3_sr', 'landsat_4_sr', 'landsat_5_sr', 'landsat_7_sr', 'landsat_8_sr']:
972+
if str(sat).lower() in ['landsat_1', 'landsat1','landsat_2', 'landsat2','landsat_3', 'landsat3','landsat_4', 'landsat4', 'landsat_5', 'landsat5', 'landsat_7', 'landsat7', 'landsat_8', 'landsat8', 'landsat_9', 'landsat9', 'landsat_1_sr', 'landsat_2_sr', 'landsat_3_sr', 'landsat_4_sr', 'landsat_5_sr', 'landsat_7_sr', 'landsat_8_sr']:
973973
cfg.ui.satellite_lineEdit.setStyleSheet('color : black')
974974
else:
975975
cfg.ui.satellite_lineEdit.setStyleSheet('color : red')

‎metadata.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name=Semi-Automatic Classification Plugin
33
qgisMinimumVersion=3.00
44
description=The Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images.
5-
version=7.10.5
5+
version=7.10.6
66
about=Developed by Luca Congedo, the Semi-Automatic Classification Plugin (SCP) allows for the supervised classification of remote sensing images, providing tools for the download, the preprocessing and postprocessing of images. Search and download is available for ASTER, GOES, Landsat, MODIS, Sentinel-1, Sentinel-2, and Sentinel-3 images. Several algorithms are available for the land cover classification. This plugin requires the installation of GDAL, OGR, Numpy, SciPy, and Matplotlib. Some tools require also the installation of SNAP (ESA Sentinel Application Platform). For more information please visit https://fromgistors.blogspot.com .
77

88
author=Luca Congedo
@@ -14,6 +14,10 @@ icon=semiautomaticclassificationplugin.png
1414
; start of optional metadata
1515
changelog=
1616

17+
7.10.6
18+
-updated the Landsat tool for preprocessing Landsat 9 data
19+
-fixed issue for TOA conversion of Landsat 5 and 7 data
20+
1721
7.10.5
1822
-fixed regression raster name in Cross classification
1923
-fixed issue with LCS classification

0 commit comments

Comments
 (0)