Merge pull request #606 from Esri/v.next_merged_with_main

Toolkit - 200.3.0 Release checklist, v.next merged with main

Author: aji13187

augmentedreality/Examples/CppArExample/CppArExample.pro

@@ -35,7 +35,7 @@ equals(QT_MAJOR_VERSION, 6) {
   }
 }
 
-ARCGIS_RUNTIME_VERSION = 200.2.0
+ARCGIS_RUNTIME_VERSION = 200.3.0
 include($$PWD/arcgisruntime.pri)
 
 HEADERS += \

augmentedreality/Examples/QmlArExample/QmlArExample.pro

@@ -37,7 +37,7 @@ equals(QT_MAJOR_VERSION, 6) {
   }
 }
 
-ARCGIS_RUNTIME_VERSION = 200.2.0
+ARCGIS_RUNTIME_VERSION = 200.3.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app

calcite-qml/demo/calcite_test.pro

@@ -23,7 +23,7 @@ CONFIG += c++17
 # additional modules are pulled in via arcgisruntime.pri
 QT += opengl qml quick quickcontrols2
 
-ARCGIS_RUNTIME_VERSION = 200.2.0
+ARCGIS_RUNTIME_VERSION = 200.3.0
 include($$PWD/arcgisruntime.pri)
 
 TEMPLATE = app

tests/uitools/cpp_quick/unit_tests/BasemapGalleryItemUnitTest/BasemapGalleryItemUnitTest.pro

@@ -27,7 +27,7 @@ QT += testlib
 QT -= gui
 QT += core gui opengl xml testlib network positioning sensors multimedia quick
 
-ARCGIS_RUNTIME_VERSION = 200.2.0
+ARCGIS_RUNTIME_VERSION = 200.3.0
 
 include($$PWD/../arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitcpp.pri)

tests/uitools/qml_quick/functional_tests/FloorFilterControllerFuncTest/FloorFilterControllerFuncTest.pro

@@ -16,7 +16,7 @@ CONFIG += c++17 warn_on qmltestcase
 
 TEMPLATE = app
 
-ARCGIS_RUNTIME_VERSION = 200.2.0
+ARCGIS_RUNTIME_VERSION = 200.3.0
 include($$PWD/../../shared/arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitqml.pri)
 

tests/uitools/qml_quick/functional_tests/FloorFilterFuncTest/FloorFilterFuncTest.pro

@@ -16,7 +16,7 @@ CONFIG += c++17 warn_on qmltestcase
 
 TEMPLATE = app
 
-ARCGIS_RUNTIME_VERSION = 200.2.0
+ARCGIS_RUNTIME_VERSION = 200.3.0
 include($$PWD/../../shared/arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitqml.pri)
 

tests/uitools/qml_quick/unit_tests/FloorFilterControllerUnitTest/FloorFilterControllerUnitTest.pro

@@ -16,7 +16,7 @@ CONFIG += c++17 warn_on qmltestcase
 
 TEMPLATE = app
 
-ARCGIS_RUNTIME_VERSION = 200.2.0
+ARCGIS_RUNTIME_VERSION = 200.3.0
 include($$PWD/../../shared/arcgisruntime.pri)
 include($$PWD/../../../../../uitools/toolkitqml.pri)
 

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))
   {
@@ -317,6 +313,14 @@ GenericListModel* CoordinateConversionController::coordinateFormats() const
   return m_coordinateFormats;
 }
 
+/*!
+  \brief Returns the \c CoordinateConversionOption at \a index from the \c GenericListModel
+ */
+CoordinateConversionOption* CoordinateConversionController::getOption(int index) const
+{
+  return m_coordinateFormats->element<CoordinateConversionOption>(m_coordinateFormats->index(index));
+}
+
 /*!
   \brief Returns the list of textual representations of the current point in
   different formats.
@@ -341,13 +345,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)
   }
 }