Show feature form when creating tracking sessions on project load (an…

…d respect supression mode)
opengisch · Feb 29, 2024 · c579938 · c579938
1 parent 48aa317
commit c579938
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 4 deletions.
diff --git a/src/core/trackingmodel.cpp b/src/core/trackingmodel.cpp
@@ -283,8 +283,17 @@ void TrackingModel::createProjectTrackers( QgsProject *project )
         mTrackers.append( tracker );
         endInsertRows();
 
-        startTracker( vl );
+        requestTrackingSettings( vl, true );
       }
     }
   }
 }
+
+void TrackingModel::requestTrackingSettings( QgsVectorLayer *layer, bool skipSettings )
+{
+  Tracker *tracker = trackerForLayer( layer );
+  if ( tracker )
+  {
+    emit trackingSettingsRequested( index( mTrackers.indexOf( tracker ), 0 ), skipSettings );
+  }
+}
diff --git a/src/core/trackingmodel.h b/src/core/trackingmodel.h
@@ -77,9 +77,14 @@ class TrackingModel : public QAbstractItemModel
 
     void reset();
 
+    Q_INVOKABLE void requestTrackingSettings( QgsVectorLayer *layer, bool skipSettings = false );
+
   signals:
+
     void layerInTrackingChanged( QgsVectorLayer *layer, bool tracking );
 
+    void trackingSettingsRequested( QModelIndex trackerIndex, bool skipSettings );
+
   private:
     QList<Tracker *> mTrackers;
     QList<Tracker *>::const_iterator trackerIterator( QgsVectorLayer *layer )

diff --git a/src/qml/LayerTreeItemProperties.qml b/src/qml/LayerTreeItemProperties.qml
@@ -319,9 +319,7 @@ Popup {
                 tracker.conjunction = positioningSettings.trackerMeetAllConstraints
                 tracker.measureType = positioningSettings.trackerMeasureType
               }
-              trackerSettings.tracker = tracker
-              trackerSettings.open()
-              trackerSettings.focus = true
+              trackingModel.requestTrackingSettings(layer)
             }
           }
         }

diff --git a/src/qml/TrackerSettings.qml b/src/qml/TrackerSettings.qml
@@ -21,6 +21,31 @@ Popup {
   closePolicy: Popup.CloseOnEscape
 
   property var tracker: undefined
+
+  Connections {
+    target: trackingModel
+
+    function onTrackingSettingsRequested(trackerIndex, skipSettings) {
+      tracker = trackings.itemAt(trackerIndex.row).tracker
+      if (!skipSettings) {
+        trackerSettings.open()
+        trackerSettings.focus = true
+      } else {
+        featureModel.resetAttributes()
+        tracker.feature = featureModel.feature
+        if (embeddedAttributeFormModel.rowCount() > 0 && !featureModel.suppressFeatureForm()) {
+          embeddedFeatureForm.active = true
+        } else {
+          trackingModel.startTracker(tracker.vectorLayer)
+          displayToast(qsTr('Track on layer %1 started').arg(tracker.vectorLayer.name))
+          if (featureModel.currentLayer.geometryType === Qgis.GeometryType.Point) {
+            projectInfo.saveTracker(featureModel.currentLayer)
+          }
+        }
+      }
+    }
+  }
+
   onTrackerChanged: {
     if (tracker != undefined) {
       featureModel.currentLayer = tracker.vectorLayer