WIP: Next Version 3.3.7

- error fixed in filesearch - error fixed in plausibiliy check
hoettges · Nov 30, 2023 · 2a293c3 · 2a293c3
1 parent dcabfad
commit 2a293c3
Show file tree

Hide file tree

Showing 31 changed files with 894 additions and 131 deletions.
diff --git a/qkan/LICENSE b/qkan/LICENSE
diff --git a/qkan/database/qkan_database.py b/qkan/database/qkan_database.py
@@ -23,7 +23,7 @@
 __date__ = "August 2019"
 __copyright__ = "(C) 2016, Joerg Hoettges"
 __dbVersion__ = "3.3.6"  # Version der QKan-Datenbank
-__qgsVersion__ = "3.3.6"  # Version des Projektes und der Projektdatei. Kann höher als die der QKan-Datenbank sein
+__qgsVersion__ = "3.3.7"  # Version des Projektes und der Projektdatei. Kann höher als die der QKan-Datenbank sein
 
 
 import logging

diff --git a/qkan/metadata.txt b/qkan/metadata.txt
@@ -10,7 +10,7 @@
 name=QKan
 qgisMinimumVersion=3.22
 description=Gruppe der QKan-Erweiterung(en)
-version=3.3.6
+version=3.3.7
 author=Jörg Höttges, Leon Ochsenfeld, Yannick Linke, Nora Blase
 [email protected]
 

diff --git a/qkan/templates/Plausibilitaetspruefungen.sql b/qkan/templates/Plausibilitaetspruefungen.sql
@@ -112,7 +112,7 @@ WHERE geom IS NULL LIMIT 5',
         printf("Haltungsnamen doppelt in Layer ""Haltungen"" in %d Datensätzen (nur max. 5 Datensätze angezeigt)", (SELECT count(*) FROM (SELECT haltnam FROM haltungen GROUP BY haltnam HAVING count(*) > 1))) AS bemerkung
     FROM (SELECT haltnam FROM haltungen GROUP BY haltnam HAVING count(*) > 1) LIMIT 5', 
  'Haltungen', 'haltnam'),
-('Kreuzende Haltungen', 'Kreuzende Haltungen', 'Warnung', 6, 
+('Kreuzende Haltungen (braucht sehr lang!)', 'Kreuzende Haltungen', 'Warnung', 6, 
     'SELECT
          haltna1 AS haltnam, 
          printf("Theoretischer Abstand zu Haltung %s beträgt d = %.2f", haltna2, COALESCE(abstkreuz, d3)) as bemerkung

diff --git a/qkan/templates/projekt.qgs b/qkan/templates/projekt.qgs
@@ -1,7 +1,7 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveDateTime="2023-10-27T13:30:12" saveUser="Nora" saveUserFull="Nora Blase" version="3.22.7-Białowieża" projectname="QKan Version 3.3.6">
+<qgis saveDateTime="2023-10-27T13:30:12" saveUser="Nora" saveUserFull="Nora Blase" version="3.22.7-Białowieża" projectname="QKan Version 3.3.7">
   <homePath path=""/>
-  <title>QKan Version 3.3.6</title>
+  <title>QKan Version 3.3.7</title>
   <autotransaction active="0"/>
   <evaluateDefaultValues active="0"/>
   <trust active="0"/>
@@ -3780,13 +3780,7 @@ def my_form_open(dialog, layer, feature):
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-        <actionsetting shortTitle="Zoom/Pan zum Objekt" action="from qgis.PyQt import QtWidgets&#xa;from qgis.core import Qgis&#xa;&#xa;obj = '[%objname%]'&#xa;attr = '[%attrname%]'&#xa;&#xa;activeproject = QgsProject().instance()&#xa;layername = '[%layername%]'&#xa;clayers = activeproject.mapLayersByName(layername)&#xa;if not clayers:&#xa;    QtWidgets.QMessageBox.information(None, &quot;Fehler im Programmcode der Aktion&quot;, f'Layer &quot;{layername}&quot;nicht definiert')&#xa;else:&#xa;    clayer = clayers[0]&#xa;    clayer.selectByExpression(f&quot;{attr} = '{obj}'&quot;)&#xa;    qgis.utils.iface.setActiveLayer(clayer)&#xa;    box = clayer.boundingBoxOfSelected()&#xa;    canvas = qgis.utils.iface.mapCanvas()&#xa;    canvas.zoomToFeatureExtent(box)&#xa;" isEnabledOnlyWhenEditable="0" capture="1" icon="C:/FHAC/hoettges/Kanalprogramme/QKan/qkan/datacheck/jump.png" id="{ce7efdcf-811f-4b6b-859e-b64a436a7a74}" name="Zoom/Pan zum Objekt" notificationMessage="" type="1">
-          <actionScope id="Feature"/>
-        </actionsetting>
-        <actionsetting shortTitle="Zoom/Pan zum Objekt" action="from qgis.PyQt import QtWidgets&#xa;    from qgis.core import Qgis&#xa;&#xa;    obj = '[%objname%]'&#xa;    attr = '[%attrname%]'&#xa;&#xa;    activeproject = QgsProject().instance()&#xa;    layername = '[%layername%]'&#xa;    clayers = activeproject.mapLayersByName(layername)&#xa;    if not clayers:&#xa;        QtWidgets.QMessageBox.information(None, &quot;Fehler im Programmcode der Aktion&quot;, f'Layer &quot;{layername}&quot;nicht definiert')&#xa;    else:&#xa;        clayer = clayers[0]&#xa;        clayer.selectByExpression(f&quot;{attr} = '{obj}'&quot;)&#xa;        qgis.utils.iface.setActiveLayer(clayer)&#xa;        box = clayer.boundingBoxOfSelected()&#xa;        canvas = qgis.utils.iface.mapCanvas()&#xa;        canvas.zoomToFeatureExtent(box)&#xa;    " isEnabledOnlyWhenEditable="0" capture="0" icon="C:/FHAC/hoettges/Kanalprogramme/QKan/qkan/datacheck/jump.png" id="{d4291ae8-f6e0-4b91-aa30-8c3f2954515c}" name="Objekt Aktivieren und Zoom/Pan zum Objekt" notificationMessage="Meldung" type="1">
-          <actionScope id="Feature"/>
-        </actionsetting>
-        <actionsetting shortTitle="Zoom/Pan zum Objekt" action="from qgis.PyQt import QtWidgets&#xa;    from qgis.core import Qgis&#xa;&#xa;    obj = '[%objname%]'&#xa;    attr = '[%attrname%]'&#xa;&#xa;    activeproject = QgsProject().instance()&#xa;    layername = '[%layername%]'&#xa;    clayers = activeproject.mapLayersByName(layername)&#xa;    if not clayers:&#xa;        QtWidgets.QMessageBox.information(None, &quot;Fehler im Programmcode der Aktion&quot;, f'Layer &quot;{layername}&quot;nicht definiert')&#xa;    else:&#xa;        clayer = clayers[0]&#xa;        clayer.selectByExpression(f&quot;{attr} = '{obj}'&quot;)&#xa;        qgis.utils.iface.setActiveLayer(clayer)&#xa;        box = clayer.boundingBoxOfSelected()&#xa;        canvas = qgis.utils.iface.mapCanvas()&#xa;        canvas.zoomToFeatureExtent(box)&#xa;    " isEnabledOnlyWhenEditable="0" capture="0" icon="C:/FHAC/hoettges/Kanalprogramme/QKan/qkan/datacheck/jump.png" id="{c9f2a0a8-200b-4d57-a573-fc3856fb2ce6}" name="Objekt Aktivieren und Zoom/Pan zum Objekt" notificationMessage="Meldung" type="1">
+        <actionsetting shortTitle="Zoom/Pan zum Objekt" action="from qgis.PyQt import QtWidgets&#xa;from qgis.core import Qgis&#xa;&#xa;obj = '[%objname%]'&#xa;attr = '[%attrname%]'&#xa;&#xa;activeproject = QgsProject().instance()&#xa;layername = '[%layername%]'&#xa;clayers = activeproject.mapLayersByName(layername)&#xa;if not clayers:&#xa;    QtWidgets.QMessageBox.information(None, &quot;Fehler im Programmcode der Aktion&quot;, f'Layer &quot;{layername}&quot;nicht definiert')&#xa;else:&#xa;    clayer = clayers[0]&#xa;    clayer.selectByExpression(f&quot;{attr} = '{obj}'&quot;)&#xa;    qgis.utils.iface.setActiveLayer(clayer)&#xa;    qgis.utils.iface.actionZoomToSelected().trigger()&#xa;" isEnabledOnlyWhenEditable="0" capture="1" icon="C:/FHAC/hoettges/Kanalprogramme/QKan/qkan/datacheck/jump.png" id="{ce7efdcf-811f-4b6b-859e-b64a436a7a74}" name="Zoom/Pan zum Objekt" notificationMessage="" type="1">
           <actionScope id="Feature"/>
         </actionsetting>
       </attributeactions>
@@ -33485,7 +33479,7 @@ def closeProject():
     <parentidentifier></parentidentifier>
     <language></language>
     <type></type>
-    <title>QKan Version 3.3.6</title>
+    <title>QKan Version 3.3.7</title>
     <abstract></abstract>
     <contact>
       <name></name>

diff --git a/qkan/templates/qml/Fehlerliste.qml b/qkan/templates/qml/Fehlerliste.qml
@@ -129,10 +129,10 @@
   <expressionfields/>
   <attributeactions>
     <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
-    <actionsetting notificationMessage="" type="1" id="{ce7efdcf-811f-4b6b-859e-b64a436a7a74}" capture="1" isEnabledOnlyWhenEditable="0" shortTitle="Zoom/Pan zum Objekt" icon="C:/FHAC/hoettges/Kanalprogramme/QKan/qkan/datacheck/jump.png" name="Zoom/Pan zum Objekt" action="from qgis.PyQt import QtWidgets&#xd;&#xa;from qgis.core import Qgis&#xd;&#xa;&#xd;&#xa;obj = '[%objname%]'&#xd;&#xa;attr = '[%attrname%]'&#xd;&#xa;&#xd;&#xa;activeproject = QgsProject().instance()&#xd;&#xa;layername = '[%layername%]'&#xd;&#xa;clayers = activeproject.mapLayersByName(layername)&#xd;&#xa;if not clayers:&#xd;&#xa;    QtWidgets.QMessageBox.information(None, &quot;Fehler im Programmcode der Aktion&quot;, f'Layer &quot;{layername}&quot;nicht definiert')&#xd;&#xa;else:&#xd;&#xa;    clayer = clayers[0]&#xd;&#xa;    clayer.selectByExpression(f&quot;{attr} = '{obj}'&quot;)&#xd;&#xa;    qgis.utils.iface.setActiveLayer(clayer)&#xd;&#xa;    box = clayer.boundingBoxOfSelected()&#xd;&#xa;    canvas = qgis.utils.iface.mapCanvas()&#xd;&#xa;    canvas.zoomToFeatureExtent(box)&#xd;&#xa;">
+    <actionsetting notificationMessage="" type="1" id="{ce7efdcf-811f-4b6b-859e-b64a436a7a74}" capture="1" isEnabledOnlyWhenEditable="0" shortTitle="Zoom/Pan zum Objekt" icon="C:/FHAC/hoettges/Kanalprogramme/QKan/qkan/datacheck/jump.png" name="Zoom/Pan zum Objekt" action="from qgis.PyQt import QtWidgets&#xd;&#xa;from qgis.core import Qgis&#xd;&#xa;&#xd;&#xa;obj = '[%objname%]'&#xd;&#xa;attr = '[%attrname%]'&#xd;&#xa;&#xd;&#xa;activeproject = QgsProject().instance()&#xd;&#xa;layername = '[%layername%]'&#xd;&#xa;clayers = activeproject.mapLayersByName(layername)&#xd;&#xa;if not clayers:&#xd;&#xa;    QtWidgets.QMessageBox.information(None, &quot;Fehler im Programmcode der Aktion&quot;, f'Layer &quot;{layername}&quot;nicht definiert')&#xd;&#xa;else:&#xd;&#xa;    clayer = clayers[0]&#xd;&#xa;    clayer.selectByExpression(f&quot;{attr} = '{obj}'&quot;)&#xd;&#xa;    qgis.utils.iface.setActiveLayer(clayer)&#xd;&#xa;    qgis.utils.iface.actionZoomToSelected().trigger()&#xd;&#xa;">
       <actionScope id="Feature"/>
     </actionsetting>
-    <actionsetting notificationMessage="Meldung" type="1" id="{d4291ae8-f6e0-4b91-aa30-8c3f2954515c}" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="Zoom/Pan zum Objekt" icon="C:/FHAC/hoettges/Kanalprogramme/QKan/qkan/datacheck/jump.png" name="Objekt Aktivieren und Zoom/Pan zum Objekt" action="from qgis.PyQt import QtWidgets&#xa;    from qgis.core import Qgis&#xa;&#xa;    obj = '[%objname%]'&#xa;    attr = '[%attrname%]'&#xa;&#xa;    activeproject = QgsProject().instance()&#xa;    layername = '[%layername%]'&#xa;    clayers = activeproject.mapLayersByName(layername)&#xa;    if not clayers:&#xa;        QtWidgets.QMessageBox.information(None, &quot;Fehler im Programmcode der Aktion&quot;, f'Layer &quot;{layername}&quot;nicht definiert')&#xa;    else:&#xa;        clayer = clayers[0]&#xa;        clayer.selectByExpression(f&quot;{attr} = '{obj}'&quot;)&#xa;        qgis.utils.iface.setActiveLayer(clayer)&#xa;        box = clayer.boundingBoxOfSelected()&#xa;        canvas = qgis.utils.iface.mapCanvas()&#xa;        canvas.zoomToFeatureExtent(box)&#xa;    ">
+    <actionsetting notificationMessage="Meldung" type="1" id="{d4291ae8-f6e0-4b91-aa30-8c3f2954515c}" capture="0" isEnabledOnlyWhenEditable="0" shortTitle="Zoom/Pan zum Objekt" icon="C:/FHAC/hoettges/Kanalprogramme/QKan/qkan/datacheck/jump.png" name="Objekt Aktivieren und Zoom/Pan zum Objekt" action="from qgis.PyQt import QtWidgets&#xa;    from qgis.core import Qgis&#xa;&#xa;    obj = '[%objname%]'&#xa;    attr = '[%attrname%]'&#xa;&#xa;    activeproject = QgsProject().instance()&#xa;    layername = '[%layername%]'&#xa;    clayers = activeproject.mapLayersByName(layername)&#xa;    if not clayers:&#xa;        QtWidgets.QMessageBox.information(None, &quot;Fehler im Programmcode der Aktion&quot;, f'Layer &quot;{layername}&quot;nicht definiert')&#xa;    else:&#xa;        clayer = clayers[0]&#xa;        clayer.selectByExpression(f&quot;{attr} = '{obj}'&quot;)&#xa;        qgis.utils.iface.setActiveLayer(clayer)&#xa;        qgis.utils.iface.actionZoomToSelected().trigger()&#xa;    ">
       <actionScope id="Feature"/>
     </actionsetting>
   </attributeactions>

diff --git a/qkan/tools/application.py b/qkan/tools/application.py
@@ -129,14 +129,6 @@ def initGui(self) -> None:
             parent=self.iface.mainWindow(),
         )
 
-        icon_help_path = ":/plugins/qkan/tools/res/icon_help.png"
-        QKan.instance.add_action(
-            icon_help_path,
-            text=self.tr("Über QKan"),
-            callback=self.run_help,
-            parent=self.iface.mainWindow(),
-        )
-
         icon_file_path = ":/plugins/qkan/tools/res/icon_filepath.png"
         QKan.instance.add_action(
             icon_file_path,
@@ -145,6 +137,14 @@ def initGui(self) -> None:
             parent=self.iface.mainWindow(),
         )
 
+        icon_help_path = ":/plugins/qkan/tools/res/icon_help.png"
+        QKan.instance.add_action(
+            icon_help_path,
+            text=self.tr("Über QKan"),
+            callback=self.run_help,
+            parent=self.iface.mainWindow(),
+        )
+
     def unload(self) -> None:
         self.dlgla.close()
         self.dlgop.close()

diff --git a/qkan/tools/k_layersadapt.py b/qkan/tools/k_layersadapt.py
@@ -92,9 +92,7 @@ def load_plausiaction(layer):
         clayer = clayers[0]
         clayer.selectByExpression(f"{attr} = '{obj}'")
         qgis.utils.iface.setActiveLayer(clayer)
-        box = clayer.boundingBoxOfSelected()
-        canvas = qgis.utils.iface.mapCanvas()
-        canvas.zoomToFeatureExtent(box)
+        qgis.utils.iface.actionZoomToSelected().trigger()
     """
     acActor = QgsAction(QgsAction.GenericPython, "Objekt Aktivieren und Zoom/Pan zum Objekt", code,
                         iconPath, False, "Zoom/Pan zum Objekt",
@@ -338,9 +336,11 @@ def layersadapt(
             if layer.name() == 'Plausibilitätsprüfungen':
                 load_plausisql(dbQK)
                 logger.debug("Plausibilitätsprüfungen mit Datei 'Plausibilitaetspruefungen.sql' ergänzt.")
-            elif layer.name() == 'Fehlerliste':
-                load_plausiaction(layer)
-                logger.debug("Aktion 'Zoom zum Objekt' für Layer 'Fehlerliste' ergänzt")
+
+            # nachfolgende Zeilen sind nicht notwendig, da in Projektdatei schon enthalten:
+            # elif layer.name() == 'Fehlerliste':
+            #     load_plausiaction(layer)
+            #     logger.debug("Aktion 'Zoom zum Objekt' für Layer 'Fehlerliste' ergänzt")
 
         if anpassen_ProjektMakros:
             nodes = qgsxml.findall("properties/Macros")

diff --git a/qkan/tools/res/application_filepath.ui b/qkan/tools/res/application_filepath.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>dbAdaptDialogBase</class>
- <widget class="QDialog" name="dbAdaptDialogBase">
+ <class>filepathDialogBase</class>
+ <widget class="QDialog" name="filepathDialogBase">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>526</width>
-    <height>361</height>
+    <height>260</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -34,6 +34,9 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
@@ -129,5 +132,38 @@
   </layout>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>button_box</sender>
+   <signal>accepted()</signal>
+   <receiver>filepathDialogBase</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>262</x>
+     <y>339</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>262</x>
+     <y>180</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>button_box</sender>
+   <signal>rejected()</signal>
+   <receiver>filepathDialogBase</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>262</x>
+     <y>339</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>262</x>
+     <y>180</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/qkan/tools/res/application_runoffparams.ui b/qkan/tools/res/application_runoffparams.ui
@@ -195,6 +195,14 @@ berücksichtigen:</string>
       <height>251</height>
      </rect>
     </property>
+    <property name="font">
+     <font>
+      <family>Tahoma</family>
+      <pointsize>10</pointsize>
+      <weight>50</weight>
+      <bold>false</bold>
+     </font>
+    </property>
     <property name="toolTip">
      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Liste der Teilgebiete. Strg + Klick ändert Auswahlstatus, Shift + Klick erweitert Auswahlbereich&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
@@ -214,6 +222,14 @@ berücksichtigen:</string>
       <height>251</height>
      </rect>
     </property>
+    <property name="font">
+     <font>
+      <family>Tahoma</family>
+      <pointsize>10</pointsize>
+      <weight>50</weight>
+      <bold>false</bold>
+     </font>
+    </property>
     <property name="toolTip">
      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Auswahl Abflussparameter. Strg + Klick ändert Auswahlstatus, Shift + Klick erweitert Auswahlbereich&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>

diff --git a/sphinx/build/doctrees/Qkan_Formulare.doctree b/sphinx/build/doctrees/Qkan_Formulare.doctree
diff --git a/sphinx/build/doctrees/Qkan_aufsetzen.doctree b/sphinx/build/doctrees/Qkan_aufsetzen.doctree
diff --git a/sphinx/build/doctrees/environment.pickle b/sphinx/build/doctrees/environment.pickle
diff --git a/sphinx/build/doctrees/index.doctree b/sphinx/build/doctrees/index.doctree