diff --git a/CenRa_AUTOMAP/canvas_editor.py b/CenRa_AUTOMAP/canvas_editor.py
index d07a0d6..d1f410d 100644
--- a/CenRa_AUTOMAP/canvas_editor.py
+++ b/CenRa_AUTOMAP/canvas_editor.py
@@ -69,10 +69,6 @@ from .tools.resources import (
)
from .issues import CenRa_Issues
-from .tools.mises_en_pages import carto_standard
-from .tools.mises_en_pages import full_page
-from .tools.mises_en_pages import left_corner
-
from datetime import date
EDITOR_CLASS = load_ui('CenRa_AutoMap_base.ui')
@@ -762,12 +758,9 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
pc = self.layout.pageCollection()
pc.pages()[0].setPageSize('A3', QgsLayoutItemPage.Landscape)
- if values_page == "left_corner.py":
- self.template_parameters = left_corner.fletch_canvas(self)
- if values_page == "carto_standard.py":
- self.template_parameters = carto_standard.fletch_canvas(self)
- if values_page == "full_page.py":
- self.template_parameters = full_page.fletch_canvas(self)
+ values_page_import = values_page[:-3]
+ eval("exec('from .tools.mises_en_pages import '+values_page_import)")
+ eval("exec('self.template_parameters = '+ values_page_import + '.fletch_canvas(self)')")
def bar_echelle_auto(self, echelle, bar_echelle):
diff --git a/CenRa_AUTOMAP/metadata.txt b/CenRa_AUTOMAP/metadata.txt
index aeee33d..256147b 100644
--- a/CenRa_AUTOMAP/metadata.txt
+++ b/CenRa_AUTOMAP/metadata.txt
@@ -21,7 +21,7 @@ tracker=https://gitea.cenra-outils.org/api/v1/repos/CEN-RA/Plugin_QGIS/issues
hasProcessingProvider=no
# Uncomment the following line and add your changelog:
-changelog=CenRa_AutoMap:
10/12/2024 - Version 1.8:
- Nouvelle mise en page. - Correctif de bug.21/10/2024 - Version 1.7:
- Epurations du code.07/10/2024 - Version 1.6:
- Option de bibliotheque de logo custome.03/10/2024 - Version 1.5:
- Remonte la fênetre dans la pille. - Gestion du nombre de colonne dans la légend.02/10/2024 - Version 1.4:
- Mise en page plein écrant.01/10/2024 - Version 1.3:
- Récupération du titre et sous-titre pour mise en page existente. - Integration de bibliotheque de logo. - Integration de gestionaire pour les source de donnée. - Mise en place d'une bar d'echelle adaptative. 30/09/2024 - Version 1.2:
- Activation du thème. - Ajouter une carte de suivie. 27/09/2024 - Version 1.1:
- Ajout d'une liste déroulante pour les sources de données. - Bouton pour ajouter des fonts de carte customisés. - Fonctionnalité de génération d'atlas. 26/09/2024 - Version 1.0:
- Lancement du plugin CenRa_AutoMap avec une seul mise en page.
+changelog=CenRa_AutoMap:
19/12/2024 - Version 1.8:
- Nouvelle mise en page. - Incrémentation automatique de nouveau modele de mise en page. - Correctif de bug.21/10/2024 - Version 1.7:
- Epurations du code.07/10/2024 - Version 1.6:
- Option de bibliotheque de logo custome.03/10/2024 - Version 1.5:
- Remonte la fênetre dans la pille. - Gestion du nombre de colonne dans la légend.02/10/2024 - Version 1.4:
- Mise en page plein écrant.01/10/2024 - Version 1.3:
- Récupération du titre et sous-titre pour mise en page existente. - Integration de bibliotheque de logo. - Integration de gestionaire pour les source de donnée. - Mise en place d'une bar d'echelle adaptative. 30/09/2024 - Version 1.2:
- Activation du thème. - Ajouter une carte de suivie. 27/09/2024 - Version 1.1:
- Ajout d'une liste déroulante pour les sources de données. - Bouton pour ajouter des fonts de carte customisés. - Fonctionnalité de génération d'atlas. 26/09/2024 - Version 1.0:
- Lancement du plugin CenRa_AutoMap avec une seul mise en page.
# Tags are comma separated with spaces allowed
tags=python
diff --git a/CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_base.ui b/CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_base.ui
index 91c343a..bf950a5 100644
--- a/CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_base.ui
+++ b/CenRa_AUTOMAP/tools/ui/CenRa_AutoMap_base.ui
@@ -114,9 +114,9 @@
30
- 10
- 311
- 41
+ 20
+ 251
+ 21
@@ -186,9 +186,9 @@
30
- 170
- 311
- 41
+ 180
+ 91
+ 21
@@ -234,9 +234,9 @@
30
- 260
- 311
- 41
+ 270
+ 111
+ 21
@@ -257,9 +257,9 @@
30
- 350
- 311
- 41
+ 360
+ 111
+ 21
@@ -342,9 +342,9 @@
30
- 440
- 311
- 41
+ 450
+ 161
+ 21
@@ -658,9 +658,9 @@
30
- 500
- 311
- 41
+ 510
+ 111
+ 21
@@ -683,7 +683,7 @@
340
470
42
- 22
+ 21
@@ -706,28 +706,28 @@
Custom Bibliotheque
- comboBox_7
- mComboBox_3
- label_4
- comboBox
- lineEdit_2
- label_6
- lineEdit_3
- label_7
- label_8
- lineEdit_4
- mComboBox_2
label_14
+ label_8
+ label_7
+ label_15
+ label_6
+ label_4
+ comboBox_7
+ comboBox
horizontalLayoutWidget
horizontalLayoutWidget_2
radioButton_9
radioButton_10
radioButton_11
radioButton_13
- mComboBox_4
- label_15
spinBox
CustomeLogo
+ mComboBox_3
+ mComboBox_4
+ mComboBox_2
+ lineEdit_3
+ lineEdit_4
+ lineEdit_2
@@ -788,9 +788,9 @@
30
- 130
- 311
- 41
+ 140
+ 111
+ 21
@@ -811,9 +811,9 @@
30
- 70
- 311
- 41
+ 80
+ 121
+ 21
@@ -882,9 +882,9 @@
30
- 10
- 311
- 41
+ 20
+ 91
+ 21
@@ -1008,9 +1008,9 @@
10
- 10
- 311
- 41
+ 20
+ 91
+ 21
@@ -1031,9 +1031,9 @@
10
- 70
- 311
- 41
+ 80
+ 91
+ 21
diff --git a/CenRa_PAGERENDER/canvas_editor.py b/CenRa_PAGERENDER/canvas_editor.py
index ef08e5d..b55796c 100644
--- a/CenRa_PAGERENDER/canvas_editor.py
+++ b/CenRa_PAGERENDER/canvas_editor.py
@@ -435,8 +435,8 @@ def fletch_canvas(self):
last_children = selection
self.toolButton_2.setText('Portrait')
elif self.toolButton_2.text() == 'Portrait':
- self.horizontalSlider.setMaximum(maxV)
- self.verticalSlider.setMaximum(maxH)
+ self.horizontalSlider.setMaximum(maxH)
+ self.verticalSlider.setMaximum(maxV)
last_children=0
for children in all_children:
selection = children
diff --git a/CenRa_PAGERENDER/demoV2.py b/CenRa_PAGERENDER/demoV2.py
deleted file mode 100644
index 5a903ee..0000000
--- a/CenRa_PAGERENDER/demoV2.py
+++ /dev/null
@@ -1,167 +0,0 @@
-
-from qgis.core import (
- QgsLayoutSize,
- QgsUnitTypes,
- QgsLayoutPoint,
-)
-def fletch_canvas(self):
- if self.radioButton_6.isChecked():
- values_page = 'A4'
- else:
- values_page = 'A3'
- if self.radioButton_7.isChecked():
- page_rotate = 'Portrait'
- else:
- page_rotate = 'Landscape'
-
- if page_rotate == 'Portrait':
- if values_page == 'A4':
- self.template_parameters['Carte_size'] = QgsLayoutSize(285.14285714285717,145, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_rotate'] = 0.0
- self.template_parameters['Carte_2_size'] = QgsLayoutSize(100.0,100, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_2_rotate'] = 0.0
- self.template_parameters['Legande_size'] = QgsLayoutSize(285.14285714285717,41, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Legande_locals'] = QgsLayoutPoint(6, 168, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Legande_rotate'] = 0.0
- self.template_parameters['Arrow_size'] = QgsLayoutSize(13.142857142857142,12, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Arrow_locals'] = QgsLayoutPoint(277, 6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Arrow_rotate'] = 0.0
- self.template_parameters['Echelle_size'] = QgsLayoutSize(54.857142857142854,15, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_locals'] = QgsLayoutPoint(232, 193, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_rotate'] = 0.0
- self.template_parameters['Logo_size'] = QgsLayoutSize(46.0,16, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_rotate'] = 0.0
- self.template_parameters['Titre_size'] = QgsLayoutSize(286.0,8, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Titre_rotate'] = 0.0
- self.template_parameters['Credit_size'] = QgsLayoutSize(100.0,4, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Credit_locals'] = QgsLayoutPoint(291, 127.0, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Credit_rotate'] = 270.0
- self.template_parameters['Source_size'] = QgsLayoutSize(100.0,4, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Source_locals'] = QgsLayoutPoint(189, 169, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Source_rotate'] = 0.0
- self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286.0,8, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Sous_titre_rotate'] = 0.0
- self.template_parameters['Echelle_2_size'] = QgsLayoutSize(54.857142857142854,15, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(232, 179, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_2_rotate'] = 0.0
- self.template_parameters['Logo_2_size'] = QgsLayoutSize(50.0,50, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(6, 118, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_2_rotate'] = 0.0
- if values_page == 'A3':
- self.template_parameters['Carte_size'] = QgsLayoutSize(402,205, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_locals'] = QgsLayoutPoint(8, 32, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_rotate'] = 0.0
- self.template_parameters['Carte_2_size'] = QgsLayoutSize(141,141, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(8, 32, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_2_rotate'] = 0.0
- self.template_parameters['Legande_size'] = QgsLayoutSize(402,58, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Legande_locals'] = QgsLayoutPoint(8, 237, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Legande_rotate'] = 0.0
- self.template_parameters['Arrow_size'] = QgsLayoutSize(19,17, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Arrow_locals'] = QgsLayoutPoint(391, 8, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Arrow_rotate'] = 0.0
- self.template_parameters['Echelle_size'] = QgsLayoutSize(77,21, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_locals'] = QgsLayoutPoint(327, 272, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_rotate'] = 0.0
- self.template_parameters['Logo_size'] = QgsLayoutSize(65,23, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_rotate'] = 0.0
- self.template_parameters['Titre_size'] = QgsLayoutSize(403,11, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Titre_locals'] = QgsLayoutPoint(7, 6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Titre_rotate'] = 0.0
- self.template_parameters['Credit_size'] = QgsLayoutSize(141,6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Credit_locals'] = QgsLayoutPoint(410, 179, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Credit_rotate'] = 270.0
- self.template_parameters['Source_size'] = QgsLayoutSize(141,6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Source_locals'] = QgsLayoutPoint(267, 238, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Source_rotate'] = 0.0
- self.template_parameters['Sous_titre_size'] = QgsLayoutSize(403,11, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(7, 17, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Sous_titre_rotate'] = 0.0
- self.template_parameters['Echelle_2_size'] = QgsLayoutSize(77,21, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(327, 252, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_2_rotate'] = 0.0
- self.template_parameters['Logo_2_size'] = QgsLayoutSize(70,70, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(8, 166, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_2_rotate'] = 0.0
- if page_rotate == 'Landscape':
- if values_page == 'A4':
- self.template_parameters['Carte_size'] = QgsLayoutSize(285.14285714285717,145, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_rotate'] = 0.0
- self.template_parameters['Carte_2_size'] = QgsLayoutSize(100.0,100, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(6, 23, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_2_rotate'] = 0.0
- self.template_parameters['Legande_size'] = QgsLayoutSize(285.14285714285717,41, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Legande_locals'] = QgsLayoutPoint(6, 168, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Legande_rotate'] = 0.0
- self.template_parameters['Arrow_size'] = QgsLayoutSize(13.142857142857142,12, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Arrow_locals'] = QgsLayoutPoint(277, 6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Arrow_rotate'] = 0.0
- self.template_parameters['Echelle_size'] = QgsLayoutSize(54.857142857142854,15, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_locals'] = QgsLayoutPoint(232, 193, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_rotate'] = 0.0
- self.template_parameters['Logo_size'] = QgsLayoutSize(46.0,16, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_rotate'] = 0.0
- self.template_parameters['Titre_size'] = QgsLayoutSize(286.0,8, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 4, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Titre_rotate'] = 0.0
- self.template_parameters['Credit_size'] = QgsLayoutSize(100.0,4, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Credit_locals'] = QgsLayoutPoint(291, 127.0, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Credit_rotate'] = 270.0
- self.template_parameters['Source_size'] = QgsLayoutSize(100.0,4, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Source_locals'] = QgsLayoutPoint(189, 169, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Source_rotate'] = 0.0
- self.template_parameters['Sous_titre_size'] = QgsLayoutSize(286.0,8, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 12, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Sous_titre_rotate'] = 0.0
- self.template_parameters['Echelle_2_size'] = QgsLayoutSize(54.857142857142854,15, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(232, 179, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_2_rotate'] = 0.0
- self.template_parameters['Logo_2_size'] = QgsLayoutSize(50.0,50, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(6, 118, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_2_rotate'] = 0.0
- if values_page == 'A3':
- self.template_parameters['Carte_size'] = QgsLayoutSize(402,205, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_locals'] = QgsLayoutPoint(8, 32, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_rotate'] = 0.0
- self.template_parameters['Carte_2_size'] = QgsLayoutSize(141,141, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(8, 32, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Carte_2_rotate'] = 0.0
- self.template_parameters['Legande_size'] = QgsLayoutSize(402,58, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Legande_locals'] = QgsLayoutPoint(8, 237, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Legande_rotate'] = 0.0
- self.template_parameters['Arrow_size'] = QgsLayoutSize(19,17, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Arrow_locals'] = QgsLayoutPoint(391, 8, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Arrow_rotate'] = 0.0
- self.template_parameters['Echelle_size'] = QgsLayoutSize(77,21, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_locals'] = QgsLayoutPoint(327, 272, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_rotate'] = 0.0
- self.template_parameters['Logo_size'] = QgsLayoutSize(65,23, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_rotate'] = 0.0
- self.template_parameters['Titre_size'] = QgsLayoutSize(403,11, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Titre_locals'] = QgsLayoutPoint(7, 6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Titre_rotate'] = 0.0
- self.template_parameters['Credit_size'] = QgsLayoutSize(141,6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Credit_locals'] = QgsLayoutPoint(410, 179, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Credit_rotate'] = 270.0
- self.template_parameters['Source_size'] = QgsLayoutSize(141,6, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Source_locals'] = QgsLayoutPoint(267, 238, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Source_rotate'] = 0.0
- self.template_parameters['Sous_titre_size'] = QgsLayoutSize(403,11, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(7, 17, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Sous_titre_rotate'] = 0.0
- self.template_parameters['Echelle_2_size'] = QgsLayoutSize(77,21, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(327, 252, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Echelle_2_rotate'] = 0.0
- self.template_parameters['Logo_2_size'] = QgsLayoutSize(70,70, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(8, 166, QgsUnitTypes.LayoutMillimeters)
- self.template_parameters['Logo_2_rotate'] = 0.0
- return self.template_parameters