diff --git a/CenRa_PAGERENDER/canvas_editor.py b/CenRa_PAGERENDER/canvas_editor.py index 67412b1..66bba0e 100644 --- a/CenRa_PAGERENDER/canvas_editor.py +++ b/CenRa_PAGERENDER/canvas_editor.py @@ -199,7 +199,7 @@ class PageRender_Editor(QDialog, EDITOR_CLASS): sourcefile = open(logopath, 'r') splitsource = sourcefile.read().splitlines() all_children = self.frame.children() - all_element = ['_locals', '_size', '_rotate'] + all_element = ['_locals', '_size', '_rotate', '_frame', '_background', '_path'] for children in all_children: flen = 0 for element in all_element: @@ -209,7 +209,17 @@ class PageRender_Editor(QDialog, EDITOR_CLASS): if find_it.find(recherche_element) != -1: flen = flen + 1 if flen == 1: - if element != '_rotate': + if element == '_frame' or element == '_background' or element == '_path': + value_find = (find_it.split('=')[1]).replace('"', '') + if children.objectName() in self.varObject: + if element[1:] in self.varObject[children.objectName()]: + self.varObject[children.objectName()][element[1:]] = value_find + else: + self.varObject[children.objectName()].update({element[1:]: value_find}) + else: + self.varObject.update({children.objectName(): {element[1:]: value_find}}) + # print(self.varObject) + elif element != '_rotate': value_find = (find_it[find_it[:].find('(') + 1:-33]).split(',') if element == '_size': Psize_h = float(value_find[0]) * 3.5 @@ -422,22 +432,27 @@ def fletch_canvas(self): def setParameter(self, selection_name): if selection_name in self.varObject: - for table2Range in range(0, self.tableWidget_2.rowCount() - 1): + for table2Range in range(0, self.tableWidget_2.rowCount()): rowName = self.tableWidget_2.item(table2Range, 0).text() - self.tableWidget_2.setItem(table2Range, 1, QTableWidgetItem(str(self.varObject[selection_name][rowName]))) + if rowName in self.varObject[selection_name]: + self.tableWidget_2.setItem(table2Range, 1, QTableWidgetItem(str(self.varObject[selection_name][rowName]))) + else: + self.varObject[selection_name].update({rowName: ""}) + self.tableWidget_2.setItem(table2Range, 1, QTableWidgetItem('')) else: - self.varObject.update({selection_name: {"frame": True, "background": True, "path": "NorthArrow_02.svg"}}) + self.varObject.update({selection_name: {"frame": "", "background": "", "path": ""}}) + self.tableWidget_2.setItem(1, 1, QTableWidgetItem('')) + self.tableWidget_2.setItem(2, 1, QTableWidgetItem('')) + self.tableWidget_2.setItem(3, 1, QTableWidgetItem('')) def setObject(self, event): selection_name = (self.tableWidget.currentItem()).text() rowName = self.tableWidget_2.item(event, 0).text() rowValue = self.tableWidget_2.item(event, 1).text() self.varObject[selection_name][rowName] = rowValue - # print(self.varObject[selection_name][rowName]) def setSlider(self): if self.tableWidget.currentItem() is not None: - # print(self.tableWidget.tabKeyNavigation()) selection_name = (self.tableWidget.currentItem()).text() all_children = self.frame.children() selection = 0 diff --git a/CenRa_PAGERENDER/demoV2.py b/CenRa_PAGERENDER/demoV2.py index 60fb7a2..df678af 100644 --- a/CenRa_PAGERENDER/demoV2.py +++ b/CenRa_PAGERENDER/demoV2.py @@ -18,244 +18,152 @@ def fletch_canvas(self): if page_rotate == 'Portrait': if values_page == 'A4': - self.template_parameters['Carte_frame'] = True - self.template_parameters['Carte_background'] = True 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_frame'] = True - self.template_parameters['Carte_2_background'] = True 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_rotate'] = 0 - self.template_parameters['Legande_frame'] = True - self.template_parameters['Legande_background'] = True 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_rotate'] = 0 - self.template_parameters['Arrow_path'] = 'NorthArrow_02.svg' 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_frame'] = True - self.template_parameters['Echelle_background'] = True 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_frame'] = True - self.template_parameters['Logo_background'] = True 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_frame'] = True - self.template_parameters['Titre_background'] = True 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_frame'] = True - self.template_parameters['Credit_background'] = True 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_rotate'] = 0 - self.template_parameters['Source_frame'] = True - self.template_parameters['Source_background'] = True 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_frame'] = True - self.template_parameters['Sous_titre_background'] = True 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_frame'] = True - self.template_parameters['Echelle_2_background'] = True 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_frame'] = True - self.template_parameters['Logo_2_background'] = True 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_frame'] = True - self.template_parameters['Carte_background'] = True 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_frame'] = True - self.template_parameters['Carte_2_background'] = True self.template_parameters['Carte_2_size'] = QgsLayoutSize(121, 97, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(295, 4, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(294, 4, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Carte_2_rotate'] = 0 - self.template_parameters['Legande_frame'] = True - self.template_parameters['Legande_background'] = True self.template_parameters['Legande_size'] = QgsLayoutSize(121, 185, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Legande_locals'] = QgsLayoutPoint(295, 104, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_locals'] = QgsLayoutPoint(294, 105, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Legande_rotate'] = 0 - self.template_parameters['Arrow_path'] = 'NorthArrow_02.svg' self.template_parameters['Arrow_size'] = QgsLayoutSize(20, 20, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Arrow_locals'] = QgsLayoutPoint(267, 28, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Arrow_locals'] = QgsLayoutPoint(266, 28, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Arrow_rotate'] = 0 - self.template_parameters['Echelle_frame'] = True - self.template_parameters['Echelle_background'] = True self.template_parameters['Echelle_size'] = QgsLayoutSize(73, 10, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_locals'] = QgsLayoutPoint(13, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_locals'] = QgsLayoutPoint(12, 278, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_rotate'] = 0 - self.template_parameters['Logo_frame'] = True - self.template_parameters['Logo_background'] = True 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_frame'] = True - self.template_parameters['Titre_background'] = True self.template_parameters['Titre_size'] = QgsLayoutSize(218, 16, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Titre_locals'] = QgsLayoutPoint(72, 4, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Titre_locals'] = QgsLayoutPoint(73, 4, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Titre_rotate'] = 0 - self.template_parameters['Credit_frame'] = True - self.template_parameters['Credit_background'] = True self.template_parameters['Credit_size'] = QgsLayoutSize(73, 8, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Credit_locals'] = QgsLayoutPoint(213, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Credit_locals'] = QgsLayoutPoint(214, 278, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Credit_rotate'] = 0 - self.template_parameters['Source_frame'] = True - self.template_parameters['Source_background'] = True self.template_parameters['Source_size'] = QgsLayoutSize(73, 8, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Source_locals'] = QgsLayoutPoint(323, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Source_locals'] = QgsLayoutPoint(322, 278, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Source_rotate'] = 0 - self.template_parameters['Sous_titre_frame'] = True - self.template_parameters['Sous_titre_background'] = True 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_frame'] = True - self.template_parameters['Echelle_2_background'] = True 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_locals'] = QgsLayoutPoint(12, 260, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_2_rotate'] = 0 - self.template_parameters['Logo_2_frame'] = True - self.template_parameters['Logo_2_background'] = True 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_locals'] = QgsLayoutPoint(12, 214, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_2_rotate'] = 0 if page_rotate == 'Landscape': if values_page == 'A4': - self.template_parameters['Carte_frame'] = True - self.template_parameters['Carte_background'] = True 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_frame'] = True - self.template_parameters['Carte_2_background'] = True 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_rotate'] = 0 - self.template_parameters['Legande_frame'] = True - self.template_parameters['Legande_background'] = True 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_rotate'] = 0 - self.template_parameters['Arrow_path'] = 'NorthArrow_02.svg' 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_frame'] = True - self.template_parameters['Echelle_background'] = True 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_frame'] = True - self.template_parameters['Logo_background'] = True 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_frame'] = True - self.template_parameters['Titre_background'] = True 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_frame'] = True - self.template_parameters['Credit_background'] = True 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_rotate'] = 0 - self.template_parameters['Source_frame'] = True - self.template_parameters['Source_background'] = True 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_frame'] = True - self.template_parameters['Sous_titre_background'] = True 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_frame'] = True - self.template_parameters['Echelle_2_background'] = True 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_frame'] = True - self.template_parameters['Logo_2_background'] = True 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_frame'] = True - self.template_parameters['Carte_background'] = True 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_frame'] = True - self.template_parameters['Carte_2_background'] = True self.template_parameters['Carte_2_size'] = QgsLayoutSize(121, 97, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(295, 4, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Carte_2_locals'] = QgsLayoutPoint(294, 4, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Carte_2_rotate'] = 0 - self.template_parameters['Legande_frame'] = True - self.template_parameters['Legande_background'] = True self.template_parameters['Legande_size'] = QgsLayoutSize(121, 185, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Legande_locals'] = QgsLayoutPoint(295, 104, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Legande_locals'] = QgsLayoutPoint(294, 105, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Legande_rotate'] = 0 - self.template_parameters['Arrow_path'] = 'NorthArrow_02.svg' self.template_parameters['Arrow_size'] = QgsLayoutSize(20, 20, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Arrow_locals'] = QgsLayoutPoint(267, 28, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Arrow_locals'] = QgsLayoutPoint(266, 28, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Arrow_rotate'] = 0 - self.template_parameters['Echelle_frame'] = True - self.template_parameters['Echelle_background'] = True self.template_parameters['Echelle_size'] = QgsLayoutSize(73, 10, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Echelle_locals'] = QgsLayoutPoint(13, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Echelle_locals'] = QgsLayoutPoint(12, 278, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_rotate'] = 0 - self.template_parameters['Logo_frame'] = True - self.template_parameters['Logo_background'] = True 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_frame'] = True - self.template_parameters['Titre_background'] = True self.template_parameters['Titre_size'] = QgsLayoutSize(218, 16, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Titre_locals'] = QgsLayoutPoint(72, 4, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Titre_locals'] = QgsLayoutPoint(73, 4, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Titre_rotate'] = 0 - self.template_parameters['Credit_frame'] = True - self.template_parameters['Credit_background'] = True self.template_parameters['Credit_size'] = QgsLayoutSize(73, 8, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Credit_locals'] = QgsLayoutPoint(213, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Credit_locals'] = QgsLayoutPoint(214, 278, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Credit_rotate'] = 0 - self.template_parameters['Source_frame'] = True - self.template_parameters['Source_background'] = True self.template_parameters['Source_size'] = QgsLayoutSize(73, 8, QgsUnitTypes.LayoutMillimeters) - self.template_parameters['Source_locals'] = QgsLayoutPoint(323, 278, QgsUnitTypes.LayoutMillimeters) + self.template_parameters['Source_locals'] = QgsLayoutPoint(322, 278, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Source_rotate'] = 0 - self.template_parameters['Sous_titre_frame'] = True - self.template_parameters['Sous_titre_background'] = True 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_frame'] = True - self.template_parameters['Echelle_2_background'] = True 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_locals'] = QgsLayoutPoint(12, 260, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Echelle_2_rotate'] = 0 - self.template_parameters['Logo_2_frame'] = True - self.template_parameters['Logo_2_background'] = True 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_locals'] = QgsLayoutPoint(12, 214, QgsUnitTypes.LayoutMillimeters) self.template_parameters['Logo_2_rotate'] = 0 return self.template_parameters