Skip to content

Commit 1f6d53c

Browse files
7.5.7
1 parent 81ec277 commit 1f6d53c

29 files changed

Lines changed: 25417 additions & 25237 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.5.6 - Matera'
45+
return 'Version 7.5.7 - Matera'
4646

4747

4848
def icon():

core/utils.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2098,7 +2098,7 @@ def checkBandSet(self, bandSetNumber = None):
20982098
else:
20992099
ck = 'No'
21002100
# logger
2101-
cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), " raster is not loaded: " + str(cfg.bandSetsList[bandSetNumber][3][x]))
2101+
cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' raster is not loaded: ' + str(cfg.bandSetsList[bandSetNumber][3][x]))
21022102
return ck
21032103
return ck
21042104

@@ -2256,12 +2256,12 @@ def createTempRasterList(self, rasterNumber):
22562256
def createTempRasterPath(self, extension, name = '_temp'):
22572257
r = cfg.randomSCP.randint(0,1000)
22582258
dT = cfg.utls.getTime()
2259-
tPMD = cfg.osSCP.path.join(cfg.tmpDir, dT + str(r) + name + '.' + extension)
2259+
tPMD = cfg.tmpDir + '/' + dT + str(r) + name + '.' + extension
22602260
return tPMD
22612261

22622262
# create temporary raster path
22632263
def createTempRasterPathBatch(self, name, extension):
2264-
tPMD = cfg.osSCP.path.join(cfg.tmpDir, name + '.' + extension)
2264+
tPMD = cfg.tmpDir + '/' + name + '.' + extension
22652265
return tPMD
22662266

22672267
# create temporary virtual raster
@@ -6744,7 +6744,13 @@ def rasterSieve(self, inputRaster, outputRaster, pixelThreshold, connect = 4, ou
67446744
tPMD = cfg.utls.createTempRasterPath('txt')
67456745
stF = open(tPMD, 'a')
67466746
sPL = len(cfg.subprocDictProc)
6747-
cfg.subprocDictProc['proc_'+ str(sPL)] = cfg.subprocessSCP.Popen(a, shell=False, stdout=stF, stderr=cfg.subprocessSCP.PIPE)
6747+
if cfg.sysSCPNm == 'Windows':
6748+
startupinfo = cfg.subprocessSCP.STARTUPINFO()
6749+
startupinfo.dwFlags = cfg.subprocessSCP.STARTF_USESHOWWINDOW
6750+
startupinfo.wShowWindow = cfg.subprocessSCP.SW_HIDE
6751+
cfg.subprocDictProc['proc_'+ str(sPL)] = cfg.subprocessSCP.Popen(a, shell=False, startupinfo = startupinfo, stdout=stF, stderr=cfg.subprocessSCP.PIPE)
6752+
else:
6753+
cfg.subprocDictProc['proc_'+ str(sPL)] = cfg.subprocessSCP.Popen(a, shell=False, stdout=stF, stderr=cfg.subprocessSCP.PIPE)
67486754
while True:
67496755
line = ''
67506756
with open(tPMD, 'r') as rStF:
@@ -7176,7 +7182,13 @@ def GDALReprojectRaster(self, input, output, outFormat = 'GTiff', s_srs = None,
71767182
tPMD = cfg.utls.createTempRasterPath('txt')
71777183
stF = open(tPMD, 'a')
71787184
sPL = len(cfg.subprocDictProc)
7179-
cfg.subprocDictProc['proc_'+ str(sPL)] = cfg.subprocessSCP.Popen(d, shell=False, stdout=stF, stderr=cfg.subprocessSCP.PIPE)
7185+
if cfg.sysSCPNm == 'Windows':
7186+
startupinfo = cfg.subprocessSCP.STARTUPINFO()
7187+
startupinfo.dwFlags = cfg.subprocessSCP.STARTF_USESHOWWINDOW
7188+
startupinfo.wShowWindow = cfg.subprocessSCP.SW_HIDE
7189+
cfg.subprocDictProc['proc_'+ str(sPL)] = cfg.subprocessSCP.Popen(d, shell=False,startupinfo = startupinfo, stdout=stF, stderr=cfg.subprocessSCP.PIPE)
7190+
else:
7191+
cfg.subprocDictProc['proc_'+ str(sPL)] = cfg.subprocessSCP.Popen(d, shell=False, stdout=stF, stderr=cfg.subprocessSCP.PIPE)
71807192
while True:
71817193
line = ''
71827194
with open(tPMD, 'r') as rStF:

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

0 commit comments

Comments
 (0)