Update plugins.xml

.gitignore

@@ -0,0 +1,2 @@
+*.zip
+*/*/PythonSQL.py

CenIsere_AUTOMAP/CenIsere_AutoMap.py

@@ -116,7 +116,7 @@ class PgAutoMap:
         """
         dialog = AutoMapAboutDialog(iface)
         dialog.exec_()
-        
+
     def open_help():
         """ Open the online help. """
         # QDesktopServices.openUrl(QUrl('https://plateformesig.CenIsere-outils.org/'))

CenIsere_AUTOMAP/canvas_editor.py

@@ -76,7 +76,8 @@ url_ortho = 'http://tiles.craig.fr/ortho/service/?crs=EPSG:2154&featureCount=10&
 url_mnt = 'http://tiles.craig.fr/mnt/crs=EPSG:2154&featureCount=10&format=image/png&layers=relief&maxHeight=256&maxWidth=256&styles=&url=http://tiles.craig.fr/mnt'
 url_pente = 'http://tiles.craig.fr/mnt/crs=EPSG:2154&featureCount=10&format=image/png&layers=pente&maxHeight=256&maxWidth=256&styles=&url=http://tiles.craig.fr/mnt'
 data_source = [
-    'CENRA',
+    'CEN Isère',
+    'CEN-RA',
     'IGN',
     'CRAIG',
     'OpenStreetMap',
@@ -184,7 +185,9 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
         for l,logo_x in enumerate(custome_bibliotech):
             logo_library.append(' '+os.path.basename(logo_x))
 
-        bibliotech = glob.glob(resources_path("logo_library","*.png"))
+        bibliotech_png = glob.glob(resources_path("logo_library","*.png"))
+        bibliotech_jpeg = glob.glob(resources_path("logo_library","*.jpg"))
+        bibliotech = [*bibliotech_png, *bibliotech_jpeg]
         for l,logo_x in enumerate(bibliotech):
             logo_library.append(os.path.basename(logo_x))
         self.mComboBox_4.addItems(sorted(logo_library))
@@ -483,13 +486,15 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                         image1.attemptMove(self.template_parameters['image_position'])
                         image1.attemptResize(self.template_parameters['image_size'])
                         self.layout.addLayoutItem(image1)
+                        image1.setMode(QgsLayoutItemPicture.FormatRaster)
 
                         # Ajout de la vague basse
-                        image2= QgsLayoutItemPicture(self.layout)
+                        image2 = QgsLayoutItemPicture(self.layout)
                         image2.setPicturePath(resources_path("mises_en_pages","vague2.png"))  
                         image2.attemptMove(self.template_parameters['image_position_2'])
                         image2.attemptResize(self.template_parameters['image_size_2'])
                         self.layout.addLayoutItem(image2)
+                        image2.setMode(QgsLayoutItemPicture.FormatRaster)
 
                         
                     
@@ -498,7 +503,8 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     self.layout.addLayoutItem(title)
                     titre = layout_name
                     title.setText(titre)
-                    title.setFont(QFont("Calibri", 15, QFont.Bold))
+                    title.setFont(QFont("Museo 700", 15, QFont.Bold))
+                    title.setFontColor(QColor(62, 62, 62, 24))
                     title.attemptMove(self.template_parameters['title_position'])
                     title.attemptResize(self.template_parameters['title_size'])
                     title.setBackgroundEnabled(True)
@@ -516,7 +522,8 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     if self.radioButton_9.isChecked() == 1:
                         titre = titre + ' [%' + self.comboBox_4.currentText() + '%]'
                     subtitle.setText(titre)
-                    subtitle.setFont(QFont("MS Shell Dlg 2", 10))
+                    subtitle.setFont(QFont("Calibri", 10))
+                    subtitle.setFontColor(QColor(0, 69, 148, 58))
                     subtitle.attemptMove(self.template_parameters['subtitle_position'])
                     subtitle.attemptResize(self.template_parameters['subtitle_size'])
                     subtitle.setId("SubTitle")
@@ -533,7 +540,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                     logo.setMode(QgsLayoutItemPicture.FormatRaster)
                     logo.attemptMove(self.template_parameters['logo_position'])
                     logo.setFixedSize(self.template_parameters['logo_size'])
-                    logo.setPicturePath(resources_path("icons","CEN.png"))
+                    logo.setPicturePath(resources_path("icons","CEN38.jpg"))
                     logo.setId('logo')
                     self.layout.addLayoutItem(logo)
 
@@ -597,9 +604,14 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 legend.setEqualColumnWidth(True)
                 legend.setSplitLayer(True)
                 legend.setColumnSpace(5)
+                legend.setTitle('Légende')
                 legend.rstyle(QgsLegendStyle.Title).setMargin(1.5)  # 1 mm
+                legend.rstyle(QgsLegendStyle.Title).setFont(QFont("Calibri", 12,QFont.Bold))
                 legend.rstyle(QgsLegendStyle.Group).setMargin(QgsLegendStyle.Top, 3)
+                legend.rstyle(QgsLegendStyle.Group).setFont(QFont("Calibri", 10))
                 legend.rstyle(QgsLegendStyle.Subgroup).setMargin(QgsLegendStyle.Top, 3)
+                legend.rstyle(QgsLegendStyle.Subgroup).setFont(QFont("Calibri", 10,QFont.Bold))
+                legend.rstyle(QgsLegendStyle.SymbolLabel).setFont(QFont("Calibri", 10))
                 legend.setColumnCount(self.spinBox.value())
 
                 legend.adjustBoxSize()
@@ -624,6 +636,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.scalebarnumeric_qpt.attemptMove(self.template_parameters['scalebarnumeric_position'])
                 self.scalebarnumeric_qpt.attemptResize(self.template_parameters['scalebarnumeric_size'])
                 self.scalebarnumeric_qpt.setAlignment(QgsScaleBarSettings.Alignment(1))
+                self.scalebarnumeric_qpt.setFont(QFont("Calibri", 10))
                 self.scalebarnumeric_qpt.setBackgroundEnabled(True)
                 self.scalebarnumeric_qpt.setBackgroundColor(QColor(255, 255, 255, 130))
 
@@ -642,6 +655,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 self.scalebar_qpt.attemptMove(self.template_parameters['scalebar_position'])
                 self.scalebar_qpt.attemptResize(self.template_parameters['scalebar_size'])
                 self.scalebar_qpt.setAlignment(QgsScaleBarSettings.Alignment(1))
+                self.scalebar_qpt.setFont(QFont("Calibri", 10))
                 self.scalebar_qpt.setBackgroundEnabled(True)
                 self.scalebar_qpt.setBackgroundColor(QColor(255, 255, 255, 130))
 
@@ -656,9 +670,9 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 north.attemptResize(self.template_parameters['north_size'])
 
                 if self.radioButton_10.isChecked() == 1:
-                    info_text = ["Source : " + self.mComboBox_3.currentText()][0]
+                    info_text = ["Source : ©" + ', ©'.join(self.mComboBox_3.checkedItems())][0]
                 else:
-                    info_text = ["Source : " + self.lineEdit_4.text()][0]
+                    info_text = ["Source : ©" + self.lineEdit_4.text()][0]
                 # ajout note info:
                 info = ["Réalisation : " + "CEN Isère (" + date.today().strftime(
                     "%d/%m/%Y") + ")"]
@@ -668,6 +682,8 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 credit_text.setHAlign(Qt.AlignRight)
                 credit_text.setVAlign(Qt.AlignVCenter)
                 credit_text.setItemRotation(-90)
+                credit_text.setBackgroundEnabled(True)
+                credit_text.setBackgroundColor(QColor(255, 255, 255, 30))
                 credit_text2 = QgsLayoutItemLabel(self.layout)
                 credit_text2.setText(info_text)
                 credit_text2.setFont(QFont("Calibri", 9))
@@ -756,7 +772,6 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
                 bar_echelle.setUnits(QgsUnitTypes.DistanceKilometers)
                 bar_echelle.setUnitLabel("km")
                 bar_echelle.setUnitsPerSegment(round((echelle.scale()*0.02)/1000))
-
             else:
                 bar_echelle.setUnits(QgsUnitTypes.DistanceMeters)
                 bar_echelle.setUnitLabel("m")

CenIsere_AUTOMAP/metadata.txt

@@ -6,7 +6,7 @@
 name=CenIsere_AutoMap
 qgisMinimumVersion=3.0
 description=CenIsere_AutoMap
-version=1.0
+version=1.6
 author=Conservatoire d'Espaces Naturels Isère
 
 

CenIsere_AUTOMAP/tools/mises_en_pages/canvas.py

@@ -12,11 +12,11 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['position_map_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['position_map_position'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['map_size'] = QgsLayoutSize(199, 175, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_size'] = QgsLayoutSize(199, 175+47, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['map_position'] = QgsLayoutPoint(5, 25, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
@@ -28,22 +28,22 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 205, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 205+47, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(55, 5, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(145, 228, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(145, 228+47, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['scalebar_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['scalebar_position'] = QgsLayoutPoint(145, 215, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(145, 215+47, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['north_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['north_position'] = QgsLayoutPoint(193, 214, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(193, 214+47, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text_position'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(200, 75, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(104, 201, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(104, 201+47, QgsUnitTypes.LayoutMillimeters)
 
 
 
@@ -56,7 +56,7 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
@@ -79,8 +79,8 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(273, 182, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(287, 123, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(189, 168.5, QgsUnitTypes.LayoutMillimeters)
@@ -93,7 +93,7 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
@@ -116,8 +116,8 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(273, 297, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(287, 123, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(189, 284, QgsUnitTypes.LayoutMillimeters)
@@ -130,7 +130,7 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(5, 23.5, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
@@ -153,7 +153,7 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(402, 270, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text_position'] = QgsLayoutPoint(415, 123, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
@@ -170,13 +170,13 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
@@ -193,8 +193,8 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(196, 283, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text_position'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(200, 75, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(55, 292, QgsUnitTypes.LayoutMillimeters)
@@ -208,13 +208,13 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 185, QgsUnitTypes.LayoutMillimeters)
@@ -231,8 +231,8 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(283, 196, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(287, 123, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(98, 205, QgsUnitTypes.LayoutMillimeters)
@@ -246,13 +246,13 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 370, QgsUnitTypes.LayoutMillimeters)
@@ -269,8 +269,8 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(24, 24, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(271, 394, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291, 125, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(287125, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(98, 414, QgsUnitTypes.LayoutMillimeters)
@@ -284,13 +284,13 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(411, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(411, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['logo_size'] = QgsLayoutSize(48, 17, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['logo_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['logo_credit_size'] = QgsLayoutSize(50, 20, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 247, QgsUnitTypes.LayoutMillimeters)
@@ -307,7 +307,7 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(24, 24, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(394, 271, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 4, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text_position'] = QgsLayoutPoint(414, 123, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 4, QgsUnitTypes.LayoutMillimeters)
@@ -320,11 +320,11 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['position_map_size'] = QgsLayoutSize(50, 50, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['position_map_position'] = QgsLayoutPoint(2.5, 20, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['map_size'] = QgsLayoutSize(199, 175, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['map_size'] = QgsLayoutSize(199, 175+47, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['map_position'] = QgsLayoutPoint(5, 25, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(200, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
@@ -336,28 +336,28 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['logo_credit_position'] = QgsLayoutPoint(5, 275, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['legend_size'] = QgsLayoutSize(405, 203, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 205, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['legend_position'] = QgsLayoutPoint(5, 205+47, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['scalebarnumeric_size'] = QgsLayoutSize(55, 5, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(145, 228, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebarnumeric_position'] = QgsLayoutPoint(145, 228+47, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['scalebar_size'] = QgsLayoutSize(55, 15, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['scalebar_position'] = QgsLayoutPoint(145, 215, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['scalebar_position'] = QgsLayoutPoint(145, 215+47, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['north_size'] = QgsLayoutSize(12, 12, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['north_position'] = QgsLayoutPoint(193, 214, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['north_position'] = QgsLayoutPoint(193, 214+47, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text_position'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(200, 79, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(104, 201, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(104, 201+47, QgsUnitTypes.LayoutMillimeters)
 			
-			self.template_parameters['image_size'] = QgsLayoutSize(200, 175, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_size'] = QgsLayoutSize(199, 20, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['image_position'] = QgsLayoutPoint(4.5, 18, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position'] = QgsLayoutPoint(5, 18, QgsUnitTypes.LayoutMillimeters)
 			
-			self.template_parameters['image_size_2'] = QgsLayoutSize(200, 175, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_size_2'] = QgsLayoutSize(200, 12, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['image_position_2'] = QgsLayoutPoint(4.5, 194.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position_2'] = QgsLayoutPoint(4.5, 194.9+47, QgsUnitTypes.LayoutMillimeters)
 			
 		if self.radioButton_6.isChecked() and self.radioButton_8.isChecked():
 
@@ -368,7 +368,7 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
@@ -391,16 +391,16 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(273, 182, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(287, 123, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(189, 168.5, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['image_size'] = QgsLayoutSize(286, 145, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_size'] = QgsLayoutSize(285, 23, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['image_position'] = QgsLayoutPoint(5.5, 13, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position'] = QgsLayoutPoint(6, 13, QgsUnitTypes.LayoutMillimeters)
 			
-			self.template_parameters['image_size_2'] = QgsLayoutSize(286, 145, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_size_2'] = QgsLayoutSize(286, 15, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['image_position_2'] = QgsLayoutPoint(5.5, 162.2, QgsUnitTypes.LayoutMillimeters)
 			
 
@@ -410,7 +410,7 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(286, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
@@ -433,16 +433,16 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(273, 297, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['credit_text_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_position'] = QgsLayoutPoint(287, 123, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(189, 284, QgsUnitTypes.LayoutMillimeters)
 			
-			self.template_parameters['image_size'] = QgsLayoutSize(286, 260, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_size'] = QgsLayoutSize(285, 30, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['image_position'] = QgsLayoutPoint(5.5, 13, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position'] = QgsLayoutPoint(6, 13, QgsUnitTypes.LayoutMillimeters)
 			
-			self.template_parameters['image_size_2'] = QgsLayoutSize(286, 260, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_size_2'] = QgsLayoutSize(286, 20, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['image_position_2'] = QgsLayoutPoint(5.5, 278.2, QgsUnitTypes.LayoutMillimeters)
 			
 
@@ -453,7 +453,7 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['map_position'] = QgsLayoutPoint(5, 23.5, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['title_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['title_position'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['title_position'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['subtitle_size'] = QgsLayoutSize(409, 8, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['subtitle_position'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters)
@@ -476,16 +476,16 @@ def fletch_canvas(self,values_page):
 			self.template_parameters['north_size'] = QgsLayoutSize(8.4, 12.5, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['north_position'] = QgsLayoutPoint(402, 270, QgsUnitTypes.LayoutMillimeters)
 
-			self.template_parameters['credit_text_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text_position'] = QgsLayoutPoint(415, 123, QgsUnitTypes.LayoutMillimeters)
 
 			self.template_parameters['credit_text2_size'] = QgsLayoutSize(100, 3.9, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['credit_text2_position'] = QgsLayoutPoint(313, 247, QgsUnitTypes.LayoutMillimeters)
 			
-			self.template_parameters['image_size'] = QgsLayoutSize(409.3, 222, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_size'] = QgsLayoutSize(408.5, 38, QgsUnitTypes.LayoutMillimeters)
-			self.template_parameters['image_position'] = QgsLayoutPoint(4.5, 8, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_position'] = QgsLayoutPoint(5, 8, QgsUnitTypes.LayoutMillimeters)
 			
-			self.template_parameters['image_size_2'] = QgsLayoutSize(409.3, 222, QgsUnitTypes.LayoutMillimeters)
+			self.template_parameters['image_size_2'] = QgsLayoutSize(409.3, 22, QgsUnitTypes.LayoutMillimeters)
 			self.template_parameters['image_position_2'] = QgsLayoutPoint(4.6, 237.15, QgsUnitTypes.LayoutMillimeters)
 
 	# Retour des info #

CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_base.ui

@@ -257,7 +257,7 @@
       <property name="geometry">
        <rect>
         <x>30</x>
-        <y>350</y>
+        <y>330</y>
         <width>311</width>
         <height>41</height>
        </rect>
@@ -283,7 +283,7 @@
       <property name="geometry">
        <rect>
         <x>40</x>
-        <y>380</y>
+        <y>360</y>
         <width>311</width>
         <height>21</height>
        </rect>
@@ -305,8 +305,8 @@
       <property name="geometry">
        <rect>
         <x>40</x>
-        <y>470</y>
+        <y>450</y>
-        <width>260</width>
+        <width>250</width>
         <height>20</height>
        </rect>
       </property>
@@ -342,7 +342,7 @@
       <property name="geometry">
        <rect>
         <x>30</x>
-        <y>440</y>
+        <y>420</y>
         <width>290</width>
         <height>41</height>
        </rect>
@@ -358,7 +358,7 @@
        <string notr="true">color: rgb(11, 11, 11);</string>
       </property>
       <property name="text">
-       <string>Eléments à intégrer à la légende :</string>
+       <string>Éléments à intégrer à la légende :</string>
       </property>
      </widget>
      <widget class="QWidget" name="horizontalLayoutWidget">
@@ -375,7 +375,7 @@
         <widget class="QLabel" name="label_3">
          <property name="font">
           <font>
-           <pointsize>7</pointsize>
+           <pointsize>10</pointsize>
            <weight>75</weight>
            <bold>true</bold>
            <underline>false</underline>
@@ -390,7 +390,7 @@
         <widget class="QRadioButton" name="radioButton_6">
          <property name="font">
           <font>
-           <pointsize>7</pointsize>
+           <pointsize>10</pointsize>
           </font>
          </property>
          <property name="text">
@@ -411,7 +411,7 @@
         <widget class="QRadioButton" name="radioButton_5">
          <property name="font">
           <font>
-           <pointsize>7</pointsize>
+           <pointsize>10</pointsize>
           </font>
          </property>
          <property name="text">
@@ -435,7 +435,7 @@
         <widget class="QLabel" name="label_16">
          <property name="font">
           <font>
-           <pointsize>7</pointsize>
+           <pointsize>10</pointsize>
            <weight>75</weight>
            <bold>true</bold>
            <underline>false</underline>
@@ -450,7 +450,7 @@
         <widget class="QRadioButton" name="radioButton_7">
          <property name="font">
           <font>
-           <pointsize>7</pointsize>
+           <pointsize>10</pointsize>
           </font>
          </property>
          <property name="text">
@@ -471,7 +471,7 @@
         <widget class="QRadioButton" name="radioButton_8">
          <property name="font">
           <font>
-           <pointsize>7</pointsize>
+           <pointsize>10</pointsize>
           </font>
          </property>
          <property name="text">
@@ -492,7 +492,7 @@
       </property>
       <property name="font">
        <font>
-        <pointsize>7</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="text">
@@ -502,15 +502,15 @@
      <widget class="QRadioButton" name="radioButton_10">
       <property name="geometry">
        <rect>
-        <x>140</x>
+        <x>75</x>
-        <y>410</y>
+        <y>390</y>
-        <width>121</width>
+        <width>200</width>
         <height>16</height>
        </rect>
       </property>
       <property name="font">
        <font>
-        <pointsize>7</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="text">
@@ -521,7 +521,7 @@
       <property name="geometry">
        <rect>
         <x>40</x>
-        <y>380</y>
+        <y>360</y>
         <width>310</width>
         <height>20</height>
        </rect>
@@ -560,15 +560,15 @@
      <widget class="QRadioButton" name="radioButton_11">
       <property name="geometry">
        <rect>
-        <x>110</x>
+        <x>75</x>
         <y>150</y>
-        <width>181</width>
+        <width>200</width>
         <height>16</height>
        </rect>
       </property>
       <property name="font">
        <font>
-        <pointsize>7</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="text">
@@ -578,15 +578,15 @@
      <widget class="QRadioButton" name="radioButton_13">
       <property name="geometry">
        <rect>
-        <x>130</x>
+        <x>75</x>
         <y>230</y>
-        <width>121</width>
+        <width>200</width>
         <height>16</height>
        </rect>
       </property>
       <property name="font">
        <font>
-        <pointsize>7</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="text">
@@ -677,11 +677,57 @@
        <string>Bibliotheque de logo :</string>
       </property>
      </widget>
+     <widget class="QLabel" name="label_17">
+      <property name="geometry">
+       <rect>
+        <x>75</x>
+        <y>465</y>
+        <width>311</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <weight>50</weight>
+        <bold>false</bold>
+        <underline>false</underline>
+       </font>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">color: rgb(11, 11, 11);</string>
+      </property>
+      <property name="text">
+       <string>Sur</string>
+      </property>
+     </widget>
+     <widget class="QLabel" name="label_18">
+      <property name="geometry">
+       <rect>
+        <x>155</x>
+        <y>465</y>
+        <width>311</width>
+        <height>41</height>
+       </rect>
+      </property>
+      <property name="font">
+       <font>
+        <weight>50</weight>
+        <bold>false</bold>
+        <underline>false</underline>
+       </font>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">color: rgb(11, 11, 11);</string>
+      </property>
+      <property name="text">
+       <string>colonne(s)</string>
+      </property>
+     </widget>
      <widget class="QSpinBox" name="spinBox">
       <property name="geometry">
        <rect>
-        <x>310</x>
+        <x>110</x>
-        <y>470</y>
+        <y>475</y>
         <width>42</width>
         <height>22</height>
        </rect>
@@ -726,6 +772,8 @@
      <zorder>radioButton_13</zorder>
      <zorder>mComboBox_4</zorder>
      <zorder>label_15</zorder>
+     <zorder>label_17</zorder>
+     <zorder>label_18</zorder>
      <zorder>spinBox</zorder>
      <zorder>CustomeLogo</zorder>
     </widget>
@@ -1061,7 +1109,7 @@
       </property>
       <property name="font">
        <font>
-        <pointsize>7</pointsize>
+        <pointsize>10</pointsize>
        </font>
       </property>
       <property name="text">

CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_base_ui.py

@@ -95,7 +95,7 @@ class Ui_MapCENDialogBase(object):
         self.label_7.setStyleSheet("color: rgb(11, 11, 11);")
         self.label_7.setObjectName("label_7")
         self.label_8 = QtWidgets.QLabel(parent=self.groupBox_7)
-        self.label_8.setGeometry(QtCore.QRect(30, 350, 311, 41))
+        self.label_8.setGeometry(QtCore.QRect(30, 330, 311, 41))
         font = QtGui.QFont()
         font.setBold(False)
         font.setUnderline(True)
@@ -105,13 +105,13 @@ class Ui_MapCENDialogBase(object):
         self.label_8.setObjectName("label_8")
         self.lineEdit_4 = QtWidgets.QLineEdit(parent=self.groupBox_7)
         self.lineEdit_4.setEnabled(True)
-        self.lineEdit_4.setGeometry(QtCore.QRect(40, 380, 311, 21))
+        self.lineEdit_4.setGeometry(QtCore.QRect(40, 360, 311, 21))
         self.lineEdit_4.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.lineEdit_4.setReadOnly(False)
         self.lineEdit_4.setClearButtonEnabled(True)
         self.lineEdit_4.setObjectName("lineEdit_4")
         self.mComboBox_2 = QgsCheckableComboBox(parent=self.groupBox_7)
-        self.mComboBox_2.setGeometry(QtCore.QRect(40, 470, 260, 20))
+        self.mComboBox_2.setGeometry(QtCore.QRect(40, 450, 250, 20))
         self.mComboBox_2.setMinimumSize(QtCore.QSize(260, 20))
         self.mComboBox_2.setMaximumSize(QtCore.QSize(310, 20))
         self.mComboBox_2.setStyleSheet("")
@@ -121,7 +121,7 @@ class Ui_MapCENDialogBase(object):
         self.mComboBox_2.setDefaultText("")
         self.mComboBox_2.setObjectName("mComboBox_2")
         self.label_14 = QtWidgets.QLabel(parent=self.groupBox_7)
-        self.label_14.setGeometry(QtCore.QRect(30, 440, 290, 41))
+        self.label_14.setGeometry(QtCore.QRect(30, 420, 290, 41))
         font = QtGui.QFont()
         font.setBold(False)
         font.setUnderline(True)
@@ -137,7 +137,7 @@ class Ui_MapCENDialogBase(object):
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.label_3 = QtWidgets.QLabel(parent=self.horizontalLayoutWidget)
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         font.setBold(True)
         font.setUnderline(False)
         font.setWeight(75)
@@ -146,7 +146,7 @@ class Ui_MapCENDialogBase(object):
         self.horizontalLayout.addWidget(self.label_3)
         self.radioButton_6 = QtWidgets.QRadioButton(parent=self.horizontalLayoutWidget)
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         self.radioButton_6.setFont(font)
         self.radioButton_6.setIconSize(QtCore.QSize(16, 16))
         self.radioButton_6.setChecked(True)
@@ -154,7 +154,7 @@ class Ui_MapCENDialogBase(object):
         self.horizontalLayout.addWidget(self.radioButton_6)
         self.radioButton_5 = QtWidgets.QRadioButton(parent=self.horizontalLayoutWidget)
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         self.radioButton_5.setFont(font)
         self.radioButton_5.setObjectName("radioButton_5")
         self.horizontalLayout.addWidget(self.radioButton_5)
@@ -166,7 +166,7 @@ class Ui_MapCENDialogBase(object):
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.label_16 = QtWidgets.QLabel(parent=self.horizontalLayoutWidget_2)
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         font.setBold(True)
         font.setUnderline(False)
         font.setWeight(75)
@@ -175,7 +175,7 @@ class Ui_MapCENDialogBase(object):
         self.horizontalLayout_2.addWidget(self.label_16)
         self.radioButton_7 = QtWidgets.QRadioButton(parent=self.horizontalLayoutWidget_2)
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         self.radioButton_7.setFont(font)
         self.radioButton_7.setIconSize(QtCore.QSize(16, 16))
         self.radioButton_7.setChecked(True)
@@ -183,24 +183,24 @@ class Ui_MapCENDialogBase(object):
         self.horizontalLayout_2.addWidget(self.radioButton_7)
         self.radioButton_8 = QtWidgets.QRadioButton(parent=self.horizontalLayoutWidget_2)
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         self.radioButton_8.setFont(font)
         self.radioButton_8.setObjectName("radioButton_8")
         self.horizontalLayout_2.addWidget(self.radioButton_8)
         self.radioButton_9 = QtWidgets.QRadioButton(parent=self.groupBox_7)
         self.radioButton_9.setGeometry(QtCore.QRect(270, 570, 82, 15))
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         self.radioButton_9.setFont(font)
         self.radioButton_9.setObjectName("radioButton_9")
         self.radioButton_10 = QtWidgets.QRadioButton(parent=self.groupBox_7)
-        self.radioButton_10.setGeometry(QtCore.QRect(140, 410, 121, 16))
+        self.radioButton_10.setGeometry(QtCore.QRect(75, 390, 200, 16))
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         self.radioButton_10.setFont(font)
         self.radioButton_10.setObjectName("radioButton_10")
         self.mComboBox_3 = QgsCheckableComboBox(parent=self.groupBox_7)
-        self.mComboBox_3.setGeometry(QtCore.QRect(40, 380, 310, 20))
+        self.mComboBox_3.setGeometry(QtCore.QRect(40, 360, 310, 20))
         self.mComboBox_3.setMinimumSize(QtCore.QSize(310, 20))
         self.mComboBox_3.setMaximumSize(QtCore.QSize(310, 20))
         self.mComboBox_3.setStyleSheet("")
@@ -211,15 +211,15 @@ class Ui_MapCENDialogBase(object):
         self.mComboBox_3.setDefaultText("")
         self.mComboBox_3.setObjectName("mComboBox_3")
         self.radioButton_11 = QtWidgets.QRadioButton(parent=self.groupBox_7)
-        self.radioButton_11.setGeometry(QtCore.QRect(110, 150, 181, 16))
+        self.radioButton_11.setGeometry(QtCore.QRect(75, 150, 200, 16))
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         self.radioButton_11.setFont(font)
         self.radioButton_11.setObjectName("radioButton_11")
         self.radioButton_13 = QtWidgets.QRadioButton(parent=self.groupBox_7)
-        self.radioButton_13.setGeometry(QtCore.QRect(130, 230, 121, 16))
+        self.radioButton_13.setGeometry(QtCore.QRect(75, 230, 200, 16))
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         self.radioButton_13.setFont(font)
         self.radioButton_13.setObjectName("radioButton_13")
         self.comboBox_7 = QtWidgets.QComboBox(parent=self.groupBox_7)
@@ -249,8 +249,26 @@ class Ui_MapCENDialogBase(object):
         self.label_15.setFont(font)
         self.label_15.setStyleSheet("color: rgb(11, 11, 11);")
         self.label_15.setObjectName("label_15")
+        self.label_17 = QtWidgets.QLabel(parent=self.groupBox_7)
+        self.label_17.setGeometry(QtCore.QRect(75, 465, 311, 41))
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setUnderline(False)
+        font.setWeight(50)
+        self.label_17.setFont(font)
+        self.label_17.setStyleSheet("color: rgb(11, 11, 11);")
+        self.label_17.setObjectName("label_17")
+        self.label_18 = QtWidgets.QLabel(parent=self.groupBox_7)
+        self.label_18.setGeometry(QtCore.QRect(155, 465, 311, 41))
+        font = QtGui.QFont()
+        font.setBold(False)
+        font.setUnderline(False)
+        font.setWeight(50)
+        self.label_18.setFont(font)
+        self.label_18.setStyleSheet("color: rgb(11, 11, 11);")
+        self.label_18.setObjectName("label_18")
         self.spinBox = QtWidgets.QSpinBox(parent=self.groupBox_7)
-        self.spinBox.setGeometry(QtCore.QRect(310, 470, 42, 22))
+        self.spinBox.setGeometry(QtCore.QRect(110, 475, 42, 22))
         self.spinBox.setMinimum(1)
         self.spinBox.setMaximum(10)
         self.spinBox.setObjectName("spinBox")
@@ -277,6 +295,8 @@ class Ui_MapCENDialogBase(object):
         self.radioButton_13.raise_()
         self.mComboBox_4.raise_()
         self.label_15.raise_()
+        self.label_17.raise_()
+        self.label_18.raise_()
         self.spinBox.raise_()
         self.CustomeLogo.raise_()
         self.label_5 = QtWidgets.QLabel(parent=self.tab)
@@ -396,7 +416,7 @@ class Ui_MapCENDialogBase(object):
         self.radioButton_12 = QtWidgets.QRadioButton(parent=self.groupBox_3)
         self.radioButton_12.setGeometry(QtCore.QRect(80, 130, 181, 16))
         font = QtGui.QFont()
-        font.setPointSize(7)
+        font.setPointSize(10)
         self.radioButton_12.setFont(font)
         self.radioButton_12.setObjectName("radioButton_12")
         self.comboBox_6 = QtWidgets.QComboBox(parent=self.groupBox_3)
@@ -430,7 +450,7 @@ class Ui_MapCENDialogBase(object):
         self.label_7.setText(_translate("MapCENDialogBase", "Sous-titre de la carte :"))
         self.label_8.setText(_translate("MapCENDialogBase", "Source des données :"))
         self.lineEdit_4.setText(_translate("MapCENDialogBase", "à renseigner ici"))
-        self.label_14.setText(_translate("MapCENDialogBase", "Eléments à intégrer à la légende :"))
+        self.label_14.setText(_translate("MapCENDialogBase", "Éléments à intégrer à la légende :"))
         self.label_3.setText(_translate("MapCENDialogBase", "Format :"))
         self.radioButton_6.setText(_translate("MapCENDialogBase", "A4"))
         self.radioButton_5.setText(_translate("MapCENDialogBase", "A3"))
@@ -442,6 +462,8 @@ class Ui_MapCENDialogBase(object):
         self.radioButton_11.setText(_translate("MapCENDialogBase", "Theme et suivie de positionnement"))
         self.radioButton_13.setText(_translate("MapCENDialogBase", "Mise en page existante"))
         self.label_15.setText(_translate("MapCENDialogBase", "Bibliotheque de logo :"))
+        self.label_17.setText(_translate("MapCENDialogBase", "Sur"))
+        self.label_18.setText(_translate("MapCENDialogBase", "colonne(s)"))
         self.CustomeLogo.setText(_translate("MapCENDialogBase", "Custom Bibliotheque"))
         self.label_9.setText(_translate("MapCENDialogBase", "Colonne de sous-titre :"))
         self.label_10.setText(_translate("MapCENDialogBase", "Colonne d\'identification :"))

CenRa_COPIE/tools/PythonSQL.py

@@ -8,21 +8,21 @@ if IPAddr[0:11] == "100.100.100": #4269
     dbname = "sig4269"
     sigdb="sig4269"
     refdb="ref_geo4269"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.0": #01
     host = "192.168.0.201"
     port = "5432"
     dbname = "sig01"
     sigdb="sig01"
     refdb="ref_geo01"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.1": #0726
     host = "192.168.1.201"
     port = "5432"
     dbname = "sig0726"
     sigdb="sig0726"
     refdb="ref_geo0726"
-    password = "McVities"
+    password = "XXXXXX"
 if sys.platform == 'linux':
     os_user = os.environ['USER']
 else:

CenRa_FLUX/tools/PythonSQL.py

@@ -9,21 +9,21 @@ if IPAddr[0:11] == "100.100.100": #4269
     dbname = "sig4269"
     sigdb="sig4269"
     refdb="ref_geo4269"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.0": #01
     host = "192.168.0.201"
     port = "5432"
     dbname = "sig01"
     sigdb="sig01"
     refdb="ref_geo01"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.1": #0726
     host = "192.168.1.201"
     port = "5432"
     dbname = "sig0726"
     sigdb="sig0726"
     refdb="ref_geo0726"
-    password = "McVities"
+    password = "XXXXXX"
 if sys.platform == 'linux':
     os_user = os.environ['USER']
 else:

CenRa_Metabase/tools/PythonSQL.py

@@ -9,21 +9,21 @@ if IPAddr[0:11] == "100.100.100": #4269
     dbname = "sig4269"
     sigdb="sig4269"
     refdb="ref_geo4269"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.0": #01
     host = "192.168.0.201"
     port = "5432"
     dbname = "sig01"
     sigdb="sig01"
     refdb="ref_geo01"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.1": #0726
     host = "192.168.1.201"
     port = "5432"
     dbname = "sig0726"
     sigdb="sig0726"
     refdb="ref_geo0726"
-    password = "McVities"
+    password = "XXXXXX"
 if sys.platform == 'linux':
     os_user = os.environ['USER']
 else:

CenRa_PAGERENDER/tools/PythonSQL.py

@@ -9,21 +9,21 @@ if IPAddr[0:11] == "100.100.100": #4269
     dbname = "sig4269"
     sigdb="sig4269"
     refdb="ref_geo4269"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.0": #01
     host = "192.168.0.201"
     port = "5432"
     dbname = "sig01"
     sigdb="sig01"
     refdb="ref_geo01"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.1": #0726
     host = "192.168.1.201"
     port = "5432"
     dbname = "sig0726"
     sigdb="sig0726"
     refdb="ref_geo0726"
-    password = "McVities"
+    password = "XXXXXX"
 if sys.platform == 'linux':
     os_user = os.environ['USER']
 else:

CenRa_POSTGIS/tools/PythonSQL.py

@@ -8,21 +8,21 @@ if IPAddr[0:11] == "100.100.100": #4269
     dbname = "sig4269"
     sigdb="sig4269"
     refdb="ref_geo4269"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.0": #01
     host = "192.168.0.201"
     port = "5432"
     dbname = "sig01"
     sigdb="sig01"
     refdb="ref_geo01"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.1": #0726
     host = "192.168.1.201"
     port = "5432"
     dbname = "sig0726"
     sigdb="sig0726"
     refdb="ref_geo0726"
-    password = "McVities"
+    password = "XXXXXX"
 if sys.platform == 'linux':
     os_user = os.environ['USER']
 else:

CenRa_SICEN/tools/PythonSQL.py

@@ -8,21 +8,21 @@ if IPAddr[0:11] == "100.100.100": #4269
     dbname = "sig4269"
     sigdb="sig4269"
     refdb="ref_geo4269"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.0": #01
     host = "192.168.0.201"
     port = "5432"
     dbname = "sig01"
     sigdb="sig01"
     refdb="ref_geo01"
-    password = "McVities"
+    password = "XXXXXX"
 if IPAddr[0:9] == "192.168.1": #0726
     host = "192.168.1.201"
     port = "5432"
     dbname = "sig0726"
     sigdb="sig0726"
     refdb="ref_geo0726"
-    password = "McVities"
+    password = "XXXXXX"
 if sys.platform == 'linux':
     os_user = os.environ['USER']
 else:

plugins.xml

@@ -1,8 +1,8 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <plugins>
-    <pyqgis_plugin name="CenIsere_AUTOMAP" version="1.0">
+    <pyqgis_plugin name="CenIsere_AUTOMAP" version="1.6">
         <description><![CDATA[Plugin QGIS d'automatisation de mise en page - CEN Isère]]></description>
-        <version>1.0</version>
+        <version>1.6</version>
         <qgis_minimum_version>3.16</qgis_minimum_version>
         <homepage>https://gitea.cenra-outils.org/CEN38/Plugin_QGIS</homepage>
         <file_name>CenIsere_AUTOMAP.zip</file_name>
@@ -16,4 +16,36 @@
         <deprecated>False</deprecated>
         <tags>cenisere,mise en page,atlas</tags>
     </pyqgis_plugin>   
+    <pyqgis_plugin name="gn_tools" version="0.1">
+        <description><![CDATA[Plugin QGIS multi outils d'accès aux données GéoNature]]></description>
+        <version>0.1</version>
+        <qgis_minimum_version>3.2</qgis_minimum_version>
+        <homepage>https://gitea.cenra-outils.org/CEN38/plugin_gn_tools</homepage>
+        <file_name>gn_tools.zip</file_name>
+        <icon>icon.png</icon>
+        <author_name>CEN-Isère</author_name>
+        <download_url>https://gitea.cenra-outils.org/CEN38/plugin_gn_tools/releases/download/0.1/gn_tools.zip</download_url>
+        <uploaded_by>CEN-Isère</uploaded_by>
+        <create_date>2026-04-22</create_date>
+        <update_date>2026-04-22</update_date>
+        <experimental>False</experimental>
+        <deprecated>False</deprecated>
+        <tags>GéoNature,Biodiv'Aura</tags>
+    </pyqgis_plugin>
+    <pyqgis_plugin name="plugin_animation" version="0.2">
+        <description><![CDATA[Plugin QGIS d'accès aux données d'animation]]></description>
+        <version>0.1</version>
+        <qgis_minimum_version>3.2</qgis_minimum_version>
+        <homepage>https://gitea.cenra-outils.org/CEN38/plugin_animation</homepage>
+        <file_name>plugin_animation.zip</file_name>
+        <icon>icon.png</icon>
+        <author_name>CEN-Isère</author_name>
+        <download_url>https://gitea.cenra-outils.org/CEN38/plugin_animation/releases/download/0.1/plugin_animation-0.1.zip</download_url>
+        <uploaded_by>CEN-Isère</uploaded_by>
+        <create_date>2026-04-27</create_date>
+        <update_date>2026-04-27</update_date>
+        <experimental>False</experimental>
+        <deprecated>False</deprecated>
+        <tags>Animation</tags>
+    </pyqgis_plugin>
 </plugins>