Merge pull request #600 from Esri/james/async_updates

James/async updates

Author: JamesMBallard

uitools/cpp/Esri/ArcGISRuntime/Toolkit/BasemapGalleryItem.cpp

@@ -13,12 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  ******************************************************************************/
-#include "BasemapGalleryController.h"
+#include "BasemapGalleryItem.h"
 
 // Toolkit headers
 #include "Internal/BasemapGalleryImageProvider.h"
 #include "Internal/DoOnLoad.h"
-#include "Internal/GeoViews.h"
 
 // ArcGISRuntime headers
 #include <Basemap.h>
@@ -28,6 +27,7 @@
 
 // Qt headers
 #include <QIcon>
+#include <QFuture>
 
 #ifdef CPP_ARCGISRUNTIME_TOOLKIT
 // Qt headers
@@ -185,8 +185,17 @@ namespace Esri::ArcGISRuntime::Toolkit {
 
                    return;
                  }
-                 connect(item, &Item::fetchThumbnailCompleted, this, &BasemapGalleryItem::basemapChanged);
-                 item->fetchThumbnail();
+
+                 // fetchThumbnailAsync returns a single future, so don't keep attaching continuations
+                 // if it's already running
+                 auto future = item->fetchThumbnailAsync();
+                 if (!future.isRunning())
+                 {
+                   future.then(this, [this](const QImage&)
+                   {
+                     emit basemapChanged();
+                   });
+                 }
                });
     }
     emit basemapChanged();

uitools/cpp/Esri/ArcGISRuntime/Toolkit/BookmarksViewController.cpp

@@ -23,6 +23,7 @@
 
 // Qt headers
 #include <QtGlobal>
+#include <QFuture>
 
 // ArcGISRuntime headers
 #include <Bookmark.h>
@@ -255,11 +256,13 @@ namespace Esri::ArcGISRuntime::Toolkit {
 
     if (auto sceneView = qobject_cast<SceneViewToolkit*>(m_geoView))
     {
-      sceneView->setBookmark(bookmark->bookmark());
+      auto future = sceneView->setBookmarkAsync(bookmark->bookmark());
+      Q_UNUSED(future)
     }
     else if (auto mapView = qobject_cast<MapViewToolkit*>(m_geoView))
     {
-      mapView->setBookmark(bookmark->bookmark());
+      auto future = mapView->setBookmarkAsync(bookmark->bookmark());
+      Q_UNUSED(future)
     }
   }
 

uitools/cpp/Esri/ArcGISRuntime/Toolkit/CoordinateConversionController.cpp

@@ -24,6 +24,7 @@
 #include <QMouseEvent>
 #include <QtGlobal>
 #include <QUuid>
+#include <QPointF>
 
 // ArcGISRuntime headers
 #include <Camera.h>
@@ -156,22 +157,17 @@ void CoordinateConversionController::setGeoView(QObject* geoView)
     connect(sceneView, &SceneViewToolkit::mouseClicked, this,
             [sceneView, this](QMouseEvent& event)
     {
-      if (m_inPickingMode && (!m_screenToLocationTask.isValid() ||
-                               m_screenToLocationTask.isDone()))
+      if (m_inPickingMode && !m_screenToLocationFuture.isRunning())
       {
-        m_screenToLocationTask = sceneView->screenToLocation(event.pos().x(), event.pos().y());
+        m_screenToLocationFuture = sceneView->screenToLocationAsync(event.pos().x(), event.pos().y());
+        m_screenToLocationFuture.then(this, [this](const Point& point)
+        {
+          setCurrentPoint(point);
+        });
+
         event.accept();
       }
     });
-
-    connect(sceneView, &SceneViewToolkit::screenToLocationCompleted, this,
-            [this](QUuid taskId, Point point)
-    {
-      if (taskId != m_screenToLocationTask.taskId())
-        return;
-
-      setCurrentPoint(point);
-    });
   }
   else if (auto mapView = qobject_cast<MapViewToolkit*>(m_geoView))
   {
@@ -341,13 +337,15 @@ void CoordinateConversionController::zoomToCurrentPoint()
   {
     const Camera currentCam = sceneView->currentViewpointCamera();
     const Camera newCam(m_currentPoint, m_zoomToDistance, currentCam.heading(), currentCam.pitch(), currentCam.roll());
-    sceneView->setViewpointCamera(newCam, 1.0);
+    auto future = sceneView->setViewpointCameraAsync(newCam, 1.0);
+    Q_UNUSED(future)
   }
   else if (auto mapView = qobject_cast<MapView*>(m_geoView))
   {
     const Viewpoint currVP = mapView->currentViewpoint(ViewpointType::CenterAndScale);
     const Viewpoint newViewPoint(m_currentPoint, currVP.targetScale());
-    mapView->setViewpoint(newViewPoint, 1.0);
+    auto future = mapView->setViewpointAsync(newViewPoint, 1.0);
+    Q_UNUSED(future)
   }
 }
 

uitools/cpp/Esri/ArcGISRuntime/Toolkit/CoordinateConversionController.h

@@ -21,16 +21,18 @@
 #include "Internal/GenericListModel.h"
 
 // Qt headers
+#include <QFuture>
 #include <QObject>
 #include <QString>
-#include <QPointF>
 
 // Qt forward declarations
 class QAbstractListModel;
 
 // ArcGISRuntime headers
 #include <Point.h>
-#include <TaskWatcher.h>
+
+Q_MOC_INCLUDE(<QPointF>)
+class QPointF;
 
 namespace Esri::ArcGISRuntime {
 
@@ -100,8 +102,8 @@ public slots:
   void removeCoordinateResultAtIndex(int index);
 
 private:
+  QFuture<Point> m_screenToLocationFuture;
   Point m_currentPoint;
-  TaskWatcher m_screenToLocationTask;
   double m_zoomToDistance = 0.0;
   GenericListModel* m_coordinateFormats = nullptr;
   GenericListModel* m_conversionResults = nullptr;

uitools/cpp/Esri/ArcGISRuntime/Toolkit/FloorFilterController.cpp

@@ -15,6 +15,8 @@
  ******************************************************************************/
 #include "FloorFilterController.h"
 
+#include <QFuture>
+
 // ArcGISRuntime headers
 #include <Envelope.h>
 #include <EnvelopeBuilder.h>
@@ -36,7 +38,6 @@
 #include "Internal/DisconnectOnSignal.h"
 #include "Internal/DoOnLoad.h"
 #include "Internal/GeoViews.h"
-#include "Internal/SingleShotConnection.h"
 
 // stl headers
 #include <cmath>
@@ -881,31 +882,25 @@ namespace Esri::ArcGISRuntime::Toolkit {
 
     if (auto mapView = qobject_cast<MapViewToolkit*>(m_geoView))
     {
-      auto c = std::make_shared<QMetaObject::Connection>();
       m_settingViewpoint = true;
-      *c = connect(mapView, &MapViewToolkit::setViewpointCompleted, this, [this, c](bool success)
-                   {
-                     if (success)
-                     {
-                       m_settingViewpoint = false;
-                       disconnect(*c);
-                     }
-                   });
-      mapView->setViewpoint(b.toEnvelope());
+      mapView->setViewpointAsync(b.toEnvelope()).then(this, [this](bool success)
+      {
+        if (success)
+        {
+          m_settingViewpoint = false;
+        }
+      });
     }
     else if (auto sceneView = qobject_cast<SceneViewToolkit*>(m_geoView))
     {
-      auto c = std::make_shared<QMetaObject::Connection>();
       m_settingViewpoint = true;
-      *c = connect(sceneView, &SceneViewToolkit::setViewpointCompleted, this, [this, c](bool success)
-                   {
-                     if (success)
-                     {
-                       m_settingViewpoint = false;
-                       disconnect(*c);
-                     }
-                   });
-      sceneView->setViewpoint(b.toEnvelope());
+      sceneView->setViewpointAsync(b.toEnvelope()).then(this, [this](bool success)
+      {
+        if (success)
+        {
+          m_settingViewpoint = false;
+        }
+      });
     }
   }
 

uitools/cpp/Esri/ArcGISRuntime/Toolkit/Internal/BasemapGalleryImageProvider.cpp

@@ -23,6 +23,7 @@
 #include <Item.h>
 
 // Qt headers
+#include <QFuture>
 #include <QIcon>
 
 namespace Esri::ArcGISRuntime::Toolkit {
@@ -102,8 +103,10 @@ namespace Esri::ArcGISRuntime::Toolkit {
                    emit finished();
                    return;
                  }
-                 connect(item, &Item::fetchThumbnailCompleted, this, &BasemapGalleryImageResponse::finished);
-                 item->fetchThumbnail();
+                 item->fetchThumbnailAsync().then(this, [this](QImage)
+                 {
+                   emit finished();
+                 });
                });
     }
 

uitools/cpp/Esri/ArcGISRuntime/Toolkit/LocatorSearchSource.cpp

@@ -116,21 +116,6 @@ namespace Esri::ArcGISRuntime::Toolkit {
     LocatorSearchSource::setMaximumResults(DEFAULT_MAXIMUM_RESULTS);
     LocatorSearchSource::setMaximumSuggestions(DEFAULT_MAXIMUM_SUGGESTIONS);
 
-    connect(m_locatorTask, &LocatorTask::geocodeCompleted, this, [this](QUuid taskId, const QList<Esri::ArcGISRuntime::GeocodeResult>& geocodeResults)
-            {
-              if (m_searchTask.taskId() != taskId)
-                return;
-
-              QList<SearchResult*> results;
-
-              for (const auto& g : geocodeResults)
-              {
-                results << resultFromGeocodeResult(g, this);
-              }
-
-              emit searchCompleted(std::move(results));
-            });
-
     doOnLoaded(locatorTask, this, [this]
              {
                const auto& info = m_locatorTask->locatorInfo();
@@ -261,23 +246,43 @@ namespace Esri::ArcGISRuntime::Toolkit {
     return m_locatorTask->suggestions();
   }
 
+  void LocatorSearchSource::onGeocodeCompleted_(const QList<GeocodeResult>& geocodeResults)
+  {
+    QList<SearchResult*> results;
+
+    for (const auto& g : geocodeResults)
+    {
+      results << resultFromGeocodeResult(g, this);
+    }
+
+    emit searchCompleted(std::move(results));
+  }
+
   /*!
       \reimp
    */
   void LocatorSearchSource::search(const SuggestResult& suggestion, Geometry area)
   {
-    m_searchTask.cancel();
+    m_geocodeFuture.cancel();
 
     auto params = normalizeGeometryParams(m_geocodeParameters, area);
-    m_searchTask = m_locatorTask->geocodeWithSuggestResultAndParameters(suggestion, params);
+    m_geocodeFuture = m_locatorTask->geocodeWithSuggestResultAndParametersAsync(suggestion, params);
+    m_geocodeFuture.then(this, [this](const QList<GeocodeResult>& geocodeResults)
+    {
+      onGeocodeCompleted_(geocodeResults);
+    });
   }
 
   void LocatorSearchSource::search(const QString& searchString, Geometry area)
   {
-    m_searchTask.cancel();
+    m_geocodeFuture.cancel();
 
     auto params = normalizeGeometryParams(m_geocodeParameters, area);
-    m_searchTask = m_locatorTask->geocodeWithParameters(searchString, params);
+    m_geocodeFuture = m_locatorTask->geocodeWithParametersAsync(searchString, params);
+    m_geocodeFuture.then(this, [this](const QList<GeocodeResult>& geocodeResults)
+    {
+      onGeocodeCompleted_(geocodeResults);
+    });
   }
 
 } // Esri::ArcGISRuntime::Toolkit

uitools/cpp/Esri/ArcGISRuntime/Toolkit/LocatorSearchSource.h

@@ -29,6 +29,10 @@
 #include <QList>
 #include <QObject>
 
+namespace Esri::ArcGISRuntime {
+  class GeocodeResult;
+}
+
 namespace Esri::ArcGISRuntime::Toolkit {
 
   class LocatorSearchSource : public SearchSourceInterface
@@ -62,10 +66,11 @@ namespace Esri::ArcGISRuntime::Toolkit {
     void search(const QString& searchString, Geometry area = Geometry{}) override;
 
   protected:
-    TaskWatcher m_searchTask;
+    virtual void onGeocodeCompleted_(const QList<GeocodeResult>& geocodeResults);
+    QFuture<QList<GeocodeResult>> m_geocodeFuture;
 
   private:
-    LocatorTask* m_locatorTask;
+    LocatorTask* m_locatorTask = nullptr;
     GeocodeParameters m_geocodeParameters;
 
   };

uitools/cpp/Esri/ArcGISRuntime/Toolkit/NorthArrowController.cpp

@@ -18,7 +18,8 @@
 #include "Internal/GeoViews.h"
 
 #include "Camera.h"
-#include "TaskWatcher.h"
+
+#include <QFuture>
 
 // std headers
 #include <cmath>
@@ -62,13 +63,15 @@ namespace Esri::ArcGISRuntime::Toolkit {
   {
     if (auto mapView = qobject_cast<MapView*>(m_geoView))
     {
-      mapView->setViewpointRotation(heading);
+      auto future = mapView->setViewpointRotationAsync(heading);
+      Q_UNUSED(future)
     }
     else if (auto sceneView = qobject_cast<SceneView*>(m_geoView))
     {
       Camera currentCamera = sceneView->currentViewpointCamera();
       Camera updatedCamera = currentCamera.rotateTo(heading, currentCamera.pitch(), currentCamera.roll());
-      sceneView->setViewpointCamera(updatedCamera, 0.50);
+      auto future = sceneView->setViewpointCameraAsync(updatedCamera, 0.50);
+      Q_UNUSED(future)
     }
   }
   /*!