mise à jour de pagerender, netoyage de metabase

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

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':

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=<h2>CenRa_PageRender:</h2></br><p><h3>21/10/2024 - Version 1.1: </h3> - Enfin fonctionnel.</p></br><p><h3>09/10/2024 - Version 1.0: </h3> - Création.</p>
+changelog=<h2>CenRa_PageRender:</h2></br><p><h3>21/10/2024 - Version 1.1: </h3> - Bouton de scroll et adaptation portrait.</p></br><p><h3>09/10/2024 - Version 1.0: </h3> - Création.</p>
 
 # 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

CenRa_PAGERENDER/tools/ui/CenRa_PageRender_base.ui

@@ -644,6 +644,46 @@
       <string>...</string>
      </property>
     </widget>
+    <widget class="QScrollBar" name="verticalScrollBar">
+     <property name="geometry">
+      <rect>
+       <x>1280</x>
+       <y>40</y>
+       <width>16</width>
+       <height>731</height>
+      </rect>
+     </property>
+     <property name="minimum">
+      <number>-300</number>
+     </property>
+     <property name="maximum">
+      <number>40</number>
+     </property>
+     <property name="singleStep">
+      <number>10</number>
+     </property>
+     <property name="pageStep">
+      <number>50</number>
+     </property>
+     <property name="value">
+      <number>40</number>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="invertedAppearance">
+      <bool>true</bool>
+     </property>
+    </widget>
+    <zorder>frame</zorder>
+    <zorder>horizontalSlider</zorder>
+    <zorder>verticalSlider</zorder>
+    <zorder>frame_2</zorder>
+    <zorder>radioButton</zorder>
+    <zorder>spinBox</zorder>
+    <zorder>spinBox_2</zorder>
+    <zorder>toolButton</zorder>
+    <zorder>verticalScrollBar</zorder>
    </widget>
   </widget>
  </widget>