7.4.5

semiautomaticgit · semiautomaticgit · commit c5537694c991 · 2021-01-10T23:32:30.000+01:00
diff --git a/__init__.py b/__init__.py
@@ -42,7 +42,7 @@ def description():
 
 
 def version():
-    return 'Version 7.4.2 - Matera'
+    return 'Version 7.4.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.4.2" plugin_id="284">
+    <pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="7.4.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.4.2</version>
+        <version>7.4.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
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin.ts b/i18n/semiautomaticclassificationplugin.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_ar.ts b/i18n/semiautomaticclassificationplugin_ar.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_de.ts b/i18n/semiautomaticclassificationplugin_de.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_el_GR.ts b/i18n/semiautomaticclassificationplugin_el_GR.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_es.ts b/i18n/semiautomaticclassificationplugin_es.ts
@@ -6644,7 +6644,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_fr.ts b/i18n/semiautomaticclassificationplugin_fr.ts
@@ -6642,7 +6642,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_it.ts b/i18n/semiautomaticclassificationplugin_it.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_ja.ts b/i18n/semiautomaticclassificationplugin_ja.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_pl.ts b/i18n/semiautomaticclassificationplugin_pl.ts
@@ -6644,7 +6644,7 @@ Chcesz dodać wymagane pola do tego shapefile?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/settings.py" line="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_pt.ts b/i18n/semiautomaticclassificationplugin_pt.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_pt_BR.ts b/i18n/semiautomaticclassificationplugin_pt_BR.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_uk_UA.ts b/i18n/semiautomaticclassificationplugin_uk_UA.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_zh_CN.ts b/i18n/semiautomaticclassificationplugin_zh_CN.ts
@@ -6640,7 +6640,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="333"/>
+        <location filename="../maininterface/settings.py" line="391"/>
         <source>Test</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/maininterface/settings.py b/maininterface/settings.py
@@ -282,10 +282,44 @@ def testGDAL(self):
 			d = cfg.ogrSCP.GetDriverByName('ESRI Shapefile')
 			if d is None:
 				test = 'Fail (missing drivers)'
+		try:
+			from osgeo import gdal
+			gdal.Translate
+		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 multiprocess
+	def multiprocessRunTest(self):
+		# pool
+		cfg.pool = cfg.poolSCP(processes=1)
+		p = 0
+		wrtP = [p]
+		results = []
+		c = cfg.pool.apply_async(self.importTest, args=(wrtP))
+		results.append([c, p])
+		for r in results:
+				res = r[0].get()
+				# logger
+				cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' multiprocess res: ' + str(res))
+		cfg.pool.close()
+		cfg.pool.terminate()
+		return res
+	
+	# test multiprocess import
+	def importTest(self, raster):
+		try:
+			from osgeo import gdal
+			gdal.Translate
+			import numpy as np
+			return 'Yes'
+		except Exception as err:
+			return str(err)
+			
 	# test multiprocess
 	def testMultiprocess(self):
 		test = 'Success'
@@ -296,15 +330,23 @@ def testMultiprocess(self):
 		# Mac OS
 		if cfg.sysSCPNm == 'Darwin':
 			cfg.uiUtls.addProgressBar()
-			dPref = cfg.osSCP.environ['PATH'].split(':')
-			# logger
-			cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' environ path: ' + str(dPref))
+			if len(cfg.ui.python_path_lineEdit.text()) > 0:
+				dPref = [cfg.ui.python_path_lineEdit.text()].rstrip('python3')
+				# logger
+				cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' python environ path preset: ' + str(dPref))
+			else:
+				dPref = cfg.osSCP.environ['PATH'].split(':')
+				# logger
+				cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' python environ path: ' + str(dPref))
 			for flPref in dPref:
 				flPrefPy = cfg.osSCP.path.join(flPref, 'python3')
 				if cfg.osSCP.path.isfile(flPrefPy):
 					# logger
 					cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' python path: ' + str(flPrefPy))
 					cfg.multiPSCP.set_executable(flPrefPy)
+					res = self.multiprocessRunTest()
+					if res != 'Yes':
+						test = 'Fail'
 					try:
 						tPMD = cfg.utls.createTempRasterPath('vrt')
 						oM = cfg.utls.createTempRasterPath('tif')
@@ -314,15 +356,31 @@ def testMultiprocess(self):
 						cfg.utls.createRasterFromReference(rD, 1, [oM], cfg.NoDataVal, 'GTiff', cfg.rasterDataType, 0,  None)
 						rD = None
 						o = cfg.utls.multiProcessRaster(rasterPath = r, functionBand = 'No', functionRaster = cfg.utls.calculateRaster, outputRasterList = [oM], functionBandArgument = ['raster * 2'], functionVariable = [['raster']], progressMessage = cfg.QtWidgetsSCP.QApplication.translate('semiautomaticclassificationplugin', 'Test'), parallel = cfg.parallelRaster)
+						# logger
+						cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' o : ' + str(o))
+						test = 'Success'
 						break
 					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'
+				else:
+					# logger
+					cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' python path not found: ' + str(flPrefPy))
 			cfg.uiUtls.removeProgressBar()
 		else:
 			try:
+				if len(cfg.ui.python_path_lineEdit.text()) > 0:
+					dPref = cfg.ui.python_path_lineEdit.text()
+					# logger
+					cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' python environ path preset: ' + str(dPref))
+					if not cfg.osSCP.path.isfile(dPref):
+						test = 'Fail'
+						return test
 				cfg.uiUtls.addProgressBar()
+				res = self.multiprocessRunTest()
+				if res != 'Yes':
+					test = 'Fail'
 				tPMD = cfg.utls.createTempRasterPath('vrt')
 				oM = cfg.utls.createTempRasterPath('tif')
 				# open input with GDAL
@@ -364,7 +422,7 @@ def testGDALSubprocess(self):
 		# 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):
 		dT = cfg.utls.getTime()
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.4.2
+version=7.4.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,15 @@ icon=semiautomaticclassificationplugin.png
 ; start of optional metadata
 changelog=
 
+	7.4.5
+	-fixed settings
+	
+	7.4.4
+	-fixed settings
+	
+	7.4.3
+	-fixed settings
+	
 	7.4.2
 	-fixed settings
 	
diff --git a/ui/resources_rc.py b/ui/resources_rc.py
