Skip to content

Commit 903271a

Browse files
semiautomaticgitsemiautomaticgit
committed
7.9.5
1 parent f50da4c commit 903271a

20 files changed

Lines changed: 23634 additions & 23601 deletions

‎__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.9.4 - Matera'
45+
return 'Version 7.9.5 - Matera'
4646

4747

4848
def icon():

‎core/utils.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3747,7 +3747,12 @@ def calculateRaster(self, gdalBandList, rasterSCPArrayfunctionBand, columnNumber
37473747
except:
37483748
pass
37493749
# perform operation
3750-
o = eval(f)
3750+
try:
3751+
o = eval(f)
3752+
except Exception as err:
3753+
# logger
3754+
cfg.utls.logCondition(str(__name__) + '-' + (cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' ERROR exception: ' + str(err))
3755+
return 'No'
37513756
# output raster
37523757
oR = cfg.gdalSCP.Open(outputRaster, cfg.gdalSCP.GA_Update)
37533758
scale = gdalBandList[0]

‎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.9.4" plugin_id="284">
3+
<pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="7.9.5" 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.9.4</version>
6+
<version>7.9.5</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>

‎i18n/models/semiautomaticclassificationplugin.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5481,12 +5481,12 @@ Do you want to add the required fields to this shapefile?</source>
54815481
<translation type="unfinished"></translation>
54825482
</message>
54835483
<message>
5484-
<location filename="../core/utils.py" line="7316"/>
5484+
<location filename="../core/utils.py" line="7321"/>
54855485
<source>Build overviews</source>
54865486
<translation type="unfinished"></translation>
54875487
</message>
54885488
<message>
5489-
<location filename="../core/utils.py" line="7316"/>
5489+
<location filename="../core/utils.py" line="7321"/>
54905490
<source>Do you want to build the external overviews of bands?</source>
54915491
<translation type="unfinished"></translation>
54925492
</message>
@@ -6101,7 +6101,7 @@ Do you want to add the required fields to this shapefile?</source>
61016101
<translation type="unfinished"></translation>
61026102
</message>
61036103
<message>
6104-
<location filename="../core/utils.py" line="9416"/>
6104+
<location filename="../core/utils.py" line="9421"/>
61056105
<source>SCP: completed process</source>
61066106
<translation type="unfinished"></translation>
61076107
</message>
@@ -6511,27 +6511,27 @@ Do you want to add the required fields to this shapefile?</source>
65116511
<translation type="unfinished"></translation>
65126512
</message>
65136513
<message>
6514-
<location filename="../core/utils.py" line="6210"/>
6514+
<location filename="../core/utils.py" line="6215"/>
65156515
<source>Calculating signature</source>
65166516
<translation type="unfinished"></translation>
65176517
</message>
65186518
<message>
6519-
<location filename="../core/utils.py" line="7590"/>
6519+
<location filename="../core/utils.py" line="7595"/>
65206520
<source>Writing file</source>
65216521
<translation type="unfinished"></translation>
65226522
</message>
65236523
<message>
6524-
<location filename="../core/utils.py" line="5504"/>
6524+
<location filename="../core/utils.py" line="5509"/>
65256525
<source>Conversion to vector</source>
65266526
<translation type="unfinished"></translation>
65276527
</message>
65286528
<message>
6529-
<location filename="../core/utils.py" line="7265"/>
6529+
<location filename="../core/utils.py" line="7270"/>
65306530
<source>Sieve</source>
65316531
<translation type="unfinished"></translation>
65326532
</message>
65336533
<message>
6534-
<location filename="../core/utils.py" line="7395"/>
6534+
<location filename="../core/utils.py" line="7400"/>
65356535
<source>Building overviews</source>
65366536
<translation type="unfinished"></translation>
65376537
</message>
@@ -6571,12 +6571,12 @@ Do you want to add the required fields to this shapefile?</source>
65716571
<translation type="unfinished"></translation>
65726572
</message>
65736573
<message>
6574-
<location filename="../core/utils.py" line="8863"/>
6574+
<location filename="../core/utils.py" line="8868"/>
65756575
<source>Remove rows</source>
65766576
<translation type="unfinished"></translation>
65776577
</message>
65786578
<message>
6579-
<location filename="../core/utils.py" line="8863"/>
6579+
<location filename="../core/utils.py" line="8868"/>
65806580
<source>Are you sure you want to remove highlighted rows from the table?</source>
65816581
<translation type="unfinished"></translation>
65826582
</message>

‎i18n/semiautomaticclassificationplugin.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5481,12 +5481,12 @@ Do you want to add the required fields to this shapefile?</source>
54815481
<translation type="unfinished"></translation>
54825482
</message>
54835483
<message>
5484-
<location filename="../core/utils.py" line="7316"/>
5484+
<location filename="../core/utils.py" line="7321"/>
54855485
<source>Build overviews</source>
54865486
<translation type="unfinished"></translation>
54875487
</message>
54885488
<message>
5489-
<location filename="../core/utils.py" line="7316"/>
5489+
<location filename="../core/utils.py" line="7321"/>
54905490
<source>Do you want to build the external overviews of bands?</source>
54915491
<translation type="unfinished"></translation>
54925492
</message>
@@ -6101,7 +6101,7 @@ Do you want to add the required fields to this shapefile?</source>
61016101
<translation type="unfinished"></translation>
61026102
</message>
61036103
<message>
6104-
<location filename="../core/utils.py" line="9416"/>
6104+
<location filename="../core/utils.py" line="9421"/>
61056105
<source>SCP: completed process</source>
61066106
<translation type="unfinished"></translation>
61076107
</message>
@@ -6511,27 +6511,27 @@ Do you want to add the required fields to this shapefile?</source>
65116511
<translation type="unfinished"></translation>
65126512
</message>
65136513
<message>
6514-
<location filename="../core/utils.py" line="6210"/>
6514+
<location filename="../core/utils.py" line="6215"/>
65156515
<source>Calculating signature</source>
65166516
<translation type="unfinished"></translation>
65176517
</message>
65186518
<message>
6519-
<location filename="../core/utils.py" line="7590"/>
6519+
<location filename="../core/utils.py" line="7595"/>
65206520
<source>Writing file</source>
65216521
<translation type="unfinished"></translation>
65226522
</message>
65236523
<message>
6524-
<location filename="../core/utils.py" line="5504"/>
6524+
<location filename="../core/utils.py" line="5509"/>
65256525
<source>Conversion to vector</source>
65266526
<translation type="unfinished"></translation>
65276527
</message>
65286528
<message>
6529-
<location filename="../core/utils.py" line="7265"/>
6529+
<location filename="../core/utils.py" line="7270"/>
65306530
<source>Sieve</source>
65316531
<translation type="unfinished"></translation>
65326532
</message>
65336533
<message>
6534-
<location filename="../core/utils.py" line="7395"/>
6534+
<location filename="../core/utils.py" line="7400"/>
65356535
<source>Building overviews</source>
65366536
<translation type="unfinished"></translation>
65376537
</message>
@@ -6571,12 +6571,12 @@ Do you want to add the required fields to this shapefile?</source>
65716571
<translation type="unfinished"></translation>
65726572
</message>
65736573
<message>
6574-
<location filename="../core/utils.py" line="8863"/>
6574+
<location filename="../core/utils.py" line="8868"/>
65756575
<source>Remove rows</source>
65766576
<translation type="unfinished"></translation>
65776577
</message>
65786578
<message>
6579-
<location filename="../core/utils.py" line="8863"/>
6579+
<location filename="../core/utils.py" line="8868"/>
65806580
<source>Are you sure you want to remove highlighted rows from the table?</source>
65816581
<translation type="unfinished"></translation>
65826582
</message>

‎i18n/semiautomaticclassificationplugin_ar.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5481,12 +5481,12 @@ Do you want to add the required fields to this shapefile?</source>
54815481
<translation type="unfinished"></translation>
54825482
</message>
54835483
<message>
5484-
<location filename="../core/utils.py" line="7316"/>
5484+
<location filename="../core/utils.py" line="7321"/>
54855485
<source>Build overviews</source>
54865486
<translation type="unfinished"></translation>
54875487
</message>
54885488
<message>
5489-
<location filename="../core/utils.py" line="7316"/>
5489+
<location filename="../core/utils.py" line="7321"/>
54905490
<source>Do you want to build the external overviews of bands?</source>
54915491
<translation type="unfinished"></translation>
54925492
</message>
@@ -6101,7 +6101,7 @@ Do you want to add the required fields to this shapefile?</source>
61016101
<translation type="unfinished"></translation>
61026102
</message>
61036103
<message>
6104-
<location filename="../core/utils.py" line="9416"/>
6104+
<location filename="../core/utils.py" line="9421"/>
61056105
<source>SCP: completed process</source>
61066106
<translation type="unfinished"></translation>
61076107
</message>
@@ -6511,27 +6511,27 @@ Do you want to add the required fields to this shapefile?</source>
65116511
<translation type="unfinished"></translation>
65126512
</message>
65136513
<message>
6514-
<location filename="../core/utils.py" line="6210"/>
6514+
<location filename="../core/utils.py" line="6215"/>
65156515
<source>Calculating signature</source>
65166516
<translation type="unfinished"></translation>
65176517
</message>
65186518
<message>
6519-
<location filename="../core/utils.py" line="7590"/>
6519+
<location filename="../core/utils.py" line="7595"/>
65206520
<source>Writing file</source>
65216521
<translation type="unfinished"></translation>
65226522
</message>
65236523
<message>
6524-
<location filename="../core/utils.py" line="5504"/>
6524+
<location filename="../core/utils.py" line="5509"/>
65256525
<source>Conversion to vector</source>
65266526
<translation type="unfinished"></translation>
65276527
</message>
65286528
<message>
6529-
<location filename="../core/utils.py" line="7265"/>
6529+
<location filename="../core/utils.py" line="7270"/>
65306530
<source>Sieve</source>
65316531
<translation type="unfinished"></translation>
65326532
</message>
65336533
<message>
6534-
<location filename="../core/utils.py" line="7395"/>
6534+
<location filename="../core/utils.py" line="7400"/>
65356535
<source>Building overviews</source>
65366536
<translation type="unfinished"></translation>
65376537
</message>
@@ -6571,12 +6571,12 @@ Do you want to add the required fields to this shapefile?</source>
65716571
<translation type="unfinished"></translation>
65726572
</message>
65736573
<message>
6574-
<location filename="../core/utils.py" line="8863"/>
6574+
<location filename="../core/utils.py" line="8868"/>
65756575
<source>Remove rows</source>
65766576
<translation type="unfinished"></translation>
65776577
</message>
65786578
<message>
6579-
<location filename="../core/utils.py" line="8863"/>
6579+
<location filename="../core/utils.py" line="8868"/>
65806580
<source>Are you sure you want to remove highlighted rows from the table?</source>
65816581
<translation type="unfinished"></translation>
65826582
</message>

‎i18n/semiautomaticclassificationplugin_de.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5481,12 +5481,12 @@ Do you want to add the required fields to this shapefile?</source>
54815481
<translation type="unfinished"></translation>
54825482
</message>
54835483
<message>
5484-
<location filename="../core/utils.py" line="7316"/>
5484+
<location filename="../core/utils.py" line="7321"/>
54855485
<source>Build overviews</source>
54865486
<translation type="unfinished"></translation>
54875487
</message>
54885488
<message>
5489-
<location filename="../core/utils.py" line="7316"/>
5489+
<location filename="../core/utils.py" line="7321"/>
54905490
<source>Do you want to build the external overviews of bands?</source>
54915491
<translation type="unfinished"></translation>
54925492
</message>
@@ -6101,7 +6101,7 @@ Do you want to add the required fields to this shapefile?</source>
61016101
<translation type="unfinished"></translation>
61026102
</message>
61036103
<message>
6104-
<location filename="../core/utils.py" line="9416"/>
6104+
<location filename="../core/utils.py" line="9421"/>
61056105
<source>SCP: completed process</source>
61066106
<translation type="unfinished"></translation>
61076107
</message>
@@ -6511,27 +6511,27 @@ Do you want to add the required fields to this shapefile?</source>
65116511
<translation type="unfinished"></translation>
65126512
</message>
65136513
<message>
6514-
<location filename="../core/utils.py" line="6210"/>
6514+
<location filename="../core/utils.py" line="6215"/>
65156515
<source>Calculating signature</source>
65166516
<translation type="unfinished"></translation>
65176517
</message>
65186518
<message>
6519-
<location filename="../core/utils.py" line="7590"/>
6519+
<location filename="../core/utils.py" line="7595"/>
65206520
<source>Writing file</source>
65216521
<translation type="unfinished"></translation>
65226522
</message>
65236523
<message>
6524-
<location filename="../core/utils.py" line="5504"/>
6524+
<location filename="../core/utils.py" line="5509"/>
65256525
<source>Conversion to vector</source>
65266526
<translation type="unfinished"></translation>
65276527
</message>
65286528
<message>
6529-
<location filename="../core/utils.py" line="7265"/>
6529+
<location filename="../core/utils.py" line="7270"/>
65306530
<source>Sieve</source>
65316531
<translation type="unfinished"></translation>
65326532
</message>
65336533
<message>
6534-
<location filename="../core/utils.py" line="7395"/>
6534+
<location filename="../core/utils.py" line="7400"/>
65356535
<source>Building overviews</source>
65366536
<translation type="unfinished"></translation>
65376537
</message>
@@ -6571,12 +6571,12 @@ Do you want to add the required fields to this shapefile?</source>
65716571
<translation type="unfinished"></translation>
65726572
</message>
65736573
<message>
6574-
<location filename="../core/utils.py" line="8863"/>
6574+
<location filename="../core/utils.py" line="8868"/>
65756575
<source>Remove rows</source>
65766576
<translation type="unfinished"></translation>
65776577
</message>
65786578
<message>
6579-
<location filename="../core/utils.py" line="8863"/>
6579+
<location filename="../core/utils.py" line="8868"/>
65806580
<source>Are you sure you want to remove highlighted rows from the table?</source>
65816581
<translation type="unfinished"></translation>
65826582
</message>

‎i18n/semiautomaticclassificationplugin_el_GR.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5481,12 +5481,12 @@ Do you want to add the required fields to this shapefile?</source>
54815481
<translation type="unfinished"></translation>
54825482
</message>
54835483
<message>
5484-
<location filename="../core/utils.py" line="7316"/>
5484+
<location filename="../core/utils.py" line="7321"/>
54855485
<source>Build overviews</source>
54865486
<translation type="unfinished"></translation>
54875487
</message>
54885488
<message>
5489-
<location filename="../core/utils.py" line="7316"/>
5489+
<location filename="../core/utils.py" line="7321"/>
54905490
<source>Do you want to build the external overviews of bands?</source>
54915491
<translation type="unfinished"></translation>
54925492
</message>
@@ -6101,7 +6101,7 @@ Do you want to add the required fields to this shapefile?</source>
61016101
<translation type="unfinished"></translation>
61026102
</message>
61036103
<message>
6104-
<location filename="../core/utils.py" line="9416"/>
6104+
<location filename="../core/utils.py" line="9421"/>
61056105
<source>SCP: completed process</source>
61066106
<translation type="unfinished"></translation>
61076107
</message>
@@ -6511,27 +6511,27 @@ Do you want to add the required fields to this shapefile?</source>
65116511
<translation type="unfinished"></translation>
65126512
</message>
65136513
<message>
6514-
<location filename="../core/utils.py" line="6210"/>
6514+
<location filename="../core/utils.py" line="6215"/>
65156515
<source>Calculating signature</source>
65166516
<translation type="unfinished"></translation>
65176517
</message>
65186518
<message>
6519-
<location filename="../core/utils.py" line="7590"/>
6519+
<location filename="../core/utils.py" line="7595"/>
65206520
<source>Writing file</source>
65216521
<translation type="unfinished"></translation>
65226522
</message>
65236523
<message>
6524-
<location filename="../core/utils.py" line="5504"/>
6524+
<location filename="../core/utils.py" line="5509"/>
65256525
<source>Conversion to vector</source>
65266526
<translation type="unfinished"></translation>
65276527
</message>
65286528
<message>
6529-
<location filename="../core/utils.py" line="7265"/>
6529+
<location filename="../core/utils.py" line="7270"/>
65306530
<source>Sieve</source>
65316531
<translation type="unfinished"></translation>
65326532
</message>
65336533
<message>
6534-
<location filename="../core/utils.py" line="7395"/>
6534+
<location filename="../core/utils.py" line="7400"/>
65356535
<source>Building overviews</source>
65366536
<translation type="unfinished"></translation>
65376537
</message>
@@ -6571,12 +6571,12 @@ Do you want to add the required fields to this shapefile?</source>
65716571
<translation type="unfinished"></translation>
65726572
</message>
65736573
<message>
6574-
<location filename="../core/utils.py" line="8863"/>
6574+
<location filename="../core/utils.py" line="8868"/>
65756575
<source>Remove rows</source>
65766576
<translation type="unfinished"></translation>
65776577
</message>
65786578
<message>
6579-
<location filename="../core/utils.py" line="8863"/>
6579+
<location filename="../core/utils.py" line="8868"/>
65806580
<source>Are you sure you want to remove highlighted rows from the table?</source>
65816581
<translation type="unfinished"></translation>
65826582
</message>

0 commit comments

Comments
 (0)