mirror of
https://github.com/ARUP-CAS/aiscr-qgis-amcr-viewer.git
synced 2026-10-08 20:07:36 +02:00
fix/small-fixes: drobné úpravy stylu a čitelnosti kódu (#54)
* small fixes * fix: refactoring rozbaleny listy, doplněny trailing commas
This commit is contained in:
1 parent
6772a99ead
commit
7ea2a99ada
2 files changed
+37
-22
No files matched your search
@@ -44,16 +44,19 @@ class UpdateCodelistsTask(QgsTask):
|
|||||||
refresh_globals()
|
refresh_globals()
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
"Hesláře AMČR byly úspěšně aktualizovány.",
|
"Hesláře AMČR byly úspěšně aktualizovány.",
|
||||||
"AMČR", Qgis.Info)
|
"AMČR", Qgis.Info
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
if self.isCanceled():
|
if self.isCanceled():
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
"Aktualizace heslářů byla zrušena.",
|
"Aktualizace heslářů byla zrušena.",
|
||||||
"AMČR", Qgis.Warning)
|
"AMČR", Qgis.Warning
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
QgsMessageLog.logMessage(
|
QgsMessageLog.logMessage(
|
||||||
f"Chyba aktualizace: {self.exception}",
|
f"Chyba aktualizace: {self.exception}",
|
||||||
"AMČR", Qgis.Critical)
|
"AMČR", Qgis.Critical
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class FilterableSelectionDialog(QDialog):
|
class FilterableSelectionDialog(QDialog):
|
||||||
@@ -151,10 +154,20 @@ class AmcrFilterDialog(QDialog):
|
|||||||
|
|
||||||
# Cache dictionary to store selected codes for each category
|
# Cache dictionary to store selected codes for each category
|
||||||
self.selection_cache = {
|
self.selection_cache = {
|
||||||
'organizace': [], 'kraj': [], 'obdobi': [], 'areal': [],
|
'organizace': [],
|
||||||
'typ_akce': [], 'okres': [], 'katastr': [], 'vedouci': [],
|
'kraj': [],
|
||||||
'pian_presnost': [], 'pristupnost': [], 'typ_lokality': [],
|
'obdobi': [],
|
||||||
'druh_lokality': [], 'jistota': [], 'lokalita_zachovalost': []
|
'areal': [],
|
||||||
|
'typ_akce': [],
|
||||||
|
'okres': [],
|
||||||
|
'katastr': [],
|
||||||
|
'vedouci': [],
|
||||||
|
'pian_presnost': [],
|
||||||
|
'pristupnost': [],
|
||||||
|
'typ_lokality': [],
|
||||||
|
'druh_lokality': [],
|
||||||
|
'jistota': [],
|
||||||
|
'lokalita_zachovalost': [],
|
||||||
}
|
}
|
||||||
|
|
||||||
layout = QVBoxLayout()
|
layout = QVBoxLayout()
|
||||||
@@ -363,7 +376,7 @@ class AmcrFilterDialog(QDialog):
|
|||||||
self.selection_cache[cache_key] = [
|
self.selection_cache[cache_key] = [
|
||||||
'HES-000861',
|
'HES-000861',
|
||||||
'HES-000862',
|
'HES-000862',
|
||||||
'HES-000863'
|
'HES-000863',
|
||||||
]
|
]
|
||||||
|
|
||||||
btn.clicked.connect(open_dialog)
|
btn.clicked.connect(open_dialog)
|
||||||
|
|||||||
+16
-14
@@ -283,7 +283,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
base_params = {
|
base_params = {
|
||||||
"mapa": "true",
|
"mapa": "true",
|
||||||
"sort": "ident_cely asc",
|
"sort": "ident_cely asc",
|
||||||
"entity": typ_dat
|
"entity": typ_dat,
|
||||||
}
|
}
|
||||||
|
|
||||||
# Restrict search to map window if requested
|
# Restrict search to map window if requested
|
||||||
@@ -479,7 +479,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
"katastr": g_list(doc, 'katastr'),
|
"katastr": g_list(doc, 'katastr'),
|
||||||
"dalsi_katastr": dalsi_kat_str,
|
"dalsi_katastr": dalsi_kat_str,
|
||||||
"pristupnost": g(doc, 'pristupnost'),
|
"pristupnost": g(doc, 'pristupnost'),
|
||||||
"loc": g_list(doc, 'loc')
|
"loc": g_list(doc, 'loc'),
|
||||||
}
|
}
|
||||||
|
|
||||||
# Add entity-specific metadata
|
# Add entity-specific metadata
|
||||||
@@ -668,8 +668,10 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
)
|
)
|
||||||
|
|
||||||
fl_pian = [
|
fl_pian = [
|
||||||
"ident_cely", "pian_typ",
|
"ident_cely",
|
||||||
"pian_chranene_udaje", "pian_presnost"
|
"pian_typ",
|
||||||
|
"pian_chranene_udaje",
|
||||||
|
"pian_presnost",
|
||||||
]
|
]
|
||||||
|
|
||||||
for i in range(0, total_pians, BATCH_PIAN):
|
for i in range(0, total_pians, BATCH_PIAN):
|
||||||
@@ -682,7 +684,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
"entity": "pian",
|
"entity": "pian",
|
||||||
"q": fq_pian,
|
"q": fq_pian,
|
||||||
"rows": len(batch),
|
"rows": len(batch),
|
||||||
"fl": ",".join(fl_pian)
|
"fl": ",".join(fl_pian),
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
QApplication.processEvents()
|
QApplication.processEvents()
|
||||||
@@ -739,7 +741,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
QgsField("odkaz_do_digiarchivu", QMetaType.Type.QString),
|
QgsField("odkaz_do_digiarchivu", QMetaType.Type.QString),
|
||||||
QgsField("okres", QMetaType.Type.QString),
|
QgsField("okres", QMetaType.Type.QString),
|
||||||
QgsField("katastr", QMetaType.Type.QString),
|
QgsField("katastr", QMetaType.Type.QString),
|
||||||
QgsField("dalsi_katastry", QMetaType.Type.QString)
|
QgsField("dalsi_katastry", QMetaType.Type.QString),
|
||||||
]
|
]
|
||||||
|
|
||||||
# Extend table based on data type
|
# Extend table based on data type
|
||||||
@@ -763,7 +765,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
QgsField("popis_lokality", QMetaType.Type.QString),
|
QgsField("popis_lokality", QMetaType.Type.QString),
|
||||||
QgsField("typ_lokality", QMetaType.Type.QString),
|
QgsField("typ_lokality", QMetaType.Type.QString),
|
||||||
QgsField("druh_lokality", QMetaType.Type.QString),
|
QgsField("druh_lokality", QMetaType.Type.QString),
|
||||||
QgsField("zachovalost", QMetaType.Type.QString)
|
QgsField("zachovalost", QMetaType.Type.QString),
|
||||||
]
|
]
|
||||||
|
|
||||||
cols.append(QgsField("Přístupnost", QMetaType.Type.QString))
|
cols.append(QgsField("Přístupnost", QMetaType.Type.QString))
|
||||||
@@ -920,7 +922,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
+ meta['ident_cely'],
|
+ meta['ident_cely'],
|
||||||
meta['az_okres'],
|
meta['az_okres'],
|
||||||
meta['katastr'],
|
meta['katastr'],
|
||||||
meta['dalsi_katastr']
|
meta['dalsi_katastr'],
|
||||||
]
|
]
|
||||||
if is_akce:
|
if is_akce:
|
||||||
atributy.extend([
|
atributy.extend([
|
||||||
@@ -942,7 +944,7 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
meta['lokalita_popis'],
|
meta['lokalita_popis'],
|
||||||
meta['lokalita_typ'],
|
meta['lokalita_typ'],
|
||||||
meta['lokalita_druh'],
|
meta['lokalita_druh'],
|
||||||
meta['lokalita_zachovalost']
|
meta['lokalita_zachovalost'],
|
||||||
])
|
])
|
||||||
|
|
||||||
atributy.append(meta['pristupnost'])
|
atributy.append(meta['pristupnost'])
|
||||||
@@ -972,12 +974,12 @@ def load_amcr_data(canvas, bb, filters=None,
|
|||||||
(feats_pt, vl_point, "Body"),
|
(feats_pt, vl_point, "Body"),
|
||||||
]
|
]
|
||||||
|
|
||||||
for f, l, n in layers_to_process:
|
for f, L, n in layers_to_process:
|
||||||
if f:
|
if f:
|
||||||
l.dataProvider().addFeatures(f)
|
L.dataProvider().addFeatures(f)
|
||||||
l.updateExtents()
|
L.updateExtents()
|
||||||
l.setName(f"AMCR_{archeologicky_zaznam}_{n}")
|
L.setName(f"AMCR_{archeologicky_zaznam}_{n}")
|
||||||
proj.addMapLayer(l)
|
proj.addMapLayer(L)
|
||||||
added += len(f)
|
added += len(f)
|
||||||
|
|
||||||
if network_error:
|
if network_error:
|
||||||
|
|||||||
Reference in new issue
Block a user