7.5.5

semiautomaticgit · semiautomaticgit · commit 86d03e742f00 · 2021-01-31T21:51:47.000+01:00
diff --git a/__init__.py b/__init__.py
@@ -42,7 +42,7 @@ def description():
 
 
 def version():
-    return 'Version 7.5.4 - Matera'
+    return 'Version 7.5.5 - Matera'
 
 
 def icon():
diff --git a/docs/repository.xml b/docs/repository.xml
@@ -1,9 +1,9 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <plugins>
-    <pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="7.5.4" plugin_id="284">
+    <pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="7.5.5" plugin_id="284">
         <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>
         <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>
-        <version>7.5.4</version>
+        <version>7.5.5</version>
         <qgis_minimum_version>3.0.0</qgis_minimum_version>
         <qgis_maximum_version>3.99.0</qgis_maximum_version>
         <homepage><![CDATA[https://fromgistors.blogspot.com/p/semi-automatic-classification-plugin.html]]></homepage>
diff --git a/i18n/models/semiautomaticclassificationplugin.ts b/i18n/models/semiautomaticclassificationplugin.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin.ts b/i18n/semiautomaticclassificationplugin.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_ar.ts b/i18n/semiautomaticclassificationplugin_ar.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_de.ts b/i18n/semiautomaticclassificationplugin_de.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_el_GR.ts b/i18n/semiautomaticclassificationplugin_el_GR.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_es.ts b/i18n/semiautomaticclassificationplugin_es.ts
@@ -6634,7 +6634,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_fr.ts b/i18n/semiautomaticclassificationplugin_fr.ts
@@ -6632,7 +6632,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_it.ts b/i18n/semiautomaticclassificationplugin_it.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_ja.ts b/i18n/semiautomaticclassificationplugin_ja.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_pl.ts b/i18n/semiautomaticclassificationplugin_pl.ts
@@ -6634,7 +6634,7 @@ Chcesz dodać wymagane pola do tego shapefile?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_pt.ts b/i18n/semiautomaticclassificationplugin_pt.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_pt_BR.ts b/i18n/semiautomaticclassificationplugin_pt_BR.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_uk_UA.ts b/i18n/semiautomaticclassificationplugin_uk_UA.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_zh_CN.ts b/i18n/semiautomaticclassificationplugin_zh_CN.ts
@@ -6630,7 +6630,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="386"/>
+        <location filename="../maininterface/settings.py" line="387"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/maininterface/bandcalcTab.py b/maininterface/bandcalcTab.py
@@ -1139,6 +1139,7 @@ def checkExpression(self, expression):
 			name.append('"' + tW.item(x, 1).text() + '"')
 			nameList.append(['"' + tW.item(x, 0).text() + '"', '"' + tW.item(x, 1).text() + '"'])
 		ex = []
+		outNameList = []
 		if expression is None:
 			checkO = 'No'
 		else:
@@ -1419,7 +1420,6 @@ def checkExpression(self, expression):
 							except:
 								pass
 				e = h
-			outNameList = []
 			for nf in e:
 				nm = None
 				nPath = None
diff --git a/maininterface/reclassificationTab.py b/maininterface/reclassificationTab.py
@@ -288,13 +288,13 @@ def editedCell(self, row, column):
 					val = float(val)
 				except:
 					cfg.ReclassTabEdited = 'No'
-					cfg.utls.setTableItem(tW, row, column, "0")
+					cfg.utls.setTableItem(tW, row, column, '0')
 					cfg.ReclassTabEdited = 'Yes'
 			elif column == 0:	
-				c = val.replace(cfg.variableName, "rasterSCPArrayfunctionBand")
+				c = val.replace(cfg.variableName, 'rasterSCPArrayfunctionBand')
 				rasterSCPArrayfunctionBand = cfg.np.arange(9).reshape(3, 3)
 				try:
-					eval("cfg.np.where(" + c + ", 1, rasterSCPArrayfunctionBand)")
+					eval('cfg.np.where(' + c + ', 1, rasterSCPArrayfunctionBand)')
 				except:
 					cfg.ReclassTabEdited = 'No'
 					cfg.utls.setTableItem(tW, row, column, "0")
diff --git a/maininterface/settings.py b/maininterface/settings.py
@@ -259,10 +259,11 @@ def testDependencies(self):
 		testMatplotlib = self.testMatplotlib()
 		testGDAL = self.testGDAL()
 		testGDALSubprocess = self.testGDALSubprocess()
+		testSNAPSubprocess = self.testSNAPSubprocess()
 		testMultiprocess = self.testMultiprocess()
 		testGDALMultiprocess = self.testGDALMultiprocess()
 		testInternet = self.testInternetConnection()
-		message = '-GDAL: ' + testGDAL + '\n' + '-GDAL subprocess: ' + testGDALSubprocess + '\n' +  '-Python multiprocess: ' + testMultiprocess + '\n' + '-GDAL multiprocess: ' + testGDALMultiprocess + '\n' + '-NumPy: ' + testNumpy + '\n' + '-SciPy: ' + testScipy + '\n' + '-Matplotlib: ' + testMatplotlib + '\n' + '-Internet connection: ' + testInternet
+		message = '-GDAL: ' + testGDAL + '\n' + '-GDAL subprocess: ' + testGDALSubprocess + '\n' + '-SNAP subprocess: ' + testSNAPSubprocess + '\n' +  '-Python multiprocess: ' + testMultiprocess + '\n' + '-GDAL multiprocess: ' + testGDALMultiprocess + '\n' + '-NumPy: ' + testNumpy + '\n' + '-SciPy: ' + testScipy + '\n' + '-Matplotlib: ' + testMatplotlib + '\n' + '-Internet connection: ' + testInternet
 		cfg.mx.msgTest(message)
 	
 	# test GDAL
@@ -417,6 +418,34 @@ def testGDALSubprocess(self):
 		# logger
 		cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' test: ' + str(test))
 		return test
+		
+	# test SNAP subprocess
+	def testSNAPSubprocess(self):
+		dT = cfg.utls.getTime()
+		test = 'Success'
+		try:
+			a = '"' + cfg.SNAPGPT + '"'
+			if cfg.sysSCPNm != 'Windows':
+				b = cfg.shlexSCP.split(a)
+			sP = cfg.subprocessSCP.Popen(b, shell=False)
+			sP.wait()
+		except Exception as err:
+			# logger
+			cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' ERROR exception: ' + str(err))
+			try:
+				sP = cfg.subprocessSCP.Popen(a, shell=True)
+				v = sP.wait()	
+				# logger
+				cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' subprocess: ' + str(v))
+				if v != 0:
+					test = 'Fail'
+			except Exception as err:
+				# logger
+				cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' ERROR exception: ' + str(err))
+				test = 'Fail'
+		# logger
+		cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' test: ' + str(test))
+		return test
 			
 	# test GDAL multiprocess
 	def testGDALMultiprocess(self):
diff --git a/metadata.txt b/metadata.txt
@@ -2,7 +2,7 @@
 name=Semi-Automatic Classification Plugin
 qgisMinimumVersion=3.00
 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.
-version=7.5.4
+version=7.5.5
 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 .
 
 author=Luca Congedo
@@ -14,6 +14,10 @@ icon=semiautomaticclassificationplugin.png
 ; start of optional metadata
 changelog=
 
+	7.5.5
+	-added settings for checking subprocess SNAP
+	-fixed issue Band calc refresh list
+	
 	7.5.4
 	-fixed Sentinel-1 preprocessing
 	
diff --git a/ui/resources_rc.py b/ui/resources_rc.py
