premier commit/push

CenRa_SICEN/sicen.py

@@ -52,6 +52,8 @@ import qgis
 import datetime
 import csv
 
+from .forms.about_form import SicenAboutDialog
+
 import psycopg2
 import psycopg2.extras
 import base64
@@ -59,6 +61,7 @@ import base64
 import os
 #import sys
 
+
 class SICEN(object):
 
     def __init__(self, iface):
@@ -81,6 +84,14 @@ class SICEN(object):
         self.dlg = SICENDialog()
         maj_verif('CenRa_SICEN')
 
+        version = qgis.utils.pluginMetadata('CenRa_SICEN','version')
+        # Display About window on first use
+        s = QSettings()
+        versionUse = s.value("sicen/version", 1, type=str)
+        if str(versionUse) != str(version) :
+            s.setValue("sicen/version", str(version))
+            self.open_about_dialog()
+
     def initGui(self):
         self.toolBar = self.iface.addToolBar("SICEN")
         self.toolBar.setObjectName("SICEN")
@@ -123,6 +134,10 @@ class SICEN(object):
         self.sicen_ouverture.triggered.connect(self.ouverture)
         self.sicen_export.triggered.connect(self.export)
 
+    def open_about_dialog(self):
+        dialog = SicenAboutDialog(self.iface)
+        dialog.exec_()
+
     def unload(self):
         # Remove the plugin menu item and icon
         self.iface.removePluginMenu(u"&SICEN", self.action)
@@ -561,13 +576,16 @@ class SICEN(object):
 
                 else :
                     selection = layer.selectedFeatures()
-                    if layer.selectedFeatureCount() == 1 :
+                    if layer.selectedFeatureCount() >= 1 :
+                        GEOM = ''
                         for feature in selection:
                             geom = feature.geometry()
-                            poly = geom.asWkt()
-
+                            poly = "ST_GeomFromText('"+geom.asWkt()+"',2154),"
+                            GEOM = GEOM + poly
+                        poly = GEOM[0:-1]
+                        #print(poly)
                         buffer = self.dlg.buffer.text()
-                        reqwhere_geom = " ST_intersects(geometrie,ST_Buffer(ST_geomFromText('" + poly + "',2154), " + buffer + " ))"
+                        reqwhere_geom = " ST_intersects(geometrie,ST_Buffer(ST_Collect(array[" + poly + "]), " + buffer + " ))"
 
                         # Requete finale
                         reqwhere_final = '(' + reqwhere_obs + ')' + 'AND' + reqwhere_insee + 'AND' + reqwhere_ordre + 'AND' + reqwhere_sp + 'AND' + '(' + reqwhere_pat + ')' +  'AND' + reqwhere_regne + 'AND' + reqwhere_date + 'AND' + reqwhere_geom
@@ -596,6 +614,7 @@ class SICEN(object):
                             ### Centroide
                             if reqwhere_final.find('()') !=  -1 :
                                 reqwhere_final = ''
+                            print(reqwhere_final)
                             uri.setDataSource("_agregation_ra", "observations_centroide", "geometrie", reqwhere_final, "gid")
                             layer = self.iface.addVectorLayer(uri.uri(), table_name + '_centroides', "postgres")