7.10.2

semiautomaticgit · semiautomaticgit · commit f711ffc2b70e · 2021-10-14T20:03:31.000+02:00
diff --git a/__init__.py b/__init__.py
@@ -42,7 +42,7 @@ def description():
 
 
 def version():
-    return 'Version 7.10.1 - Matera'
+    return 'Version 7.10.2 - Matera'
 
 
 def icon():
diff --git a/core/config.py b/core/config.py
@@ -852,6 +852,8 @@
 functionNames.append([[endForBandSetNm, '', '', []]])
 functionNames.append([[tempRasterNm + '1!', '', '', []]])
 functionNames.append([[tempDirNm, '', '', []]])
+functionNames.append([['Notifications']])
+functionNames.append([[' send_notification', 'cfg.batchT.performSendNotification',  'cfg.utls.sendSMTPMessage', ['subject : \'\'', 'message : \'\'']]])
 
 ''' Scatter plot '''
 scatterColorMap = ['rainbow', 'gist_rainbow', 'jet', 'afmhot', 'bwr', 'gnuplot', 'gnuplot2', 'BrBG', 'coolwarm', 'PiYG', 'PRGn', 'PuOr', 'RdBu', 'RdGy', 'RdYlBu', 'RdYlGn', 'Spectral', 'seismic', 'ocean', 'terrain', 'Blues', 'BuGn', 'BuPu', 'GnBu', 'Greens', 'Greys', 'Oranges', 'OrRd', 'PuBu', 'PuBuGn', 'PuRd', 'Purples', 'RdPu', 'Reds', 'YlGn', 'YlGnBu', 'YlOrBr', 'YlOrRd']
diff --git a/core/utils.py b/core/utils.py
@@ -9548,6 +9548,7 @@ def sendSMTPMessage(self, subject = None, message = None):
 					msg = 'From: SCP\nTo: \nSubject: ' + subject + '\n\n' + message + '\n\n---\nSemi-Automatic Classification Plugin\nhttps://fromgistors.blogspot.com/p/semi-automatic-classification-plugin.html'
 					s.sendmail(cfg.SMTPUser, tolist, msg)
 					s.quit()
+					cfg.utls.logCondition(str(__name__) + '-' + str(cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' subject:' + str(subject) + ' message:' + str(message))
 			except Exception as err:
 				# logger
 				cfg.utls.logCondition(str(__name__) + '-' + (cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' ERROR exception: ' + str(err))
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.10.1" plugin_id="284">
+    <pyqgis_plugin name="Semi-Automatic Classification Plugin - master" version="7.10.2" 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.10.1</version>
+        <version>7.10.2</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
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin.ts b/i18n/semiautomaticclassificationplugin.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_ar.ts b/i18n/semiautomaticclassificationplugin_ar.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_de.ts b/i18n/semiautomaticclassificationplugin_de.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_el_GR.ts b/i18n/semiautomaticclassificationplugin_el_GR.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_es.ts b/i18n/semiautomaticclassificationplugin_es.ts
@@ -6038,7 +6038,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6268,7 +6268,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_fr.ts b/i18n/semiautomaticclassificationplugin_fr.ts
@@ -4800,7 +4800,7 @@ ROI</source>
 <context>
     <name>semiautomaticclassificationplugin</name>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5951,7 +5951,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_it.ts b/i18n/semiautomaticclassificationplugin_it.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_ja.ts b/i18n/semiautomaticclassificationplugin_ja.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_pl.ts b/i18n/semiautomaticclassificationplugin_pl.ts
@@ -6038,7 +6038,7 @@ Chcesz dodać wymagane pola do tego shapefile?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6268,7 +6268,7 @@ Chcesz dodać wymagane pola do tego shapefile?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_pt.ts b/i18n/semiautomaticclassificationplugin_pt.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_pt_BR.ts b/i18n/semiautomaticclassificationplugin_pt_BR.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_uk_UA.ts b/i18n/semiautomaticclassificationplugin_uk_UA.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/semiautomaticclassificationplugin_zh_CN.ts b/i18n/semiautomaticclassificationplugin_zh_CN.ts
@@ -6034,7 +6034,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../semiautomaticclassificationplugin.py" line="1640"/>
+        <location filename="../semiautomaticclassificationplugin.py" line="1650"/>
         <source>Please, restart QGIS for executing the Semi-Automatic Classification Plugin</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6264,7 +6264,7 @@ Do you want to add the required fields to this shapefile?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../maininterface/batchTab.py" line="3747"/>
+        <location filename="../maininterface/batchTab.py" line="3776"/>
         <source>missing parameter</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/maininterface/batchTab.py b/maininterface/batchTab.py
@@ -1737,6 +1737,35 @@ def performAddNewBandSet(self, paramList):
 		parameters.append('\'Yes\'')
 		parameters.append(bandset)
 		return 'Yes', parameters
+		
+	# batch send notification
+	def performSendNotification(self, paramList):
+		parameters = []
+		for p in paramList:
+			pSplit = p.split(':', 1)
+			pName = pSplit[0].lower().replace(' ', '')
+			if pName == 'subject':
+				pSplitX = pSplit[1].strip()
+				g = cfg.reSCP.findall('[\'](.*?)[\']',pSplitX.replace('\\', '/'))
+				subject = '\'' + g[0] + '\''
+				if len(cfg.utls.fileName(g[0])) > 0:
+					pass
+				else:
+					return 'No', pName
+			elif pName == 'message':
+				pSplitX = pSplit[1].strip()
+				g = cfg.reSCP.findall('[\'](.*?)[\']',pSplitX.replace('\\', '/'))
+				message = '\'' + g[0] + '\''
+				if len(cfg.utls.fileName(g[0])) > 0:
+					pass
+				else:
+					return 'No', pName
+			else:
+				if len(pName.strip()) > 0:
+					return 'No', pName
+		parameters.append(subject)
+		parameters.append(message)
+		return 'Yes', parameters
 									
 	# batch band combination
 	def performBandCombination(self, paramList):
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.10.1
+version=7.10.2
 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.10.2
+	-when QGIS project is loaded a new function allows for automatically running a file batch.txt, if found in the plugin directory, as batch command
+	-batch added function send_notification for sending a smtp message during processes
+	
 	7.10.1
 	-in Band calc added option NoData mask, if checked, every NoData pixel in input will be NoData pixel in output
 	-fixed issue with classification and calculations
diff --git a/semiautomaticclassificationplugin.py b/semiautomaticclassificationplugin.py
@@ -317,7 +317,7 @@ def __init__(self, iface):
 			cfg.RGBLT = RGBListTab()
 			cfg.bstLT = BandSetListTab()
 			cfg.bCalc = BandCalcTab()
-			cfg.batchT= BatchTab()
+			cfg.batchT = BatchTab()
 			cfg.clipMulti = ClipMultipleRasters()
 			cfg.stackRstr = StackRasterBands()
 			cfg.mosaicBS = MosaicBandSets()
@@ -1599,6 +1599,16 @@ def newProjectLoaded(self):
 		cfg.bCalc.rasterBandName()
 		cfg.SCPD.openInput()
 		cfg.bstLT.BandSetListTable()
+		# allow automatic batch
+		batchPath = cfg.plgnDir + '/batch.txt'
+		if cfg.osSCP.path.isfile(batchPath):
+			try:
+				text = open(batchPath, 'r').read()
+				cfg.ui.plainTextEdit_batch.setPlainText(text)
+				cfg.batchT.runButton()
+			except Exception as err:
+				# logger
+				cfg.utls.logCondition(str(__name__) + '-' + (cfg.inspectSCP.stack()[0][3])+ ' ' + cfg.utls.lineOfCode(), ' ERROR exception: ' + str(err))
 		
 	# read project variables
 	def projectLoaded(self):
diff --git a/ui/resources_rc.py b/ui/resources_rc.py
