From fbdc653c9b89e0e6beeea1a892e0aeffe516965c Mon Sep 17 00:00:00 2001 From: tlaveille Date: Tue, 30 Jun 2026 12:00:49 +0200 Subject: [PATCH] n2000 logo maj size --- CenRa_AUTOMAP/tools/mises_en_pages/n2000.py | 14 +++++++------- .../tools/mises_en_pages/n2000_comparaison.py | 14 +++++++------- CenRa_FLUX/flux_editor.py | 3 +++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CenRa_AUTOMAP/tools/mises_en_pages/n2000.py b/CenRa_AUTOMAP/tools/mises_en_pages/n2000.py index 7b45465..0a037dd 100644 --- a/CenRa_AUTOMAP/tools/mises_en_pages/n2000.py +++ b/CenRa_AUTOMAP/tools/mises_en_pages/n2000.py @@ -36,10 +36,10 @@ def fletch_canvas(self): self.template_parameters['Arrow_background'] = False self.template_parameters['Arrow_path'] = "NorthArrow_03.svg" self.template_parameters['Echelle_size'] = QgsLayoutSize(50.0, 10, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_locals'] = QgsLayoutPoint(90, 244, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_locals'] = QgsLayoutPoint(140, 244, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_rotate'] = 0 self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_locals'] = QgsLayoutPoint(6, 234, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_locals'] = QgsLayoutPoint(6, 241, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_rotate'] = 0 self.template_parameters['Titre_size'] = QgsLayoutSize(206.0, 10, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 3, QgsUnitTypes.LayoutMillimeters) @@ -56,9 +56,9 @@ def fletch_canvas(self): self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(4, 13, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Sous_titre_rotate'] = 0 self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50.0, 13, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(90, 233, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(130, 233, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_2_rotate'] = 0 - self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_size'] = QgsLayoutSize(80.0, 35, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(48, 234, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_2_rotate'] = 0 if values_page == 'A3': @@ -128,7 +128,7 @@ def fletch_canvas(self): self.template_parameters['Echelle_locals'] = QgsLayoutPoint(247, 43, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_rotate'] = 0 self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_locals'] = QgsLayoutPoint(209, 174.0, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_locals'] = QgsLayoutPoint(228, 149.0, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_rotate'] = 0 self.template_parameters['Titre_size'] = QgsLayoutSize(289.0, 11, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Titre_locals'] = QgsLayoutPoint(3, 1.0, QgsUnitTypes.LayoutMillimeters) @@ -147,8 +147,8 @@ def fletch_canvas(self): self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(249, 30, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_2_rotate'] = 0 - self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(252, 174, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_size'] = QgsLayoutSize(80.0, 35, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(208, 172, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_2_rotate'] = 0 if values_page == 'A3': self.template_parameters['Carte_size'] = QgsLayoutSize(305.0, 273, QgsUnitTypes.LayoutMillimeters) diff --git a/CenRa_AUTOMAP/tools/mises_en_pages/n2000_comparaison.py b/CenRa_AUTOMAP/tools/mises_en_pages/n2000_comparaison.py index d88ac87..006b2fd 100644 --- a/CenRa_AUTOMAP/tools/mises_en_pages/n2000_comparaison.py +++ b/CenRa_AUTOMAP/tools/mises_en_pages/n2000_comparaison.py @@ -39,7 +39,7 @@ def fletch_canvas(self): self.template_parameters['Echelle_locals'] = QgsLayoutPoint(154, 220, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_rotate'] = 0 self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_locals'] = QgsLayoutPoint(160, 264, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_locals'] = QgsLayoutPoint(148, 267, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_rotate'] = 0 self.template_parameters['Titre_size'] = QgsLayoutSize(205.0, 10, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Titre_locals'] = QgsLayoutPoint(2, 1, QgsUnitTypes.LayoutMillimeters) @@ -58,8 +58,8 @@ def fletch_canvas(self): self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50.0, 13, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(162, 208, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_2_rotate'] = 0 - self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 20, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(160, 234, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_size'] = QgsLayoutSize(80.0, 35, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(128, 234, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_2_rotate'] = 0 if values_page == 'A3': self.template_parameters['Carte_size'] = QgsLayoutSize(233.0, 192, QgsUnitTypes.LayoutMillimeters) @@ -125,7 +125,7 @@ def fletch_canvas(self): self.template_parameters['Arrow_background'] = False self.template_parameters['Arrow_path'] = "NorthArrow_03.svg" self.template_parameters['Echelle_size'] = QgsLayoutSize(50, 8, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_locals'] = QgsLayoutPoint(110, 191, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_locals'] = QgsLayoutPoint(138, 191, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_rotate'] = 0 self.template_parameters['Logo_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_locals'] = QgsLayoutPoint(7, 175.0, QgsUnitTypes.LayoutMillimeters) @@ -145,10 +145,10 @@ def fletch_canvas(self): self.template_parameters['Sous_titre_locals'] = QgsLayoutPoint(3, 11.0, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Sous_titre_rotate'] = 0 self.template_parameters['Echelle_2_size'] = QgsLayoutSize(50, 13, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(110, 180, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_2_locals'] = QgsLayoutPoint(138, 180, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_2_rotate'] = 0 - self.template_parameters['Logo_2_size'] = QgsLayoutSize(40.0, 30, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(52, 175, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_size'] = QgsLayoutSize(80.0, 35, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Logo_2_locals'] = QgsLayoutPoint(52, 172, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_2_rotate'] = 0 if values_page == 'A3': self.template_parameters['Carte_size'] = QgsLayoutSize(200.0, 230, QgsUnitTypes.LayoutMillimeters) diff --git a/CenRa_FLUX/flux_editor.py b/CenRa_FLUX/flux_editor.py index 2d15f34..4e39082 100644 --- a/CenRa_FLUX/flux_editor.py +++ b/CenRa_FLUX/flux_editor.py @@ -721,6 +721,9 @@ class Flux_Editor(QDialog, EDITOR_CLASS): except psycopg2.errors.InsufficientPrivilege: print('Insufficient Privilege... RollBack !') con.rollback() + except psycopg2.errors.UndefinedColumn: + print('Column "geom" does not exist... RollBack !') + con.rollback() else: if self.QMBquestionNoLogin != QMessageBox.StandardButton(0x00004000):