Skip to content

Commit c96774b

Browse files
semiautomaticgitsemiautomaticgit
committed
7.8.36
1 parent 828f12a commit c96774b

19 files changed

Lines changed: 23538 additions & 23532 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.8.35 - Matera'
45+
return 'Version 7.8.36 - Matera'
4646

4747

4848
def icon():

‎core/utils.py‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4384,15 +4384,26 @@ def multiProcessNoBlocksDev(self, raster = None, signatureList = None, bandNumbe
43844384
import time
43854385
import datetime
43864386
import random
4387+
cfg.osSCP = os
4388+
cfg.sysSCP = sys
4389+
cfg.inspectSCP = inspect
4390+
cfg.datetimeSCP = datetime
4391+
cfg.randomSCP = random
43874392
wrtProc = str(writerLog[0])
43884393
cfg.tmpDir = writerLog[1]
43894394
memory = writerLog[2]
4390-
GDALDLLPath = writerLog[3]
4395+
compress = writerLog[3]
4396+
compressFormat = writerLog[4]
4397+
GDALDLLPath = writerLog[5]
4398+
from .utils import Utils
4399+
cfg.utls = Utils()
4400+
cfg.logFile = cfg.tmpDir + '/log_' + wrtProc
43914401
for d in GDALDLLPath.split(';'):
43924402
try:
43934403
os.add_dll_directory(d)
4394-
except:
4395-
pass
4404+
except Exception as err:
4405+
# logger
4406+
cfg.utls.logToFile(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), 'error ' + str(err) )
43964407
import numpy as np
43974408
try:
43984409
from scipy.ndimage import label
@@ -4415,18 +4426,10 @@ def multiProcessNoBlocksDev(self, raster = None, signatureList = None, bandNumbe
44154426
from osgeo import gdal
44164427
from osgeo import ogr
44174428
from osgeo import osr
4418-
cfg.osSCP = os
4419-
cfg.sysSCP = sys
4420-
cfg.inspectSCP = inspect
4421-
cfg.datetimeSCP = datetime
4422-
cfg.np = np
4423-
cfg.randomSCP = random
44244429
cfg.gdalSCP = gdal
44254430
cfg.ogrSCP = ogr
44264431
cfg.osrSCP = osr
4427-
from .utils import Utils
4428-
cfg.utls = Utils()
4429-
cfg.logFile = cfg.tmpDir + '/log_' + wrtProc
4432+
cfg.np = np
44304433
# GDAL config
44314434
try:
44324435
cfg.gdalSCP.SetConfigOption('GDAL_DISABLE_READDIR_ON_OPEN', 'TRUE')

‎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.8.35" plugin_id="284">
3+
<pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="7.8.36" 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.8.35</version>
6+
<version>7.8.36</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="7294"/>
5484+
<location filename="../core/utils.py" line="7297"/>
54855485
<source>Build overviews</source>
54865486
<translation type="unfinished"></translation>
54875487
</message>
54885488
<message>
5489-
<location filename="../core/utils.py" line="7294"/>
5489+
<location filename="../core/utils.py" line="7297"/>
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="9394"/>
6104+
<location filename="../core/utils.py" line="9397"/>
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="6188"/>
6514+
<location filename="../core/utils.py" line="6191"/>
65156515
<source>Calculating signature</source>
65166516
<translation type="unfinished"></translation>
65176517
</message>
65186518
<message>
6519-
<location filename="../core/utils.py" line="7568"/>
6519+
<location filename="../core/utils.py" line="7571"/>
65206520
<source>Writing file</source>
65216521
<translation type="unfinished"></translation>
65226522
</message>
65236523
<message>
6524-
<location filename="../core/utils.py" line="5482"/>
6524+
<location filename="../core/utils.py" line="5485"/>
65256525
<source>Conversion to vector</source>
65266526
<translation type="unfinished"></translation>
65276527
</message>
65286528
<message>
6529-
<location filename="../core/utils.py" line="7243"/>
6529+
<location filename="../core/utils.py" line="7246"/>
65306530
<source>Sieve</source>
65316531
<translation type="unfinished"></translation>
65326532
</message>
65336533
<message>
6534-
<location filename="../core/utils.py" line="7373"/>
6534+
<location filename="../core/utils.py" line="7376"/>
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="8841"/>
6574+
<location filename="../core/utils.py" line="8844"/>
65756575
<source>Remove rows</source>
65766576
<translation type="unfinished"></translation>
65776577
</message>
65786578
<message>
6579-
<location filename="../core/utils.py" line="8841"/>
6579+
<location filename="../core/utils.py" line="8844"/>
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="7294"/>
5484+
<location filename="../core/utils.py" line="7297"/>
54855485
<source>Build overviews</source>
54865486
<translation type="unfinished"></translation>
54875487
</message>
54885488
<message>
5489-
<location filename="../core/utils.py" line="7294"/>
5489+
<location filename="../core/utils.py" line="7297"/>
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="9394"/>
6104+
<location filename="../core/utils.py" line="9397"/>
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="6188"/>
6514+
<location filename="../core/utils.py" line="6191"/>
65156515
<source>Calculating signature</source>
65166516
<translation type="unfinished"></translation>
65176517
</message>
65186518
<message>
6519-
<location filename="../core/utils.py" line="7568"/>
6519+
<location filename="../core/utils.py" line="7571"/>
65206520
<source>Writing file</source>
65216521
<translation type="unfinished"></translation>
65226522
</message>
65236523
<message>
6524-
<location filename="../core/utils.py" line="5482"/>
6524+
<location filename="../core/utils.py" line="5485"/>
65256525
<source>Conversion to vector</source>
65266526
<translation type="unfinished"></translation>
65276527
</message>
65286528
<message>
6529-
<location filename="../core/utils.py" line="7243"/>
6529+
<location filename="../core/utils.py" line="7246"/>
65306530
<source>Sieve</source>
65316531
<translation type="unfinished"></translation>
65326532
</message>
65336533
<message>
6534-
<location filename="../core/utils.py" line="7373"/>
6534+
<location filename="../core/utils.py" line="7376"/>
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="8841"/>
6574+
<location filename="../core/utils.py" line="8844"/>
65756575
<source>Remove rows</source>
65766576
<translation type="unfinished"></translation>
65776577
</message>
65786578
<message>
6579-
<location filename="../core/utils.py" line="8841"/>
6579+
<location filename="../core/utils.py" line="8844"/>
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="7294"/>
5484+
<location filename="../core/utils.py" line="7297"/>
54855485
<source>Build overviews</source>
54865486
<translation type="unfinished"></translation>
54875487
</message>
54885488
<message>
5489-
<location filename="../core/utils.py" line="7294"/>
5489+
<location filename="../core/utils.py" line="7297"/>
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="9394"/>
6104+
<location filename="../core/utils.py" line="9397"/>
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="6188"/>
6514+
<location filename="../core/utils.py" line="6191"/>
65156515
<source>Calculating signature</source>
65166516
<translation type="unfinished"></translation>
65176517
</message>
65186518
<message>
6519-
<location filename="../core/utils.py" line="7568"/>
6519+
<location filename="../core/utils.py" line="7571"/>
65206520
<source>Writing file</source>
65216521
<translation type="unfinished"></translation>
65226522
</message>
65236523
<message>
6524-
<location filename="../core/utils.py" line="5482"/>
6524+
<location filename="../core/utils.py" line="5485"/>
65256525
<source>Conversion to vector</source>
65266526
<translation type="unfinished"></translation>
65276527
</message>
65286528
<message>
6529-
<location filename="../core/utils.py" line="7243"/>
6529+
<location filename="../core/utils.py" line="7246"/>
65306530
<source>Sieve</source>
65316531
<translation type="unfinished"></translation>
65326532
</message>
65336533
<message>
6534-
<location filename="../core/utils.py" line="7373"/>
6534+
<location filename="../core/utils.py" line="7376"/>
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="8841"/>
6574+
<location filename="../core/utils.py" line="8844"/>
65756575
<source>Remove rows</source>
65766576
<translation type="unfinished"></translation>
65776577
</message>
65786578
<message>
6579-
<location filename="../core/utils.py" line="8841"/>
6579+
<location filename="../core/utils.py" line="8844"/>
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="7294"/>
5484+
<location filename="../core/utils.py" line="7297"/>
54855485
<source>Build overviews</source>
54865486
<translation type="unfinished"></translation>
54875487
</message>
54885488
<message>
5489-
<location filename="../core/utils.py" line="7294"/>
5489+
<location filename="../core/utils.py" line="7297"/>
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="9394"/>
6104+
<location filename="../core/utils.py" line="9397"/>
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="6188"/>
6514+
<location filename="../core/utils.py" line="6191"/>
65156515
<source>Calculating signature</source>
65166516
<translation type="unfinished"></translation>
65176517
</message>
65186518
<message>
6519-
<location filename="../core/utils.py" line="7568"/>
6519+
<location filename="../core/utils.py" line="7571"/>
65206520
<source>Writing file</source>
65216521
<translation type="unfinished"></translation>
65226522
</message>
65236523
<message>
6524-
<location filename="../core/utils.py" line="5482"/>
6524+
<location filename="../core/utils.py" line="5485"/>
65256525
<source>Conversion to vector</source>
65266526
<translation type="unfinished"></translation>
65276527
</message>
65286528
<message>
6529-
<location filename="../core/utils.py" line="7243"/>
6529+
<location filename="../core/utils.py" line="7246"/>
65306530
<source>Sieve</source>
65316531
<translation type="unfinished"></translation>
65326532
</message>
65336533
<message>
6534-
<location filename="../core/utils.py" line="7373"/>
6534+
<location filename="../core/utils.py" line="7376"/>
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="8841"/>
6574+
<location filename="../core/utils.py" line="8844"/>
65756575
<source>Remove rows</source>
65766576
<translation type="unfinished"></translation>
65776577
</message>
65786578
<message>
6579-
<location filename="../core/utils.py" line="8841"/>
6579+
<location filename="../core/utils.py" line="8844"/>
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)