erreur de push à réparé
This commit is contained in:
parent
08dda9ebb0
commit
ec175643bc
@ -57,6 +57,7 @@ from qgis.PyQt.QtWidgets import (
|
||||
QTableWidgetItem,
|
||||
QVBoxLayout,
|
||||
)
|
||||
from PyQt5 import QtGui
|
||||
from qgis.PyQt.QtXml import QDomDocument
|
||||
from qgis.utils import iface
|
||||
import glob
|
||||
@ -68,10 +69,6 @@ from .tools.resources import (
|
||||
)
|
||||
from .issues import CenRa_Issues
|
||||
|
||||
from .tools.mises_en_pages import carto_standard
|
||||
from .tools.mises_en_pages import full_page
|
||||
from .tools.mises_en_pages import demo
|
||||
|
||||
from datetime import date
|
||||
|
||||
EDITOR_CLASS = load_ui('CenRa_AutoMap_base.ui')
|
||||
@ -114,6 +111,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
|
||||
self.setupUi(self)
|
||||
self.settings = QgsSettings()
|
||||
self.s = QSettings()
|
||||
self.setWindowIcon(QtGui.QIcon(resources_path('icons','icon.png')))
|
||||
|
||||
path = ''
|
||||
ix = 0
|
||||
@ -478,11 +476,12 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
|
||||
self.position_map.setItemRotation(self.template_parameters['Carte_2_rotate'])
|
||||
self.position_map.attemptResize(self.template_parameters['Carte_2_size'])
|
||||
self.position_map.attemptMove(self.template_parameters['Carte_2_locals'])
|
||||
overviewitem = QgsLayoutItemMapOverviewStack(self.position_map)
|
||||
map_overview = self.position_map.overview()
|
||||
map_overview.setLinkedMap(self.map_modele_test)
|
||||
map_overview.setCentered(True)
|
||||
overviewitem.addOverview(map_overview)
|
||||
self.position_map.overview().setLinkedMap(self.map_modele_test)
|
||||
#overviewitem = QgsLayoutItemMapOverviewStack(self.position_map)
|
||||
#map_overview = self.position_map.overview()
|
||||
#map_overview.setLinkedMap(self.map_modele_test)
|
||||
#map_overview.setCentered(True)
|
||||
#overviewitem.addOverview(map_overview)
|
||||
|
||||
self.position_map.refresh()
|
||||
self.map_modele_test.setFrameEnabled(True)
|
||||
@ -591,7 +590,6 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
|
||||
layertreelayer = root.findLayer(layer.id())
|
||||
|
||||
# get the parent of the layer tree layer (layer tree root, or group)
|
||||
print(layertreelayer)
|
||||
if layertreelayer != None:
|
||||
parent = layertreelayer.parent()
|
||||
|
||||
@ -668,7 +666,11 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
|
||||
north.setItemRotation(self.template_parameters['Arrow_rotate'])
|
||||
|
||||
if self.radioButton_10.isChecked() == 1:
|
||||
info_text = ["Source : " + self.mComboBox_3.currentText()][0]
|
||||
text_source = ' '
|
||||
for Item_mComboBox_3 in self.mComboBox_3.checkedItems():
|
||||
text_source = text_source+Item_mComboBox_3+','
|
||||
text_source = text_source[:-1]
|
||||
info_text = ["Source :" + text_source][0]
|
||||
else:
|
||||
info_text = ["Source : " + self.lineEdit_4.text()][0]
|
||||
# ajout note info:
|
||||
@ -719,7 +721,7 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
|
||||
|
||||
existing_layout = project.layoutManager().layoutByName(self.layout.name())
|
||||
if existing_layout:
|
||||
if self.radioButton_12.isChecked() != 1:
|
||||
#if self.radioButton_12.isChecked() != 1:
|
||||
project.layoutManager().removeLayout(existing_layout)
|
||||
|
||||
result = project.layoutManager().addLayout(self.layout)
|
||||
@ -757,12 +759,9 @@ class AutoMap_Editor(QDialog, EDITOR_CLASS):
|
||||
pc = self.layout.pageCollection()
|
||||
pc.pages()[0].setPageSize('A3', QgsLayoutItemPage.Landscape)
|
||||
|
||||
if values_page == "demo.py":
|
||||
self.template_parameters = demo.fletch_canvas(self)
|
||||
if values_page == "carto_standard.py":
|
||||
self.template_parameters = carto_standard.fletch_canvas(self)
|
||||
if values_page == "full_page.py":
|
||||
self.template_parameters = full_page.fletch_canvas(self)
|
||||
values_page_import = values_page[:-3]
|
||||
eval("exec('from .tools.mises_en_pages import '+values_page_import)")
|
||||
eval("exec('self.template_parameters = '+ values_page_import + '.fletch_canvas(self)')")
|
||||
|
||||
def bar_echelle_auto(self, echelle, bar_echelle):
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user