From 36403781acc16f3707bbb6192ef0b74befff3eaa Mon Sep 17 00:00:00 2001 From: Colas Geier Date: Fri, 7 Feb 2025 14:47:57 +0100 Subject: [PATCH] adjust params position --- .../tools/mises_en_pages/canvas.py | 124 +++++++++--------- .../tools/ui/CenIsere_AutoMap_base.ui | 102 ++++++++++---- .../tools/ui/CenIsere_AutoMap_base_ui.py | 64 ++++++--- 3 files changed, 180 insertions(+), 110 deletions(-) diff --git a/CenIsere_AUTOMAP/tools/mises_en_pages/canvas.py b/CenIsere_AUTOMAP/tools/mises_en_pages/canvas.py index 72e8287c..64221f6b 100644 --- a/CenIsere_AUTOMAP/tools/mises_en_pages/canvas.py +++ b/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_position'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, 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_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, 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_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, 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_position'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, 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_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, 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_position'] = QgsLayoutPoint(291, 125, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, 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_position'] = QgsLayoutPoint(205, 125, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, 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_position'] = QgsLayoutPoint(4.5, 18, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['image_size'] = QgsLayoutSize(199, 20, 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_position_2'] = QgsLayoutPoint(4.5, 194.9, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['image_size_2'] = QgsLayoutSize(200, 12, 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_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, 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_position'] = QgsLayoutPoint(5.5, 13, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['image_size'] = QgsLayoutSize(285, 23, 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_position'] = QgsLayoutPoint(291.5, 123, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['credit_text_size'] = QgsLayoutSize(50, 3.9, 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_position'] = QgsLayoutPoint(5.5, 13, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['image_size'] = QgsLayoutSize(285, 30, 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_position'] = QgsLayoutPoint(4.5, 8, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['image_size'] = QgsLayoutSize(408.5, 38, 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 # diff --git a/CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_base.ui b/CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_base.ui index 849efe94..2b079b87 100644 --- a/CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_base.ui +++ b/CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_base.ui @@ -257,7 +257,7 @@ 30 - 350 + 330 311 41 @@ -283,7 +283,7 @@ 40 - 380 + 360 311 21 @@ -305,8 +305,8 @@ 40 - 470 - 260 + 450 + 250 20 @@ -342,7 +342,7 @@ 30 - 440 + 420 290 41 @@ -358,7 +358,7 @@ color: rgb(11, 11, 11); - Eléments à intégrer à la légende : + Éléments à intégrer à la légende : @@ -375,7 +375,7 @@ - 7 + 10 75 true false @@ -390,7 +390,7 @@ - 7 + 10 @@ -411,7 +411,7 @@ - 7 + 10 @@ -435,7 +435,7 @@ - 7 + 10 75 true false @@ -450,7 +450,7 @@ - 7 + 10 @@ -471,7 +471,7 @@ - 7 + 10 @@ -492,7 +492,7 @@ - 7 + 10 @@ -502,15 +502,15 @@ - 140 - 410 - 121 + 75 + 390 + 200 16 - 7 + 10 @@ -521,7 +521,7 @@ 40 - 380 + 360 310 20 @@ -560,15 +560,15 @@ - 110 + 75 150 - 181 + 200 16 - 7 + 10 @@ -578,15 +578,15 @@ - 130 + 75 230 - 121 + 200 16 - 7 + 10 @@ -677,11 +677,57 @@ Bibliotheque de logo : + + + + 75 + 465 + 311 + 41 + + + + + 50 + false + false + + + + color: rgb(11, 11, 11); + + + Sur + + + + + + 155 + 465 + 311 + 41 + + + + + 50 + false + false + + + + color: rgb(11, 11, 11); + + + colonne(s) + + - 310 - 470 + 110 + 475 42 22 @@ -726,6 +772,8 @@ radioButton_13 mComboBox_4 label_15 + label_17 + label_18 spinBox CustomeLogo @@ -1061,7 +1109,7 @@ - 7 + 10 diff --git a/CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_base_ui.py b/CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_base_ui.py index 35c4570c..3201cc1a 100644 --- a/CenIsere_AUTOMAP/tools/ui/CenIsere_AutoMap_base_ui.py +++ b/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 :"))