Skip to content

Commit

Permalink
Merge branch 'v.next' into guil8553/font
Browse files Browse the repository at this point in the history 
* v.next: (28 commits)
  Bump up the minimum versions. (#1778)
  Fix deprecated Qt API usages. (#1777)
  Workaround for iOS. (#1775)
  unused (#1776)
  snap geometry sample fixes (#1773)
  Update README.metadata.json (#1772)
  jared/200.7.0 (#1770)
  Split apart connection logic from permission requests logic (#1764)
  Bluetooth requirement is mobile only for indoors. (#1765)
  Sample viewer and the indoors sample must specify bluetooth manually now. (#1763)
  Bri12415/5917 android context (#1762)
  Update README to include haptics (#1761)
  Fix find place sample (#1758)
  Change all references of `DisplayGrid` to `ShowGrid` (#1759)
  Tan11389/scene grid app update (#1754)
  Fix ifdef condition (#1757)
  Update samples to request permissions (#1753)
  These paths have changed. (#1755)
  Update snap geometry edits sample (#1752)
  Use 200.6 ENC data. (#1751)
  ...
  • Loading branch information
@GuillaumeBelz
GuillaumeBelz committed Jan 23, 2025
2 parents e57f946 + 0c54eca commit a12fe0e
Show file tree
Hide file tree
Showing 1,229 changed files with 9,835 additions and 6,719 deletions.
4 changes: 3 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,10 @@ Thumbs.db

# ignore all build directories

*build*
*build-*
.qmake.stash
*Makefile*
.qtc_clangd
mocinclude.opt
build/

9 changes: 6 additions & 3 deletions CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
// [Legal]
// Copyright 2020 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.
Expand All @@ -18,17 +18,20 @@
#include "pch.hpp"
#endif // PCH_BUILD

// sample headers
#include "DisplayScenesInTabletopAR.h"

// ArcGIS Maps SDK headers
#include "Error.h"
#include "MobileScenePackage.h"
#include "Scene.h"
#include "SceneQuickView.h"
#include "SceneViewTypes.h"
#include "Surface.h"

#include <QtCore/qglobal.h>
// Qt headers
#include <QStandardPaths>
#include <QtCore/qglobal.h>

using namespace Esri::ArcGISRuntime;

Expand Down
13 changes: 8 additions & 5 deletions CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
// [Legal]
// Copyright 2020 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.
Expand All @@ -17,6 +17,12 @@
#ifndef DISPLAYSCENESINTABLETOPAR_H
#define DISPLAYSCENESINTABLETOPAR_H

// toolkit headers
#include "ArcGISArView.h"

// Qt headers
#include <QObject>

namespace Esri::ArcGISRuntime
{
class ArcGISSceneLayer;
Expand All @@ -26,9 +32,6 @@ class Scene;
class SceneQuickView;
}

#include <QObject>
#include "ArcGISArView.h"

class DisplayScenesInTabletopAR : public QObject
{
Q_OBJECT
Expand Down
6 changes: 3 additions & 3 deletions CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ QT += opengl qml quick
TEMPLATE = app
TARGET = DisplayScenesInTabletopAR

ARCGIS_RUNTIME_VERSION = 200.5.0
ARCGIS_RUNTIME_VERSION = 200.7.0
include($$PWD/arcgisruntime.pri)

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -65,8 +65,8 @@ ios {
# path of the toolkit relative to the sample
ARCGIS_TOOLKIT_PATH = $$PWD/../../../arcgis-maps-sdk-toolkit-qt

exists($$ARCGIS_TOOLKIT_PATH/augmentedreality/CppApi/ArCppApi.pri) {
include($$ARCGIS_TOOLKIT_PATH/augmentedreality/CppApi/ArCppApi.pri)
exists($$ARCGIS_TOOLKIT_PATH/augmented_reality/ArApi/ArApi.pri) {
include($$ARCGIS_TOOLKIT_PATH/augmented_reality/ArApi/ArApi.pri)
} else {
error(ARCGIS_TOOLKIT_PATH is missing which is required to build this application.)
}
Expand Down
4 changes: 2 additions & 2 deletions CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
// [Legal]
// Copyright 2020 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.
Expand Down
2 changes: 1 addition & 1 deletion CppSamples/AR/DisplayScenesInTabletopAR/android/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.esri.arcgis.DisplayScenesInTabletopAR" android:installLocation="auto" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:versionName="-- %%INSERT_VERSION_NAME%% --">

<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="28"/>
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>

<!-- required at targetSdkVersion=30 to check for arcore support -->
<queries>
Expand Down
17 changes: 13 additions & 4 deletions CppSamples/AR/DisplayScenesInTabletopAR/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,35 @@
// [Legal]
// Copyright 2020 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.
// [Legal]

#include "ArcGISArView.h"
// sample headers
#include "DisplayScenesInTabletopAR.h"

// toolkit headers
#include "ArcGISArView.h"

// ArcGIS Maps SDK headers
#include "ArcGISRuntimeEnvironment.h"

// Qt headers
#include <QDir>
#include <QGuiApplication>
#include <QQmlApplicationEngine>
#include <QSurfaceFormat>
#include <QQuickWindow>
#include <QSurfaceFormat>

// Platform specific headers
#ifdef Q_OS_WIN
#include <Windows.h>
#endif
Expand Down
4 changes: 2 additions & 2 deletions CppSamples/AR/DisplayScenesInTabletopAR/main.qml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// [WriteFile Name=DisplayScenesInTabletopAR, Category=AR]
// [Legal]
// Copyright 2020 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.
Expand Down
6 changes: 4 additions & 2 deletions CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// [WriteFile Name=ExploreScenesInFlyoverAR, Category=AR]
// [Legal]
// Copyright 2020 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.
Expand All @@ -18,8 +18,10 @@
#include "pch.hpp"
#endif // PCH_BUILD

// sample headers
#include "ExploreScenesInFlyoverAR.h"

// ArcGIS Maps SDK headers
#include "ArcGISTiledElevationSource.h"
#include "ElevationSourceListModel.h"
#include "Envelope.h"
Expand Down
13 changes: 8 additions & 5 deletions CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// [WriteFile Name=ExploreScenesInFlyoverAR, Category=AR]
// [Legal]
// Copyright 2020 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.
Expand All @@ -17,16 +17,19 @@
#ifndef EXPLORESCENESINFLYOVERAR_H
#define EXPLORESCENESINFLYOVERAR_H

// toolkit headers
#include "ArcGISArView.h"

// Qt headers
#include <QObject>

namespace Esri::ArcGISRuntime
{
class Scene;
class SceneQuickView;
class IntegratedMeshLayer;
}

#include <QObject>
#include "ArcGISArView.h"

class ExploreScenesInFlyoverAR : public QObject
{
Q_OBJECT
Expand Down
6 changes: 3 additions & 3 deletions CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ QT += opengl qml quick
TEMPLATE = app
TARGET = ExploreScenesInFlyoverAR

ARCGIS_RUNTIME_VERSION = 200.5.0
ARCGIS_RUNTIME_VERSION = 200.7.0
include($$PWD/arcgisruntime.pri)

#-------------------------------------------------------------------------------
Expand Down Expand Up @@ -72,8 +72,8 @@ android {
# path of the toolkit relative to the sample
ARCGIS_TOOLKIT_PATH = $$PWD/../../../arcgis-maps-sdk-toolkit-qt

exists($$ARCGIS_TOOLKIT_PATH/augmentedreality/CppApi/ArCppApi.pri) {
include($$ARCGIS_TOOLKIT_PATH/augmentedreality/CppApi/ArCppApi.pri)
exists($$ARCGIS_TOOLKIT_PATH/augmented_reality/ArApi/ArApi.pri) {
include($$ARCGIS_TOOLKIT_PATH/augmented_reality/ArApi/ArApi.pri)
} else {
error(ARCGIS_TOOLKIT_PATH is missing which is required to build this application.)
}
Expand Down
4 changes: 2 additions & 2 deletions CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// [WriteFile Name=ExploreScenesInFlyoverAR, Category=AR]
// [Legal]
// Copyright 2020 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.
Expand Down
2 changes: 1 addition & 1 deletion CppSamples/AR/ExploreScenesInFlyoverAR/android/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.esri.arcgis.ExploreScenesInFlyoverAR" android:installLocation="auto" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:versionName="-- %%INSERT_VERSION_NAME%% --">

<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="28"/>
<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>

<!-- required at targetSdkVersion=30 to check for arcore support -->
<queries>
Expand Down
13 changes: 10 additions & 3 deletions CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
// [Legal]
// Copyright 2020 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.
// [Legal]

// sample headers
#include "ExploreScenesInFlyoverAR.h"

// ArcGIS Maps SDK headers
#include "ArcGISRuntimeEnvironment.h"

// Qt headers
#include <QDir>
#include <QGuiApplication>
#include <QQmlApplicationEngine>
#include <QSurfaceFormat>
#include <QQuickWindow>
#include <QSurfaceFormat>

// Platform specific headers
#ifdef Q_OS_WIN
#include <Windows.h>
#endif
Expand Down
26 changes: 14 additions & 12 deletions CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// [WriteFile Name=AnalyzeHotspots, Category=Analysis]
// [Legal]
// Copyright 2017 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.
Expand All @@ -18,22 +18,25 @@
#include "pch.hpp"
#endif // PCH_BUILD

// sample headers
#include "AnalyzeHotspots.h"

#include "Map.h"
#include "MapQuickView.h"
#include "MapTypes.h"
#include "GeoprocessingTask.h"
// ArcGIS Maps SDK headers
#include "ArcGISMapImageLayer.h"
#include "Envelope.h"
#include "Error.h"
#include "GeoprocessingJob.h"
#include "GeoprocessingResult.h"
#include "GeoprocessingString.h"
#include "GeoprocessingTask.h"
#include "GeoprocessingTypes.h"
#include "ArcGISMapImageLayer.h"
#include "Error.h"
#include "TaskTypes.h"
#include "LayerListModel.h"
#include "GeoprocessingResult.h"
#include "Envelope.h"
#include "Map.h"
#include "MapQuickView.h"
#include "MapTypes.h"
#include "TaskTypes.h"

// Qt headers
#include <QFuture>

using namespace Esri::ArcGISRuntime;
Expand Down Expand Up @@ -74,7 +77,6 @@ void AnalyzeHotspots::componentComplete()
});
}


void AnalyzeHotspots::executeTaskWithDates(const QString& fromDate, const QString& toDate)
{
// Create the GP Parameters
Expand Down
Loading

0 comments on commit a12fe0e

Please sign in to comment.