diff --git a/CenRa_AUTOMAP/tools/mises_en_pages/demo.py b/CenRa_AUTOMAP/tools/mises_en_pages/demo.py index 2202d24..7675dc5 100644 --- a/CenRa_AUTOMAP/tools/mises_en_pages/demo.py +++ b/CenRa_AUTOMAP/tools/mises_en_pages/demo.py @@ -16,79 +16,79 @@ def fletch_canvas(self): if page_rotate == 'Portrait': if values_page == 'A4': - self.template_parameters['Carte_size'] = QgsLayoutSize(210.0,297, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_rotate'] = 0.0 - self.template_parameters['Carte_2_size'] = QgsLayoutSize(50.0,50, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(3, 20, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_2_rotate'] = 0.0 - self.template_parameters['Legande_size'] = QgsLayoutSize(405.14285714285717,203, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Legande_locals'] = QgsLayoutPoint(133, 215, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Legande_rotate'] = 0.0 - self.template_parameters['Arrow_size'] = QgsLayoutSize(12.0,12, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Arrow_locals'] = QgsLayoutPoint(196, 283, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Arrow_rotate'] = 0.0 - self.template_parameters['Echelle_size'] = QgsLayoutSize(64.0,7, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_locals'] = QgsLayoutPoint(3, 288, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_rotate'] = 0.0 - self.template_parameters['Logo_size'] = QgsLayoutSize(48.0,17, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_locals'] = QgsLayoutPoint(5, 2, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_rotate'] = 0.0 - self.template_parameters['Titre_size'] = QgsLayoutSize(200.0,8, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Titre_locals'] = QgsLayoutPoint(5, 2, 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(205, 225.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(55, 210, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Source_rotate'] = 0.0 - self.template_parameters['Sous_titre_size'] = QgsLayoutSize(200.0,8, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(5, 10, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Sous_titre_rotate'] = 0.0 - self.template_parameters['Echelle_2_size'] = QgsLayoutSize(65.14285714285714,15, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(3, 210, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_2_rotate'] = 0.0 - self.template_parameters['Logo_2_size'] = QgsLayoutSize(50.0,20, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(5, 210, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_2_rotate'] = 0.0 + self.template_parameters['Carte_size'] = QgsLayoutSize(200.0,200, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 6, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_rotate'] = 0 + self.template_parameters['Carte_2_size'] = QgsLayoutSize(80.0,80, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(126, 210, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_rotate'] = 0 + self.template_parameters['Legande_size'] = QgsLayoutSize(86.0,86, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_locals'] = QgsLayoutPoint(6, 208, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_rotate'] = 0 + self.template_parameters['Arrow_size'] = QgsLayoutSize(14.285714285714286,14, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Arrow_locals'] = QgsLayoutPoint(189, 20, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Arrow_rotate'] = 0 + self.template_parameters['Echelle_size'] = QgsLayoutSize(51.42857142857143,7, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_locals'] = QgsLayoutPoint(9, 197, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_rotate'] = 0 + self.template_parameters['Logo_size'] = QgsLayoutSize(45.714285714285715,11, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_locals'] = QgsLayoutPoint(3, 3, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_rotate'] = 0 + self.template_parameters['Titre_size'] = QgsLayoutSize(154.28571428571428,11, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Titre_locals'] = QgsLayoutPoint(51, 3, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Titre_rotate'] = 0 + self.template_parameters['Credit_size'] = QgsLayoutSize(51.42857142857143,6, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Credit_locals'] = QgsLayoutPoint(151, 210, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Credit_rotate'] = 0 + self.template_parameters['Source_size'] = QgsLayoutSize(51.42857142857143,6, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Source_locals'] = QgsLayoutPoint(229, 197, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Source_rotate'] = 0 + self.template_parameters['Sous_titre_size'] = QgsLayoutSize(125.71428571428571,14, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(60, 20, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Sous_titre_rotate'] = 0 + self.template_parameters['Echelle_2_size'] = QgsLayoutSize(51.42857142857143,13, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(9, 184, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_2_rotate'] = 0 + self.template_parameters['Logo_2_size'] = QgsLayoutSize(28.571428571428573,29, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(9, 151, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_rotate'] = 0 if values_page == 'A3': - self.template_parameters['Carte_size'] = QgsLayoutSize(296,419, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_locals'] = QgsLayoutPoint(0, 0, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_rotate'] = 0.0 - self.template_parameters['Carte_2_size'] = QgsLayoutSize(70,70, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(4, 28, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_2_rotate'] = 0.0 - self.template_parameters['Legande_size'] = QgsLayoutSize(571,286, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Legande_locals'] = QgsLayoutPoint(188, 303, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Legande_rotate'] = 0.0 - self.template_parameters['Arrow_size'] = QgsLayoutSize(17,17, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Arrow_locals'] = QgsLayoutPoint(276, 399, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Arrow_rotate'] = 0.0 - self.template_parameters['Echelle_size'] = QgsLayoutSize(90,10, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_locals'] = QgsLayoutPoint(4, 406, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_rotate'] = 0.0 - self.template_parameters['Logo_size'] = QgsLayoutSize(68,24, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 3, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_rotate'] = 0.0 - self.template_parameters['Titre_size'] = QgsLayoutSize(282,11, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Titre_locals'] = QgsLayoutPoint(7, 3, 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(289, 317, 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(77, 296, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Source_rotate'] = 0.0 - self.template_parameters['Sous_titre_size'] = QgsLayoutSize(282,11, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(7, 14, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Sous_titre_rotate'] = 0.0 - self.template_parameters['Echelle_2_size'] = QgsLayoutSize(92,21, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(4, 296, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_2_rotate'] = 0.0 - self.template_parameters['Logo_2_size'] = QgsLayoutSize(70,28, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(7, 296, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_2_rotate'] = 0.0 + self.template_parameters['Carte_size'] = QgsLayoutSize(282,282, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_locals'] = QgsLayoutPoint(8, 8, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_rotate'] = 0 + self.template_parameters['Carte_2_size'] = QgsLayoutSize(113,113, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(178, 296, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_rotate'] = 0 + self.template_parameters['Legande_size'] = QgsLayoutSize(121,121, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_locals'] = QgsLayoutPoint(8, 293, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_rotate'] = 0 + self.template_parameters['Arrow_size'] = QgsLayoutSize(20,20, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Arrow_locals'] = QgsLayoutPoint(267, 28, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Arrow_rotate'] = 0 + self.template_parameters['Echelle_size'] = QgsLayoutSize(73,10, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_locals'] = QgsLayoutPoint(13, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_rotate'] = 0 + self.template_parameters['Logo_size'] = QgsLayoutSize(64,16, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_locals'] = QgsLayoutPoint(4, 4, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_rotate'] = 0 + self.template_parameters['Titre_size'] = QgsLayoutSize(218,16, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Titre_locals'] = QgsLayoutPoint(72, 4, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Titre_rotate'] = 0 + self.template_parameters['Credit_size'] = QgsLayoutSize(73,8, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Credit_locals'] = QgsLayoutPoint(213, 296, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Credit_rotate'] = 0 + self.template_parameters['Source_size'] = QgsLayoutSize(73,8, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Source_locals'] = QgsLayoutPoint(323, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Source_rotate'] = 0 + self.template_parameters['Sous_titre_size'] = QgsLayoutSize(177,20, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(85, 28, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Sous_titre_rotate'] = 0 + self.template_parameters['Echelle_2_size'] = QgsLayoutSize(73,18, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(13, 259, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_2_rotate'] = 0 + self.template_parameters['Logo_2_size'] = QgsLayoutSize(40,40, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(13, 213, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_rotate'] = 0 if page_rotate == 'Landscape': if values_page == 'A4': self.template_parameters['Carte_size'] = QgsLayoutSize(200.0,200, QgsUnitTypes.LayoutMillimeters) diff --git a/CenRa_Metabase/metadata.txt b/CenRa_Metabase/metadata.txt index 38a0a0b..03c552c 100644 --- a/CenRa_Metabase/metadata.txt +++ b/CenRa_Metabase/metadata.txt @@ -30,7 +30,7 @@ tags=python category=Plugins icon=icon.png # experimental flag -experimental=False +experimental=True # deprecated flag (applies to the whole plugin, not just a single version) deprecated=False diff --git a/CenRa_Metabase/tools/bg/Capture.png b/CenRa_Metabase/tools/bg/Capture.png deleted file mode 100644 index ba8fc76..0000000 Binary files a/CenRa_Metabase/tools/bg/Capture.png and /dev/null differ diff --git a/CenRa_PAGERENDER/canvas_editor.py b/CenRa_PAGERENDER/canvas_editor.py index 929131e..2a6e7a5 100644 --- a/CenRa_PAGERENDER/canvas_editor.py +++ b/CenRa_PAGERENDER/canvas_editor.py @@ -69,7 +69,8 @@ from .tools.resources import ( from .issues import CenRa_Issues from datetime import date last_select = None - +maxV=210 +maxH=296 EDITOR_CLASS = load_ui('CenRa_PageRender_base.ui') LOGGER = logging.getLogger('CenRa_PageRender') url_osm = 'https://osm.datagrandest.fr/mapcache/?crs=EPSG:2154&featureCount=10&format=image/png&layers=pure&maxHeight=256&maxWidth=256&styles=&url=https://osm.datagrandest.fr/mapcache' @@ -144,10 +145,14 @@ class PageRender_Editor(QDialog, EDITOR_CLASS): self.toolButton.clicked.connect(self.rotate) self.toolButton_2.clicked.connect(self.type_page) self.pushButton_2.clicked.connect(self.load) + self.verticalScrollBar.valueChanged.connect(self.moveFrame) def raise_(self): self.activateWindow() self.setNavigator() + self.verticalScrollBar.setValue(self.frame.y()) + def moveFrame(self): + self.frame.move(self.frame.x(),self.verticalScrollBar.value()) def select_file(self): options = QFileDialog.Options() @@ -328,6 +333,8 @@ def fletch_canvas(self): def type_page(self): all_children = self.frame.children() if self.toolButton_2.text() == 'Landscape': + self.horizontalSlider.setMaximum(maxV) + self.verticalSlider.setMaximum(maxH) last_children=0 for children in all_children: selection = children @@ -347,6 +354,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) last_children=0 for children in all_children: selection = children diff --git a/CenRa_PAGERENDER/demoV2.py b/CenRa_PAGERENDER/demoV2.py index 6cafdd2..7675dc5 100644 --- a/CenRa_PAGERENDER/demoV2.py +++ b/CenRa_PAGERENDER/demoV2.py @@ -19,11 +19,11 @@ def fletch_canvas(self): self.template_parameters['Carte_size'] = QgsLayoutSize(200.0,200, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Carte_locals'] = QgsLayoutPoint(6, 6, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Carte_rotate'] = 0 - self.template_parameters['Carte_2_size'] = QgsLayoutSize(85.71428571428571,69, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(209, 3, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_size'] = QgsLayoutSize(80.0,80, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(126, 210, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Carte_2_rotate'] = 0 - self.template_parameters['Legande_size'] = QgsLayoutSize(85.71428571428571,131, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Legande_locals'] = QgsLayoutPoint(209, 74, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_size'] = QgsLayoutSize(86.0,86, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_locals'] = QgsLayoutPoint(6, 208, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Legande_rotate'] = 0 self.template_parameters['Arrow_size'] = QgsLayoutSize(14.285714285714286,14, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Arrow_locals'] = QgsLayoutPoint(189, 20, QgsUnitTypes.LayoutMillimeters) @@ -38,7 +38,7 @@ def fletch_canvas(self): self.template_parameters['Titre_locals'] = QgsLayoutPoint(51, 3, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Titre_rotate'] = 0 self.template_parameters['Credit_size'] = QgsLayoutSize(51.42857142857143,6, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Credit_locals'] = QgsLayoutPoint(151, 197, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Credit_locals'] = QgsLayoutPoint(151, 210, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Credit_rotate'] = 0 self.template_parameters['Source_size'] = QgsLayoutSize(51.42857142857143,6, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Source_locals'] = QgsLayoutPoint(229, 197, QgsUnitTypes.LayoutMillimeters) @@ -56,38 +56,38 @@ def fletch_canvas(self): self.template_parameters['Carte_size'] = QgsLayoutSize(282,282, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Carte_locals'] = QgsLayoutPoint(8, 8, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Carte_rotate'] = 0 - self.template_parameters['Carte_2_size'] = QgsLayoutSize(121,97, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(294, 4, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_size'] = QgsLayoutSize(113,113, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(178, 296, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Carte_2_rotate'] = 0 - self.template_parameters['Legande_size'] = QgsLayoutSize(121,185, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Legande_locals'] = QgsLayoutPoint(294, 105, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_size'] = QgsLayoutSize(121,121, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_locals'] = QgsLayoutPoint(8, 293, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Legande_rotate'] = 0 self.template_parameters['Arrow_size'] = QgsLayoutSize(20,20, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Arrow_locals'] = QgsLayoutPoint(266, 28, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Arrow_locals'] = QgsLayoutPoint(267, 28, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Arrow_rotate'] = 0 self.template_parameters['Echelle_size'] = QgsLayoutSize(73,10, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_locals'] = QgsLayoutPoint(12, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_locals'] = QgsLayoutPoint(13, 278, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_rotate'] = 0 self.template_parameters['Logo_size'] = QgsLayoutSize(64,16, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_locals'] = QgsLayoutPoint(4, 4, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_rotate'] = 0 self.template_parameters['Titre_size'] = QgsLayoutSize(218,16, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Titre_locals'] = QgsLayoutPoint(73, 4, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Titre_locals'] = QgsLayoutPoint(72, 4, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Titre_rotate'] = 0 self.template_parameters['Credit_size'] = QgsLayoutSize(73,8, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Credit_locals'] = QgsLayoutPoint(214, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Credit_locals'] = QgsLayoutPoint(213, 296, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Credit_rotate'] = 0 self.template_parameters['Source_size'] = QgsLayoutSize(73,8, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Source_locals'] = QgsLayoutPoint(322, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Source_locals'] = QgsLayoutPoint(323, 278, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Source_rotate'] = 0 self.template_parameters['Sous_titre_size'] = QgsLayoutSize(177,20, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(85, 28, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Sous_titre_rotate'] = 0 self.template_parameters['Echelle_2_size'] = QgsLayoutSize(73,18, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(12, 260, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(13, 259, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_2_rotate'] = 0 self.template_parameters['Logo_2_size'] = QgsLayoutSize(40,40, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(12, 214, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(13, 213, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_2_rotate'] = 0 if page_rotate == 'Landscape': if values_page == 'A4': diff --git a/CenRa_PAGERENDER/metadata.txt b/CenRa_PAGERENDER/metadata.txt index 6ecec24..1e03763 100644 --- a/CenRa_PAGERENDER/metadata.txt +++ b/CenRa_PAGERENDER/metadata.txt @@ -6,7 +6,7 @@ name=CenRa_PageRender qgisMinimumVersion=3.0 description=CenRa_PageRender -version=1.1 +version=1.2 author=Conservatoire d'Espaces Naturels de Rhône-Alpes email=si_besoin@cen-rhonealpes.fr @@ -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_PageRender:


21/10/2024 - Version 1.1:

- Enfin fonctionnel.


09/10/2024 - Version 1.0:

- Création.

+changelog=

CenRa_PageRender:


21/10/2024 - Version 1.1:

- Bouton de scroll et adaptation portrait.


09/10/2024 - Version 1.0:

- Création.

# Tags are comma separated with spaces allowed tags=python @@ -30,7 +30,7 @@ tags=python category=Plugins icon=icon.png # experimental flag -experimental=False +experimental=True # deprecated flag (applies to the whole plugin, not just a single version) deprecated=False diff --git a/CenRa_PAGERENDER/tools/ui/CenRa_PageRender_base.ui b/CenRa_PAGERENDER/tools/ui/CenRa_PageRender_base.ui index 7c7e393..abb71cb 100644 --- a/CenRa_PAGERENDER/tools/ui/CenRa_PageRender_base.ui +++ b/CenRa_PAGERENDER/tools/ui/CenRa_PageRender_base.ui @@ -644,6 +644,46 @@ ... + + + + 1280 + 40 + 16 + 731 + + + + -300 + + + 40 + + + 10 + + + 50 + + + 40 + + + Qt::Vertical + + + true + + + frame + horizontalSlider + verticalSlider + frame_2 + radioButton + spinBox + spinBox_2 + toolButton + verticalScrollBar diff --git a/plugins.xml b/plugins.xml index 50464e2..964fb53 100644 --- a/plugins.xml +++ b/plugins.xml @@ -87,7 +87,7 @@ - 1.6 + 1.7 3.16 https://plateformesig.cenra-outils.org/ CenRa_AUTOMAP.zip @@ -102,19 +102,19 @@ cenra,mise en page,atlas - + - 1.1 + 1.2 3.16 https://plateformesig.cenra-outils.org/ - CenRa_AUTOMAP.zip + CenRa_PAGERENDER.zip CEN-Rhone-Alpes.png CEN-Rhone-Alpes - https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_AUTOMAP.zip + https://gitea.cenra-outils.org/CEN-RA/Plugin_QGIS/releases/download/latest/CenRa_PAGERENDER.zip CEN-Rhone-Alpes 2024-10-09 2024-10-21 - False + True False cenra,mise en page,atlas