Updating main branch to 200.5 (#636)

* 200.4.0 -> 200.5.0 version upgrade.

* cmake file for the toolkit

* toolkit cmake file

* include_directories is enough for header files

* move some stuff around, account for IOS

* modify QML_IMPORT_PATH so qml knows where the module is

* Add contributors 

Add two new contributors to the toolkit readme

* Put common needed files in common.cmake, make widgets cmake file, adjust toolkitcpp.cmake

* Make the names consistent

* update README.md

* Add headers to display in IDE.

* PR Frank Miller

* remove common.cmake, no longer needed.

* Do not use file(GLOB...

* new line at end of file

* match ordering elsewhere

* Use functions to assign variables, follow naming pattern for variables

* remove common.cmake

* Just explicitly list the required files

* update README with new instructs

* Update docs on location of setup_toolkit call

* typo

* setup_toolkit -> setup_toolkitwidgets

* MyTarget -> target_name to match toolkitcpp.cmake doc

* setup_toolkit -> setup_toolkitwidgets

* append to QML_IMPORT_PATH

* update readme to match template app

* nitpick variable/argument highlighting in markdown

* James PR

* James PR

* James PR

* Bri12415/toolkit libary cmake (#619)

* stash commit, test turning toolkit into library

* CMakeLists.txt for the toolkit

* copyright

* remove comment

* QML_IMPORT_PATH

* Change project directory structure, toolkitcpp and toolkitwidgets, so each can have CMakeLists.txt

* James partial PR: move doc images to og location

* Update README.md with new cmake workflows

* Move toolkitcpp.pri and toolkitwidgets.pri to original location. Adjust internals for new directory changes.

* Toolkit - Update builds and minimum requirements to Qt 6.5.6 (#620)

* Update doc (#621)

* Reverted xcode, Qt 6.5.6 changes in tookit (#622)

* Toolkit - Update builds and minimum requirements to Qt 6.5.6 (#623)

* Jared/remove qml (#625)

* remove QML examples/tests

* remove controllers and qml api

* some qml doc fixes, very preliminary

* point to cpp references now.

* no QML controller anymore.

* qml removed, no longer applicable. This is the way...

* bye qml

* doc updates

* remove more qml doc.

* Use newer gradle. (#626)

* Luca6804/citrav2 doc (#624)

* changing text from api key to access token

* Update README.md

* Update main.cpp

* Apply suggestions from code review

Co-authored-by: Mary Harvey <mharvey@esri.com>

* Apply suggestions from code review Rd 2

Co-authored-by: Don Kemlage <dkemlage@esri.com>

---------

Co-authored-by: Mary Harvey <mharvey@esri.com>
Co-authored-by: Don Kemlage <dkemlage@esri.com>

* Jared/calcite fix (#628)

* change map/basemap from qml to c++

* fixing .pri

* new c++ class

* not needed.

* alphabetical

* Update calcite-qml/demo/main.cpp

Co-authored-by: James Ballard <JamesMBallard@users.noreply.github.com>

* review comment.

---------

Co-authored-by: James Ballard <JamesMBallard@users.noreply.github.com>

* change qAsConst to std::as_const (#629)

* Guil8553/5362 remove qml (#627)

* remove/rename qml

* commit 2

* commit 3

* commit 5

* commit 6

* commit 7

* commit 8

* cmmit 8

* commit 9

* commit 10

* commit 11

* commit 12

* commit 13

* remove comment

* fix path to toolkit

* remove calcite

* cancel change

* remove change

* cancel calcite changes

* remove calcite changes

* clean up

* rename calcite-qml to calcite

* remove unused

* fix doc (#630)

* fix build (#631)

* fix build (#632)

* Modify CFBundleDisplayName and CFBundleExecutable Info.plist keys to fix iOS deployment (#633)

* fix projects using $$files (#634)

* Aji13187/map pin not loaded (#635)

* Toolkit Search view pin image not displayed fix

* toolkitwidgets files updated

* toolkitwidget image added.

* review comment fixed

* Update CHANGELOG.md

---------

Co-authored-by: Jared Caccamo <jcaccamo@esri.com>
Co-authored-by: Jared Caccamo <11935261+jared-2016@users.noreply.github.com>
Co-authored-by: Brian Noble <bnoble@esri.com>
Co-authored-by: Brian Noble <bri12415@esri.com>
Co-authored-by: Ajith Challiyil Pulakkatuthodi <123126365+aji13187@users.noreply.github.com>
Co-authored-by: James Ballard <JamesMBallard@users.noreply.github.com>
Co-authored-by: Mary Harvey <mharvey@esri.com>
Co-authored-by: Don Kemlage <dkemlage@esri.com>
Co-authored-by: Guillaume Belz <1651508+GuillaumeBelz@users.noreply.github.com>
Co-authored-by: Guillaume Belz <GBelz@esri.com>

Author: 8 people

.vscode/settings.json

@@ -2,7 +2,7 @@
   "cSpell.words": [
     "ARCGIS",
     "ARCGISRUNTIME",
-    "augmentedreality",
+    "augmented_reality",
     "Basemap",
     "Basemaps",
     "Callout",
@@ -22,9 +22,8 @@
     "Struct",
     "subclassing",
     "toolkitcpp",
-    "toolkitqml",
     "toolkitwidgets",
     "uitools"
   ],
   "cSpell.language": "en-US"
-}
+}

CHANGELOG.md

@@ -0,0 +1,109 @@
+###############################################################################
+# Copyright 2012-2019 Esri
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###############################################################################
+
+# This configuration file is an internal file.
+# To use the AR features of the ArcGIS Runtime Toolkit for Qt,
+# uses the files ArApi.pri to use C++ API. See AR.md for details.
+
+isEmpty(ARCGIS_TOOLKIT_PATH) {
+    error(ARCGIS_TOOLKIT_PATH is not set)
+}
+
+AUGMENTED_REALITY_PATH = $$ARCGIS_TOOLKIT_PATH/augmented_reality
+
+AR_API_PATH = $$AUGMENTED_REALITY_PATH/ArApi
+AR_API_INCLUDE_PATH = $$AR_API_PATH/include
+AR_API_SOURCE_PATH = $$AR_API_PATH/source
+AR_API_QML_PATH = $$AR_API_PATH/qml
+
+#-------------------------------------------------
+# platform independent configuration
+
+HEADERS += $$files($$AR_API_INCLUDE_PATH/*.h)
+SOURCES += $$files($$AR_API_SOURCE_PATH/*.cpp)
+RESOURCES += $$files($$AR_API_QML_PATH/*.qrc)
+
+INCLUDEPATH += $$AR_API_INCLUDE_PATH
+DEPENDPATH += $$AR_API_INCLUDE_PATH
+
+#-------------------------------------------------
+# iOS configuration
+
+ios {
+    OBJECTIVE_HEADERS += \
+        $$AR_API_INCLUDE_PATH/iOS/ArKitWrapper.h
+
+    OBJECTIVE_SOURCES += \
+        $$AR_API_SOURCE_PATH/iOS/ArKitWrapper.mm \
+        $$AR_API_SOURCE_PATH/iOS/ArKitUtils.mm
+
+    HEADERS += \
+        $$AR_API_INCLUDE_PATH/iOS/ArKitFrameRenderer.h \
+        $$AR_API_INCLUDE_PATH/iOS/ArKitPointCloudRenderer.h \
+        $$AR_API_INCLUDE_PATH/iOS/ArKitPlaneRenderer.h \
+        $$AR_API_INCLUDE_PATH/iOS/ArKitUtils.h
+
+    SOURCES += \
+        $$AR_API_SOURCE_PATH/iOS/ArKitFrameRenderer.cpp \
+        $$AR_API_SOURCE_PATH/iOS/ArKitPointCloudRenderer.cpp \
+        $$AR_API_SOURCE_PATH/iOS/ArKitPlaneRenderer.cpp
+
+    INCLUDEPATH += $$AR_API_INCLUDE_PATH/iOS
+    DEPENDPATH += $$AR_API_INCLUDE_PATH/iOS
+
+    LIBS += -framework ARKit
+}
+
+#-------------------------------------------------
+# Android configuration
+
+android {
+    QT += core
+
+    HEADERS += \
+        $$AR_API_INCLUDE_PATH/Android/ArCoreWrapper.h \
+        $$AR_API_INCLUDE_PATH/Android/ArCoreFrameRenderer.h \
+        $$AR_API_INCLUDE_PATH/Android/ArCorePointCloudRenderer.h \
+        $$AR_API_INCLUDE_PATH/Android/ArCorePlaneRenderer.h
+
+    SOURCES += \
+        $$AR_API_SOURCE_PATH/Android/ArCoreWrapper.cpp \
+        $$AR_API_SOURCE_PATH/Android/ArCoreFrameRenderer.cpp \
+        $$AR_API_SOURCE_PATH/Android/ArCorePointCloudRenderer.cpp \
+        $$AR_API_SOURCE_PATH/Android/ArCorePlaneRenderer.cpp
+
+    INCLUDEPATH += $$AR_API_INCLUDE_PATH/Android
+    DEPENDPATH += $$AR_API_INCLUDE_PATH/Android
+
+    # Extra files from the ARCore framework (Apache 2.0 licence)
+    AR_CORE_PATH = $$AR_API_PATH/3rdparty/arcore
+    AR_CORE_INCLUDE_PATH = $$AR_CORE_PATH/include
+    AR_CORE_LIBS_PATH = $$AR_CORE_PATH/libs
+    AR_CORE_GRADLE_PATH = $$AR_CORE_PATH/gradle
+
+    HEADERS += \
+        $$AR_CORE_INCLUDE_PATH/arcore_c_api.h
+
+    INCLUDEPATH += $$AR_CORE_INCLUDE_PATH
+    DEPENDPATH += $$AR_CORE_INCLUDE_PATH
+
+    LIBS += -larcore_sdk_c
+
+    # only arm64-v8a supported for Android
+    ANDROID_ABIS = arm64-v8a
+    LIBS += -L"$$AR_CORE_LIBS_PATH/jni/arm64-v8a"
+    ANDROID_EXTRA_LIBS += "$$AR_CORE_LIBS_PATH/jni/arm64-v8a/libarcore_sdk_c.so"
+}

CONTRIBUTING.md

@@ -21,10 +21,8 @@ import QtQuick.Controls
     \qmltype CalibrationView
     \ingroup ArcGISQtToolkitAR
     \ingroup ArcGISQtToolkitARCppApi
-    \ingroup ArcGISQtToolkitARQmlApi
     \ingroup ArcGISQtToolkit
     \ingroup ArcGISQtToolkitCppApi
-    \ingroup ArcGISQtToolkitQmlApi
     \inqmlmodule Esri.ArcGISRuntime.Toolkit.AR
     \since Esri.ArcGISRutime 100.6
     \brief A item displaying controls for adjusting a scene view's location, heading, and elevation.

README.md

@@ -21,10 +21,8 @@ import QtQuick.Controls
     \qmltype ClippingView
     \ingroup ArcGISQtToolkitAR
     \ingroup ArcGISQtToolkitARCppApi
-    \ingroup ArcGISQtToolkitARQmlApi
     \ingroup ArcGISQtToolkit
     \ingroup ArcGISQtToolkitCppApi
-    \ingroup ArcGISQtToolkitQmlApi
     \inqmlmodule Esri.ArcGISRuntime.Toolkit.AR
     \since Esri.ArcGISRutime 100.8
     \brief An item displaying controls for adjusting a scene view's clipping distance.

augmentedreality/Common/3rdparty/arcore/LICENSE.txt renamed to augmented_reality/ArApi/3rdparty/arcore/LICENSE.txt

@@ -36,9 +36,8 @@ namespace Esri::ArcGISRuntime::Toolkit {
   \since Esri::ArcGISRuntime 100.6
   \brief Base class to impement AR scene view.
 
-  This class provides the AR features without using the C++ or QML APIs of the ArcGIS Maps SDK for Qt.
-  It is used as a base class to create two API-dependent classes: \l ArcGISArSceneView which uses the C++ API and
-  \l QmlArcGISArSceneView which uses the QML API.
+  This class provides the AR features without using the C++ API of the ArcGIS Maps SDK for Qt.
+  It is used as a base class to create the API-dependent classe: \l ArcGISArView which uses the C++ API.
  */
 
 /*!

augmentedreality/Common/3rdparty/arcore/gradle/build.gradle renamed to augmented_reality/ArApi/3rdparty/arcore/gradle/build.gradle

@@ -25,10 +25,8 @@ using namespace Esri::ArcGISRuntime::Toolkit;
   \class Esri::ArcGISRuntime::Toolkit::LocationDataSource
   \ingroup ArcGISQtToolkitAR
   \ingroup ArcGISQtToolkitARCppApi
-  \ingroup ArcGISQtToolkitARQmlApi
   \ingroup ArcGISQtToolkit
   \ingroup ArcGISQtToolkitCppApi
-  \ingroup ArcGISQtToolkitQmlApi
   \inmodule ArcGISQtToolkit
   \since Esri::ArcGISRuntime 100.6
   \brief Updates the location using the positioning device.

augmentedreality/Common/3rdparty/arcore/include/arcore_c_api.h renamed to augmented_reality/ArApi/3rdparty/arcore/include/arcore_c_api.h

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.4.1'
     }
 }
 

augmentedreality/Common/3rdparty/arcore/libs/jni/arm64-v8a/libarcore_sdk_c.so renamed to augmented_reality/ArApi/3rdparty/arcore/libs/jni/arm64-v8a/libarcore_sdk_c.so

@@ -20,54 +20,42 @@ QT += core gui opengl network positioning sensors qml quick multimedia
 
 CONFIG += c++17
 
-TARGET = CppArExample
+TARGET = ArExample
 
 lessThan(QT_MAJOR_VERSION, 6) {
-    error("This version of the ArcGIS Maps SDK for Qt requires at least Qt 6.5.1")
+    error("This version of the ArcGIS Maps SDK for Qt requires at least Qt 6.5.6")
 }
 
 equals(QT_MAJOR_VERSION, 6) {
     lessThan(QT_MINOR_VERSION, 5) {
-        error("This version of the ArcGIS Maps SDK for Qt requires at least Qt 6.5.1")
+        error("This version of the ArcGIS Maps SDK for Qt requires at least Qt 6.5.6")
     }
-  equals(QT_MINOR_VERSION, 5) : lessThan(QT_PATCH_VERSION, 1) {
-    error("This version of the ArcGIS Maps SDK for Qt requires at least Qt 6.5.1")
+  equals(QT_MINOR_VERSION, 5) : lessThan(QT_PATCH_VERSION, 6) {
+    error("This version of the ArcGIS Maps SDK for Qt requires at least Qt 6.5.6")
   }
 }
 
-ARCGIS_RUNTIME_VERSION = 200.4.0
+ARCGIS_RUNTIME_VERSION = 200.5.0
 include($$PWD/arcgisruntime.pri)
 
-HEADERS += \
-    AppInfo.h \
-    CppArExample.h
-
-SOURCES += \
-    main.cpp \
-    CppArExample.cpp
-
+HEADERS += $$files($$PWD/*.h)
+SOURCES += $$files($$PWD/*.cpp)
 RESOURCES += \
     qml/qml.qrc \
     Resources/Resources.qrc
-
 OTHER_FILES += \
-    qml/*.qml \
-    qml/*.js
+    $$files($$PWD/qml/*.qml) \
+    $$files($$PWD/qml/*.js)
 
 #-------------------------------------------------------------------------------
 # AR configuration
 
-# The path to the ArcGIS runtime toolkit for Qt sources, corresponding to the files downloaded
-# from the GitHub repo: https://github.com/Esri/arcgis-maps-sdk-toolkit-qt
+ARCGIS_TOOLKIT_PATH = $$absolute_path($$PWD/../../)
 
-ARCGIS_TOOLKIT_PATH = # must be set to the root path of the toolkit folder
-
-isEmpty(ARCGIS_TOOLKIT_PATH) {
-    error(ARCGIS_TOOLKIT_PATH is not set)
+include($$ARCGIS_TOOLKIT_PATH/augmented_reality/ArApi/ArApi.pri) {
+    error(Fails to open $$ARCGIS_TOOLKIT_PATH/augmented_reality/ArApi/ArApi.pri)
 }
 
-include($$ARCGIS_TOOLKIT_PATH/augmentedreality/CppApi/ArCppApi.pri)
-
 #-------------------------------------------------------------------------------
 
 win32 {