From cc20a8f95753cd0dbda31d1b04d7d9a7bf910066 Mon Sep 17 00:00:00 2001 From: Brian Noble Date: Wed, 13 Nov 2024 16:30:48 -0700 Subject: [PATCH] Bri12415/v.next merged with main (#1767) * version upgrade (#1702) * version upgrade * few stragglers * Add additional permission for testing purposes. (#1703) * QFuturize EditFeatureAttachments and Geotriggers sample (#1704) * QFuturize EditFeatureAttachments and Geotriggers sample * comment updated. * Update ArcGISRuntimeSDKQt_CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp Co-authored-by: James Ballard * review comment fixed * Review comment fixed. * self review * review comment fixed * review comment fixed --------- Co-authored-by: James Ballard * Let the implicit sizing handle displaying the button. (#1705) * Jared/remove extras dependency (#1707) * extras dependency removed and sample app still builds, and runs without the ability to download data. * samples download and unzip with the replacement zlib-ng/minizip-ng. testing unzip on other platforms. * zlib-ng/minizip-ng * zconf.h before cmake generation * updates * update to pro * fix paths for storing data * first pass of cleanup. Needs another pass and condensing of extras api moved into the sampleviewer. * not sure how these were getting pickedup in the includepath but this is fixed now. * files no longer needed. * updated to have a constructor that sets the path rather than having to call setPath after it has been created. * Almost ready for review. Quick test on windows. * reog * put it back * no longer needed. * update. * QML stuff no longer needed. * Disabling since we don't need it to build. * no longer needed. * undoing changes no longer needed. * remove build folder and other remnants. * remove build folder from minizip-ng * Lots of files not needed for zlib-ng/minizip-ng. Reducing to whats necessary. * moving this back. * moved zlib, minizip, and helper file into it's own pri * Update ArcGISRuntimeSDKQt_SampleViewers/ArcGISRuntimeSDKQt_CppSamples/ZipHelper.h Co-authored-by: James Ballard * pr feedback. * pr feedback. * cleaned up a little. * little more condensing. * cleanup. * rogue parentheses * reduced zlib-ng files * forward declare. * adding ignore for all build directories. * Testing to see if we really need this. This call into zlib-ng/minizip-ng which requires us to include mz_crypt currently. * this seems to be the only way to read a zip file which is needed by our ZipHelper to properly unzip an archive. Oh well. --------- Co-authored-by: James Ballard * Revert "Jared/remove extras dependency (#1707)" (#1709) This reverts commit a254a045d426a2850b5a8481a971482dfb6ef185. * Jared/lets try to merge (#1710) * Revert "Revert "Jared/remove extras dependency (#1707)" (#1709)" This reverts commit e155a75b73ff8fd6283ca3be30e84cf6ad653ac9. * pch was being compiled with C which we didn't want. * need to keep qml until devops can remove the qml sample build from their scripts. * we want qml to build but need it to not use the same entrypoint, ugly but it does what it needs to do. * These should be quotes and not angle brackets * putting this back. * Revert "Revert "Jared/remove extras dependency (#1707)" (#1709)" This reverts commit e155a75b73ff8fd6283ca3be30e84cf6ad653ac9. * Switch paths to bypass path issues on Windows. * removing duplicates. * duplicates. * Removing comments. * review comment --------- Co-authored-by: James Ballard * Update tile source (#1711) * Jared/re org no qml sample app (#1712) * remove qml sample viewer. Reorganize and rename. * when using relative paths we need to remove one level as the Samples app moved up a directory * Reduce ArcGISRuntimeSDKQt_Samples -> SampleViewer * rename and update contents of .pro and .rc * rename samples folders to be less verbose. * remove qml template folder. Rename existing folders to be less verbose and to ahead to CamelCase like we do everywhere else in the repo. * location of samples changed. * Revert "rename samples folders to be less verbose." This reverts commit 207849ae4de6319a6231fe7ccddf349800b3fb99. * move for Widgets * move CppSamples * simplification, no longer support 32-bit builds of windows. * path was incorrect. * Updated for Qt6.5.6 (#1715) * qml samples removed. (#1716) Goodbeye QML Samples, we will miss you. * Create Dynamic Basemap Gallery sample (#1714) * Revert "Create Dynamic Basemap Gallery sample (#1714)" (#1718) This reverts commit 461cefde5d1a42a90b261a2d57c34e05b00c4048. * Adding Snap geometry edits sample (#1706) * Dynamic Basemap Gallery (fixed) (#1719) * change folder (#1720) * Add BasemapStyleListModel to qrc (#1721) * Update for LoadableImage disk path (#1722) * Update for LoadableImage disk path * review comment fixed * Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp Co-authored-by: James Ballard * Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp Co-authored-by: James Ballard * Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp Co-authored-by: James Ballard * Update BasemapStyleListModel.cpp removed const. --------- Co-authored-by: James Ballard * Jared/sample download when offline (#1725) * minor samples repo doc update. * I remember my confusion from before. I still don't know why or how this ever worked before. * fix to partial data download issue (#1724) * minor samples repo doc update. (#1717) * minor samples repo doc update. * no need to specify c++. * duplicate text * Fixing reachability implementation in samples (#1726) * didn't realize I missed part of the port required for Reachability to work. Needs to be loaded. Reverting other changes. * typo * tabbing fix. * Fix build number oddities and compiler warning (#1727) * Fix strange build number parsing, maybe. * Fix unrelated build warnings: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers] const int CreateDynamicBasemapGallery::indexOfSelectedStyle() const * api key changes (#1723) * api key changes * Update FindAddress.cpp * Update FindPlace.cpp * Update README.md * Update ReverseGeocodeOnline.cpp * Update FindAddress.cpp * fix sample names (#1729) * Jared/qml cleanup (#1728) * rename * ifdefs removed. * remove qml auth view and rename cppauthenticationview * remove api from title. * no longer applicable. Reduced down to just the one authentication view. * using an alias since using our own AuthenticationView ontop of the toolkits was giving a warning. * no longer being used. * last little bit of clean up * add branch in github action (#1731) * Jared/api key to access token (#1733) * find and replace with updated access token. * odd man out disabled setting the API key. There is no comment explaining why so im guessing this was a mistake but I wanted to make a note. * apikey replace with token access * remove forward declare of helper. * helper removed. * remove excess trailing new lines from earlier find and replace. * catching a few stragglers * unification across all samples. * renamed all samples when running standalone to remove the ` - C++` to the application name. Also unified the formatting to what the templates currently have. * forgot to commit the rest of the files. Same comment as the previous commit. * templates updated to remove the helper and for qquickitem samples, to remove ` - C++` from the sample name. * I always forget good old widgets. * change qAsConst to std::as_const (#1734) * I think this is it. (#1735) * updating samples with reticle (#1736) * updating samples with reticle * Update CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp Co-authored-by: James Ballard --------- Co-authored-by: James Ballard * James/restore ls samples (#1740) * Restore the local server samples. * There is no more base class. Remove virtual. * Const correctness. Don't shadow vars. * Bri12415/display device perm check (#1738) * Use QPermissions API to request Location permissions. * Update qml with dialog popup to inform user of denied permissions. * Update info.plist with permissions entries. * James PR: Provide explicit parameters for Accuracy and Availability on the requested location permissions. * QPermission(s) not QPermission * Add work around for permissions API qt bug https://bugreports.qt.io/browse/QTBUG-116178 * Bri12415/display device location fix (#1742) * Replace deprecated plist entry and add whenInUse entry for ios DisplayDeviceLocation * Add Info.plist for mac DisplayDeviceLocation for location permissions entries * Add location permission entries to SampleViewer mac/info.plist * Modify SampleViewer/mac/info.plist * Remove old ios info.plist from DisplayDeviceLocation * Add permission entry for ios/Info.plist * Jared/hooktesting (#1743) * Standardize licensing header for all lines to lead with `//` to better work with the CodeFormatter.py script used when running git hooks. * put pch back * adding new line to end of legal to try and trigger the git hook on all sample source files, phase 1 * adding new line to end of legal to try and trigger the git hook on all sample source files, phase 2 * test one file * standardized legal header for samples, running git hooks on all samples source files. Phase 1 * standardized legal header for samples, running git hooks on all samples source files. Phase 2 * standardized legal header for samples, running git hooks on all samples source files. Phase 3 * standardized legal header for samples, running git hooks on all samples source files. Phase 4 * standardized legal header for samples, running git hooks on all samples source files. Phase 5 * standardized legal header for samples, running git hooks on all samples source files. Phase 6 * standardized legal header for samples, running git hooks on all samples source files. Phase 7 * standardized legal header for samples, running git hooks on all samples source files. Phase 8 * standardized legal header for samples, running git hooks on all samples source files. Phase 9 * standardized legal header for samples, running git hooks on all samples source files. Phase 10 * gitignore skips anything with `build` in it so i ran this directly. * updated templates to be compliant with git-hooks. * testing how main.cpp of each sample is handled * run githook on all main.cpp for each individual sample as well. * don't forget these guys. * comment successfully updated from precommit hook * toolkit changed recently so i updated the script. Let's see if it fixes these. * James/200.6.0 (#1746) * Changes for 200.6. * Reformat this file. Remove tabs, let Qt Creator auto-format the rest. * James/sample include ordering (#1745) * Redo how sample includes are brought in. Adding every sample's path to the include path makes the command line so long it occasionally fails on Windows. * Fix Windows build errors. * James/task manager (#1748) * Keep track of async tasks for certain samples. Sample code can get into trouble if we destruct samples at the same time they are processing async task results. In some cases, it is enough to simply cancel tasks in progress. * Clean up logging and clarify doc. * Make sure the individual samples also build. * Code review: Brian Use consistent style. * Update CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.cpp Co-authored-by: Brian Noble --------- Co-authored-by: Brian Noble * Migrate QRegExp to QRegularExpression (#1747) * Fix linux build, restrict to x64 machines (#1750) * Use 200.6 ENC data. (#1751) * Update snap geometry edits sample (#1752) * These paths have changed. (#1755) * Update samples to request permissions (#1753) * Fix ifdef condition (#1757) * Tan11389/scene grid app update (#1754) * push sample changes * Update for 200.6 * Update grid sample * Apply requested changes from code feedback * Revert naming * Rename DisplayGrid to ShowGrid * Update ShowGrid * Do not reuse property signals * Streamline geoview setting * Change all references of `DisplayGrid` to `ShowGrid` (#1759) * Change all references of `DisplayGrid` to `ShowGrid` * Alphabetize * Fix find place sample (#1758) * Update README to include haptics (#1761) * Bri12415/5917 android context (#1762) * Add setAndroidApplicationContext call to ShowDeviceLocationIndoorPositioning sample * Add setAndroidApplicationContext call to SnapGeometryEdits sample * Update CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp Co-authored-by: James Ballard --------- Co-authored-by: James Ballard * Sample viewer and the indoors sample must specify bluetooth manually now. (#1763) * Bluetooth requirement is mobile only for indoors. (#1765) * Split apart connection logic from permission requests logic (#1764) --------- Co-authored-by: Jared Caccamo <11935261+jared-2016@users.noreply.github.com> Co-authored-by: James Ballard Co-authored-by: Ajith Challiyil Pulakkatuthodi <123126365+aji13187@users.noreply.github.com> Co-authored-by: James Ballard Co-authored-by: Tanner Yould Co-authored-by: Andrew Bladon <86665727+AndrewBladon@users.noreply.github.com> Co-authored-by: Lucas Danzinger Co-authored-by: Harini Chaganti <155201385+har13205@users.noreply.github.com> Co-authored-by: Guillaume Belz <1651508+GuillaumeBelz@users.noreply.github.com> --- .gitignore | 4 +- .../DisplayScenesInTabletopAR.cpp | 9 +- .../DisplayScenesInTabletopAR.h | 13 +- .../DisplayScenesInTabletopAR.pro | 2 +- .../DisplayScenesInTabletopAR.qml | 4 +- .../AR/DisplayScenesInTabletopAR/main.cpp | 17 +- .../AR/DisplayScenesInTabletopAR/main.qml | 4 +- .../ExploreScenesInFlyoverAR.cpp | 6 +- .../ExploreScenesInFlyoverAR.h | 13 +- .../ExploreScenesInFlyoverAR.pro | 2 +- .../ExploreScenesInFlyoverAR.qml | 4 +- .../AR/ExploreScenesInFlyoverAR/main.cpp | 13 +- .../AnalyzeHotspots/AnalyzeHotspots.cpp | 26 +- .../AnalyzeHotspots/AnalyzeHotspots.h | 13 +- .../AnalyzeHotspots/AnalyzeHotspots.pro | 2 +- .../AnalyzeHotspots/AnalyzeHotspots.qml | 4 +- CppSamples/Analysis/AnalyzeHotspots/main.cpp | 20 +- .../AnalyzeViewshed/AnalyzeViewshed.cpp | 49 +- .../AnalyzeViewshed/AnalyzeViewshed.h | 9 +- .../AnalyzeViewshed/AnalyzeViewshed.pro | 2 +- .../AnalyzeViewshed/AnalyzeViewshed.qml | 4 +- CppSamples/Analysis/AnalyzeViewshed/main.cpp | 20 +- .../DistanceMeasurementAnalysis.cpp | 8 +- .../DistanceMeasurementAnalysis.h | 9 +- .../DistanceMeasurementAnalysis.pro | 2 +- .../DistanceMeasurementAnalysis.qml | 4 +- .../DistanceMeasurementAnalysis/main.cpp | 10 +- .../Analysis/Geotriggers/FeatureInfoPane.qml | 4 +- .../Analysis/Geotriggers/Geotriggers.cpp | 28 +- CppSamples/Analysis/Geotriggers/Geotriggers.h | 13 +- .../Analysis/Geotriggers/Geotriggers.pro | 2 +- .../Analysis/Geotriggers/Geotriggers.qml | 4 +- CppSamples/Analysis/Geotriggers/main.cpp | 11 +- .../LineOfSightGeoElement.cpp | 51 +- .../LineOfSightGeoElement.h | 11 +- .../LineOfSightGeoElement.pro | 2 +- .../LineOfSightGeoElement.qml | 4 +- .../Analysis/LineOfSightGeoElement/main.cpp | 11 +- .../LineOfSightLocation.cpp | 25 +- .../LineOfSightLocation/LineOfSightLocation.h | 9 +- .../LineOfSightLocation.pro | 2 +- .../LineOfSightLocation.qml | 4 +- .../Analysis/LineOfSightLocation/main.cpp | 21 +- .../StatisticalQuery/StatisticalQuery.cpp | 28 +- .../StatisticalQuery/StatisticalQuery.h | 9 +- .../StatisticalQuery/StatisticalQuery.pro | 2 +- .../StatisticalQuery/StatisticalQuery.qml | 4 +- CppSamples/Analysis/StatisticalQuery/main.cpp | 21 +- .../StatisticalQueryGroupSort/OptionsPage.qml | 4 +- .../StatisticalQueryGroupSort/ResultsPage.qml | 4 +- .../StatisticResultListModel.cpp | 33 +- .../StatisticResultListModel.h | 21 +- .../StatisticalQueryGroupSort.cpp | 24 +- .../StatisticalQueryGroupSort.h | 17 +- .../StatisticalQueryGroupSort.pro | 2 +- .../StatisticalQueryGroupSort.qml | 4 +- .../StatisticalQueryGroupSort/main.cpp | 21 +- .../ViewshedCamera/ViewshedCamera.cpp | 28 +- .../Analysis/ViewshedCamera/ViewshedCamera.h | 9 +- .../ViewshedCamera/ViewshedCamera.pro | 2 +- .../ViewshedCamera/ViewshedCamera.qml | 4 +- CppSamples/Analysis/ViewshedCamera/main.cpp | 21 +- .../ViewshedGeoElement/ViewshedGeoElement.cpp | 59 ++- .../ViewshedGeoElement/ViewshedGeoElement.h | 17 +- .../ViewshedGeoElement/ViewshedGeoElement.pro | 2 +- .../ViewshedGeoElement/ViewshedGeoElement.qml | 4 +- .../Analysis/ViewshedGeoElement/main.cpp | 21 +- .../Analysis/ViewshedLocation/ColorDialog.qml | 4 +- .../ViewshedLocation/ViewshedLocation.cpp | 25 +- .../ViewshedLocation/ViewshedLocation.h | 11 +- .../ViewshedLocation/ViewshedLocation.pro | 2 +- .../ViewshedLocation/ViewshedLocation.qml | 4 +- .../ViewshedLocation/ViewshedSlider.qml | 4 +- CppSamples/Analysis/ViewshedLocation/main.cpp | 21 +- .../AddItemsToPortal/AddItemsToPortal.cpp | 38 +- .../AddItemsToPortal/AddItemsToPortal.h | 23 +- .../AddItemsToPortal/AddItemsToPortal.pro | 2 +- .../AddItemsToPortal/AddItemsToPortal.qml | 4 +- .../CloudAndPortal/AddItemsToPortal/main.cpp | 12 +- .../IntegratedWindowsAuthentication.cpp | 13 +- .../IntegratedWindowsAuthentication.h | 11 +- .../IntegratedWindowsAuthentication.pro | 2 +- .../IntegratedWindowsAuthentication.qml | 4 +- .../IntegratedWindowsAuthentication/main.cpp | 11 +- .../PortalUserInfo/PortalUserInfo.cpp | 20 +- .../PortalUserInfo/PortalUserInfo.h | 11 +- .../PortalUserInfo/PortalUserInfo.pro | 2 +- .../PortalUserInfo/PortalUserInfo.qml | 4 +- .../CloudAndPortal/PortalUserInfo/main.cpp | 12 +- .../SearchForWebmap/SearchForWebmap.cpp | 32 +- .../SearchForWebmap/SearchForWebmap.h | 25 +- .../SearchForWebmap/SearchForWebmap.pro | 2 +- .../CloudAndPortal/SearchForWebmap/main.cpp | 12 +- .../ShowOrgBasemaps/ShowOrgBasemaps.cpp | 21 +- .../ShowOrgBasemaps/ShowOrgBasemaps.h | 11 +- .../ShowOrgBasemaps/ShowOrgBasemaps.pro | 2 +- .../ShowOrgBasemaps/ShowOrgBasemaps.qml | 4 +- .../CloudAndPortal/ShowOrgBasemaps/main.cpp | 14 +- .../TokenAuthentication.cpp | 9 +- .../TokenAuthentication/TokenAuthentication.h | 9 +- .../TokenAuthentication.pro | 2 +- .../TokenAuthentication.qml | 4 +- .../TokenAuthentication/main.cpp | 11 +- .../AddGraphicsWithRenderer.cpp | 7 +- .../AddGraphicsWithRenderer.h | 9 +- .../AddGraphicsWithRenderer.pro | 2 +- .../AddGraphicsWithRenderer.qml | 4 +- .../AddGraphicsWithRenderer/main.cpp | 10 +- .../BuildLegend/BuildLegend.cpp | 21 +- .../BuildLegend/BuildLegend.h | 12 +- .../BuildLegend/BuildLegend.pro | 2 +- .../BuildLegend/BuildLegend.qml | 4 +- .../DisplayInformation/BuildLegend/main.cpp | 23 +- .../ControlAnnotationSublayerVisibility.cpp | 17 +- .../ControlAnnotationSublayerVisibility.h | 9 +- .../ControlAnnotationSublayerVisibility.pro | 2 +- .../ControlAnnotationSublayerVisibility.qml | 4 +- .../main.cpp | 11 +- .../CreateSymbolStylesFromWebStyles.cpp | 21 +- .../CreateSymbolStylesFromWebStyles.h | 13 +- .../CreateSymbolStylesFromWebStyles.pro | 2 +- .../CreateSymbolStylesFromWebStyles.qml | 4 +- .../CreateSymbolStylesFromWebStyles/main.cpp | 11 +- .../CustomDictionaryStyle.cpp | 19 +- .../CustomDictionaryStyle.h | 9 +- .../CustomDictionaryStyle.pro | 2 +- .../CustomDictionaryStyle.qml | 4 +- .../CustomDictionaryStyle/main.cpp | 11 +- .../DisplayClusters/DisplayClusters.cpp | 8 +- .../DisplayClusters/DisplayClusters.h | 11 +- .../DisplayClusters/DisplayClusters.pro | 2 +- .../DisplayClusters/DisplayClusters.qml | 4 +- .../DisplayClusters/main.cpp | 16 +- .../DisplayGrid/DisplayGrid.cpp | 313 ----------- .../DisplayGrid/DisplayGrid.h | 143 ----- .../DisplayGrid/DisplayGrid.qrc | 10 - .../DisplayInformation/DisplayGrid/README.md | 38 -- .../DisplayGrid/arcgisruntime.pri | 27 - .../DisplayGrid/screenshot.png | Bin 188756 -> 0 bytes .../GODictionaryRenderer.cpp | 25 +- .../GODictionaryRenderer.h | 6 +- .../GODictionaryRenderer.pro | 2 +- .../GODictionaryRenderer.qml | 4 +- .../GODictionaryRenderer/main.cpp | 21 +- .../GODictionaryRenderer_3D.cpp | 27 +- .../GODictionaryRenderer_3D.h | 6 +- .../GODictionaryRenderer_3D.pro | 2 +- .../GODictionaryRenderer_3D.qml | 4 +- .../GODictionaryRenderer_3D/main.cpp | 21 +- .../GOSymbols/GOSymbols.cpp | 27 +- .../DisplayInformation/GOSymbols/GOSymbols.h | 10 +- .../GOSymbols/GOSymbols.pro | 2 +- .../GOSymbols/GOSymbols.qml | 4 +- .../DisplayInformation/GOSymbols/main.cpp | 23 +- .../IdentifyGraphics/IdentifyGraphics.cpp | 29 +- .../IdentifyGraphics/IdentifyGraphics.h | 10 +- .../IdentifyGraphics/IdentifyGraphics.pro | 2 +- .../IdentifyGraphics/IdentifyGraphics.qml | 4 +- .../IdentifyGraphics/main.cpp | 23 +- .../Picture_Marker_Symbol.cpp | 29 +- .../Picture_Marker_Symbol.h | 11 +- .../Picture_Marker_Symbol.pro | 2 +- .../Picture_Marker_Symbol.qml | 4 +- .../Picture_Marker_Symbol/main.cpp | 21 +- .../QueryFeaturesWithArcadeExpression.cpp | 23 +- .../QueryFeaturesWithArcadeExpression.h | 10 +- .../QueryFeaturesWithArcadeExpression.pro | 2 +- .../QueryFeaturesWithArcadeExpression.qml | 4 +- .../main.cpp | 16 +- .../ReadSymbolsFromMobileStyle.cpp | 33 +- .../ReadSymbolsFromMobileStyle.h | 19 +- .../ReadSymbolsFromMobileStyle.pro | 2 +- .../ReadSymbolsFromMobileStyle.qml | 4 +- .../SymbolComboBox.qml | 4 +- .../SymbolImageProvider.cpp | 8 +- .../SymbolImageProvider.h | 13 + .../ReadSymbolsFromMobileStyle/main.cpp | 11 +- .../ShowCallout/ShowCallout.cpp | 12 +- .../ShowCallout/ShowCallout.h | 9 +- .../ShowCallout/ShowCallout.pro | 2 +- .../ShowCallout/ShowCallout.qml | 4 +- .../DisplayInformation/ShowCallout/main.cpp | 22 +- .../{DisplayGrid => ShowGrid}/Info.plist | 8 +- .../DisplayInformation/ShowGrid/README.md | 40 ++ .../README.metadata.json | 12 +- .../DisplayInformation/ShowGrid/ShowGrid.cpp | 266 ++++++++++ .../DisplayInformation/ShowGrid/ShowGrid.h | 140 +++++ .../DisplayGrid.pro => ShowGrid/ShowGrid.pro} | 25 +- .../DisplayGrid.qml => ShowGrid/ShowGrid.qml} | 182 +++++-- .../DisplayInformation/ShowGrid/ShowGrid.qrc | 11 + .../ShowGrid/arcgisruntime.pri | 29 ++ .../{DisplayGrid => ShowGrid}/main.cpp | 55 +- .../DisplayInformation/ShowGrid/main.qml | 25 + .../ShowGrid/screenshot.png | Bin 0 -> 313111 bytes .../ShowLabelsOnLayers/ShowLabelsOnLayers.cpp | 23 +- .../ShowLabelsOnLayers/ShowLabelsOnLayers.h | 9 +- .../ShowLabelsOnLayers/ShowLabelsOnLayers.pro | 2 +- .../ShowLabelsOnLayers/ShowLabelsOnLayers.qml | 4 +- .../ShowLabelsOnLayers/main.cpp | 21 +- .../ShowPopup/ShowPopup.cpp | 21 +- .../DisplayInformation/ShowPopup/ShowPopup.h | 17 +- .../ShowPopup/ShowPopup.pro | 2 +- .../ShowPopup/ShowPopup.qml | 4 +- .../DisplayInformation/ShowPopup/main.cpp | 16 +- .../Simple_Marker_Symbol.cpp | 19 +- .../Simple_Marker_Symbol.h | 9 +- .../Simple_Marker_Symbol.pro | 2 +- .../Simple_Marker_Symbol.qml | 4 +- .../Simple_Marker_Symbol/main.cpp | 21 +- .../Simple_Renderer/Simple_Renderer.cpp | 21 +- .../Simple_Renderer/Simple_Renderer.h | 9 +- .../Simple_Renderer/Simple_Renderer.pro | 2 +- .../Simple_Renderer/Simple_Renderer.qml | 4 +- .../Simple_Renderer/main.cpp | 21 +- .../SketchOnMap/SketchEditorButton.qml | 4 +- .../SketchOnMap/SketchOnMap.cpp | 27 +- .../SketchOnMap/SketchOnMap.h | 9 +- .../SketchOnMap/SketchOnMap.pro | 2 +- .../SketchOnMap/SketchOnMap.qml | 4 +- .../DisplayInformation/SketchOnMap/main.cpp | 11 +- .../SymbolizeShapefile/SymbolizeShapefile.cpp | 21 +- .../SymbolizeShapefile/SymbolizeShapefile.h | 9 +- .../SymbolizeShapefile/SymbolizeShapefile.pro | 2 +- .../SymbolizeShapefile/SymbolizeShapefile.qml | 4 +- .../SymbolizeShapefile/main.cpp | 21 +- .../Unique_Value_Renderer.cpp | 29 +- .../Unique_Value_Renderer.h | 9 +- .../Unique_Value_Renderer.pro | 2 +- .../Unique_Value_Renderer.qml | 4 +- .../Unique_Value_Renderer/main.cpp | 23 +- .../AddFeaturesFeatureService.cpp | 7 +- .../AddFeaturesFeatureService.h | 9 +- .../AddFeaturesFeatureService.pro | 2 +- .../AddFeaturesFeatureService.qml | 4 +- .../AddFeaturesFeatureService/main.cpp | 10 +- .../ContingentValues/ContingentValues.cpp | 43 +- .../ContingentValues/ContingentValues.h | 11 +- .../ContingentValues/ContingentValues.pro | 2 +- .../ContingentValues/ContingentValues.qml | 4 +- CppSamples/EditData/ContingentValues/main.cpp | 10 +- .../DeleteFeaturesFeatureService.cpp | 43 +- .../DeleteFeaturesFeatureService.h | 10 +- .../DeleteFeaturesFeatureService.pro | 2 +- .../DeleteFeaturesFeatureService.qml | 4 +- .../DeleteFeaturesFeatureService/main.cpp | 24 +- .../EditAndSyncFeatures.cpp | 45 +- .../EditAndSyncFeatures/EditAndSyncFeatures.h | 22 +- .../EditAndSyncFeatures.pro | 2 +- .../EditAndSyncFeatures.qml | 4 +- .../EditData/EditAndSyncFeatures/main.cpp | 21 +- .../EditFeatureAttachments.cpp | 49 +- .../EditFeatureAttachments.h | 14 +- .../EditFeatureAttachments.pro | 2 +- .../EditFeatureAttachments.qml | 4 +- .../EditData/EditFeatureAttachments/main.cpp | 26 +- ...ditFeaturesWithFeatureLinkedAnnotation.cpp | 40 +- .../EditFeaturesWithFeatureLinkedAnnotation.h | 22 +- ...ditFeaturesWithFeatureLinkedAnnotation.pro | 2 +- ...ditFeaturesWithFeatureLinkedAnnotation.qml | 4 +- .../main.cpp | 11 +- .../EditKmlGroundOverlay.cpp | 28 +- .../EditKmlGroundOverlay.h | 9 +- .../EditKmlGroundOverlay.pro | 2 +- .../EditKmlGroundOverlay.qml | 4 +- .../EditData/EditKmlGroundOverlay/main.cpp | 11 +- .../EditWithBranchVersioning.cpp | 29 +- .../EditWithBranchVersioning.h | 18 +- .../EditWithBranchVersioning.pro | 2 +- .../EditWithBranchVersioning.qml | 4 +- .../EditWithBranchVersioning/main.cpp | 11 +- .../GeometryEditorButton.qml | 4 +- .../EditData/SnapGeometryEdits/README.md | 9 +- .../SnapGeometryEdits/SnapGeometryEdits.cpp | 34 +- .../SnapGeometryEdits/SnapGeometryEdits.h | 12 +- .../SnapGeometryEdits/SnapGeometryEdits.pro | 2 +- .../SnapGeometryEdits/SnapGeometryEdits.qml | 60 ++- .../SnapGeometryEdits/SnapSourceListModel.cpp | 31 +- .../SnapGeometryEdits/SnapSourceListModel.h | 13 + .../EditData/SnapGeometryEdits/main.cpp | 13 +- .../UpdateAttributesFeatureService.cpp | 39 +- .../UpdateAttributesFeatureService.h | 10 +- .../UpdateAttributesFeatureService.pro | 2 +- .../UpdateAttributesFeatureService.qml | 4 +- .../UpdateAttributesFeatureService/main.cpp | 24 +- .../UpdateGeometryFeatureService.cpp | 31 +- .../UpdateGeometryFeatureService.h | 10 +- .../UpdateGeometryFeatureService.pro | 2 +- .../UpdateGeometryFeatureService.qml | 4 +- .../UpdateGeometryFeatureService/main.cpp | 23 +- .../ControlTimeExtentTimeSlider.cpp | 12 +- .../ControlTimeExtentTimeSlider.h | 9 +- .../ControlTimeExtentTimeSlider.pro | 2 +- .../ControlTimeExtentTimeSlider.qml | 4 +- .../ControlTimeExtentTimeSlider/main.cpp | 14 +- .../CreateMobileGeodatabase.cpp | 18 +- .../CreateMobileGeodatabase.h | 18 +- .../CreateMobileGeodatabase.pro | 2 +- .../CreateMobileGeodatabase.qml | 4 +- .../FeatureListModel.cpp | 8 +- .../FeatureListModel.h | 16 + .../Features/CreateMobileGeodatabase/main.cpp | 10 +- .../FeatureLayerChangeRenderer.cpp | 23 +- .../FeatureLayerChangeRenderer.h | 10 +- .../FeatureLayerChangeRenderer.pro | 2 +- .../FeatureLayerChangeRenderer.qml | 4 +- .../FeatureLayerChangeRenderer/main.cpp | 23 +- .../FeatureLayerDictionaryRenderer.cpp | 15 +- .../FeatureLayerDictionaryRenderer.h | 5 +- .../FeatureLayerDictionaryRenderer.pro | 2 +- .../FeatureLayerDictionaryRenderer.qml | 4 +- .../FeatureLayerDictionaryRenderer/main.cpp | 21 +- .../FeatureLayerQuery/FeatureLayerQuery.cpp | 36 +- .../FeatureLayerQuery/FeatureLayerQuery.h | 9 +- .../FeatureLayerQuery/FeatureLayerQuery.pro | 2 +- .../FeatureLayerQuery/FeatureLayerQuery.qml | 4 +- .../Features/FeatureLayerQuery/main.cpp | 23 +- .../FeatureLayerSelection.cpp | 9 +- .../FeatureLayerSelection.h | 9 +- .../FeatureLayerSelection.pro | 2 +- .../FeatureLayerSelection.qml | 4 +- .../Features/FeatureLayerSelection/main.cpp | 10 +- ...rByDefinitionExpressionOrDisplayFilter.cpp | 19 +- ...terByDefinitionExpressionOrDisplayFilter.h | 10 +- ...rByDefinitionExpressionOrDisplayFilter.pro | 2 +- ...rByDefinitionExpressionOrDisplayFilter.qml | 4 +- .../main.cpp | 23 +- ...teGeodatabaseReplicaFromFeatureService.cpp | 41 +- ...rateGeodatabaseReplicaFromFeatureService.h | 22 +- ...teGeodatabaseReplicaFromFeatureService.pro | 2 +- ...teGeodatabaseReplicaFromFeatureService.qml | 4 +- .../main.cpp | 23 +- .../ListRelatedFeatures.cpp | 48 +- .../ListRelatedFeatures/ListRelatedFeatures.h | 16 +- .../ListRelatedFeatures.pro | 2 +- .../ListRelatedFeatures.qml | 4 +- .../ListRelatedFeatures/RelatedFeature.cpp | 10 +- .../ListRelatedFeatures/RelatedFeature.h | 4 +- .../RelatedFeatureListModel.cpp | 12 +- .../RelatedFeatureListModel.h | 9 +- .../Features/ListRelatedFeatures/main.cpp | 21 +- .../ServiceFeatureTableCache.cpp | 22 +- .../ServiceFeatureTableCache.h | 9 +- .../ServiceFeatureTableCache.pro | 2 +- .../ServiceFeatureTableCache.qml | 4 +- .../ServiceFeatureTableCache/main.cpp | 23 +- .../ServiceFeatureTableManualCache.cpp | 25 +- .../ServiceFeatureTableManualCache.h | 10 +- .../ServiceFeatureTableManualCache.pro | 2 +- .../ServiceFeatureTableManualCache.qml | 4 +- .../ServiceFeatureTableManualCache/main.cpp | 23 +- .../ServiceFeatureTableNoCache.cpp | 24 +- .../ServiceFeatureTableNoCache.h | 10 +- .../ServiceFeatureTableNoCache.pro | 2 +- .../ServiceFeatureTableNoCache.qml | 4 +- .../ServiceFeatureTableNoCache/main.cpp | 23 +- CppSamples/Geometry/Buffer/Buffer.cpp | 7 +- CppSamples/Geometry/Buffer/Buffer.h | 11 +- CppSamples/Geometry/Buffer/Buffer.pro | 2 +- CppSamples/Geometry/Buffer/Buffer.qml | 4 +- CppSamples/Geometry/Buffer/main.cpp | 10 +- .../Geometry/ClipGeometry/ClipGeometry.cpp | 27 +- .../Geometry/ClipGeometry/ClipGeometry.h | 13 +- .../Geometry/ClipGeometry/ClipGeometry.pro | 2 +- .../Geometry/ClipGeometry/ClipGeometry.qml | 4 +- CppSamples/Geometry/ClipGeometry/main.cpp | 21 +- CppSamples/Geometry/ConvexHull/ConvexHull.cpp | 24 +- CppSamples/Geometry/ConvexHull/ConvexHull.h | 11 +- CppSamples/Geometry/ConvexHull/ConvexHull.pro | 2 +- CppSamples/Geometry/ConvexHull/ConvexHull.qml | 4 +- CppSamples/Geometry/ConvexHull/main.cpp | 11 +- .../CreateAndEditGeometries.cpp | 7 +- .../CreateAndEditGeometries.h | 9 +- .../CreateAndEditGeometries.pro | 2 +- .../CreateAndEditGeometries.qml | 4 +- .../GeometryEditorButton.qml | 4 +- .../Geometry/CreateAndEditGeometries/main.cpp | 10 +- .../CreateGeometries/CreateGeometries.cpp | 29 +- .../CreateGeometries/CreateGeometries.h | 13 +- .../CreateGeometries/CreateGeometries.pro | 2 +- .../CreateGeometries/CreateGeometries.qml | 4 +- CppSamples/Geometry/CreateGeometries/main.cpp | 21 +- .../Geometry/CutGeometry/CutGeometry.cpp | 25 +- CppSamples/Geometry/CutGeometry/CutGeometry.h | 15 +- .../Geometry/CutGeometry/CutGeometry.pro | 2 +- .../Geometry/CutGeometry/CutGeometry.qml | 4 +- CppSamples/Geometry/CutGeometry/main.cpp | 21 +- .../DensifyAndGeneralize.cpp | 38 +- .../DensifyAndGeneralize.h | 13 +- .../DensifyAndGeneralize.pro | 2 +- .../DensifyAndGeneralize.qml | 4 +- .../Geometry/DensifyAndGeneralize/main.cpp | 21 +- .../FormatCoordinates/FormatCoordinates.cpp | 16 +- .../FormatCoordinates/FormatCoordinates.h | 15 +- .../FormatCoordinates/FormatCoordinates.pro | 2 +- .../FormatCoordinates/FormatCoordinates.qml | 4 +- .../Geometry/FormatCoordinates/main.cpp | 23 +- .../Geometry/FormatCoordinates/main.qml | 4 +- .../GeodesicOperations/GeodesicOperations.cpp | 27 +- .../GeodesicOperations/GeodesicOperations.h | 15 +- .../GeodesicOperations/GeodesicOperations.pro | 2 +- .../GeodesicOperations/GeodesicOperations.qml | 4 +- .../Geometry/GeodesicOperations/main.cpp | 21 +- .../ListTransformations.cpp | 40 +- .../ListTransformations/ListTransformations.h | 18 +- .../ListTransformations.pro | 2 +- .../ListTransformations.qml | 4 +- .../Geometry/ListTransformations/main.cpp | 21 +- .../Geometry/NearestVertex/NearestVertex.cpp | 21 +- .../Geometry/NearestVertex/NearestVertex.h | 9 +- .../Geometry/NearestVertex/NearestVertex.pro | 2 +- .../Geometry/NearestVertex/NearestVertex.qml | 4 +- CppSamples/Geometry/NearestVertex/main.cpp | 11 +- .../ProjectGeometry/ProjectGeometry.cpp | 24 +- .../ProjectGeometry/ProjectGeometry.h | 11 +- .../ProjectGeometry/ProjectGeometry.pro | 2 +- .../ProjectGeometry/ProjectGeometry.qml | 4 +- CppSamples/Geometry/ProjectGeometry/main.cpp | 22 +- .../SpatialOperations/SpatialOperations.cpp | 26 +- .../SpatialOperations/SpatialOperations.h | 15 +- .../SpatialOperations/SpatialOperations.pro | 2 +- .../SpatialOperations/SpatialOperations.qml | 4 +- .../Geometry/SpatialOperations/main.cpp | 21 +- .../SpatialRelationships.cpp | 43 +- .../SpatialRelationships.h | 13 +- .../SpatialRelationships.pro | 2 +- .../SpatialRelationships.qml | 4 +- .../Geometry/SpatialRelationships/main.cpp | 21 +- .../AddCustomDynamicEntityDataSource.cpp | 40 +- .../AddCustomDynamicEntityDataSource.h | 11 +- .../AddCustomDynamicEntityDataSource.pro | 2 +- .../AddCustomDynamicEntityDataSource.qml | 4 +- .../CustomDataSource.cpp | 27 +- .../CustomDataSource.h | 28 +- .../AddCustomDynamicEntityDataSource/main.cpp | 14 +- .../AddDynamicEntityLayer.cpp | 8 +- .../AddDynamicEntityLayer.h | 9 +- .../AddDynamicEntityLayer.pro | 2 +- .../AddDynamicEntityLayer.qml | 4 +- .../Layers/AddDynamicEntityLayer/main.cpp | 12 +- .../AddEncExchangeSet/AddEncExchangeSet.cpp | 23 +- .../AddEncExchangeSet/AddEncExchangeSet.h | 9 +- .../AddEncExchangeSet/AddEncExchangeSet.pro | 2 +- .../AddEncExchangeSet/AddEncExchangeSet.qml | 4 +- .../AddEncExchangeSet/README.metadata.json | 2 +- CppSamples/Layers/AddEncExchangeSet/main.cpp | 11 +- .../ApplyMosaicRuleToRasters.cpp | 17 +- .../ApplyMosaicRuleToRasters.h | 9 +- .../ApplyMosaicRuleToRasters.pro | 2 +- .../ApplyMosaicRuleToRasters.qml | 4 +- .../Layers/ApplyMosaicRuleToRasters/main.cpp | 11 +- .../ApplyUniqueValuesWithAlternateSymbols.cpp | 19 +- .../ApplyUniqueValuesWithAlternateSymbols.h | 9 +- .../ApplyUniqueValuesWithAlternateSymbols.pro | 2 +- .../ApplyUniqueValuesWithAlternateSymbols.qml | 4 +- .../main.cpp | 10 +- .../ArcGISMapImageLayerUrl.cpp | 13 +- .../ArcGISMapImageLayerUrl.h | 9 +- .../ArcGISMapImageLayerUrl.pro | 2 +- .../ArcGISMapImageLayerUrl.qml | 4 +- .../Layers/ArcGISMapImageLayerUrl/main.cpp | 25 +- .../ArcGISTiledLayerUrl.cpp | 12 +- .../ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h | 9 +- .../ArcGISTiledLayerUrl.pro | 2 +- .../ArcGISTiledLayerUrl.qml | 4 +- .../Layers/ArcGISTiledLayerUrl/main.cpp | 25 +- .../BlendRasterLayer/BlendRasterLayer.cpp | 17 +- .../BlendRasterLayer/BlendRasterLayer.h | 9 +- .../BlendRasterLayer/BlendRasterLayer.pro | 2 +- .../BlendRasterLayer/BlendRasterLayer.qml | 4 +- .../BlendRasterLayer/ColorRampModel.qml | 4 +- .../BlendRasterLayer/SlopeTypeModel.qml | 4 +- CppSamples/Layers/BlendRasterLayer/main.cpp | 21 +- .../BrowseOGCAPIFeatureService.cpp | 17 +- .../BrowseOGCAPIFeatureService.h | 11 +- .../BrowseOGCAPIFeatureService.pro | 2 +- .../BrowseOGCAPIFeatureService.qml | 4 +- .../BrowseOGCAPIFeatureService/main.cpp | 11 +- .../BrowseWfsLayers/BrowseWfsLayers.cpp | 33 +- .../Layers/BrowseWfsLayers/BrowseWfsLayers.h | 14 +- .../BrowseWfsLayers/BrowseWfsLayers.pro | 2 +- .../BrowseWfsLayers/BrowseWfsLayers.qml | 4 +- CppSamples/Layers/BrowseWfsLayers/main.cpp | 11 +- .../ChangeSublayerRenderer.cpp | 24 +- .../ChangeSublayerRenderer.h | 9 +- .../ChangeSublayerRenderer.pro | 2 +- .../ChangeSublayerRenderer.qml | 4 +- .../Layers/ChangeSublayerRenderer/main.cpp | 21 +- .../ChangeSublayerVisibility.cpp | 21 +- .../ChangeSublayerVisibility.h | 12 +- .../ChangeSublayerVisibility.pro | 2 +- .../ChangeSublayerVisibility.qml | 4 +- .../Layers/ChangeSublayerVisibility/main.cpp | 27 +- .../ConfigureClusters/ConfigureClusters.cpp | 9 +- .../ConfigureClusters/ConfigureClusters.h | 9 +- .../ConfigureClusters/ConfigureClusters.pro | 2 +- .../ConfigureClusters/ConfigureClusters.qml | 4 +- CppSamples/Layers/ConfigureClusters/main.cpp | 10 +- .../CreateAndSaveKmlFile.cpp | 33 +- .../CreateAndSaveKmlFile.h | 24 +- .../CreateAndSaveKmlFile.pro | 2 +- .../CreateAndSaveKmlFile.qml | 4 +- .../Layers/CreateAndSaveKmlFile/main.cpp | 11 +- .../DisplayAnnotation/DisplayAnnotation.cpp | 12 +- .../DisplayAnnotation/DisplayAnnotation.h | 9 +- .../DisplayAnnotation/DisplayAnnotation.pro | 2 +- .../DisplayAnnotation/DisplayAnnotation.qml | 4 +- CppSamples/Layers/DisplayAnnotation/main.cpp | 11 +- .../DisplayDimensions/DisplayDimensions.cpp | 13 +- .../DisplayDimensions/DisplayDimensions.h | 9 +- .../DisplayDimensions/DisplayDimensions.pro | 2 +- .../DisplayDimensions/DisplayDimensions.qml | 4 +- CppSamples/Layers/DisplayDimensions/main.cpp | 10 +- .../DisplayFeatureLayers.cpp | 11 +- .../DisplayFeatureLayers.h | 9 +- .../DisplayFeatureLayers.pro | 2 +- .../DisplayFeatureLayers.qml | 4 +- .../Layers/DisplayFeatureLayers/main.cpp | 10 +- CppSamples/Layers/DisplayKml/DisplayKml.cpp | 27 +- CppSamples/Layers/DisplayKml/DisplayKml.h | 13 +- CppSamples/Layers/DisplayKml/DisplayKml.pro | 2 +- CppSamples/Layers/DisplayKml/DisplayKml.qml | 4 +- CppSamples/Layers/DisplayKml/main.cpp | 21 +- .../DisplayKmlNetworkLinks.cpp | 16 +- .../DisplayKmlNetworkLinks.h | 9 +- .../DisplayKmlNetworkLinks.pro | 2 +- .../DisplayKmlNetworkLinks.qml | 4 +- .../DisplayKmlNetworkLinks/MessageButton.qml | 4 +- .../Layers/DisplayKmlNetworkLinks/main.cpp | 21 +- .../DisplayOgcApiFeatureCollection.cpp | 17 +- .../DisplayOgcApiFeatureCollection.h | 10 +- .../DisplayOgcApiFeatureCollection.pro | 2 +- .../DisplayOgcApiFeatureCollection.qml | 4 +- .../DisplayOgcApiFeatureCollection/main.cpp | 10 +- .../DisplaySubtypeFeatureLayer.cpp | 26 +- .../DisplaySubtypeFeatureLayer.h | 14 +- .../DisplaySubtypeFeatureLayer.pro | 2 +- .../DisplaySubtypeFeatureLayer.qml | 4 +- .../DisplaySubtypeFeatureLayer/main.cpp | 11 +- .../DisplayWfsLayer/DisplayWfsLayer.cpp | 29 +- .../Layers/DisplayWfsLayer/DisplayWfsLayer.h | 9 +- .../DisplayWfsLayer/DisplayWfsLayer.pro | 2 +- .../DisplayWfsLayer/DisplayWfsLayer.qml | 4 +- CppSamples/Layers/DisplayWfsLayer/main.cpp | 11 +- CppSamples/Layers/ExportTiles/ExportTiles.cpp | 33 +- CppSamples/Layers/ExportTiles/ExportTiles.h | 11 +- CppSamples/Layers/ExportTiles/ExportTiles.pro | 2 +- CppSamples/Layers/ExportTiles/ExportTiles.qml | 4 +- CppSamples/Layers/ExportTiles/main.cpp | 23 +- .../ExportVectorTiles/ExportVectorTiles.cpp | 35 +- .../ExportVectorTiles/ExportVectorTiles.h | 11 +- .../ExportVectorTiles/ExportVectorTiles.pro | 2 +- .../ExportVectorTiles/ExportVectorTiles.qml | 4 +- CppSamples/Layers/ExportVectorTiles/main.cpp | 10 +- .../FeatureCollectionLayerFromPortal.cpp | 12 +- .../FeatureCollectionLayerFromPortal.h | 9 +- .../FeatureCollectionLayerFromPortal.pro | 2 +- .../FeatureCollectionLayerFromPortal.qml | 4 +- .../FeatureCollectionLayerFromPortal/main.cpp | 11 +- .../FeatureCollectionLayerQuery.cpp | 14 +- .../FeatureCollectionLayerQuery.h | 9 +- .../FeatureCollectionLayerQuery.pro | 2 +- .../FeatureCollectionLayerQuery.qml | 4 +- .../FeatureCollectionLayerQuery/main.cpp | 21 +- .../FeatureLayerRenderingModeMap.cpp | 17 +- .../FeatureLayerRenderingModeMap.h | 13 +- .../FeatureLayerRenderingModeMap.pro | 2 +- .../FeatureLayerRenderingModeMap.qml | 4 +- .../FeatureLayerRenderingModeMap/main.cpp | 21 +- .../FeatureLayerRenderingModeScene.cpp | 19 +- .../FeatureLayerRenderingModeScene.h | 13 +- .../FeatureLayerRenderingModeScene.pro | 2 +- .../FeatureLayerRenderingModeScene.qml | 4 +- .../FeatureLayerRenderingModeScene/main.cpp | 21 +- .../Feature_Collection_Layer.cpp | 31 +- .../Feature_Collection_Layer.h | 15 +- .../Feature_Collection_Layer.pro | 2 +- .../Feature_Collection_Layer.qml | 4 +- .../Layers/Feature_Collection_Layer/main.cpp | 21 +- CppSamples/Layers/GroupLayers/GroupLayers.cpp | 25 +- CppSamples/Layers/GroupLayers/GroupLayers.h | 9 +- CppSamples/Layers/GroupLayers/GroupLayers.pro | 2 +- CppSamples/Layers/GroupLayers/GroupLayers.qml | 4 +- CppSamples/Layers/GroupLayers/main.cpp | 11 +- .../Hillshade_Renderer/HillshadeSettings.qml | 4 +- .../HillshadeSlopeTypeModel.qml | 4 +- .../Hillshade_Renderer/Hillshade_Renderer.cpp | 17 +- .../Hillshade_Renderer/Hillshade_Renderer.h | 9 +- .../Hillshade_Renderer/Hillshade_Renderer.pro | 2 +- .../Hillshade_Renderer/Hillshade_Renderer.qml | 4 +- CppSamples/Layers/Hillshade_Renderer/main.cpp | 21 +- .../IdentifyKmlFeatures.cpp | 15 +- .../IdentifyKmlFeatures/IdentifyKmlFeatures.h | 12 +- .../IdentifyKmlFeatures.pro | 2 +- .../IdentifyKmlFeatures.qml | 4 +- .../Layers/IdentifyKmlFeatures/main.cpp | 16 +- .../IdentifyRasterCell/IdentifyRasterCell.cpp | 27 +- .../IdentifyRasterCell/IdentifyRasterCell.h | 6 +- .../IdentifyRasterCell/IdentifyRasterCell.pro | 2 +- .../IdentifyRasterCell/IdentifyRasterCell.qml | 4 +- CppSamples/Layers/IdentifyRasterCell/main.cpp | 16 +- .../ListKmlContents/ListKmlContents.cpp | 31 +- .../Layers/ListKmlContents/ListKmlContents.h | 14 +- .../ListKmlContents/ListKmlContents.pro | 2 +- .../ListKmlContents/ListKmlContents.qml | 4 +- CppSamples/Layers/ListKmlContents/main.cpp | 11 +- .../LoadWfsXmlQuery/LoadWfsXmlQuery.cpp | 19 +- .../Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h | 9 +- .../LoadWfsXmlQuery/LoadWfsXmlQuery.pro | 2 +- .../LoadWfsXmlQuery/LoadWfsXmlQuery.qml | 4 +- CppSamples/Layers/LoadWfsXmlQuery/main.cpp | 11 +- .../DrawOrderLayerListModel.cpp | 7 +- .../DrawOrderLayerListModel.h | 14 + .../ManageOperationalLayers.cpp | 12 +- .../ManageOperationalLayers.h | 9 +- .../ManageOperationalLayers.pro | 2 +- .../ManageOperationalLayers.qml | 4 +- .../Layers/ManageOperationalLayers/main.cpp | 11 +- CppSamples/Layers/OSM_Layer/OSM_Layer.cpp | 10 +- CppSamples/Layers/OSM_Layer/OSM_Layer.h | 9 +- CppSamples/Layers/OSM_Layer/OSM_Layer.pro | 2 +- CppSamples/Layers/OSM_Layer/OSM_Layer.qml | 4 +- CppSamples/Layers/OSM_Layer/main.cpp | 21 +- .../Layers/PlayAKmlTour/PlayAKmlTour.cpp | 27 +- CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h | 10 +- .../Layers/PlayAKmlTour/PlayAKmlTour.pro | 2 +- .../Layers/PlayAKmlTour/PlayAKmlTour.qml | 4 +- CppSamples/Layers/PlayAKmlTour/main.cpp | 11 +- .../QueryMapImageSublayer.cpp | 44 +- .../QueryMapImageSublayer.h | 9 +- .../QueryMapImageSublayer.pro | 2 +- .../QueryMapImageSublayer.qml | 4 +- .../Layers/QueryMapImageSublayer/main.cpp | 21 +- .../QueryOGCAPICQLFilters.cpp | 15 +- .../QueryOGCAPICQLFilters.h | 10 +- .../QueryOGCAPICQLFilters.pro | 2 +- .../QueryOGCAPICQLFilters.qml | 4 +- .../Layers/QueryOGCAPICQLFilters/main.cpp | 10 +- .../RasterColormapRenderer.cpp | 19 +- .../RasterColormapRenderer.h | 9 +- .../RasterColormapRenderer.pro | 2 +- .../RasterColormapRenderer.qml | 4 +- .../Layers/RasterColormapRenderer/main.cpp | 21 +- .../RasterFunctionFile/RasterFunctionFile.cpp | 21 +- .../RasterFunctionFile/RasterFunctionFile.h | 9 +- .../RasterFunctionFile/RasterFunctionFile.pro | 2 +- .../RasterFunctionFile/RasterFunctionFile.qml | 4 +- CppSamples/Layers/RasterFunctionFile/main.cpp | 21 +- .../RasterFunctionService.cpp | 27 +- .../RasterFunctionService.h | 9 +- .../RasterFunctionService.pro | 2 +- .../RasterFunctionService.qml | 4 +- .../Layers/RasterFunctionService/main.cpp | 21 +- .../RasterLayerFile/RasterLayerFile.cpp | 21 +- .../Layers/RasterLayerFile/RasterLayerFile.h | 9 +- .../RasterLayerFile/RasterLayerFile.pro | 2 +- .../RasterLayerFile/RasterLayerFile.qml | 4 +- .../Layers/RasterLayerFile/RasterLoader.qml | 4 +- CppSamples/Layers/RasterLayerFile/main.cpp | 23 +- .../RasterLayerGeoPackage.cpp | 23 +- .../RasterLayerGeoPackage.h | 9 +- .../RasterLayerGeoPackage.pro | 2 +- .../RasterLayerGeoPackage.qml | 4 +- .../Layers/RasterLayerGeoPackage/main.cpp | 21 +- .../RasterLayerService/RasterLayerService.cpp | 23 +- .../RasterLayerService/RasterLayerService.h | 9 +- .../RasterLayerService/RasterLayerService.pro | 2 +- .../RasterLayerService/RasterLayerService.qml | 4 +- CppSamples/Layers/RasterLayerService/main.cpp | 21 +- .../RasterRenderingRule.cpp | 25 +- .../RasterRenderingRule/RasterRenderingRule.h | 9 +- .../RasterRenderingRule.pro | 2 +- .../RasterRenderingRule.qml | 4 +- .../Layers/RasterRenderingRule/main.cpp | 21 +- .../RasterRgbRenderer/RasterRgbRenderer.cpp | 15 +- .../RasterRgbRenderer/RasterRgbRenderer.h | 9 +- .../RasterRgbRenderer/RasterRgbRenderer.pro | 2 +- .../RasterRgbRenderer/RasterRgbRenderer.qml | 4 +- CppSamples/Layers/RasterRgbRenderer/main.cpp | 21 +- .../RasterStretchRenderer/InputWithLabel.qml | 4 +- .../RasterStretchRenderer.cpp | 15 +- .../RasterStretchRenderer.h | 9 +- .../RasterStretchRenderer.pro | 2 +- .../RasterStretchRenderer.qml | 4 +- .../Layers/RasterStretchRenderer/main.cpp | 21 +- .../Layers/StyleWmsLayer/StyleWmsLayer.cpp | 15 +- .../Layers/StyleWmsLayer/StyleWmsLayer.h | 9 +- .../Layers/StyleWmsLayer/StyleWmsLayer.pro | 2 +- .../Layers/StyleWmsLayer/StyleWmsLayer.qml | 4 +- CppSamples/Layers/StyleWmsLayer/main.cpp | 21 +- .../Layers/TileCacheLayer/TileCacheLayer.cpp | 10 +- .../Layers/TileCacheLayer/TileCacheLayer.h | 9 +- .../Layers/TileCacheLayer/TileCacheLayer.pro | 2 +- .../Layers/TileCacheLayer/TileCacheLayer.qml | 4 +- CppSamples/Layers/TileCacheLayer/main.cpp | 11 +- .../VectorTiledLayerUrl.cpp | 20 +- .../VectorTiledLayerUrl/VectorTiledLayerUrl.h | 10 +- .../VectorTiledLayerUrl.pro | 2 +- .../VectorTiledLayerUrl.qml | 4 +- .../Layers/VectorTiledLayerUrl/main.cpp | 23 +- CppSamples/Layers/WMTS_Layer/WMTS_Layer.cpp | 12 +- CppSamples/Layers/WMTS_Layer/WMTS_Layer.h | 9 +- CppSamples/Layers/WMTS_Layer/WMTS_Layer.pro | 2 +- CppSamples/Layers/WMTS_Layer/WMTS_Layer.qml | 4 +- CppSamples/Layers/WMTS_Layer/main.cpp | 21 +- .../Web_Tiled_Layer/Web_Tiled_Layer.cpp | 13 +- .../Layers/Web_Tiled_Layer/Web_Tiled_Layer.h | 9 +- .../Web_Tiled_Layer/Web_Tiled_Layer.pro | 2 +- .../Web_Tiled_Layer/Web_Tiled_Layer.qml | 4 +- CppSamples/Layers/Web_Tiled_Layer/main.cpp | 21 +- CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.cpp | 13 +- CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h | 9 +- CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.pro | 2 +- CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.qml | 4 +- CppSamples/Layers/WmsLayerUrl/main.cpp | 21 +- .../LocalServerFeatureLayer.cpp | 25 +- .../LocalServerFeatureLayer.h | 12 +- .../LocalServerFeatureLayer.pro | 2 +- .../LocalServerFeatureLayer.qml | 4 +- .../LocalServerFeatureLayer/main.cpp | 23 +- .../LocalServerGeoprocessing.cpp | 33 +- .../LocalServerGeoprocessing.h | 16 +- .../LocalServerGeoprocessing.pro | 2 +- .../LocalServerGeoprocessing.qml | 4 +- .../LocalServerGeoprocessing/main.cpp | 23 +- .../LocalServerMapImageLayer.cpp | 23 +- .../LocalServerMapImageLayer.h | 10 +- .../LocalServerMapImageLayer.pro | 2 +- .../LocalServerMapImageLayer.qml | 4 +- .../LocalServerMapImageLayer/main.cpp | 23 +- .../LocalServerServices.cpp | 11 +- .../LocalServerServices/LocalServerServices.h | 14 +- .../LocalServerServices.pro | 2 +- .../LocalServerServices.qml | 4 +- .../LocalServer/LocalServerServices/main.cpp | 25 +- .../ApplyScheduledMapUpdates.cpp | 22 +- .../ApplyScheduledMapUpdates.h | 16 +- .../ApplyScheduledMapUpdates.pro | 2 +- .../ApplyScheduledMapUpdates.qml | 4 +- .../Maps/ApplyScheduledMapUpdates/main.cpp | 11 +- .../BrowseBuildingFloors.cpp | 8 +- .../BrowseBuildingFloors.h | 9 +- .../BrowseBuildingFloors.pro | 2 +- .../BrowseBuildingFloors.qml | 4 +- CppSamples/Maps/BrowseBuildingFloors/main.cpp | 10 +- .../Maps/ChangeBasemap/ChangeBasemap.cpp | 7 +- CppSamples/Maps/ChangeBasemap/ChangeBasemap.h | 9 +- .../Maps/ChangeBasemap/ChangeBasemap.pro | 2 +- .../Maps/ChangeBasemap/ChangeBasemap.qml | 4 +- CppSamples/Maps/ChangeBasemap/main.cpp | 14 +- .../Maps/ChangeViewpoint/ChangeViewpoint.cpp | 15 +- .../Maps/ChangeViewpoint/ChangeViewpoint.h | 9 +- .../Maps/ChangeViewpoint/ChangeViewpoint.pro | 2 +- .../Maps/ChangeViewpoint/ChangeViewpoint.qml | 4 +- CppSamples/Maps/ChangeViewpoint/main.cpp | 23 +- .../ConfigureBasemapStyleLanguage.cpp | 10 +- .../ConfigureBasemapStyleLanguage.h | 9 +- .../ConfigureBasemapStyleLanguage.pro | 2 +- .../ConfigureBasemapStyleLanguage.qml | 4 +- .../ConfigureBasemapStyleLanguage/main.cpp | 10 +- .../CreateAndSaveMap/CreateAndSaveMap.cpp | 19 +- .../Maps/CreateAndSaveMap/CreateAndSaveMap.h | 9 +- .../CreateAndSaveMap/CreateAndSaveMap.pro | 2 +- .../CreateAndSaveMap/CreateAndSaveMap.qml | 4 +- CppSamples/Maps/CreateAndSaveMap/main.cpp | 11 +- .../BasemapStyleListModel.cpp | 6 +- .../BasemapStyleListModel.h | 5 +- .../CreateDynamicBasemapGallery.cpp | 9 +- .../CreateDynamicBasemapGallery.h | 7 +- .../CreateDynamicBasemapGallery.pro | 2 +- .../CreateDynamicBasemapGallery.qml | 4 +- .../Maps/CreateDynamicBasemapGallery/main.cpp | 10 +- .../DisplayDeviceLocation.cpp | 10 +- .../DisplayDeviceLocation.h | 10 +- .../DisplayDeviceLocation.pro | 2 +- .../DisplayDeviceLocation.qml | 4 +- .../Maps/DisplayDeviceLocation/main.cpp | 23 +- ...splayDeviceLocationWithNmeaDataSources.cpp | 14 +- ...DisplayDeviceLocationWithNmeaDataSources.h | 15 +- ...splayDeviceLocationWithNmeaDataSources.qml | 4 +- ...splayDeviceLocationWithNmeaDataSources.pro | 2 +- .../main.cpp | 11 +- .../DisplayDrawingStatus.cpp | 15 +- .../DisplayDrawingStatus.h | 9 +- .../DisplayDrawingStatus.pro | 2 +- .../DisplayDrawingStatus.qml | 4 +- CppSamples/Maps/DisplayDrawingStatus/main.cpp | 21 +- .../DisplayLayerViewDrawState.cpp | 19 +- .../DisplayLayerViewDrawState.h | 9 +- .../DisplayLayerViewDrawState.pro | 2 +- .../DisplayLayerViewDrawState.qml | 4 +- .../Maps/DisplayLayerViewDrawState/main.cpp | 16 +- CppSamples/Maps/DisplayMap/DisplayMap.cpp | 6 +- CppSamples/Maps/DisplayMap/DisplayMap.h | 9 +- CppSamples/Maps/DisplayMap/DisplayMap.pro | 2 +- CppSamples/Maps/DisplayMap/DisplayMap.qml | 4 +- CppSamples/Maps/DisplayMap/main.cpp | 10 +- .../DisplayOverviewMap/DisplayOverviewMap.cpp | 14 +- .../DisplayOverviewMap/DisplayOverviewMap.h | 9 +- .../DisplayOverviewMap/DisplayOverviewMap.pro | 2 +- .../DisplayOverviewMap/DisplayOverviewMap.qml | 4 +- CppSamples/Maps/DisplayOverviewMap/main.cpp | 14 +- .../DownloadPreplannedMap.cpp | 25 +- .../DownloadPreplannedMap.h | 16 +- .../DownloadPreplannedMap.pro | 2 +- .../DownloadPreplannedMap.qml | 4 +- .../Maps/DownloadPreplannedMap/main.cpp | 11 +- .../GenerateOfflineMap/GenerateOfflineMap.cpp | 25 +- .../GenerateOfflineMap/GenerateOfflineMap.h | 11 +- .../GenerateOfflineMap/GenerateOfflineMap.pro | 2 +- .../GenerateOfflineMap/GenerateOfflineMap.qml | 4 +- CppSamples/Maps/GenerateOfflineMap/main.cpp | 22 +- .../GenerateOfflineMapLocalBasemap.cpp | 30 +- .../GenerateOfflineMapLocalBasemap.h | 11 +- .../GenerateOfflineMapLocalBasemap.pro | 2 +- .../GenerateOfflineMapLocalBasemap.qml | 4 +- .../GenerateOfflineMapLocalBasemap/main.cpp | 22 +- .../GenerateOfflineMap_Overrides.cpp | 40 +- .../GenerateOfflineMap_Overrides.h | 13 +- .../GenerateOfflineMap_Overrides.pro | 2 +- .../GenerateOfflineMap_Overrides.qml | 4 +- .../GenerateOfflineMap_Overrides/main.cpp | 22 +- .../HonorMobileMapPackageExpiration.cpp | 15 +- .../HonorMobileMapPackageExpiration.h | 9 +- .../HonorMobileMapPackageExpiration.pro | 2 +- .../HonorMobileMapPackageExpiration.qml | 4 +- .../HonorMobileMapPackageExpiration/main.cpp | 11 +- .../Maps/IdentifyLayers/IdentifyLayers.cpp | 29 +- .../Maps/IdentifyLayers/IdentifyLayers.h | 9 +- .../Maps/IdentifyLayers/IdentifyLayers.pro | 2 +- .../Maps/IdentifyLayers/IdentifyLayers.qml | 4 +- CppSamples/Maps/IdentifyLayers/main.cpp | 21 +- .../Maps/ManageBookmarks/ManageBookmarks.cpp | 17 +- .../Maps/ManageBookmarks/ManageBookmarks.h | 12 +- .../Maps/ManageBookmarks/ManageBookmarks.pro | 2 +- .../Maps/ManageBookmarks/ManageBookmarks.qml | 4 +- CppSamples/Maps/ManageBookmarks/main.cpp | 23 +- CppSamples/Maps/MapLoaded/MapLoaded.cpp | 9 +- CppSamples/Maps/MapLoaded/MapLoaded.h | 10 +- CppSamples/Maps/MapLoaded/MapLoaded.pro | 2 +- CppSamples/Maps/MapLoaded/MapLoaded.qml | 4 +- CppSamples/Maps/MapLoaded/main.cpp | 23 +- .../MapReferenceScale/MapReferenceScale.cpp | 18 +- .../MapReferenceScale/MapReferenceScale.h | 11 +- .../MapReferenceScale/MapReferenceScale.pro | 2 +- .../MapReferenceScale/MapReferenceScale.qml | 4 +- CppSamples/Maps/MapReferenceScale/main.cpp | 11 +- CppSamples/Maps/MapRotation/MapRotation.cpp | 13 +- CppSamples/Maps/MapRotation/MapRotation.h | 10 +- CppSamples/Maps/MapRotation/MapRotation.pro | 2 +- CppSamples/Maps/MapRotation/MapRotation.qml | 4 +- CppSamples/Maps/MapRotation/main.cpp | 23 +- CppSamples/Maps/MinMaxScale/MinMaxScale.cpp | 9 +- CppSamples/Maps/MinMaxScale/MinMaxScale.h | 9 +- CppSamples/Maps/MinMaxScale/MinMaxScale.pro | 2 +- CppSamples/Maps/MinMaxScale/MinMaxScale.qml | 4 +- CppSamples/Maps/MinMaxScale/main.cpp | 21 +- .../MobileMap_SearchAndRoute.cpp | 55 +- .../MobileMap_SearchAndRoute.h | 24 +- .../MobileMap_SearchAndRoute.pro | 2 +- .../MobileMap_SearchAndRoute.qml | 4 +- .../Maps/MobileMap_SearchAndRoute/main.cpp | 22 +- CppSamples/Maps/OpenMapUrl/OpenMapUrl.cpp | 8 +- CppSamples/Maps/OpenMapUrl/OpenMapUrl.h | 10 +- CppSamples/Maps/OpenMapUrl/OpenMapUrl.pro | 2 +- CppSamples/Maps/OpenMapUrl/OpenMapUrl.qml | 4 +- CppSamples/Maps/OpenMapUrl/main.cpp | 23 +- .../OpenMobileMap_MapPackage.cpp | 9 +- .../OpenMobileMap_MapPackage.h | 10 +- .../OpenMobileMap_MapPackage.pro | 2 +- .../OpenMobileMap_MapPackage.qml | 4 +- .../Maps/OpenMobileMap_MapPackage/main.cpp | 23 +- .../Maps/ReadGeoPackage/ReadGeoPackage.cpp | 27 +- .../Maps/ReadGeoPackage/ReadGeoPackage.h | 13 +- .../Maps/ReadGeoPackage/ReadGeoPackage.pro | 2 +- .../Maps/ReadGeoPackage/ReadGeoPackage.qml | 4 +- CppSamples/Maps/ReadGeoPackage/main.cpp | 21 +- .../SetInitialMapArea/SetInitialMapArea.cpp | 13 +- .../SetInitialMapArea/SetInitialMapArea.h | 10 +- .../SetInitialMapArea/SetInitialMapArea.pro | 2 +- .../SetInitialMapArea/SetInitialMapArea.qml | 4 +- CppSamples/Maps/SetInitialMapArea/main.cpp | 23 +- .../SetInitialMapLocation.cpp | 7 +- .../SetInitialMapLocation.h | 10 +- .../SetInitialMapLocation.pro | 2 +- .../SetInitialMapLocation.qml | 4 +- .../Maps/SetInitialMapLocation/main.cpp | 23 +- .../SetMapSpatialReference.cpp | 15 +- .../SetMapSpatialReference.h | 10 +- .../SetMapSpatialReference.pro | 2 +- .../SetMapSpatialReference.qml | 4 +- .../Maps/SetMapSpatialReference/main.cpp | 23 +- CppSamples/Maps/SetMaxExtent/SetMaxExtent.cpp | 17 +- CppSamples/Maps/SetMaxExtent/SetMaxExtent.h | 13 +- CppSamples/Maps/SetMaxExtent/SetMaxExtent.pro | 2 +- CppSamples/Maps/SetMaxExtent/SetMaxExtent.qml | 4 +- CppSamples/Maps/SetMaxExtent/main.cpp | 10 +- .../IndoorsLocationDataSourceCreator.cpp | 14 +- .../IndoorsLocationDataSourceCreator.h | 21 +- ...owDeviceLocationUsingIndoorPositioning.cpp | 82 ++- ...ShowDeviceLocationUsingIndoorPositioning.h | 21 +- ...owDeviceLocationUsingIndoorPositioning.pro | 9 +- ...owDeviceLocationUsingIndoorPositioning.qml | 47 +- .../ios/Info.plist | 56 ++ .../mac/Info.plist | 33 ++ .../main.cpp | 10 +- .../ShowLocationHistory.cpp | 21 +- .../ShowLocationHistory/ShowLocationHistory.h | 6 +- .../ShowLocationHistory.pro | 2 +- .../ShowLocationHistory.qml | 4 +- CppSamples/Maps/ShowLocationHistory/main.cpp | 11 +- .../Maps/ShowMagnifier/ShowMagnifier.cpp | 13 +- CppSamples/Maps/ShowMagnifier/ShowMagnifier.h | 10 +- .../Maps/ShowMagnifier/ShowMagnifier.pro | 2 +- .../Maps/ShowMagnifier/ShowMagnifier.qml | 4 +- CppSamples/Maps/ShowMagnifier/main.cpp | 23 +- .../Maps/TakeScreenshot/MapImageProvider.cpp | 8 +- .../Maps/TakeScreenshot/MapImageProvider.h | 13 + .../Maps/TakeScreenshot/TakeScreenshot.cpp | 9 +- .../Maps/TakeScreenshot/TakeScreenshot.h | 9 +- .../Maps/TakeScreenshot/TakeScreenshot.pro | 2 +- .../Maps/TakeScreenshot/TakeScreenshot.qml | 4 +- CppSamples/Maps/TakeScreenshot/main.cpp | 25 +- .../ClosestFacility/ClosestFacility.cpp | 35 +- .../Routing/ClosestFacility/ClosestFacility.h | 18 +- .../ClosestFacility/ClosestFacility.pro | 2 +- .../ClosestFacility/ClosestFacility.qml | 4 +- CppSamples/Routing/ClosestFacility/main.cpp | 21 +- .../DisplayRouteLayer/DisplayRouteLayer.cpp | 31 +- .../DisplayRouteLayer/DisplayRouteLayer.h | 10 +- .../DisplayRouteLayer/DisplayRouteLayer.pro | 2 +- .../DisplayRouteLayer/DisplayRouteLayer.qml | 4 +- CppSamples/Routing/DisplayRouteLayer/main.cpp | 10 +- ...sestFacilityToMultipleIncidentsService.cpp | 39 +- ...losestFacilityToMultipleIncidentsService.h | 16 +- ...sestFacilityToMultipleIncidentsService.pro | 2 +- ...sestFacilityToMultipleIncidentsService.qml | 4 +- .../main.cpp | 11 +- CppSamples/Routing/FindRoute/FindRoute.cpp | 41 +- CppSamples/Routing/FindRoute/FindRoute.h | 16 +- CppSamples/Routing/FindRoute/FindRoute.pro | 2 +- CppSamples/Routing/FindRoute/FindRoute.qml | 4 +- CppSamples/Routing/FindRoute/main.cpp | 23 +- .../FindServiceAreasForMultipleFacilities.cpp | 31 +- .../FindServiceAreasForMultipleFacilities.h | 12 +- .../FindServiceAreasForMultipleFacilities.pro | 2 +- .../FindServiceAreasForMultipleFacilities.qml | 4 +- .../main.cpp | 11 +- .../NavigateARouteWithRerouting.cpp | 17 +- .../NavigateARouteWithRerouting.h | 14 +- .../NavigateARouteWithRerouting.pro | 2 +- .../NavigateARouteWithRerouting.qml | 4 +- .../NavigateARouteWithRerouting/main.cpp | 10 +- .../Routing/NavigateRoute/NavigateRoute.cpp | 40 +- .../Routing/NavigateRoute/NavigateRoute.h | 12 +- .../Routing/NavigateRoute/NavigateRoute.pro | 2 +- .../Routing/NavigateRoute/NavigateRoute.qml | 4 +- CppSamples/Routing/NavigateRoute/main.cpp | 11 +- .../Routing/OfflineRouting/OfflineRouting.cpp | 37 +- .../Routing/OfflineRouting/OfflineRouting.h | 12 +- .../Routing/OfflineRouting/OfflineRouting.pro | 2 +- .../Routing/OfflineRouting/OfflineRouting.qml | 4 +- CppSamples/Routing/OfflineRouting/main.cpp | 11 +- .../RouteAroundBarriers.cpp | 25 +- .../RouteAroundBarriers/RouteAroundBarriers.h | 10 +- .../RouteAroundBarriers.pro | 2 +- .../RouteAroundBarriers.qml | 4 +- .../Routing/RouteAroundBarriers/main.cpp | 11 +- .../Routing/ServiceArea/ServiceArea.cpp | 39 +- CppSamples/Routing/ServiceArea/ServiceArea.h | 16 +- .../Routing/ServiceArea/ServiceArea.pro | 2 +- .../Routing/ServiceArea/ServiceArea.qml | 4 +- CppSamples/Routing/ServiceArea/main.cpp | 21 +- .../Add3DTilesLayer/Add3DTilesLayer.cpp | 6 +- .../Scenes/Add3DTilesLayer/Add3DTilesLayer.h | 9 +- .../Add3DTilesLayer/Add3DTilesLayer.pro | 2 +- .../Add3DTilesLayer/Add3DTilesLayer.qml | 4 +- CppSamples/Scenes/Add3DTilesLayer/main.cpp | 10 +- .../AddAPointSceneLayer.cpp | 16 +- .../AddAPointSceneLayer/AddAPointSceneLayer.h | 9 +- .../AddAPointSceneLayer.pro | 2 +- .../AddAPointSceneLayer.qml | 4 +- .../Scenes/AddAPointSceneLayer/main.cpp | 11 +- .../AddIntegratedMeshLayer.cpp | 17 +- .../AddIntegratedMeshLayer.h | 9 +- .../AddIntegratedMeshLayer.pro | 2 +- .../AddIntegratedMeshLayer.qml | 4 +- .../Scenes/AddIntegratedMeshLayer/main.cpp | 11 +- .../Animate3DSymbols/Animate3DSymbols.cpp | 34 +- .../Animate3DSymbols/Animate3DSymbols.h | 15 +- .../Animate3DSymbols/Animate3DSymbols.pro | 2 +- .../Animate3DSymbols/Animate3DSymbols.qml | 4 +- .../Scenes/Animate3DSymbols/MissionData.cpp | 6 +- .../Scenes/Animate3DSymbols/MissionData.h | 7 +- CppSamples/Scenes/Animate3DSymbols/main.cpp | 28 +- .../AnimateImagesWithImageOverlay.cpp | 30 +- .../AnimateImagesWithImageOverlay.h | 16 +- .../AnimateImagesWithImageOverlay.pro | 2 +- .../AnimateImagesWithImageOverlay.qml | 4 +- .../AnimateImagesWithImageOverlay/main.cpp | 11 +- .../Scenes/BasicSceneView/BasicSceneView.cpp | 7 +- .../Scenes/BasicSceneView/BasicSceneView.h | 9 +- .../Scenes/BasicSceneView/BasicSceneView.pro | 2 +- .../Scenes/BasicSceneView/BasicSceneView.qml | 4 +- CppSamples/Scenes/BasicSceneView/main.cpp | 10 +- .../ChangeAtmosphereEffect.cpp | 15 +- .../ChangeAtmosphereEffect.h | 10 +- .../ChangeAtmosphereEffect.pro | 2 +- .../ChangeAtmosphereEffect.qml | 4 +- .../Scenes/ChangeAtmosphereEffect/main.cpp | 11 +- .../ChooseCameraController.cpp | 32 +- .../ChooseCameraController.h | 6 +- .../ChooseCameraController.pro | 2 +- .../ChooseCameraController.qml | 4 +- .../Scenes/ChooseCameraController/main.cpp | 11 +- .../CreateTerrainSurfaceFromLocalRaster.cpp | 17 +- .../CreateTerrainSurfaceFromLocalRaster.h | 10 +- .../CreateTerrainSurfaceFromLocalRaster.pro | 2 +- .../CreateTerrainSurfaceFromLocalRaster.qml | 4 +- .../main.cpp | 11 +- ...eateTerrainSurfaceFromLocalTilePackage.cpp | 18 +- ...CreateTerrainSurfaceFromLocalTilePackage.h | 10 +- ...eateTerrainSurfaceFromLocalTilePackage.pro | 2 +- ...eateTerrainSurfaceFromLocalTilePackage.qml | 4 +- .../main.cpp | 11 +- .../Display3DLabelsInScene.cpp | 17 +- .../Display3DLabelsInScene.h | 9 +- .../Display3DLabelsInScene.pro | 2 +- .../Display3DLabelsInScene.qml | 4 +- .../Scenes/Display3DLabelsInScene/main.cpp | 11 +- .../DisplaySceneLayer/DisplaySceneLayer.cpp | 23 +- .../DisplaySceneLayer/DisplaySceneLayer.h | 10 +- .../DisplaySceneLayer/DisplaySceneLayer.pro | 2 +- .../DisplaySceneLayer/DisplaySceneLayer.qml | 4 +- CppSamples/Scenes/DisplaySceneLayer/main.cpp | 23 +- .../DistanceCompositeSymbol.cpp | 39 +- .../DistanceCompositeSymbol.h | 10 +- .../DistanceCompositeSymbol.pro | 2 +- .../DistanceCompositeSymbol.qml | 4 +- .../Scenes/DistanceCompositeSymbol/main.cpp | 23 +- .../ExtrudeGraphics/ExtrudeGraphics.cpp | 39 +- .../Scenes/ExtrudeGraphics/ExtrudeGraphics.h | 11 +- .../ExtrudeGraphics/ExtrudeGraphics.pro | 2 +- .../ExtrudeGraphics/ExtrudeGraphics.qml | 4 +- CppSamples/Scenes/ExtrudeGraphics/main.cpp | 23 +- .../FeatureLayerExtrusion.cpp | 34 +- .../FeatureLayerExtrusion.h | 15 +- .../FeatureLayerExtrusion.pro | 2 +- .../FeatureLayerExtrusion.qml | 4 +- .../Scenes/FeatureLayerExtrusion/main.cpp | 21 +- .../FilterFeaturesInScene.cpp | 7 +- .../FilterFeaturesInScene.h | 14 +- .../FilterFeaturesInScene.pro | 2 +- .../FilterFeaturesInScene.qml | 4 +- .../Scenes/FilterFeaturesInScene/main.cpp | 10 +- .../GetElevationAtPoint.cpp | 22 +- .../GetElevationAtPoint/GetElevationAtPoint.h | 4 +- .../GetElevationAtPoint.pro | 2 +- .../GetElevationAtPoint.qml | 4 +- .../Scenes/GetElevationAtPoint/main.cpp | 11 +- .../OpenMobileScenePackage.cpp | 9 +- .../OpenMobileScenePackage.h | 9 +- .../OpenMobileScenePackage.pro | 2 +- .../OpenMobileScenePackage.qml | 4 +- .../Scenes/OpenMobileScenePackage/main.cpp | 11 +- CppSamples/Scenes/OpenScene/OpenScene.cpp | 8 +- CppSamples/Scenes/OpenScene/OpenScene.h | 9 +- CppSamples/Scenes/OpenScene/OpenScene.pro | 2 +- CppSamples/Scenes/OpenScene/OpenScene.qml | 4 +- CppSamples/Scenes/OpenScene/main.cpp | 21 +- .../OrbitCameraAroundObject.cpp | 31 +- .../OrbitCameraAroundObject.h | 11 +- .../OrbitCameraAroundObject.pro | 2 +- .../OrbitCameraAroundObject.qml | 4 +- .../Scenes/OrbitCameraAroundObject/main.cpp | 11 +- .../RealisticLightingAndShadows.cpp | 20 +- .../RealisticLightingAndShadows.h | 9 +- .../RealisticLightingAndShadows.pro | 2 +- .../RealisticLightingAndShadows.qml | 4 +- .../RealisticLightingAndShadows/main.cpp | 11 +- .../SceneLayerSelection.cpp | 29 +- .../SceneLayerSelection/SceneLayerSelection.h | 9 +- .../SceneLayerSelection.pro | 2 +- .../SceneLayerSelection.qml | 4 +- .../Scenes/SceneLayerSelection/main.cpp | 21 +- .../ScenePropertiesExpressions.cpp | 32 +- .../ScenePropertiesExpressions.h | 9 +- .../ScenePropertiesExpressions.pro | 2 +- .../ScenePropertiesExpressions.qml | 4 +- .../ScenePropertiesExpressions/main.cpp | 11 +- .../SetSurfacePlacementMode.cpp | 24 +- .../SetSurfacePlacementMode.h | 9 +- .../SetSurfacePlacementMode.pro | 2 +- .../SetSurfacePlacementMode.qml | 4 +- .../Scenes/SetSurfacePlacementMode/main.cpp | 21 +- CppSamples/Scenes/Symbols/Symbols.cpp | 30 +- CppSamples/Scenes/Symbols/Symbols.h | 10 +- CppSamples/Scenes/Symbols/Symbols.pro | 2 +- CppSamples/Scenes/Symbols/Symbols.qml | 4 +- CppSamples/Scenes/Symbols/main.cpp | 23 +- .../SyncMapViewSceneView.cpp | 11 +- .../SyncMapViewSceneView.h | 9 +- .../SyncMapViewSceneView.pro | 2 +- .../SyncMapViewSceneView.qml | 4 +- .../Scenes/SyncMapViewSceneView/main.cpp | 11 +- .../TerrainExaggeration.cpp | 15 +- .../TerrainExaggeration/TerrainExaggeration.h | 9 +- .../TerrainExaggeration.pro | 2 +- .../TerrainExaggeration.qml | 4 +- .../Scenes/TerrainExaggeration/main.cpp | 21 +- .../ViewContentBeneathTerrainSurface.cpp | 10 +- .../ViewContentBeneathTerrainSurface.h | 9 +- .../ViewContentBeneathTerrainSurface.pro | 2 +- .../ViewContentBeneathTerrainSurface.qml | 4 +- .../ViewContentBeneathTerrainSurface/main.cpp | 11 +- .../ViewPointCloudDataOffline.cpp | 23 +- .../ViewPointCloudDataOffline.h | 9 +- .../ViewPointCloudDataOffline.pro | 2 +- .../ViewPointCloudDataOffline.qml | 4 +- .../Scenes/ViewPointCloudDataOffline/main.cpp | 11 +- CppSamples/Search/FindAddress/FindAddress.cpp | 35 +- CppSamples/Search/FindAddress/FindAddress.h | 14 +- CppSamples/Search/FindAddress/FindAddress.pro | 2 +- CppSamples/Search/FindAddress/FindAddress.qml | 4 +- CppSamples/Search/FindAddress/main.cpp | 24 +- CppSamples/Search/FindPlace/FindPlace.cpp | 82 +-- CppSamples/Search/FindPlace/FindPlace.h | 22 +- CppSamples/Search/FindPlace/FindPlace.pro | 8 +- CppSamples/Search/FindPlace/FindPlace.qml | 26 +- CppSamples/Search/FindPlace/SearchBox.qml | 4 +- CppSamples/Search/FindPlace/SearchButton.qml | 4 +- .../Search/FindPlace/SuggestionView.qml | 4 +- CppSamples/Search/FindPlace/ios/Info.plist | 55 ++ CppSamples/Search/FindPlace/mac/Info.plist | 31 ++ CppSamples/Search/FindPlace/main.cpp | 22 +- .../Search/OfflineGeocode/OfflineGeocode.cpp | 45 +- .../Search/OfflineGeocode/OfflineGeocode.h | 22 +- .../Search/OfflineGeocode/OfflineGeocode.pro | 2 +- .../Search/OfflineGeocode/OfflineGeocode.qml | 4 +- CppSamples/Search/OfflineGeocode/main.cpp | 22 +- .../ReverseGeocodeOnline.cpp | 25 +- .../ReverseGeocodeOnline.h | 9 +- .../ReverseGeocodeOnline.pro | 2 +- .../ReverseGeocodeOnline.qml | 4 +- .../Search/ReverseGeocodeOnline/main.cpp | 16 +- .../SearchDictionarySymbolStyle.cpp | 12 +- .../SearchDictionarySymbolStyle.h | 13 +- .../SearchDictionarySymbolStyle.pro | 2 +- .../SearchDictionarySymbolStyle.qml | 4 +- .../SearchDictionarySymbolStyle/main.cpp | 38 +- .../ConfigureSubnetworkTrace.cpp | 13 +- .../ConfigureSubnetworkTrace.h | 20 +- .../ConfigureSubnetworkTrace.pro | 2 +- .../ConfigureSubnetworkTrace.qml | 4 +- .../ConfigureSubnetworkTrace/main.cpp | 11 +- .../CreateLoadReport/CreateLoadReport.cpp | 16 +- .../CreateLoadReport/CreateLoadReport.h | 13 +- .../CreateLoadReport/CreateLoadReport.pro | 2 +- .../CreateLoadReport/CreateLoadReport.qml | 4 +- .../UtilityNetwork/CreateLoadReport/main.cpp | 11 +- ...isplayContentOfUtilityNetworkContainer.cpp | 53 +- .../DisplayContentOfUtilityNetworkContainer.h | 20 +- ...isplayContentOfUtilityNetworkContainer.pro | 2 +- ...isplayContentOfUtilityNetworkContainer.qml | 4 +- .../SymbolImageProvider.cpp | 8 +- .../SymbolImageProvider.h | 13 + .../main.cpp | 10 +- .../DisplayUtilityAssociations.cpp | 34 +- .../DisplayUtilityAssociations.h | 9 +- .../DisplayUtilityAssociations.pro | 2 +- .../DisplayUtilityAssociations.qml | 4 +- .../SymbolImageProvider.cpp | 8 +- .../SymbolImageProvider.h | 13 + .../DisplayUtilityAssociations/main.cpp | 11 +- .../PerformValveIsolationTrace.cpp | 55 +- .../PerformValveIsolationTrace.h | 18 +- .../PerformValveIsolationTrace.pro | 7 +- .../PerformValveIsolationTrace.qml | 4 +- .../PerformValveIsolationTrace/main.cpp | 12 +- .../TraceUtilityNetwork.cpp | 72 +-- .../TraceUtilityNetwork/TraceUtilityNetwork.h | 18 +- .../TraceUtilityNetwork.pro | 7 +- .../TraceUtilityNetwork.qml | 4 +- .../TraceUtilityNetwork/main.cpp | 11 +- .../ValidateUtilityNetworkTopology.cpp | 15 +- .../ValidateUtilityNetworkTopology.h | 10 +- .../ValidateUtilityNetworkTopology.pro | 2 +- .../ValidateUtilityNetworkTopology.qml | 4 +- .../ValidateUtilityNetworkTopology/main.cpp | 9 +- .../BuildLegend/BuildLegend.pro | 2 +- .../GORenderers/GORenderers.pro | 2 +- .../GOSymbols/GOSymbols.pro | 2 +- .../ArcGISTiledLayerUrl.pro | 2 +- .../Maps/ChangeBasemap/ChangeBasemap.pro | 2 +- .../Maps/ChangeViewpoint/ChangeViewpoint.pro | 2 +- .../Maps/DisplayMap/DisplayMap.pro | 2 +- .../Maps/ManageBookmarks/ManageBookmarks.pro | 2 +- .../Maps/MapLoaded/MapLoaded.pro | 2 +- .../Maps/MapRotation/MapRotation.pro | 2 +- .../Maps/OpenExistingMap/OpenExistingMap.pro | 2 +- .../SetInitialMapArea/SetInitialMapArea.pro | 2 +- .../SetInitialMapLocation.pro | 2 +- .../SetMapSpatialReference.pro | 2 +- .../Scenes/BasicSceneView/BasicSceneView.pro | 2 +- SampleViewer/SampleViewer.pro | 14 +- ...{QMLHighlighter.cpp => QmlHighlighter.cpp} | 53 +- .../{QMLHighlighter.h => QmlHighlighter.h} | 12 +- ..._highlighter.cpp => SyntaxHighlighter.cpp} | 6 +- ...ntax_highlighter.h => SyntaxHighlighter.h} | 0 SampleViewer/TaskCanceler.h | 74 +++ SampleViewer/mainSample.cpp | 493 +++++++++--------- SampleViewer/samples.pri | 229 +------- Templates/CppSampleTemplate/main.cpp.tmpl | 4 +- Templates/CppSampleTemplate/main.qml.tmpl | 4 +- Templates/CppSampleTemplate/sample.cpp.tmpl | 4 +- Templates/CppSampleTemplate/sample.h.tmpl | 8 +- Templates/CppSampleTemplate/sample.pro.tmpl | 2 +- Templates/CppSampleTemplate/wizard.json | 6 +- .../CppWidgetsSampleTemplate/main.cpp.tmpl | 4 +- .../CppWidgetsSampleTemplate/sample.cpp.tmpl | 4 +- .../CppWidgetsSampleTemplate/sample.h.tmpl | 8 +- .../CppWidgetsSampleTemplate/sample.pro.tmpl | 2 +- .../CppWidgetsSampleTemplate/wizard.json | 370 ++++++------- 1222 files changed, 9669 insertions(+), 6692 deletions(-) delete mode 100644 CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.cpp delete mode 100644 CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.h delete mode 100644 CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qrc delete mode 100644 CppSamples/DisplayInformation/DisplayGrid/README.md delete mode 100644 CppSamples/DisplayInformation/DisplayGrid/arcgisruntime.pri delete mode 100644 CppSamples/DisplayInformation/DisplayGrid/screenshot.png rename CppSamples/DisplayInformation/{DisplayGrid => ShowGrid}/Info.plist (92%) create mode 100644 CppSamples/DisplayInformation/ShowGrid/README.md rename CppSamples/DisplayInformation/{DisplayGrid => ShowGrid}/README.metadata.json (78%) create mode 100644 CppSamples/DisplayInformation/ShowGrid/ShowGrid.cpp create mode 100644 CppSamples/DisplayInformation/ShowGrid/ShowGrid.h rename CppSamples/DisplayInformation/{DisplayGrid/DisplayGrid.pro => ShowGrid/ShowGrid.pro} (79%) rename CppSamples/DisplayInformation/{DisplayGrid/DisplayGrid.qml => ShowGrid/ShowGrid.qml} (66%) create mode 100644 CppSamples/DisplayInformation/ShowGrid/ShowGrid.qrc create mode 100644 CppSamples/DisplayInformation/ShowGrid/arcgisruntime.pri rename CppSamples/DisplayInformation/{DisplayGrid => ShowGrid}/main.cpp (57%) create mode 100644 CppSamples/DisplayInformation/ShowGrid/main.qml create mode 100644 CppSamples/DisplayInformation/ShowGrid/screenshot.png create mode 100644 CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ios/Info.plist create mode 100644 CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/mac/Info.plist create mode 100644 CppSamples/Search/FindPlace/ios/Info.plist create mode 100644 CppSamples/Search/FindPlace/mac/Info.plist rename SampleViewer/SyntaxHighlighter/{QMLHighlighter.cpp => QmlHighlighter.cpp} (69%) rename SampleViewer/SyntaxHighlighter/{QMLHighlighter.h => QmlHighlighter.h} (84%) rename SampleViewer/SyntaxHighlighter/{syntax_highlighter.cpp => SyntaxHighlighter.cpp} (89%) rename SampleViewer/SyntaxHighlighter/{syntax_highlighter.h => SyntaxHighlighter.h} (100%) create mode 100644 SampleViewer/TaskCanceler.h diff --git a/.gitignore b/.gitignore index 124351b1a4..4ec231dbc2 100644 --- a/.gitignore +++ b/.gitignore @@ -141,8 +141,10 @@ Thumbs.db # ignore all build directories -*build* +*build-* .qmake.stash *Makefile* .qtc_clangd mocinclude.opt +build/ + diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp index 51b3df5192..4b40b204b0 100644 --- a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp +++ b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.cpp @@ -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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayScenesInTabletopAR.h" +// ArcGIS Maps SDK headers #include "Error.h" #include "MobileScenePackage.h" #include "Scene.h" @@ -27,8 +29,9 @@ #include "SceneViewTypes.h" #include "Surface.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h index d9c32a6bf6..16aff3057c 100644 --- a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h +++ b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.h @@ -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. @@ -17,6 +17,12 @@ #ifndef DISPLAYSCENESINTABLETOPAR_H #define DISPLAYSCENESINTABLETOPAR_H +// toolkit headers +#include "ArcGISArView.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class ArcGISSceneLayer; @@ -26,9 +32,6 @@ class Scene; class SceneQuickView; } -#include -#include "ArcGISArView.h" - class DisplayScenesInTabletopAR : public QObject { Q_OBJECT diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro index 15d3e59645..60a500c027 100644 --- a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro +++ b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayScenesInTabletopAR -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml index 725925d0ee..6462a12057 100644 --- a/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml +++ b/CppSamples/AR/DisplayScenesInTabletopAR/DisplayScenesInTabletopAR.qml @@ -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. diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/main.cpp b/CppSamples/AR/DisplayScenesInTabletopAR/main.cpp index 9ec8f8c419..74758c5606 100644 --- a/CppSamples/AR/DisplayScenesInTabletopAR/main.cpp +++ b/CppSamples/AR/DisplayScenesInTabletopAR/main.cpp @@ -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 #include #include -#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/AR/DisplayScenesInTabletopAR/main.qml b/CppSamples/AR/DisplayScenesInTabletopAR/main.qml index cd08b552c8..b1694b0094 100644 --- a/CppSamples/AR/DisplayScenesInTabletopAR/main.qml +++ b/CppSamples/AR/DisplayScenesInTabletopAR/main.qml @@ -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. diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp index eea9c47059..1a41f56eac 100644 --- a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp +++ b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.cpp @@ -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. @@ -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" diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h index d33100058c..90990ae261 100644 --- a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h +++ b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.h @@ -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. @@ -17,6 +17,12 @@ #ifndef EXPLORESCENESINFLYOVERAR_H #define EXPLORESCENESINFLYOVERAR_H +// toolkit headers +#include "ArcGISArView.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -24,9 +30,6 @@ class SceneQuickView; class IntegratedMeshLayer; } -#include -#include "ArcGISArView.h" - class ExploreScenesInFlyoverAR : public QObject { Q_OBJECT diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro index ff3d912aa4..a5dbc24d09 100644 --- a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro +++ b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ExploreScenesInFlyoverAR -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml index ff8dd0c594..1031a0a1c5 100644 --- a/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml +++ b/CppSamples/AR/ExploreScenesInFlyoverAR/ExploreScenesInFlyoverAR.qml @@ -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. diff --git a/CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp b/CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp index 2b05ae6587..e0a8be5747 100644 --- a/CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp +++ b/CppSamples/AR/ExploreScenesInFlyoverAR/main.cpp @@ -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 #include #include -#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp index 46fe25f14b..5c4fd62f80 100644 --- a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp +++ b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.cpp @@ -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. @@ -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 using namespace Esri::ArcGISRuntime; @@ -74,7 +77,6 @@ void AnalyzeHotspots::componentComplete() }); } - void AnalyzeHotspots::executeTaskWithDates(const QString& fromDate, const QString& toDate) { // Create the GP Parameters diff --git a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h index 294b40b7d2..7633bbd4a2 100644 --- a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h +++ b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h @@ -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. @@ -17,6 +17,12 @@ #ifndef ANALYZEHOTSPOTS_H #define ANALYZEHOTSPOTS_H +// ArcGIS Maps SDK headers +#include "GeoprocessingParameters.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,9 +32,6 @@ namespace Esri::ArcGISRuntime class ArcGISMapImageLayer; } -#include "GeoprocessingParameters.h" -#include - class AnalyzeHotspots : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro index b3d0828da2..6ed2a1d21f 100644 --- a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro +++ b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.qml b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.qml index a33aa2c37b..fc876c9620 100644 --- a/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.qml +++ b/CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.qml @@ -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. diff --git a/CppSamples/Analysis/AnalyzeHotspots/main.cpp b/CppSamples/Analysis/AnalyzeHotspots/main.cpp index d3a6408c4e..dedda79ca2 100644 --- a/CppSamples/Analysis/AnalyzeHotspots/main.cpp +++ b/CppSamples/Analysis/AnalyzeHotspots/main.cpp @@ -1,30 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include -#include +// sample headers +#include "AnalyzeHotspots.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers +#include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "AnalyzeHotspots.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.cpp b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.cpp index 226a618409..d952383c7e 100644 --- a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.cpp +++ b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=AnalyzeViewshed, Category=Analysis] // [Legal] // Copyright 2016 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. @@ -18,40 +18,43 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "AnalyzeViewshed.h" +// ArcGIS Maps SDK headers +#include "Error.h" +#include "Feature.h" +#include "FeatureCollectionTable.h" +#include "FeatureIterator.h" +#include "Field.h" +#include "GeoprocessingFeatures.h" +#include "GeoprocessingJob.h" +#include "GeoprocessingParameter.h" +#include "GeoprocessingParameters.h" +#include "GeoprocessingResult.h" +#include "GeoprocessingTask.h" +#include "GeoprocessingTypes.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" -#include "MapTypes.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "MapViewTypes.h" #include "Point.h" -#include "Viewpoint.h" -#include "SpatialReference.h" -#include "GraphicsOverlay.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "SimpleMarkerSymbol.h" #include "SimpleFillSymbol.h" +#include "SimpleMarkerSymbol.h" #include "SimpleRenderer.h" -#include "Graphic.h" -#include "GeoprocessingTask.h" -#include "GeoprocessingJob.h" -#include "GeoprocessingFeatures.h" -#include "GeoprocessingParameter.h" -#include "GeoprocessingParameters.h" -#include "GeoprocessingResult.h" -#include "GeoprocessingTypes.h" -#include "FeatureCollectionTable.h" -#include "Feature.h" +#include "SpatialReference.h" #include "SymbolTypes.h" -#include "Error.h" #include "TaskTypes.h" -#include "FeatureIterator.h" -#include "Field.h" +#include "Viewpoint.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h index 1aecadfd1b..7c5899a8c8 100644 --- a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h +++ b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h @@ -1,12 +1,12 @@ // [WriteFile Name=AnalyzeViewshed, Category=Analysis] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef ANALYZEVIEWSHED_H #define ANALYZEVIEWSHED_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureCollectionTable; @@ -28,8 +31,6 @@ namespace Esri::ArcGISRuntime class MapQuickView; } -#include - class AnalyzeViewshed : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro index 671be4ee3d..ea697d158d 100644 --- a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro +++ b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.qml b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.qml index dca583aeaa..4f8c7f002f 100644 --- a/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.qml +++ b/CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AnalyzeViewshed, Category=Analysis] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Analysis/AnalyzeViewshed/main.cpp b/CppSamples/Analysis/AnalyzeViewshed/main.cpp index 96ebf953f4..485c825300 100644 --- a/CppSamples/Analysis/AnalyzeViewshed/main.cpp +++ b/CppSamples/Analysis/AnalyzeViewshed/main.cpp @@ -1,30 +1,36 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "AnalyzeViewshed.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers +#include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "AnalyzeViewshed.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.cpp b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.cpp index bc63fdb091..abfa5f482e 100644 --- a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.cpp +++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DistanceMeasurementAnalysis, Category=Analysis] // [Legal] // Copyright 2022 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DistanceMeasurementAnalysis.h" +// ArcGIS Maps SDK headers #include "AnalysisListModel.h" #include "AnalysisOverlay.h" #include "AnalysisOverlayListModel.h" @@ -40,6 +42,7 @@ #include "Surface.h" #include "Viewpoint.h" +// Qt headers #include #include @@ -178,7 +181,6 @@ void DistanceMeasurementAnalysis::connectSignals() m_isNavigating = false; }); - // Set a flag when viewpointChanged signal emits connect(m_sceneView, &SceneQuickView::viewpointChanged, this, [this] { diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h index ec92b328a6..bc5101dd5b 100644 --- a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h +++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h @@ -1,12 +1,12 @@ // [WriteFile Name=DistanceMeasurementAnalysis, Category=Analysis] // [Legal] // Copyright 2022 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. @@ -17,6 +17,9 @@ #ifndef DISTANCEMEASUREMENTANALYSIS_H #define DISTANCEMEASUREMENTANALYSIS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class LocationDistanceMeasurement; @@ -25,8 +28,6 @@ class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h"); class DistanceMeasurementAnalysis : public QObject diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro index 0662715095..2bbfa8aa21 100644 --- a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro +++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DistanceMeasurementAnalysis -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.qml b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.qml index 4659e34ac9..17d8129437 100644 --- a/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.qml +++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DistanceMeasurementAnalysis, Category=Analysis] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Analysis/DistanceMeasurementAnalysis/main.cpp b/CppSamples/Analysis/DistanceMeasurementAnalysis/main.cpp index 0fb6c2bf03..5815944647 100644 --- a/CppSamples/Analysis/DistanceMeasurementAnalysis/main.cpp +++ b/CppSamples/Analysis/DistanceMeasurementAnalysis/main.cpp @@ -1,26 +1,32 @@ +// [Legal] // Copyright 2022 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 "DistanceMeasurementAnalysis.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Analysis/Geotriggers/FeatureInfoPane.qml b/CppSamples/Analysis/Geotriggers/FeatureInfoPane.qml index 950213188d..aaf3cdf581 100644 --- a/CppSamples/Analysis/Geotriggers/FeatureInfoPane.qml +++ b/CppSamples/Analysis/Geotriggers/FeatureInfoPane.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Geotriggers, Category=Analysis] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Analysis/Geotriggers/Geotriggers.cpp b/CppSamples/Analysis/Geotriggers/Geotriggers.cpp index 85ab6df823..056788c5b1 100644 --- a/CppSamples/Analysis/Geotriggers/Geotriggers.cpp +++ b/CppSamples/Analysis/Geotriggers/Geotriggers.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Geotriggers, Category=Analysis] // [Legal] // Copyright 2021 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. @@ -14,39 +14,41 @@ // limitations under the License. // [Legal] -#include "ArcGISFeature.h" #ifdef PCH_BUILD #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Geotriggers.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" #include "ArcadeExpression.h" +#include "Attachment.h" +#include "AttachmentListModel.h" +#include "AttributeListModel.h" +#include "FeatureEditResult.h" +#include "FeatureFenceParameters.h" #include "FenceGeotrigger.h" #include "FenceGeotriggerNotificationInfo.h" -#include "GeotriggerNotificationInfo.h" #include "GeotriggerMonitor.h" +#include "GeotriggerNotificationInfo.h" #include "GeotriggersTypes.h" -#include "FeatureEditResult.h" -#include "FeatureFenceParameters.h" -#include "LocationGeotriggerFeed.h" #include "LocationDisplay.h" +#include "LocationGeotriggerFeed.h" #include "Map.h" #include "MapQuickView.h" #include "MapViewTypes.h" +#include "Polyline.h" #include "PortalItem.h" #include "ServiceFeatureTable.h" #include "SimulatedLocationDataSource.h" #include "SimulationParameters.h" -#include "ArcGISFeature.h" -#include "AttributeListModel.h" -#include "Attachment.h" -#include "AttachmentListModel.h" -#include "Polyline.h" +// Qt headers +#include #include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Analysis/Geotriggers/Geotriggers.h b/CppSamples/Analysis/Geotriggers/Geotriggers.h index b08f8c1284..e16754458d 100644 --- a/CppSamples/Analysis/Geotriggers/Geotriggers.h +++ b/CppSamples/Analysis/Geotriggers/Geotriggers.h @@ -1,12 +1,12 @@ // [WriteFile Name=Geotriggers, Category=Analysis] // [Legal] // Copyright 2021 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. @@ -17,6 +17,11 @@ #ifndef GEOTRIGGERS_H #define GEOTRIGGERS_H +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class ArcGISFeature; @@ -32,10 +37,6 @@ class ServiceFeatureTable; class SimulatedLocationDataSource; } -#include -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class Geotriggers : public QObject diff --git a/CppSamples/Analysis/Geotriggers/Geotriggers.pro b/CppSamples/Analysis/Geotriggers/Geotriggers.pro index 786d5d6b97..12439bdd89 100644 --- a/CppSamples/Analysis/Geotriggers/Geotriggers.pro +++ b/CppSamples/Analysis/Geotriggers/Geotriggers.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = Geotriggers -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Analysis/Geotriggers/Geotriggers.qml b/CppSamples/Analysis/Geotriggers/Geotriggers.qml index d772df6e9f..6e958033c2 100644 --- a/CppSamples/Analysis/Geotriggers/Geotriggers.qml +++ b/CppSamples/Analysis/Geotriggers/Geotriggers.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Geotriggers, Category=Analysis] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Analysis/Geotriggers/main.cpp b/CppSamples/Analysis/Geotriggers/main.cpp index 7be6e076a8..b17757a2f2 100644 --- a/CppSamples/Analysis/Geotriggers/main.cpp +++ b/CppSamples/Analysis/Geotriggers/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 2021 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 "Geotriggers.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.cpp b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.cpp index bfac9c9285..8433c69308 100644 --- a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.cpp +++ b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=LineOfSightGeoElement, Category=Analysis] // [Legal] // Copyright 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. @@ -18,46 +18,51 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "LineOfSightGeoElement.h" +// ArcGIS Maps SDK headers +#include "AnalysisListModel.h" +#include "AnalysisOverlay.h" +#include "AnalysisOverlayListModel.h" +#include "AngularUnit.h" #include "ArcGISSceneLayer.h" #include "ArcGISTiledElevationSource.h" +#include "AttributeListModel.h" +#include "Camera.h" +#include "ElevationSourceListModel.h" +#include "Error.h" #include "GeoElementLineOfSight.h" +#include "GeodeticDistanceResult.h" #include "GeometryEngine.h" +#include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" #include "GraphicsOverlayListModel.h" +#include "LayerListModel.h" +#include "LayerSceneProperties.h" +#include "LinearUnit.h" +#include "MapTypes.h" #include "ModelSceneSymbol.h" +#include "Point.h" #include "PointBuilder.h" +#include "RendererSceneProperties.h" #include "Scene.h" #include "SceneQuickView.h" #include "SceneViewTypes.h" +#include "SimpleMarkerSymbol.h" #include "SimpleRenderer.h" -#include "MapTypes.h" +#include "SpatialReference.h" #include "Surface.h" -#include "ElevationSourceListModel.h" -#include "LayerListModel.h" -#include "LayerSceneProperties.h" -#include "RendererSceneProperties.h" #include "SymbolTypes.h" -#include "GraphicListModel.h" -#include "Error.h" -#include "AttributeListModel.h" -#include "AnalysisOverlay.h" -#include "AnalysisOverlayListModel.h" -#include "AnalysisListModel.h" -#include "Camera.h" -#include "GeodeticDistanceResult.h" -#include "LinearUnit.h" -#include "AngularUnit.h" -#include "SpatialReference.h" -#include "Point.h" -#include "Graphic.h" -#include "SimpleMarkerSymbol.h" -#include +// Qt headers #include -#include #include +#include + +// STL headers +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h index 13ab16f4d5..d473a91a99 100644 --- a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h +++ b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h @@ -1,12 +1,12 @@ // [WriteFile Name=LineOfSightGeoElement, Category=Analysis] // [Legal] // Copyright 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. @@ -17,6 +17,10 @@ #ifndef LineOfSightGeoElement_H #define LineOfSightGeoElement_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -24,9 +28,6 @@ class SceneQuickView; class Graphic; } -#include -#include - Q_MOC_INCLUDE("SceneQuickView.h") class LineOfSightGeoElement : public QObject diff --git a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro index 312bbd0f0d..f3adcee63a 100644 --- a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro +++ b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = LineOfSightGeoElement -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.qml b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.qml index cd7f69d24c..cfc56b361c 100644 --- a/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.qml +++ b/CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.qml @@ -1,12 +1,12 @@ // [WriteFile Name=LineOfSightGeoElement, Category=Analysis] // [Legal] // Copyright 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. diff --git a/CppSamples/Analysis/LineOfSightGeoElement/main.cpp b/CppSamples/Analysis/LineOfSightGeoElement/main.cpp index d5897b3838..5be37e7096 100644 --- a/CppSamples/Analysis/LineOfSightGeoElement/main.cpp +++ b/CppSamples/Analysis/LineOfSightGeoElement/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 2018 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 "LineOfSightGeoElement.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.cpp b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.cpp index 73da6e3b30..46256f12bc 100644 --- a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.cpp +++ b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=LineOfSightLocation, 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. @@ -18,22 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "LineOfSightLocation.h" -#include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "LocationLineOfSight.h" +// ArcGIS Maps SDK headers +#include "AnalysisListModel.h" #include "AnalysisOverlay.h" +#include "AnalysisOverlayListModel.h" +#include "ArcGISTiledElevationSource.h" #include "Camera.h" -#include "MapTypes.h" -#include "Surface.h" #include "ElevationSourceListModel.h" -#include "AnalysisOverlayListModel.h" -#include "AnalysisListModel.h" -#include "SpatialReference.h" +#include "LocationLineOfSight.h" +#include "MapTypes.h" #include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "SpatialReference.h" +#include "Surface.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h index c56b9a6d9f..23ebd139d5 100644 --- a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h +++ b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h @@ -1,12 +1,12 @@ // [WriteFile Name=LineOfSightLocation, 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. @@ -17,6 +17,9 @@ #ifndef LINEOFSIGHTLOCATION_H #define LINEOFSIGHTLOCATION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; @@ -24,8 +27,6 @@ class AnalysisOverlay; class LocationLineOfSight; } -#include - class LineOfSightLocation : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro index 763e34914e..6f3267a000 100644 --- a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro +++ b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = LineOfSightLocation -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.qml b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.qml index aac7378b4f..7e0916b84c 100644 --- a/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.qml +++ b/CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.qml @@ -1,12 +1,12 @@ // [WriteFile Name=LineOfSightLocation, 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. diff --git a/CppSamples/Analysis/LineOfSightLocation/main.cpp b/CppSamples/Analysis/LineOfSightLocation/main.cpp index 6761355ee1..de2619ca9e 100644 --- a/CppSamples/Analysis/LineOfSightLocation/main.cpp +++ b/CppSamples/Analysis/LineOfSightLocation/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "LineOfSightLocation.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "LineOfSightLocation.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.cpp b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.cpp index 03d211441e..1de3f0f937 100644 --- a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.cpp +++ b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=StatisticalQuery, 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. @@ -18,29 +18,33 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "StatisticalQuery.h" +// ArcGIS Maps SDK headers +#include "CoreTypes.h" +#include "Error.h" +#include "FeatureLayer.h" +#include "Geometry.h" +#include "LayerListModel.h" #include "Map.h" -#include "MapTypes.h" #include "MapQuickView.h" -#include "FeatureLayer.h" +#include "MapTypes.h" #include "ServiceFeatureTable.h" -#include "StatisticalQuery.h" -#include "StatisticsQueryParameters.h" #include "StatisticDefinition.h" #include "StatisticRecord.h" #include "StatisticRecordIterator.h" -#include "Viewpoint.h" -#include "Error.h" -#include "LayerListModel.h" -#include "CoreTypes.h" +#include "StatisticsQueryParameters.h" #include "StatisticsQueryResult.h" -#include "Geometry.h" +#include "Viewpoint.h" +// Qt headers #include +#include #include + +// STL headers #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h index 45824a1320..046787126f 100644 --- a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h +++ b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h @@ -1,12 +1,12 @@ // [WriteFile Name=StatisticalQuery, 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. @@ -17,6 +17,9 @@ #ifndef STATISTICALQUERY_H #define STATISTICALQUERY_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ class ServiceFeatureTable; class StatisticsQueryResult; } -#include - class StatisticalQuery : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro index 53396b3668..7165cd5119 100644 --- a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro +++ b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = StatisticalQuery -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.qml b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.qml index cc5988d8d9..6ebf40e5da 100644 --- a/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.qml +++ b/CppSamples/Analysis/StatisticalQuery/StatisticalQuery.qml @@ -1,12 +1,12 @@ // [WriteFile Name=StatisticalQuery, 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. diff --git a/CppSamples/Analysis/StatisticalQuery/main.cpp b/CppSamples/Analysis/StatisticalQuery/main.cpp index 50dc734721..94d8115876 100644 --- a/CppSamples/Analysis/StatisticalQuery/main.cpp +++ b/CppSamples/Analysis/StatisticalQuery/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "StatisticalQuery.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "StatisticalQuery.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/OptionsPage.qml b/CppSamples/Analysis/StatisticalQueryGroupSort/OptionsPage.qml index f18e9ef91e..ed9e6d64ea 100644 --- a/CppSamples/Analysis/StatisticalQueryGroupSort/OptionsPage.qml +++ b/CppSamples/Analysis/StatisticalQueryGroupSort/OptionsPage.qml @@ -1,9 +1,9 @@ - +// // 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. diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/ResultsPage.qml b/CppSamples/Analysis/StatisticalQueryGroupSort/ResultsPage.qml index 8c95f29ec1..e571058b93 100644 --- a/CppSamples/Analysis/StatisticalQueryGroupSort/ResultsPage.qml +++ b/CppSamples/Analysis/StatisticalQueryGroupSort/ResultsPage.qml @@ -1,9 +1,9 @@ - +// // 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. diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.cpp b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.cpp index 74fba0a931..94b3a4db4e 100644 --- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.cpp +++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.cpp @@ -1,26 +1,31 @@ -// Copyright 2016 ESRI +// [Legal] +// Copyright 2016 Esri. // -// All rights reserved under the copyright laws of the United States -// and applicable international laws, treaties, and conventions. -// -// You may freely redistribute and use this sample code, with or -// without modification, provided you include the original copyright -// notice and use restrictions. -// -// See the Sample code usage restrictions document for further information. +// 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 "StatisticResultListModel.h" +// Qt headers #include #include +#include +#include #include +#include #include #include #include -#include -#include -#include - -#include "StatisticResultListModel.h" StatisticResultListModel::StatisticResultListModel(QObject* parent) : QAbstractListModel(parent) diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.h b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.h index 5288430eb8..ef71ffd119 100644 --- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.h +++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticResultListModel.h @@ -1,14 +1,17 @@ -// Copyright 2016 ESRI +// [Legal] +// Copyright 2016 Esri. // -// All rights reserved under the copyright laws of the United States -// and applicable international laws, treaties, and conventions. -// -// You may freely redistribute and use this sample code, with or -// without modification, provided you include the original copyright -// notice and use restrictions. -// -// See the Sample code usage restrictions document for further information. +// 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] #ifndef STATISTICRESULTISTMODEL_H #define STATISTICRESULTISTMODEL_H diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.cpp b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.cpp index 610dcc0433..d6746929f5 100644 --- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.cpp +++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=StatisticalQueryGroupSort, 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. @@ -18,24 +18,30 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers +#include "StatisticResultListModel.h" #include "StatisticalQueryGroupSort.h" + +// ArcGIS Maps SDK headers +#include "CoreTypes.h" +#include "Error.h" +#include "Field.h" +#include "OrderBy.h" #include "ServiceFeatureTable.h" #include "StatisticDefinition.h" #include "StatisticRecord.h" #include "StatisticRecordIterator.h" #include "StatisticsQueryParameters.h" #include "StatisticsQueryResult.h" -#include "Field.h" -#include "StatisticResultListModel.h" -#include "Error.h" -#include "OrderBy.h" -#include "CoreTypes.h" +// Qt headers #include -#include +#include #include +#include #include -#include + +// STL headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h index b4eaec4880..ba96fc4c0e 100644 --- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h +++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h @@ -1,12 +1,12 @@ // [WriteFile Name=StatisticalQueryGroupSort, 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. @@ -17,6 +17,13 @@ #ifndef STATISTICALQUERYGROUPSORT_H #define STATISTICALQUERYGROUPSORT_H +// Qt headers +#include +#include +#include +#include +#include + namespace Esri::ArcGISRuntime { class ServiceFeatureTable; @@ -28,12 +35,6 @@ namespace Esri::ArcGISRuntime class StatisticResultListModel; -#include -#include -#include -#include -#include - class StatisticalQueryGroupSort : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro index a9adef5cef..52869eb983 100644 --- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro +++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = StatisticalQueryGroupSort -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.qml b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.qml index 5b215a6f15..83966d4d8c 100644 --- a/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.qml +++ b/CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.qml @@ -1,12 +1,12 @@ // [WriteFile Name=StatisticalQueryGroupSort, 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. diff --git a/CppSamples/Analysis/StatisticalQueryGroupSort/main.cpp b/CppSamples/Analysis/StatisticalQueryGroupSort/main.cpp index a32c123181..6ede4e9d08 100644 --- a/CppSamples/Analysis/StatisticalQueryGroupSort/main.cpp +++ b/CppSamples/Analysis/StatisticalQueryGroupSort/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "StatisticalQueryGroupSort.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "StatisticalQueryGroupSort.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.cpp b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.cpp index 33db292683..afcc400358 100644 --- a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.cpp +++ b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedCamera, 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. @@ -18,24 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ViewshedCamera.h" -#include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" +// ArcGIS Maps SDK headers +#include "AnalysisListModel.h" #include "AnalysisOverlay.h" -#include "Point.h" +#include "AnalysisOverlayListModel.h" +#include "ArcGISTiledElevationSource.h" #include "Camera.h" -#include "Viewpoint.h" -#include "LocationViewshed.h" -#include "IntegratedMeshLayer.h" -#include "MapTypes.h" -#include "Surface.h" #include "ElevationSourceListModel.h" +#include "IntegratedMeshLayer.h" #include "LayerListModel.h" -#include "AnalysisOverlayListModel.h" -#include "AnalysisListModel.h" +#include "LocationViewshed.h" +#include "MapTypes.h" +#include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SpatialReference.h" +#include "Surface.h" +#include "Viewpoint.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h index f9f7cbf44d..912ca705d8 100644 --- a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h +++ b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedCamera, 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. @@ -17,6 +17,9 @@ #ifndef VIEWSHEDCAMERA_H #define VIEWSHEDCAMERA_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -25,8 +28,6 @@ class AnalysisOverlay; class LocationViewshed; } -#include - class ViewshedCamera : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro index cfd65cdfd7..001e659dee 100644 --- a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro +++ b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ViewshedCamera -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.qml b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.qml index 947b44b9f1..7685f33435 100644 --- a/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.qml +++ b/CppSamples/Analysis/ViewshedCamera/ViewshedCamera.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedCamera, 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. diff --git a/CppSamples/Analysis/ViewshedCamera/main.cpp b/CppSamples/Analysis/ViewshedCamera/main.cpp index c8f43a8a96..9c4212e3b6 100644 --- a/CppSamples/Analysis/ViewshedCamera/main.cpp +++ b/CppSamples/Analysis/ViewshedCamera/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "ViewshedCamera.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ViewshedCamera.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.cpp b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.cpp index cba19ef146..9eba31406b 100644 --- a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.cpp +++ b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedGeoElement, 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. @@ -18,46 +18,49 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ViewshedGeoElement.h" -#include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "Point.h" -#include "ArcGISSceneLayer.h" -#include "SimpleRenderer.h" -#include "ModelSceneSymbol.h" -#include "GeoElementViewshed.h" -#include "GeometryEngine.h" -#include "OrbitGeoElementCameraController.h" -#include "MapTypes.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" -#include "LayerListModel.h" +// ArcGIS Maps SDK headers +#include "AnalysisListModel.h" #include "AnalysisOverlay.h" #include "AnalysisOverlayListModel.h" -#include "AnalysisListModel.h" -#include "GraphicsOverlayListModel.h" -#include "LayerSceneProperties.h" -#include "SceneViewTypes.h" -#include "RendererSceneProperties.h" -#include "SymbolTypes.h" -#include "GraphicListModel.h" -#include "GeodeticDistanceResult.h" -#include "LinearUnit.h" #include "AngularUnit.h" +#include "ArcGISSceneLayer.h" +#include "ArcGISTiledElevationSource.h" #include "AttributeListModel.h" +#include "ElevationSourceListModel.h" +#include "GeoElementViewshed.h" +#include "GeodeticDistanceResult.h" +#include "GeometryEngine.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerListModel.h" +#include "LayerSceneProperties.h" +#include "LinearUnit.h" +#include "MapTypes.h" +#include "ModelSceneSymbol.h" +#include "OrbitGeoElementCameraController.h" +#include "Point.h" +#include "RendererSceneProperties.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "SceneViewTypes.h" +#include "SimpleRenderer.h" #include "SpatialReference.h" +#include "Surface.h" +#include "SymbolTypes.h" -#include +// Qt headers +#include +#include #include +#include #include #include -#include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h index 9c5dfb1a68..ebb69bfb57 100644 --- a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h +++ b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedGeoElement, 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. @@ -17,6 +17,14 @@ #ifndef VIEWSHEDGEOELEMENT_H #define VIEWSHEDGEOELEMENT_H +// ArcGIS Maps SDK headers +#include "GeometryTypes.h" +#include "Point.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; @@ -26,11 +34,6 @@ class GraphicsOverlay; class Graphic; } -#include "Point.h" -#include "GeometryTypes.h" -#include -#include - class ViewshedGeoElement : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro index 95e6769c12..8bc0415e3a 100644 --- a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro +++ b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ViewshedGeoElement -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.qml b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.qml index 9d131837fd..84a995ba97 100644 --- a/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.qml +++ b/CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedGeoElement, 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. diff --git a/CppSamples/Analysis/ViewshedGeoElement/main.cpp b/CppSamples/Analysis/ViewshedGeoElement/main.cpp index ed54fd0dd7..97d3f4ab62 100644 --- a/CppSamples/Analysis/ViewshedGeoElement/main.cpp +++ b/CppSamples/Analysis/ViewshedGeoElement/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "ViewshedGeoElement.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ViewshedGeoElement.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Analysis/ViewshedLocation/ColorDialog.qml b/CppSamples/Analysis/ViewshedLocation/ColorDialog.qml index 54491f560d..7937e0a741 100644 --- a/CppSamples/Analysis/ViewshedLocation/ColorDialog.qml +++ b/CppSamples/Analysis/ViewshedLocation/ColorDialog.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedLocation, Category=Analysis] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.cpp b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.cpp index 8bf66f917e..7f41992723 100644 --- a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.cpp +++ b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedLocation, 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. @@ -18,22 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ViewshedLocation.h" +// ArcGIS Maps SDK headers +#include "AnalysisListModel.h" +#include "AnalysisOverlay.h" +#include "AnalysisOverlayListModel.h" #include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "LocationViewshed.h" #include "Camera.h" -#include "Point.h" -#include "AnalysisOverlay.h" -#include "MapTypes.h" -#include "Surface.h" #include "ElevationSourceListModel.h" -#include "AnalysisOverlayListModel.h" -#include "AnalysisListModel.h" +#include "LocationViewshed.h" +#include "MapTypes.h" +#include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SpatialReference.h" +#include "Surface.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h index 10dcf99acb..fbb3c9c712 100644 --- a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h +++ b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedLocation, 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. @@ -17,6 +17,10 @@ #ifndef VIEWSHEDLOCATION_H #define VIEWSHEDLOCATION_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; @@ -24,9 +28,6 @@ class LocationViewshed; class AnalysisOverlay; } -#include -#include - class ViewshedLocation : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro index 1b5cf01b49..e8a3c55c84 100644 --- a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro +++ b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ViewshedLocation -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.qml b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.qml index 54ab657381..a1cd88c61d 100644 --- a/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.qml +++ b/CppSamples/Analysis/ViewshedLocation/ViewshedLocation.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedLocation, 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. diff --git a/CppSamples/Analysis/ViewshedLocation/ViewshedSlider.qml b/CppSamples/Analysis/ViewshedLocation/ViewshedSlider.qml index ca4b14a0f5..ee262a92a1 100644 --- a/CppSamples/Analysis/ViewshedLocation/ViewshedSlider.qml +++ b/CppSamples/Analysis/ViewshedLocation/ViewshedSlider.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ViewshedLocation, 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. diff --git a/CppSamples/Analysis/ViewshedLocation/main.cpp b/CppSamples/Analysis/ViewshedLocation/main.cpp index e847db95c5..c8ed0e6964 100644 --- a/CppSamples/Analysis/ViewshedLocation/main.cpp +++ b/CppSamples/Analysis/ViewshedLocation/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "ViewshedLocation.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ViewshedLocation.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp index 561d64e5a2..c9364e0481 100644 --- a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp +++ b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.cpp @@ -1,36 +1,42 @@ // [WriteFile Name=AddItemsToPortal, Category=CloudAndPortal] // [Legal] -// Copyright 2016 ESRI +// Copyright 2016 Esri. // -// All rights reserved under the copyright laws of the United States -// and applicable international laws, treaties, and conventions. +// 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 // -// You may freely redistribute and use this sample code, with or -// without modification, provided you include the original copyright -// notice and use restrictions. -// -// See the Sample code usage restrictions document for further information. +// 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] #ifdef PCH_BUILD #include "pch.hpp" #endif // PCH_BUILD -#include "AuthenticationManager.h" -#include "Portal.h" -#include "PortalItem.h" -#include "PortalItemListModel.h" +// sample headers #include "AddItemsToPortal.h" -#include "MapTypes.h" -#include "PortalTypes.h" + +// ArcGIS Maps SDK headers +#include "AuthenticationManager.h" #include "CoreTypes.h" #include "Credential.h" -#include "OAuthClientInfo.h" -#include "PortalUser.h" #include "Error.h" #include "ErrorException.h" #include "ErrorInformationKeys.h" +#include "MapTypes.h" +#include "OAuthClientInfo.h" +#include "Portal.h" +#include "PortalItem.h" +#include "PortalItemListModel.h" +#include "PortalTypes.h" +#include "PortalUser.h" +// Qt headers #include #include diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h index 48fcdb64b2..5f16fefa3d 100644 --- a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h +++ b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h @@ -1,20 +1,25 @@ // [WriteFile Name=AddItemsToPortal, Category=CloudAndPortal] // [Legal] -// Copyright 2016 ESRI +// Copyright 2016 Esri. // -// All rights reserved under the copyright laws of the United States -// and applicable international laws, treaties, and conventions. +// 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 // -// You may freely redistribute and use this sample code, with or -// without modification, provided you include the original copyright -// notice and use restrictions. -// -// See the Sample code usage restrictions document for further information. +// 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] #ifndef ADDITEMSTOPORTAL_H #define ADDITEMSTOPORTAL_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Portal; @@ -22,8 +27,6 @@ namespace Esri::ArcGISRuntime class PortalUser; } -#include - class AddItemsToPortal : public QQuickItem { Q_OBJECT diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro index a5ab82118b..3912523eed 100644 --- a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro +++ b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.qml b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.qml index 157871155b..286b258be2 100644 --- a/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.qml +++ b/CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AddItemsToPortal, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/CloudAndPortal/AddItemsToPortal/main.cpp b/CppSamples/CloudAndPortal/AddItemsToPortal/main.cpp index 0eea5fac9e..f66bce3d13 100644 --- a/CppSamples/CloudAndPortal/AddItemsToPortal/main.cpp +++ b/CppSamples/CloudAndPortal/AddItemsToPortal/main.cpp @@ -1,21 +1,25 @@ +// [Legal] // Copyright 2015 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 -#include +// Qt headers #include #include +#include #include +#include + #ifdef QT_WEBVIEW_WEBENGINE_BACKEND #include #endif // QT_WEBVIEW_WEBENGINE_BACKEND diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp index 3fd11de55f..192911aad7 100644 --- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp +++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=IntegratedWindowsAuthentication, Category=CloudAndPortal] // [Legal] // Copyright 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. @@ -18,19 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "IntegratedWindowsAuthentication.h" +// ArcGIS Maps SDK headers +#include "Error.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "Portal.h" #include "PortalItem.h" -#include "PortalQueryResultSetForItems.h" #include "PortalItemListModel.h" -#include "MapTypes.h" #include "PortalQueryParametersForItems.h" +#include "PortalQueryResultSetForItems.h" #include "PortalTypes.h" -#include "Error.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h index 8b72f5968a..682f48fd9d 100644 --- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h +++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h @@ -1,12 +1,12 @@ // [WriteFile Name=IntegratedWindowsAuthentication, Category=CloudAndPortal] // [Legal] // Copyright 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. @@ -17,6 +17,10 @@ #ifndef INTEGRATEDWINDOWSAUTHENTICATION_H #define INTEGRATEDWINDOWSAUTHENTICATION_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -30,9 +34,6 @@ class PortalQueryResultSetForItems; class Error; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class IntegratedWindowsAuthentication : public QObject diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro index 8022b19a17..a3f5bda34b 100644 --- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro +++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = IntegratedWindowsAuthentication -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.qml b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.qml index e594084021..8783b3998b 100644 --- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.qml +++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.qml @@ -1,12 +1,12 @@ // [WriteFile Name=IntegratedWindowsAuthentication, Category=CloudAndPortal] // [Legal] // Copyright 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. diff --git a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/main.cpp b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/main.cpp index e91ed5dbd5..a470583b91 100644 --- a/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/main.cpp +++ b/CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "IntegratedWindowsAuthentication.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp index 4907ac3ea6..304b0063c5 100644 --- a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp +++ b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=PortalUserInfo, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. @@ -18,20 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "PortalUserInfo.h" +// ArcGIS Maps SDK headers #include "AuthenticationManager.h" -#include "Credential.h" -#include "Portal.h" -#include "PortalUser.h" -#include "MapTypes.h" -#include "PortalTypes.h" #include "CoreTypes.h" #include "Credential.h" -#include "OAuthClientInfo.h" -#include "PortalUser.h" #include "Error.h" +#include "MapTypes.h" +#include "OAuthClientInfo.h" +#include "Portal.h" #include "PortalInfo.h" +#include "PortalTypes.h" +#include "PortalUser.h" + +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h index 5018c6e6be..ae27bfcb15 100644 --- a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h +++ b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h @@ -1,12 +1,12 @@ // [WriteFile Name=PortalUserInfo, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. @@ -17,6 +17,10 @@ #ifndef PORTALUSERINFO_H #define PORTALUSERINFO_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Credential; @@ -25,9 +29,6 @@ namespace Esri::ArcGISRuntime enum class LoadStatus; } -#include -#include - class PortalUserInfo : public QQuickItem { Q_OBJECT diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.pro b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.pro index 8456a8076e..ca33d13f7c 100644 --- a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.pro +++ b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.qml b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.qml index 4c5eb3415d..301f1a598d 100644 --- a/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.qml +++ b/CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.qml @@ -1,12 +1,12 @@ // [WriteFile Name=PortalUserInfo, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/CloudAndPortal/PortalUserInfo/main.cpp b/CppSamples/CloudAndPortal/PortalUserInfo/main.cpp index 18c3c6982d..7a3756a783 100644 --- a/CppSamples/CloudAndPortal/PortalUserInfo/main.cpp +++ b/CppSamples/CloudAndPortal/PortalUserInfo/main.cpp @@ -1,21 +1,25 @@ +// [Legal] // Copyright 2015 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 -#include +// Qt headers #include #include +#include #include +#include + #ifdef QT_WEBVIEW_WEBENGINE_BACKEND #include #endif // QT_WEBVIEW_WEBENGINE_BACKEND diff --git a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.cpp b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.cpp index ad881b5b33..a7d81ef40d 100644 --- a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.cpp +++ b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.cpp @@ -1,35 +1,41 @@ // [WriteFile Name=SearchForWebmap, Category=CloudAndPortal] // [Legal] -// Copyright 2016 ESRI +// Copyright 2016 Esri. // -// All rights reserved under the copyright laws of the United States -// and applicable international laws, treaties, and conventions. +// 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 // -// You may freely redistribute and use this sample code, with or -// without modification, provided you include the original copyright -// notice and use restrictions. -// -// See the Sample code usage restrictions document for further information. +// 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] #ifdef PCH_BUILD #include "pch.hpp" #endif // PCH_BUILD +// sample headers +#include "SearchForWebmap.h" + +// ArcGIS Maps SDK headers #include "AuthenticationManager.h" +#include "Error.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "Portal.h" #include "PortalItem.h" #include "PortalItemListModel.h" #include "PortalQueryParametersForItems.h" -#include "SearchForWebmap.h" -#include "MapTypes.h" -#include "PortalTypes.h" -#include "Error.h" #include "PortalQueryResultSetForItems.h" -#include "MapViewTypes.h" +#include "PortalTypes.h" +// Qt headers #include #include #include diff --git a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h index 56483185f8..6334516189 100644 --- a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h +++ b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h @@ -1,20 +1,26 @@ // [WriteFile Name=SearchForWebmap, Category=CloudAndPortal] // [Legal] -// Copyright 2016 ESRI +// Copyright 2016 Esri. // -// All rights reserved under the copyright laws of the United States -// and applicable international laws, treaties, and conventions. +// 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 // -// You may freely redistribute and use this sample code, with or -// without modification, provided you include the original copyright -// notice and use restrictions. -// -// See the Sample code usage restrictions document for further information. +// 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] #ifndef SEARCHFORWEBMAP_H #define SEARCHFORWEBMAP_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,9 +31,6 @@ namespace Esri::ArcGISRuntime class PortalQueryResultSetForItems; } -#include -#include - class SearchForWebmap : public QQuickItem { Q_OBJECT diff --git a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.pro b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.pro index 20f5f5085b..6a9085c71d 100644 --- a/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.pro +++ b/CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/CloudAndPortal/SearchForWebmap/main.cpp b/CppSamples/CloudAndPortal/SearchForWebmap/main.cpp index c81dbceced..e998d6ac1f 100644 --- a/CppSamples/CloudAndPortal/SearchForWebmap/main.cpp +++ b/CppSamples/CloudAndPortal/SearchForWebmap/main.cpp @@ -1,21 +1,25 @@ +// [Legal] // Copyright 2015 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 -#include +// Qt headers #include #include +#include #include +#include + #ifdef QT_WEBVIEW_WEBENGINE_BACKEND #include #endif // QT_WEBVIEW_WEBENGINE_BACKEND diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.cpp b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.cpp index 4c96bab4c3..45d5646fe8 100644 --- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.cpp +++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ShowOrgBasemaps, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. @@ -18,20 +18,24 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers +#include "ShowOrgBasemaps.h" + +// ArcGIS Maps SDK headers #include "AuthenticationManager.h" -#include "Map.h" -#include "MapQuickView.h" #include "Basemap.h" #include "BasemapListModel.h" -#include "Portal.h" -#include "ShowOrgBasemaps.h" -#include "MapTypes.h" #include "CoreTypes.h" #include "Credential.h" -#include "OAuthClientInfo.h" #include "Error.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "OAuthClientInfo.h" +#include "Portal.h" #include "PortalInfo.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; @@ -51,7 +55,6 @@ void ShowOrgBasemaps::init() qmlRegisterType("Esri.Samples", 1, 0, "ShowOrgBasemapsSample"); } - void ShowOrgBasemaps::connectLoadStatusSignal() { if (m_portal) diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h index ba291d0883..d27d4274c5 100644 --- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h +++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h @@ -1,12 +1,12 @@ // [WriteFile Name=ShowOrgBasemaps, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. @@ -17,6 +17,10 @@ #ifndef SHOWORGBASEMAPS_H #define SHOWORGBASEMAPS_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class BasemapListModel; @@ -25,9 +29,6 @@ namespace Esri::ArcGISRuntime class Portal; } -#include -#include - class ShowOrgBasemaps : public QQuickItem { Q_OBJECT diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.pro b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.pro index 90b7034d5f..50aa28bb0f 100644 --- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.pro +++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.qml b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.qml index d114e7fd4a..9fdc4dce64 100644 --- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.qml +++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ShowOrgBasemaps, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/CloudAndPortal/ShowOrgBasemaps/main.cpp b/CppSamples/CloudAndPortal/ShowOrgBasemaps/main.cpp index 92365fd344..d533a56f3e 100644 --- a/CppSamples/CloudAndPortal/ShowOrgBasemaps/main.cpp +++ b/CppSamples/CloudAndPortal/ShowOrgBasemaps/main.cpp @@ -1,22 +1,26 @@ +// [Legal] // Copyright 2015 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 -#include +// Qt headers +#include #include #include +#include #include -#include +#include + #ifdef QT_WEBVIEW_WEBENGINE_BACKEND #include #endif // QT_WEBVIEW_WEBENGINE_BACKEND diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.cpp b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.cpp index dca588a03c..c7f0104eee 100644 --- a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.cpp +++ b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=TokenAuthentication, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. @@ -18,14 +18,17 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "TokenAuthentication.h" +// ArcGIS Maps SDK headers #include "Map.h" #include "MapQuickView.h" +#include "MapViewTypes.h" #include "Portal.h" #include "PortalItem.h" -#include "MapViewTypes.h" +// Qt headers #include namespace diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h index 3946301375..8fe7403e3d 100644 --- a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h +++ b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h @@ -1,12 +1,12 @@ // [WriteFile Name=TokenAuthentication, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef TOKENAUTHENTICATION_H #define TOKENAUTHENTICATION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class TokenAuthentication : public QQuickItem { Q_OBJECT diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.pro b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.pro index d2885d73ea..84e21c7ada 100644 --- a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.pro +++ b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.qml b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.qml index 5257e40ebf..8d1715fd0c 100644 --- a/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.qml +++ b/CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.qml @@ -1,12 +1,12 @@ // [WriteFile Name=TokenAuthentication, Category=CloudAndPortal] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/CloudAndPortal/TokenAuthentication/main.cpp b/CppSamples/CloudAndPortal/TokenAuthentication/main.cpp index a07fad3c06..1550f0bf7d 100644 --- a/CppSamples/CloudAndPortal/TokenAuthentication/main.cpp +++ b/CppSamples/CloudAndPortal/TokenAuthentication/main.cpp @@ -1,21 +1,24 @@ +// [Legal] // Copyright 2015 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 -#include +// Qt headers #include #include +#include #include +#include #ifdef QT_WEBVIEW_WEBENGINE_BACKEND #include diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.cpp b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.cpp index 6156f0b8b6..5132ce7ad1 100644 --- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.cpp +++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=AddGraphicsWithRenderer, Category=DisplayInformation] // [Legal] // Copyright 2022 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "AddGraphicsWithRenderer.h" +// ArcGIS Maps SDK headers #include "AngularUnit.h" #include "CubicBezierSegment.h" #include "EllipticArcSegment.h" @@ -41,7 +43,6 @@ #include "SimpleFillSymbol.h" #include "SimpleLineSymbol.h" #include "SimpleMarkerSymbol.h" -#include "SimpleMarkerSymbol.h" #include "SimpleRenderer.h" #include "SpatialReference.h" #include "SymbolTypes.h" diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h index 82c446ed6a..a071eea720 100644 --- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h +++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=AddGraphicsWithRenderer, Category=DisplayInformation] // [Legal] // Copyright 2022 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. @@ -17,6 +17,9 @@ #ifndef ADDGRAPHICSWITHRENDERER_H #define ADDGRAPHICSWITHRENDERER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Geometry; @@ -26,8 +29,6 @@ class MapQuickView; class Symbol; } -#include - Q_MOC_INCLUDE("MapQuickView.h"); class AddGraphicsWithRenderer : public QObject diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.pro b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.pro index 63ce54ca6a..9f4df4a779 100644 --- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.pro +++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = AddGraphicsWithRenderer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.qml b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.qml index e0bbdb6096..56a49d96c3 100644 --- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.qml +++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AddGraphicsWithRenderer, Category=DisplayInformation] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/main.cpp b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/main.cpp index 668541f207..d1f1238e5b 100644 --- a/CppSamples/DisplayInformation/AddGraphicsWithRenderer/main.cpp +++ b/CppSamples/DisplayInformation/AddGraphicsWithRenderer/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "AddGraphicsWithRenderer.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.cpp b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.cpp index dca928c877..6abc3ed0d4 100644 --- a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.cpp +++ b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=BuildLegend, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -18,21 +18,24 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "BuildLegend.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Basemap.h" +// ArcGIS Maps SDK headers #include "ArcGISMapImageLayer.h" +#include "Basemap.h" #include "FeatureLayer.h" -#include "ServiceFeatureTable.h" -#include "MapTypes.h" -#include "LegendInfoListModel.h" #include "LayerListModel.h" -#include "SpatialReference.h" +#include "LegendInfoListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "Point.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.h b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.h index 2d36aef602..347b2a2268 100644 --- a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.h +++ b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.h @@ -1,12 +1,12 @@ // [WriteFile Name=BuildLegend, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,6 +17,10 @@ #ifndef BUILD_LEGEND_H #define BUILD_LEGEND_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,9 +29,6 @@ namespace Esri::ArcGISRuntime class QString; -#include -#include - class BuildLegend : public QQuickItem { Q_OBJECT @@ -54,4 +55,3 @@ class BuildLegend : public QQuickItem }; #endif // BUILD_LEGEND_H - diff --git a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.pro b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.pro index e781d7269d..b0c0326315 100644 --- a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.pro +++ b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.qml b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.qml index 6ce5e72f3f..503cbf1e6a 100644 --- a/CppSamples/DisplayInformation/BuildLegend/BuildLegend.qml +++ b/CppSamples/DisplayInformation/BuildLegend/BuildLegend.qml @@ -1,12 +1,12 @@ // [WriteFile Name=BuildLegend, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/BuildLegend/main.cpp b/CppSamples/DisplayInformation/BuildLegend/main.cpp index c951e3b3b1..85f8b10d91 100644 --- a/CppSamples/DisplayInformation/BuildLegend/main.cpp +++ b/CppSamples/DisplayInformation/BuildLegend/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "BuildLegend.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "BuildLegend.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp index 726fb38915..ff39db59f4 100644 --- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp +++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ControlAnnotationSublayerVisibility, Category=DisplayInformation] // [Legal] // Copyright 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. @@ -18,19 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ControlAnnotationSublayerVisibility.h" -#include "Map.h" -#include "MapQuickView.h" -#include "MobileMapPackage.h" +// ArcGIS Maps SDK headers #include "AnnotationSublayer.h" #include "Error.h" +#include "Layer.h" #include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" #include "MapTypes.h" -#include "Layer.h" +#include "MobileMapPackage.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h index c2273d774e..8ecae57a16 100644 --- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h +++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h @@ -1,12 +1,12 @@ // [WriteFile Name=ControlAnnotationSublayerVisibility, Category=DisplayInformation] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef CONTROLANNOTATIONSUBLAYERVISIBILITY_H #define CONTROLANNOTATIONSUBLAYERVISIBILITY_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -27,8 +30,6 @@ class LayerListModel; class Layer; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class ControlAnnotationSublayerVisibility : public QObject diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.pro b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.pro index 4669c9eaa1..fceaaac551 100644 --- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.pro +++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ControlAnnotationSublayerVisibility -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qml b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qml index fc3ece2699..41ae4f0106 100644 --- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qml +++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ControlAnnotationSublayerVisibility, Category=DisplayInformation] // [Legal] // Copyright 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. diff --git a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/main.cpp b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/main.cpp index 97e7e66558..485ae362fb 100644 --- a/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/main.cpp +++ b/CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "ControlAnnotationSublayerVisibility.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp index fe3b37e84d..f3d7bdc5a4 100644 --- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp +++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateSymbolStylesFromWebStyles, Category=DisplayInformation] // [Legal] // Copyright 2021 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. @@ -18,25 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CreateSymbolStylesFromWebStyles.h" +// ArcGIS Maps SDK headers #include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "Point.h" #include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "Symbol.h" #include "SymbolStyle.h" -#include "UniqueValueRenderer.h" -#include "MapTypes.h" -#include "LayerListModel.h" #include "SymbolStyleSearchParameters.h" -#include "SymbolStyleSearchResultListModel.h" #include "SymbolStyleSearchResult.h" +#include "SymbolStyleSearchResultListModel.h" #include "UniqueValue.h" #include "UniqueValueListModel.h" -#include "SpatialReference.h" -#include "Point.h" -#include "Symbol.h" +#include "UniqueValueRenderer.h" +// Qt headers #include #include diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h index 94380c18f2..e93ec193a2 100644 --- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h +++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateSymbolStylesFromWebStyles, Category=DisplayInformation] // [Legal] // Copyright 2021 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. @@ -17,6 +17,11 @@ #ifndef CREATESYMBOLSTYLESFROMWEBSTYLES_H #define CREATESYMBOLSTYLESFROMWEBSTYLES_H +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -30,10 +35,6 @@ namespace Esri::ArcGISRuntime class QAbstractListModel; -#include -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("QAbstractListModel") diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.pro b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.pro index 0d6a7840d2..9b76463b77 100644 --- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.pro +++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateSymbolStylesFromWebStyles -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qml b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qml index bf2055f5c3..fca750512e 100644 --- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qml +++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateSymbolStylesFromWebStyles, Category=DisplayInformation] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/main.cpp b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/main.cpp index e32893953a..983566a61e 100644 --- a/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/main.cpp +++ b/CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 2021 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 "CreateSymbolStylesFromWebStyles.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp index 82fc14b7a9..39c4d7143d 100644 --- a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp +++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CustomDictionaryStyle, Category=DisplayInformation] // [Legal] // Copyright 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. @@ -18,23 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CustomDictionaryStyle.h" +// ArcGIS Maps SDK headers #include "DictionaryRenderer.h" #include "DictionarySymbolStyle.h" #include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "ServiceFeatureTable.h" -#include "Viewpoint.h" -#include "PortalItem.h" #include "MapTypes.h" -#include "LayerListModel.h" -#include "SpatialReference.h" #include "Point.h" +#include "PortalItem.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "Viewpoint.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h index d14e2080f2..217353378c 100644 --- a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h +++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h @@ -1,12 +1,12 @@ // [WriteFile Name=CustomDictionaryStyle, Category=DisplayInformation] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef CUSTOMDICTIONARYSTYLE_H #define CUSTOMDICTIONARYSTYLE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class DictionaryRenderer; @@ -25,8 +28,6 @@ class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class CustomDictionaryStyle : public QObject diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.pro b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.pro index 09ea40f757..f82f8a4cb9 100644 --- a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.pro +++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CustomDictionaryStyle -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qml b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qml index cd8d9ee8d1..3e5438533b 100644 --- a/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qml +++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CustomDictionaryStyle, Category=DisplayInformation] // [Legal] // Copyright 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. diff --git a/CppSamples/DisplayInformation/CustomDictionaryStyle/main.cpp b/CppSamples/DisplayInformation/CustomDictionaryStyle/main.cpp index 3f35945847..bc79debfef 100644 --- a/CppSamples/DisplayInformation/CustomDictionaryStyle/main.cpp +++ b/CppSamples/DisplayInformation/CustomDictionaryStyle/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "CustomDictionaryStyle.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.cpp b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.cpp index f5f2aaaf0c..45e66c0c8c 100644 --- a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.cpp +++ b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayClusters, Category=DisplayInformation] // [Legal] // Copyright 2023 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayClusters.h" +// ArcGIS Maps SDK headers #include "AggregateGeoElement.h" #include "CalloutData.h" #include "Error.h" @@ -37,6 +39,7 @@ #include "PopupManager.h" #include "PortalItem.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; @@ -125,7 +128,6 @@ void DisplayClusters::onMouseClicked(const QMouseEvent &mouseClick) if (identifyResult->popups().isEmpty()) return; - Popup* popup = identifyResult->popups().constFirst(); // if the identified object is a cluster, select it diff --git a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h index 5b13bb7128..caa3b76368 100644 --- a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h +++ b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayClusters, Category=DisplayInformation] // [Legal] // Copyright 2023 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. @@ -17,6 +17,10 @@ #ifndef DISPLAYCLUSTERS_H #define DISPLAYCLUSTERS_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class AggregateGeoElement; @@ -25,9 +29,6 @@ class Map; class MapQuickView; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h"); class DisplayClusters : public QObject diff --git a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.pro b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.pro index 5667fcf5a9..9e1284adf4 100644 --- a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.pro +++ b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayClusters -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.qml b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.qml index d6e737a7fb..26d2d06e3d 100644 --- a/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.qml +++ b/CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayClusters, Category=DisplayInformation] // [Legal] // Copyright 2023 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. diff --git a/CppSamples/DisplayInformation/DisplayClusters/main.cpp b/CppSamples/DisplayInformation/DisplayClusters/main.cpp index e12a009d75..25e7968259 100644 --- a/CppSamples/DisplayInformation/DisplayClusters/main.cpp +++ b/CppSamples/DisplayInformation/DisplayClusters/main.cpp @@ -1,29 +1,37 @@ +// [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 "DisplayClusters.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Esri/ArcGISRuntime/Toolkit/register.h" - int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); diff --git a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.cpp b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.cpp deleted file mode 100644 index 17d5d5414c..0000000000 --- a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.cpp +++ /dev/null @@ -1,313 +0,0 @@ -// [WriteFile Name=DisplayGrid, Category=DisplayInformation] -// [Legal] -// Copyright 2016 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] - -#ifdef PCH_BUILD -#include "pch.hpp" -#endif // PCH_BUILD - -#include "DisplayGrid.h" - -#include "Map.h" -#include "MapQuickView.h" -#include "Grid.h" -#include "LatitudeLongitudeGrid.h" -#include "UTMGrid.h" -#include "USNGGrid.h" -#include "MGRSGrid.h" -#include "SimpleLineSymbol.h" -#include "TextSymbol.h" -#include "Viewpoint.h" -#include "Point.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "SpatialReference.h" - -using namespace Esri::ArcGISRuntime; - -const QString DisplayGrid::s_utmGrid = QStringLiteral("UTM"); -const QString DisplayGrid::s_usngGrid = QStringLiteral("USNG"); -const QString DisplayGrid::s_latlonGrid = QStringLiteral("LatLon"); -const QString DisplayGrid::s_mgrsGrid = QStringLiteral("MGRS"); -const QString DisplayGrid::s_ddFormat = QStringLiteral("Decimal degrees"); -const QString DisplayGrid::s_dmsFormat = QStringLiteral( "Degrees minutes seconds"); -const QString DisplayGrid::s_geographicPosition = QStringLiteral("Geographic"); -const QString DisplayGrid::s_bottomLeftPosition = QStringLiteral("Bottom left"); -const QString DisplayGrid::s_bottomRightPosition = QStringLiteral("Bottom right"); -const QString DisplayGrid::s_topLeftPosition = QStringLiteral("Top left"); -const QString DisplayGrid::s_topRightPosition = QStringLiteral("Top right"); -const QString DisplayGrid::s_centerPosition = QStringLiteral("Center"); -const QString DisplayGrid::s_allSidesPosition = QStringLiteral("All sides"); - -DisplayGrid::DisplayGrid(QQuickItem* parent /* = nullptr */): - QQuickItem(parent) -{ -} - -DisplayGrid::~DisplayGrid() = default; - -void DisplayGrid::init() -{ - qmlRegisterType("Esri.Samples", 1, 0, "MapView"); - qmlRegisterType("Esri.Samples", 1, 0, "DisplayGridSample"); -} - -void DisplayGrid::componentComplete() -{ - QQuickItem::componentComplete(); - - // find QML MapView component - m_mapView->setWrapAroundMode(WrapAroundMode::Disabled); - - // Create a map using the imagery basemap - m_map = new Map(BasemapStyle::ArcGISImageryStandard, this); - double targetScale = 6450785; - m_map->setInitialViewpoint(Viewpoint(Point(-10336141.70018318, 5418213.05332071, SpatialReference::webMercator()), targetScale)); - - // Set map to map view - m_mapView->setMap(m_map); -} - -// change the grid type -void DisplayGrid::changeGrid(const QString& gridType) -{ - if (gridType == latlonGrid()) - { - //! [DisplayGrid Set_LatLon_Grid_Cpp] - // create a grid for showing Latitude and Longitude (Meridians and Parallels) - LatitudeLongitudeGrid* latlonGrid = new LatitudeLongitudeGrid(this); - m_mapView->setGrid(latlonGrid); - //! [DisplayGrid Set_LatLon_Grid_Cpp] - } - else if (gridType == utmGrid()) - { - UTMGrid* utmGrid = new UTMGrid(this); - m_mapView->setGrid(utmGrid); - } - else if (gridType == usngGrid()) - { - USNGGrid* utmGrid = new USNGGrid(this); - m_mapView->setGrid(utmGrid); - } - else if (gridType == mgrsGrid()) - { - MGRSGrid* utmGrid = new MGRSGrid(this); - m_mapView->setGrid(utmGrid); - } - - // apply any styling that has been set - changeGridColor(currentGridColor()); - changeLabelColor(currentLabelColor()); - changeLabelFormat(currentLabelFormat()); - changeLabelPosition(currentLabelPosition()); - setGridLabelVisibility(gridVisibility()); - setGridVisibility(gridVisibility()); -} - -// change the grid color -void DisplayGrid::changeGridColor(const QString& color) -{ - if (m_mapView->grid()) - { - // find the number of resolution levels in the grid - int gridLevels = m_mapView->grid()->levelCount(); - - //! [DisplayGrid Set_Grid_Lines_Cpp] - for (int level = 0; level < gridLevels; level++) - { - const float width = 1 + level; - SimpleLineSymbol* lineSym = new SimpleLineSymbol(SimpleLineSymbolStyle::Solid, QColor(color), width, this); - m_mapView->grid()->setLineSymbol(level, lineSym); - } - //! [DisplayGrid Set_Grid_Lines_Cpp] - } -} - -// change the grid label color -void DisplayGrid::changeLabelColor(const QString& color) -{ - if (m_mapView->grid()) - { - //! [DisplayGrid Grid_Levels_Cpp] - // find the number of resolution levels in the grid - int gridLevels = m_mapView->grid()->levelCount(); - //! [DisplayGrid Grid_Levels_Cpp] - - //! [DisplayGrid Set_Grid_Labels_Cpp] - for (int level = 0; level < gridLevels; level++) - { - constexpr float size = 14.0f; - TextSymbol* textSym = new TextSymbol("text", QColor(color), size, HorizontalAlignment::Left, VerticalAlignment::Bottom, this); - textSym->setHaloColor(QColor("white")); - textSym->setHaloWidth(2.0f + level); - m_mapView->grid()->setTextSymbol(level, textSym); - } - //! [DisplayGrid Set_Grid_Labels_Cpp] - } -} - -// change the grid label format -void DisplayGrid::changeLabelFormat(const QString& format) -{ - if (m_mapView->grid()) - { - if (m_mapView->grid()->gridType() == GridType::LatitudeLongitudeGrid) - { - if (format == ddFormat()) - { - // format the labels to display in decimal degrees - static_cast(m_mapView->grid())->setLabelFormat(LatitudeLongitudeGridLabelFormat::DecimalDegrees); - } - else if (format == dmsFormat()) - { - //! [DisplayGrid Set_Label_Format_Cpp] - // format the labels to display in degrees, minutes and seconds - static_cast(m_mapView->grid())->setLabelFormat(LatitudeLongitudeGridLabelFormat::DegreesMinutesSeconds); - //! [DisplayGrid Set_Label_Format_Cpp] - } - } - } -} - -// change the grid label placement -void DisplayGrid::changeLabelPosition(const QString& position) -{ - if (m_mapView->grid()) - { - if (position == geographicPosition()) - { - //! [DisplayGrid Set_Label_Placement_Geographic_Cpp] - // update the label positioning to geographic - m_mapView->grid()->setLabelPosition(GridLabelPosition::Geographic); - //! [DisplayGrid Set_Label_Placement_Geographic_Cpp] - } - else if (position == bottomLeftPosition()) - { - // update the label positioning to bottom left - m_mapView->grid()->setLabelPosition(GridLabelPosition::BottomLeft); - } - else if (position == bottomRightPosition()) - { - // update the label positioning to bottom right - m_mapView->grid()->setLabelPosition(GridLabelPosition::BottomRight); - } - else if (position == topLeftPosition()) - { - // update the label positioning to top left - m_mapView->grid()->setLabelPosition(GridLabelPosition::TopLeft); - } - else if (position == topRightPosition()) - { - //! [DisplayGrid Set_Label_Placement_Top_Right_Cpp] - // update the label positioning to top right - m_mapView->grid()->setLabelPosition(GridLabelPosition::TopRight); - //! [DisplayGrid Set_Label_Placement_Top_Right_Cpp] - } - else if (position == centerPosition()) - { - // update the label positioning to center - m_mapView->grid()->setLabelPosition(GridLabelPosition::Center); - } - else if (position == allSidesPosition()) - { - // update the label positioning to all sides - m_mapView->grid()->setLabelPosition(GridLabelPosition::AllSides); - } - } -} - -MapQuickView* DisplayGrid::mapQuickView() const -{ - return m_mapView; -} - -void DisplayGrid::setMapQuickView(MapQuickView* mapView) -{ - m_mapView = mapView; - emit mapQuickViewChanged(); -} - -QString DisplayGrid::currentGridColor() const -{ - return m_currentGridColor; -} - -void DisplayGrid::setCurrentGridColor(const QString& gridColor) -{ - m_currentGridColor = gridColor; - changeGridColor(m_currentGridColor); -} - -QString DisplayGrid::currentLabelColor() const -{ - return m_currentLabelColor; -} - -void DisplayGrid::setCurrentLabelColor(const QString& labelColor) -{ - m_currentLabelColor = labelColor; - changeLabelColor(m_currentLabelColor); -} - -QString DisplayGrid::currentLabelFormat() const -{ - return m_currentLabelFormat; -} - -void DisplayGrid::setCurrentLabelFormat(const QString& labelFormat) -{ - m_currentLabelFormat = labelFormat; - changeLabelFormat(m_currentLabelFormat); -} - -QString DisplayGrid::currentLabelPosition() const -{ - return m_currentLabelPosition; -} - -void DisplayGrid::setCurrentLabelPosition(const QString& labelPosition) -{ - m_currentLabelPosition = labelPosition; - changeLabelPosition(m_currentLabelPosition); -} - -bool DisplayGrid::gridVisibility() -{ - return m_gridVisibility; -} - -void DisplayGrid::setGridVisibility(bool visible) -{ - m_gridVisibility = visible; - - //! [DisplayGrid Grid_Visible_Cpp] - m_mapView->grid()->setVisible(m_gridVisibility); - //! [DisplayGrid Grid_Visible_Cpp] -} - -bool DisplayGrid::gridLabelVisibility() -{ - return m_gridLabelVisibility; -} - -void DisplayGrid::setGridLabelVisibility(bool visible) -{ - m_gridLabelVisibility = visible; - - //! [DisplayGrid Label_Visible_Cpp] - m_mapView->grid()->setLabelsVisible(m_gridLabelVisibility); - //! [DisplayGrid Label_Visible_Cpp] -} diff --git a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.h b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.h deleted file mode 100644 index 97c3e4ec7b..0000000000 --- a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.h +++ /dev/null @@ -1,143 +0,0 @@ -// [WriteFile Name=DisplayGrid, Category=DisplayInformation] -// [Legal] -// Copyright 2016 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] - -#ifndef DISPLAYGRID_H -#define DISPLAYGRID_H - -namespace Esri::ArcGISRuntime -{ - class Map; - class MapQuickView; -} - -#include - -Q_MOC_INCLUDE("MapQuickView.h") - -class DisplayGrid : public QQuickItem -{ - Q_OBJECT - - Q_PROPERTY(Esri::ArcGISRuntime::MapQuickView* mapView READ mapQuickView WRITE setMapQuickView NOTIFY mapQuickViewChanged) - - Q_PROPERTY(QString utmGrid READ utmGrid NOTIFY utmGridChanged) - Q_PROPERTY(QString usngGrid READ usngGrid NOTIFY usngGridChanged) - Q_PROPERTY(QString latlonGrid READ latlonGrid NOTIFY latlonGridChanged) - Q_PROPERTY(QString mgrsGrid READ mgrsGrid NOTIFY mgrsGridChanged) - Q_PROPERTY(QString ddFormat READ ddFormat NOTIFY ddFormatChanged) - Q_PROPERTY(QString dmsFormat READ dmsFormat NOTIFY dmsFormatChanged) - Q_PROPERTY(QString geographicPosition READ geographicPosition NOTIFY geographicPositionChanged) - Q_PROPERTY(QString bottomLeftPosition READ bottomLeftPosition NOTIFY bottomLeftPositionChanged) - Q_PROPERTY(QString bottomRightPosition READ bottomRightPosition NOTIFY bottomRightPositionChanged) - Q_PROPERTY(QString topLeftPosition READ topLeftPosition NOTIFY topLeftPositionChanged) - Q_PROPERTY(QString topRightPosition READ topRightPosition NOTIFY topRightPositionChanged) - Q_PROPERTY(QString centerPosition READ centerPosition NOTIFY centerPositionChanged) - Q_PROPERTY(QString allSidesPosition READ allSidesPosition NOTIFY allSidesPositionChanged) - Q_PROPERTY(QString currentGridColor READ currentGridColor WRITE setCurrentGridColor NOTIFY currentGridColorChanged) - Q_PROPERTY(QString currentLabelColor READ currentLabelColor WRITE setCurrentLabelColor NOTIFY currentLabelColorChanged) - Q_PROPERTY(QString currentLabelFormat READ currentLabelFormat WRITE setCurrentLabelFormat NOTIFY currentLabelFormatChanged) - Q_PROPERTY(QString currentLabelPosition READ currentLabelPosition WRITE setCurrentLabelPosition NOTIFY currentLabelPositionChanged) - Q_PROPERTY(bool gridVisibility READ gridVisibility WRITE setGridVisibility NOTIFY gridVisibilityChanged) - Q_PROPERTY(bool gridLabelVisibility READ gridLabelVisibility WRITE setGridLabelVisibility NOTIFY gridLabelVisibilityChanged) - -public: - explicit DisplayGrid(QQuickItem* parent = nullptr); - ~DisplayGrid() override; - - void componentComplete() override; - static void init(); - Q_INVOKABLE void changeGrid(const QString& gridType); - Q_INVOKABLE void changeGridColor(const QString& color); - Q_INVOKABLE void changeLabelColor(const QString& color); - Q_INVOKABLE void changeLabelFormat(const QString& format); - Q_INVOKABLE void changeLabelPosition(const QString& position); - -signals: - void utmGridChanged(); - void usngGridChanged(); - void latlonGridChanged(); - void mgrsGridChanged(); - void ddFormatChanged(); - void dmsFormatChanged(); - void geographicPositionChanged(); - void bottomLeftPositionChanged(); - void bottomRightPositionChanged(); - void topLeftPositionChanged(); - void topRightPositionChanged(); - void centerPositionChanged(); - void allSidesPositionChanged(); - void currentGridColorChanged(); - void currentLabelColorChanged(); - void currentLabelFormatChanged(); - void currentLabelPositionChanged(); - void gridVisibilityChanged(); - void gridLabelVisibilityChanged(); - void mapQuickViewChanged(); - -private: - static const QString utmGrid() { return s_utmGrid; } - static const QString usngGrid() { return s_usngGrid; } - static const QString latlonGrid() { return s_latlonGrid; } - static const QString mgrsGrid() { return s_mgrsGrid; } - static const QString ddFormat() { return s_ddFormat; } - static const QString dmsFormat() { return s_dmsFormat; } - static const QString geographicPosition() { return s_geographicPosition; } - static const QString bottomLeftPosition() { return s_bottomLeftPosition; } - static const QString bottomRightPosition() { return s_bottomRightPosition; } - static const QString topLeftPosition() { return s_topLeftPosition; } - static const QString topRightPosition() { return s_topRightPosition; } - static const QString centerPosition() { return s_centerPosition; } - static const QString allSidesPosition() { return s_allSidesPosition; } - Esri::ArcGISRuntime::MapQuickView* mapQuickView() const; - void setMapQuickView(Esri::ArcGISRuntime::MapQuickView* mapView); - QString currentGridColor() const; - void setCurrentGridColor(const QString& gridColor); - QString currentLabelColor() const; - void setCurrentLabelColor(const QString& labelColor); - QString currentLabelFormat() const; - void setCurrentLabelFormat(const QString& labelFormat); - QString currentLabelPosition() const; - void setCurrentLabelPosition(const QString& labelPosition); - bool gridVisibility(); - void setGridVisibility(bool visible); - bool gridLabelVisibility(); - void setGridLabelVisibility(bool visible); - -private: - Esri::ArcGISRuntime::Map* m_map = nullptr; - Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr; - static const QString s_utmGrid; - static const QString s_usngGrid; - static const QString s_latlonGrid; - static const QString s_mgrsGrid; - static const QString s_ddFormat; - static const QString s_dmsFormat; - static const QString s_geographicPosition; - static const QString s_bottomLeftPosition; - static const QString s_bottomRightPosition; - static const QString s_topLeftPosition; - static const QString s_topRightPosition; - static const QString s_centerPosition; - static const QString s_allSidesPosition; - QString m_currentGridColor = QStringLiteral("red"); - QString m_currentLabelColor = QStringLiteral("black"); - QString m_currentLabelFormat; - QString m_currentLabelPosition; - bool m_gridVisibility = true; - bool m_gridLabelVisibility = true; -}; - -#endif // DISPLAYGRID_H diff --git a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qrc b/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qrc deleted file mode 100644 index 4c03c49b27..0000000000 --- a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - README.metadata.json - screenshot.png - DisplayGrid.qml - DisplayGrid.h - DisplayGrid.cpp - README.md - - diff --git a/CppSamples/DisplayInformation/DisplayGrid/README.md b/CppSamples/DisplayInformation/DisplayGrid/README.md deleted file mode 100644 index dc0eccbda6..0000000000 --- a/CppSamples/DisplayInformation/DisplayGrid/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# Display a grid - -Display coordinate system grids including Latitude/Longitude, MGRS, UTM and USNG on a map view. Also, toggle label visibility and change the color of grid lines and grid labels. - -![](screenshot.png) - -## Use case - -Grids are often used on printed maps, but can also be helpful on digital maps, to identify locations on a map. - -## How to use the sample - -Tap on the `Change Grid` button in the toolbar to open a settings view. You can select type of grid from `Grid Type` (LatLong, MGRS, UTM and USNG) and modify its properties like label visibility, grid line color, and grid label color. - -## How it works - -1. Create an instance of one of the `Grid` types. -1. Grid lines and labels can be styled per grid level with `setLineSymbol(gridLevel, lineSymbol)` and `setTextSymbol(gridLevel, textSymbol)` methods on the grid. -1. The label position can be set with `setLabelPosition(labelPosition)` method on the grid. -1. For the `LatitudeLongitudeGrid` type, you can specify a label format of `DecimalDegrees` or `DegreesMinutesSeconds`. -1. To set the grid, use the `setGrid(grid)` method on the map view. - -## Relevant API - -* ArcGISGrid -* LatitudeLongitudeGrid -* LatitudeLongitudeGridLabelFormat::DecimalDegrees -* LatitudeLongitudeGridLabelFormat::DegreesMinutesSeconds -* MapView -* MGRSGrid -* SimpleLineSymbol -* TextSymbol -* USNGGrid -* UTMGrid - -## Tags - -coordinates, degrees, graticule, grid, latitude, longitude, MGRS, minutes, seconds, USNG, UTM diff --git a/CppSamples/DisplayInformation/DisplayGrid/arcgisruntime.pri b/CppSamples/DisplayInformation/DisplayGrid/arcgisruntime.pri deleted file mode 100644 index 0a3989e404..0000000000 --- a/CppSamples/DisplayInformation/DisplayGrid/arcgisruntime.pri +++ /dev/null @@ -1,27 +0,0 @@ -#------------------------------------------------- -# Copyright 2017 ESRI -# -# All rights reserved under the copyright laws of the United States -# and applicable international laws, treaties, and conventions. -# -# You may freely redistribute and use this sample code, with or -# without modification, provided you include the original copyright -# notice and use restrictions. -# -# See the Sample code usage restrictions document for further information. -#------------------------------------------------- - -contains(QMAKE_HOST.os, Windows):{ - iniPath = $$(ALLUSERSPROFILE)\\EsriRuntimeQt\\ArcGIS Runtime SDK for Qt $${ARCGIS_RUNTIME_VERSION}.ini -} -else { - userHome = $$system(echo $HOME) - iniPath = $${userHome}/.config/EsriRuntimeQt/ArcGIS Runtime SDK for Qt $${ARCGIS_RUNTIME_VERSION}.ini -} -iniLine = $$cat($${iniPath}, "lines") -dirPath = $$find(iniLine, "InstallDir") -cleanDirPath = $$replace(dirPath, "InstallDir=", "") -priLocation = $$replace(cleanDirPath, '"', "") -!include($$priLocation/sdk/ideintegration/arcgis_runtime_qml_cpp.pri) { - message("Error. Cannot locate ArcGIS Runtime PRI file") -} diff --git a/CppSamples/DisplayInformation/DisplayGrid/screenshot.png b/CppSamples/DisplayInformation/DisplayGrid/screenshot.png deleted file mode 100644 index f6b2d7c04d8149e64a2ebe619846170822f2fdea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188756 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 z 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⋘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�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 diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp index 5ebedd0042..5f4b409339 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp +++ b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GODictionaryRenderer, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -18,27 +18,30 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GODictionaryRenderer.h" +// ArcGIS Maps SDK headers #include "DictionaryRenderer.h" +#include "DictionarySymbolStyle.h" +#include "DictionarySymbolStyleConfiguration.h" +#include "Graphic.h" #include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "MultipointBuilder.h" -#include "DictionarySymbolStyle.h" -#include "DictionarySymbolStyleConfiguration.h" #include "MapTypes.h" -#include "GraphicsOverlayListModel.h" +#include "MultipointBuilder.h" +#include "Point.h" #include "PointCollection.h" -#include "GraphicsOverlay.h" #include "SpatialReference.h" -#include "Point.h" -#include "Graphic.h" -#include -#include +// Qt headers #include +#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h index 38b74bb7e7..3d96018ecf 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h +++ b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=GODictionaryRenderer, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,7 +17,7 @@ #ifndef GraphicsOverlayDictionaryRenderer_H #define GraphicsOverlayDictionaryRenderer_H -// C++ API headers +// ArcGIS Maps SDK headers #include "Envelope.h" // Qt headers diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.pro b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.pro index 5ef0335d4d..f5e0c79183 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.pro +++ b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qml b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qml index 74adf6a31e..fcf2efd1d5 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qml +++ b/CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GODictionaryRenderer, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer/main.cpp b/CppSamples/DisplayInformation/GODictionaryRenderer/main.cpp index da3046b817..408d231ba5 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer/main.cpp +++ b/CppSamples/DisplayInformation/GODictionaryRenderer/main.cpp @@ -1,28 +1,35 @@ +// [Legal] // Copyright 2015-2016 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 -#include +// sample headers +#include "GODictionaryRenderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "GODictionaryRenderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp index 4bf61a0fea..2b6f6450b7 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp +++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GODictionaryRenderer_3D, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -18,29 +18,30 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GODictionaryRenderer_3D.h" -#include - +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" #include "Camera.h" #include "DictionaryRenderer.h" +#include "DictionarySymbolStyle.h" +#include "ElevationSourceListModel.h" #include "GeometryEngine.h" +#include "Graphic.h" #include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "MapTypes.h" +#include "Point.h" #include "Scene.h" #include "SceneQuickView.h" #include "Surface.h" -#include "DictionarySymbolStyle.h" -#include "MapTypes.h" -#include "ElevationSourceListModel.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicsOverlay.h" -#include "Graphic.h" -#include "Point.h" -#include +// Qt headers +#include #include - +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h index 7c0085ac80..967f94eac1 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h +++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h @@ -1,12 +1,12 @@ // [WriteFile Name=GODictionaryRenderer_3D, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,7 +17,7 @@ #ifndef GraphicsOverlayDictionaryRenderer_3D_H #define GraphicsOverlayDictionaryRenderer_3D_H -// C++ API headers +// ArcGIS Maps SDK headers #include "Envelope.h" #include "Error.h" #include "SpatialReference.h" diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.pro b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.pro index 80fdd08e4b..e12a0182d4 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.pro +++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qml b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qml index 6b04358ec1..41debdbf43 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qml +++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GraphicsOverlayDictionaryRenderer_3D, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/main.cpp b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/main.cpp index 17eb6175c6..0a3042b825 100644 --- a/CppSamples/DisplayInformation/GODictionaryRenderer_3D/main.cpp +++ b/CppSamples/DisplayInformation/GODictionaryRenderer_3D/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2015-2016 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 -#include +// sample headers +#include "GODictionaryRenderer_3D.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "GODictionaryRenderer_3D.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.cpp b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.cpp index 9bdd3a1049..c3f51dd5a2 100644 --- a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.cpp +++ b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GOSymbols, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -18,26 +18,29 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GOSymbols.h" +// ArcGIS Maps SDK headers +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "SpatialReference.h" +#include "MapTypes.h" #include "Point.h" -#include "Polyline.h" #include "PolygonBuilder.h" -#include "Graphic.h" -#include "GraphicsOverlay.h" -#include "SimpleMarkerSymbol.h" -#include "SimpleLineSymbol.h" +#include "Polyline.h" #include "SimpleFillSymbol.h" -#include "TextSymbol.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" +#include "SimpleLineSymbol.h" +#include "SimpleMarkerSymbol.h" +#include "SpatialReference.h" #include "SymbolTypes.h" -#include "GraphicListModel.h" +#include "TextSymbol.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.h b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.h index 6d6e58e7a3..9fbd7ff217 100644 --- a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.h +++ b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.h @@ -1,12 +1,12 @@ // [WriteFile Name=GOSymbols, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef GO_SYMBOLS_H #define GO_SYMBOLS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class GraphicsOverlay; } -#include - class GOSymbols : public QQuickItem { Q_OBJECT @@ -51,4 +52,3 @@ class GOSymbols : public QQuickItem }; #endif // GOSYMBOLS_H - diff --git a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.pro b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.pro index 7d49bf8705..fff2946940 100644 --- a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.pro +++ b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.qml b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.qml index 9de477cf0a..d9498409ea 100644 --- a/CppSamples/DisplayInformation/GOSymbols/GOSymbols.qml +++ b/CppSamples/DisplayInformation/GOSymbols/GOSymbols.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GOSymbols, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/GOSymbols/main.cpp b/CppSamples/DisplayInformation/GOSymbols/main.cpp index 3e8d5f34b3..f90660cf18 100644 --- a/CppSamples/DisplayInformation/GOSymbols/main.cpp +++ b/CppSamples/DisplayInformation/GOSymbols/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "GOSymbols.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "GOSymbols.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.cpp b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.cpp index 4d6eed2ef6..acf672e504 100644 --- a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.cpp +++ b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyGraphics, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -18,27 +18,32 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "IdentifyGraphics.h" +// ArcGIS Maps SDK headers +#include "Geometry.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "IdentifyGraphicsOverlayResult.h" #include "Map.h" #include "MapQuickView.h" -#include "SpatialReference.h" -#include "GraphicsOverlay.h" +#include "MapTypes.h" +#include "PolygonBuilder.h" #include "SimpleFillSymbol.h" #include "SimpleRenderer.h" -#include "PolygonBuilder.h" -#include "Graphic.h" -#include "MapTypes.h" +#include "SpatialReference.h" #include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "IdentifyGraphicsOverlayResult.h" -#include "Geometry.h" +// Qt headers #include -#include #include +#include #include + +// STL headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h index 5c263c1873..12b8286cb7 100644 --- a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h +++ b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyGraphics, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef IDENTIFY_GRAPHICS_H #define IDENTIFY_GRAPHICS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime class GraphicsOverlay; } -#include - class IdentifyGraphics : public QQuickItem { Q_OBJECT @@ -55,4 +56,3 @@ class IdentifyGraphics : public QQuickItem }; #endif // IDENTIFY_GRAPHICS_H - diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.pro b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.pro index 752693bd11..312382f107 100644 --- a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.pro +++ b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.qml b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.qml index d276772594..e86514720f 100644 --- a/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.qml +++ b/CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.qml @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyGraphics, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/IdentifyGraphics/main.cpp b/CppSamples/DisplayInformation/IdentifyGraphics/main.cpp index 12016e2640..1aabf08e8a 100644 --- a/CppSamples/DisplayInformation/IdentifyGraphics/main.cpp +++ b/CppSamples/DisplayInformation/IdentifyGraphics/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "IdentifyGraphics.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "IdentifyGraphics.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.cpp b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.cpp index 1265a8a076..2306473bc1 100644 --- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.cpp +++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Picture_Marker_Symbol, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -18,26 +18,29 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Picture_Marker_Symbol.h" -#include "Map.h" -#include "Point.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" #include "Graphic.h" -#include "Viewpoint.h" -#include "MapQuickView.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" -#include "SpatialReference.h" -#include "PictureMarkerSymbol.h" +#include "GraphicsOverlayListModel.h" +#include "Map.h" +#include "MapQuickView.h" #include "MapTypes.h" #include "MapViewTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Envelope.h" +#include "PictureMarkerSymbol.h" +#include "Point.h" +#include "SpatialReference.h" +#include "Viewpoint.h" -#include +// Qt headers +#include #include +#include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h index eaee0ade88..9113e4cf91 100644 --- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h +++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h @@ -1,12 +1,12 @@ // [WriteFile Name=Picture_Marker_Symbol, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,6 +17,10 @@ #ifndef PICTURE_MARKER_SYMBOL_H #define PICTURE_MARKER_SYMBOL_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,9 +30,6 @@ namespace Esri::ArcGISRuntime class Point; } -#include -#include - class Picture_Marker_Symbol : public QQuickItem { Q_OBJECT diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.pro b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.pro index 106522c81d..23f5b9c605 100644 --- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.pro +++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.qml b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.qml index 9254bcb0fb..e29a1f2e93 100644 --- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.qml +++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Picture_Marker_Symbol, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/Picture_Marker_Symbol/main.cpp b/CppSamples/DisplayInformation/Picture_Marker_Symbol/main.cpp index a0c252b066..6a7fc9026e 100644 --- a/CppSamples/DisplayInformation/Picture_Marker_Symbol/main.cpp +++ b/CppSamples/DisplayInformation/Picture_Marker_Symbol/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "Picture_Marker_Symbol.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Picture_Marker_Symbol.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.cpp b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.cpp index 0b9b19ce33..f0402fadfa 100644 --- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.cpp +++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=QueryFeaturesWithArcadeExpression, Category=DisplayInformation] // [Legal] // Copyright 2022 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. @@ -18,24 +18,27 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "QueryFeaturesWithArcadeExpression.h" -#include "ArcadeEvaluator.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" #include "ArcadeEvaluationResult.h" +#include "ArcadeEvaluator.h" #include "ArcadeExpression.h" #include "CalloutData.h" +#include "ExpressionTypes.h" +#include "IdentifyLayerResult.h" +#include "Layer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "Point.h" -#include "PortalItem.h" #include "MapTypes.h" +#include "Point.h" #include "Portal.h" -#include "LayerListModel.h" -#include "IdentifyLayerResult.h" -#include "ArcGISFeature.h" -#include "ExpressionTypes.h" -#include "Layer.h" +#include "PortalItem.h" +// Qt headers #include #include #include diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h index 76b18d3fcb..ab2576b5bb 100644 --- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h +++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h @@ -1,12 +1,12 @@ // [WriteFile Name=QueryFeaturesWithArcadeExpression, Category=DisplayInformation] // [Legal] // Copyright 2022 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. @@ -17,8 +17,12 @@ #ifndef QUERYFEATURESWITHARCADEEXPRESSION_H #define QUERYFEATURESWITHARCADEEXPRESSION_H +// ArcGIS Maps SDK headers #include "Point.h" +// Qt headers +#include + namespace Esri::ArcGISRuntime { class ArcGISFeature; @@ -28,8 +32,6 @@ class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class QueryFeaturesWithArcadeExpression : public QObject diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.pro b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.pro index 73ae40ff2f..1920791f95 100644 --- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.pro +++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = QueryFeaturesWithArcadeExpression -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qml b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qml index 0e009bc295..85e0090dbb 100644 --- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qml +++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qml @@ -1,12 +1,12 @@ // [WriteFile Name=QueryFeaturesWithArcadeExpression, Category=DisplayInformation] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/main.cpp b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/main.cpp index 66f2dd41de..e0bb6ecf1f 100644 --- a/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/main.cpp +++ b/CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/main.cpp @@ -1,31 +1,38 @@ +// [Legal] // Copyright 2022 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 "QueryFeaturesWithArcadeExpression.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Esri/ArcGISRuntime/Toolkit/register.h" - int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); @@ -65,7 +72,6 @@ int main(int argc, char *argv[]) // Add the import Path engine.addImportPath(QDir(QCoreApplication::applicationDirPath()).filePath("qml")); - #ifdef ARCGIS_RUNTIME_IMPORT_PATH_2 engine.addImportPath(ARCGIS_RUNTIME_IMPORT_PATH_2); #endif diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp index 60a22552d4..069970260e 100644 --- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp +++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ReadSymbolsFromMobileStyle, Category=DisplayInformation] // [Legal] // Copyright 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. @@ -18,33 +18,36 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ReadSymbolsFromMobileStyle.h" +#include "SymbolImageProvider.h" +// ArcGIS Maps SDK headers +#include "Error.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "GraphicsOverlay.h" -#include "Graphic.h" -#include "SymbolStyle.h" +#include "MapTypes.h" +#include "MultilayerPointSymbol.h" #include "MultilayerSymbol.h" #include "Point.h" -#include "MultilayerPointSymbol.h" -#include "SymbolImageProvider.h" -#include "SymbolStyleSearchResultListModel.h" -#include "MapTypes.h" -#include "Error.h" -#include "SymbolStyleSearchParameters.h" -#include "SymbolLayerListModel.h" #include "SymbolLayer.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" +#include "SymbolLayerListModel.h" +#include "SymbolStyle.h" +#include "SymbolStyleSearchParameters.h" #include "SymbolStyleSearchResult.h" +#include "SymbolStyleSearchResultListModel.h" +// Qt headers #include #include #include +#include #include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h index 41cc2d8d83..76076c813f 100644 --- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h +++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h @@ -1,12 +1,12 @@ // [WriteFile Name=ReadSymbolsFromMobileStyle, Category=DisplayInformation] // [Legal] // Copyright 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. @@ -17,6 +17,14 @@ #ifndef READSYMBOLSFROMMOBILESTYLE_H #define READSYMBOLSFROMMOBILESTYLE_H +// Qt headers +#include +#include +#include +#include +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -29,13 +37,6 @@ class SymbolStyleSearchResultListModel; class SymbolImageProvider; class QAbstractListModel; -#include -#include -#include -#include -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("SymbolStyleSearchResultListModel.h") diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.pro b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.pro index 465e2c913b..cfc8c60aa0 100644 --- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.pro +++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ReadSymbolsFromMobileStyle -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qml b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qml index a064824e8f..acb8e2c80c 100644 --- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qml +++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ReadSymbolsFromMobileStyle, Category=DisplayInformation] // [Legal] // Copyright 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. diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolComboBox.qml b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolComboBox.qml index e414a5a59c..5f8361ff94 100644 --- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolComboBox.qml +++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolComboBox.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ReadSymbolsFromMobileStyle, Category=DisplayInformation] // [Legal] // Copyright 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. diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp index 87b540b731..1c33cf3134 100644 --- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp +++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp @@ -1,18 +1,22 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "SymbolImageProvider.h" +// Qt headers #include SymbolImageProvider::SymbolImageProvider() : diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h index 621d4d557f..0c92d0b464 100644 --- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h +++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h @@ -1,4 +1,17 @@ +// [Legal] // Copyright 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. +// [Legal] // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/main.cpp b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/main.cpp index 855f8b6bba..a5054c508f 100644 --- a/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/main.cpp +++ b/CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "ReadSymbolsFromMobileStyle.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.cpp b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.cpp index 8c2f7c0313..373830542f 100644 --- a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.cpp +++ b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ShowCallout, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -18,16 +18,20 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ShowCallout.h" +// ArcGIS Maps SDK headers +#include "CalloutData.h" #include "Map.h" #include "MapQuickView.h" -#include "CalloutData.h" #include "MapTypes.h" #include "MapViewTypes.h" -#include "SpatialReference.h" #include "Point.h" +#include "SpatialReference.h" #include "Viewpoint.h" + +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.h b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.h index 4261aeb7aa..c9820731c6 100644 --- a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.h +++ b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.h @@ -1,12 +1,12 @@ // [WriteFile Name=ShowCallout, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef SHOWCALLOUT_H #define SHOWCALLOUT_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class ShowCallout : public QQuickItem { Q_OBJECT diff --git a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.pro b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.pro index 8ffd0bc448..bf89180778 100644 --- a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.pro +++ b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.qml b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.qml index 089cd8fc13..334a703565 100644 --- a/CppSamples/DisplayInformation/ShowCallout/ShowCallout.qml +++ b/CppSamples/DisplayInformation/ShowCallout/ShowCallout.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ShowCallout, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/ShowCallout/main.cpp b/CppSamples/DisplayInformation/ShowCallout/main.cpp index 804ce2c72a..aa5ac85aac 100644 --- a/CppSamples/DisplayInformation/ShowCallout/main.cpp +++ b/CppSamples/DisplayInformation/ShowCallout/main.cpp @@ -1,31 +1,39 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "ShowCallout.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Other headers #include "Esri/ArcGISRuntime/Toolkit/register.h" -#include "ArcGISRuntimeEnvironment.h" +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ShowCallout.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/DisplayGrid/Info.plist b/CppSamples/DisplayInformation/ShowGrid/Info.plist similarity index 92% rename from CppSamples/DisplayInformation/DisplayGrid/Info.plist rename to CppSamples/DisplayInformation/ShowGrid/Info.plist index 5e8b024576..d2ddec78f1 100644 --- a/CppSamples/DisplayInformation/DisplayGrid/Info.plist +++ b/CppSamples/DisplayInformation/ShowGrid/Info.plist @@ -3,9 +3,9 @@ CFBundleDisplayName - DisplayGrid + ShowGrid CFBundleExecutable - DisplayGrid + ShowGrid CFBundleGetInfoString ArcGIS CFBundleIcons~ipad @@ -48,8 +48,8 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UILaunchStoryboardName - LaunchScreen + UILaunchStoryboardName + LaunchScreen diff --git a/CppSamples/DisplayInformation/ShowGrid/README.md b/CppSamples/DisplayInformation/ShowGrid/README.md new file mode 100644 index 0000000000..18568020a2 --- /dev/null +++ b/CppSamples/DisplayInformation/ShowGrid/README.md @@ -0,0 +1,40 @@ +# Show grid + +Display and customize coordinate system grids including Latitude/Longitude, MGRS, UTM and USNG on a map view or scene view. + +![](screenshot.png) + +## Use case + +Grids are often used on printed maps, but can also be helpful on digital 2D maps or 3D scenes, to identify locations. + +## How to use the sample + +Tap on the `Change Grid` button in the toolbar to open a settings view. You can change the view from 2D or 3D, select the type of grid from `Grid Type` (LatLong, MGRS, UTM, and USNG) and modify its properties like label visibility, grid line color, grid label color, and label formatting. + +## How it works + +1. Create an instance of one of the `Grid` types. +2. Grid lines and labels can be styled per grid level with `setLineSymbol(gridLevel, lineSymbol)` and `setTextSymbol(gridLevel, textSymbol)` methods on the grid. +3. The label position can be set with `setLabelPosition(labelPosition)` method on the grid. + * Note that as of 200.6, MGRS, UTM, and USNG grids in a SceneView only support the `Geographic` label position. +4. For the `LatitudeLongitudeGrid` type, you can specify a label format of `DECIMAL_DEGREES` or `DEGREES_MINUTES_SECONDS`. +5. To set the grid, use the `setGrid(grid)` method on the map view or scene view. + +## Relevant API + +* ArcGISGrid +* LatitudeLongitudeGrid +* LatitudeLongitudeGridLabelFormat::DecimalDegrees +* LatitudeLongitudeGridLabelFormat::DegreesMinutesSeconds +* MapView +* MGRSGrid +* SceneView +* SimpleLineSymbol +* TextSymbol +* USNGGrid +* UTMGrid + +## Tags + +coordinates, degrees, graticule, grid, latitude, longitude, MGRS, minutes, seconds, USNG, UTM diff --git a/CppSamples/DisplayInformation/DisplayGrid/README.metadata.json b/CppSamples/DisplayInformation/ShowGrid/README.metadata.json similarity index 78% rename from CppSamples/DisplayInformation/DisplayGrid/README.metadata.json rename to CppSamples/DisplayInformation/ShowGrid/README.metadata.json index bb372c6023..b0cdd37438 100644 --- a/CppSamples/DisplayInformation/DisplayGrid/README.metadata.json +++ b/CppSamples/DisplayInformation/ShowGrid/README.metadata.json @@ -1,6 +1,6 @@ { "category": "Display information", - "description": "Display coordinate system grids including Latitude/Longitude, MGRS, UTM and USNG on a map view. Also, toggle label visibility and change the color of grid lines and grid labels.", + "description": "Display and customize coordinate system grids including Latitude/Longitude, MGRS, UTM and USNG on a map view or scene view.", "featured": false, "ignore": false, "images": [ @@ -25,6 +25,7 @@ "MGRSGrid", "MapView", "SimpleLineSymbol", + "SceneView", "TextSymbol", "USNGGrid", "UTMGrid" @@ -40,14 +41,15 @@ "MGRSGrid", "MapView", "SimpleLineSymbol", + "SceneView", "TextSymbol", "USNGGrid", "UTMGrid" ], "snippets": [ - "DisplayGrid.cpp", - "DisplayGrid.h", - "DisplayGrid.qml" + "ShowGrid.cpp", + "ShowGrid.h", + "ShowGrid.qml" ], - "title": "Display a grid" + "title": "Show grid" } diff --git a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.cpp b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.cpp new file mode 100644 index 0000000000..73d86ad5e7 --- /dev/null +++ b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.cpp @@ -0,0 +1,266 @@ +// [WriteFile Name=ShowGrid, Category=DisplayInformation] +// [Legal] +// Copyright 2024 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] + +#ifdef PCH_BUILD +#include "pch.hpp" +#endif // PCH_BUILD + +#include "ShowGrid.h" + +#include "ArcGISTiledElevationSource.h" +#include "ElevationSourceListModel.h" +#include "LatitudeLongitudeGrid.h" +#include "Map.h" +#include "MapTypes.h" +#include "MapQuickView.h" +#include "MapViewTypes.h" +#include "MGRSGrid.h" +#include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "SimpleLineSymbol.h" +#include "SpatialReference.h" +#include "Surface.h" +#include "TextSymbol.h" +#include "USNGGrid.h" +#include "UTMGrid.h" +#include "Viewpoint.h" + +#include + +using namespace Esri::ArcGISRuntime; + +ShowGrid::ShowGrid(QObject* parent /* = nullptr */): + QObject(parent), + m_map(new Map(BasemapStyle::ArcGISImagery, this)), + m_scene(new Scene(BasemapStyle::ArcGISImagery, this)) +{ + // create a new elevation source from Terrain3D REST service + ArcGISTiledElevationSource* elevationSource = new ArcGISTiledElevationSource( + QUrl("https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer"), this); + + // add the elevation source to the scene to display elevation + m_scene->baseSurface()->elevationSources()->append(elevationSource); + + // Set the sample's initial GeoView type to MapView + m_currentViewType = s_mapView; + + // Set the initial viewpoint of the map + constexpr double targetScale = 6450785; + m_map->setInitialViewpoint(Viewpoint(Point(-10336141.70018318, 5418213.05332071, SpatialReference::webMercator()), targetScale)); + + // Set the intial grid to LatitudeLongitudeGrid + m_grid = new LatitudeLongitudeGrid(this); +} + +ShowGrid::~ShowGrid() = default; + +void ShowGrid::init() +{ + // Register classes for QML + qmlRegisterType("Esri.Samples", 1, 0, "MapView"); + qmlRegisterType("Esri.Samples", 1, 0, "SceneView"); + qmlRegisterType("Esri.Samples", 1, 0, "ShowGridSample"); +} + +MapQuickView* ShowGrid::mapView() const +{ + return m_mapView; +} + +// Set the view (created in QML) +void ShowGrid::setMapView(MapQuickView* mapView) +{ + if (!mapView || mapView == m_mapView) + return; + + m_mapView = mapView; + m_mapView->setMap(m_map); + + m_mapView->setGrid(m_grid); + + emit mapViewChanged(); +} + +SceneQuickView* ShowGrid::sceneView() const +{ + return m_sceneView; +} + +// Set the view (created in QML) +void ShowGrid::setSceneView(SceneQuickView* sceneView) +{ + if (!sceneView || sceneView == m_sceneView) + return; + + m_sceneView = sceneView; + m_sceneView->setArcGISScene(m_scene); + + // Set the SceneView initially to be invisible + m_sceneView->setVisible(false); + + emit sceneViewChanged(); +} + + +void ShowGrid::setViewType(const QString& viewType) +{ + if (m_currentViewType == viewType) + return; + + m_currentViewType = viewType; + + // MapView and SceneView share the same inherited class GeoView + GeoView* newGeoView = viewType == s_mapView ? dynamic_cast(m_mapView) : dynamic_cast(m_sceneView); + GeoView* oldGeoView = viewType != s_mapView ? dynamic_cast(m_mapView) : dynamic_cast(m_sceneView); + + // Set the viewpoint of the new view to the current viewpoint of the old view + newGeoView->setViewpointAsync(oldGeoView->currentViewpoint(ViewpointType::BoundingGeometry), 0); + + // The Grid cannot be shared between a MapView and a SceneView so we need to unset it first + oldGeoView->setGrid(nullptr); + newGeoView->setGrid(m_grid); + + emit viewTypeChanged(); +} + +void ShowGrid::setGridType(const QString& gridType) +{ + if (m_currentGridType == gridType) + return; + + m_currentGridType = gridType; + + if (m_grid) + { + delete m_grid; + m_grid = nullptr; + } + + // Create a new Grid of the selected type + if (gridType == s_latLong) + m_grid = new LatitudeLongitudeGrid(this); + else if (gridType == s_mgrs) + m_grid = new MGRSGrid(this); + else if (gridType == s_utm) + m_grid = new UTMGrid(this); + else if (gridType == s_usng) + m_grid = new USNGGrid(this); + + // Set the grid on the current view + if (m_currentViewType == s_mapView) + m_mapView->setGrid(m_grid); + else + m_sceneView->setGrid(m_grid); + + // Set properties from current UI values + setGridVisible(m_gridVisible); + setLabelsVisible(m_labelsVisible); + setLineColor(m_currentLineColor); + setLabelColor(m_currentLabelColor); + setLabelPosition(m_currentLabelPosition); + setLabelFormat(m_currentLabelFormat); + + emit gridTypeChanged(); +} + +void ShowGrid::setGridVisible(bool visible) +{ + if (m_grid->isVisible() == visible) + return; + + m_gridVisible = visible; + m_grid->setVisible(visible); + + emit gridVisibleChanged(); +} + +void ShowGrid::setLabelsVisible(bool visible) +{ + if (m_grid->isLabelsVisible() == visible) + return; + + m_labelsVisible = visible; + m_grid->setLabelsVisible(visible); + + emit labelsVisibleChanged(); +} + +void ShowGrid::setLineColor(const QString& lineColor) +{ + m_currentLineColor = lineColor; + + SimpleLineSymbol* lineSymbol = static_cast(m_grid->lineSymbol(0)); + lineSymbol->setColor(lineColor.toLower()); + + // Some grids have multiple levels, in this sample we set the same symbol for all levels + for (int level = 0; level < m_grid->levelCount(); ++level) + m_grid->setLineSymbol(level, lineSymbol); + + emit lineColorChanged(); +} + +void ShowGrid::setLabelColor(const QString& labelColor) +{ + m_currentLabelColor = labelColor; + + TextSymbol* labelSymbol = static_cast(m_grid->textSymbol(0)); + labelSymbol->setColor(labelColor.toLower()); + + // Some grids have multiple levels, in this sample we set the same symbol for all levels + for (int level = 0; level < m_grid->levelCount(); ++level) + m_grid->setTextSymbol(level, labelSymbol); + + emit labelColorChanged(); +} + +void ShowGrid::setLabelPosition(const QString& labelPosition) +{ + m_currentLabelPosition = labelPosition; + + if (labelPosition == s_geographic) + m_grid->setLabelPosition(GridLabelPosition::Geographic); + else if (labelPosition == s_bottomLeft) + m_grid->setLabelPosition(GridLabelPosition::BottomLeft); + else if (labelPosition == s_bottomRight) + m_grid->setLabelPosition(GridLabelPosition::BottomRight); + else if (labelPosition == s_topLeft) + m_grid->setLabelPosition(GridLabelPosition::TopLeft); + else if (labelPosition == s_topRight) + m_grid->setLabelPosition(GridLabelPosition::TopRight); + else if (labelPosition == s_center) + m_grid->setLabelPosition(GridLabelPosition::Center); + else if (labelPosition == s_allSides) + m_grid->setLabelPosition(GridLabelPosition::AllSides); + + emit labelPositionChanged(); +} + +void ShowGrid::setLabelFormat(const QString& labelFormat) +{ + m_currentLabelFormat = labelFormat; + + // Only LatitudeLongitudeGrid supports label formats + if (m_grid->gridType() != GridType::LatitudeLongitudeGrid) + return; + + if (labelFormat == s_decimalDegrees) + static_cast(m_grid)->setLabelFormat(LatitudeLongitudeGridLabelFormat::DecimalDegrees); + else if (labelFormat == s_degreesMinutesSeconds) + static_cast(m_grid)->setLabelFormat(LatitudeLongitudeGridLabelFormat::DegreesMinutesSeconds); + + emit labelFormatChanged(); +} diff --git a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.h b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.h new file mode 100644 index 0000000000..8e9a86d1e4 --- /dev/null +++ b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.h @@ -0,0 +1,140 @@ +// [WriteFile Name=ShowGrid, Category=DisplayInformation] +// [Legal] +// Copyright 2024 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] + +#ifndef SHOWGRID_H +#define SHOWGRID_H + +#include + +namespace Esri::ArcGISRuntime +{ +class Grid; +class Map; +class MapQuickView; +class Scene; +class SceneQuickView; +class SimpleLineSymbol; +class TextSymbol; +} + +Q_MOC_INCLUDE("MapQuickView.h"); +Q_MOC_INCLUDE("SceneQuickView.h"); + +class ShowGrid : public QObject +{ + Q_OBJECT + + Q_PROPERTY(Esri::ArcGISRuntime::MapQuickView* mapView READ mapView WRITE setMapView NOTIFY mapViewChanged) + Q_PROPERTY(Esri::ArcGISRuntime::SceneQuickView* sceneView READ sceneView WRITE setSceneView NOTIFY sceneViewChanged) + Q_PROPERTY(QString currentViewType MEMBER m_currentViewType NOTIFY viewTypeChanged) + Q_PROPERTY(QStringList viewTypes MEMBER m_viewTypes CONSTANT) + Q_PROPERTY(QString currentGridType MEMBER m_currentGridType NOTIFY gridTypeChanged) + Q_PROPERTY(QStringList gridTypes MEMBER m_gridTypes CONSTANT) + Q_PROPERTY(bool gridVisible MEMBER m_gridVisible NOTIFY gridVisibleChanged) + Q_PROPERTY(bool labelsVisible MEMBER m_labelsVisible NOTIFY labelsVisibleChanged) + Q_PROPERTY(QString currentLineColor MEMBER m_currentLineColor NOTIFY lineColorChanged) + Q_PROPERTY(QStringList lineColors MEMBER m_lineColors CONSTANT) + Q_PROPERTY(QString currentLabelColor MEMBER m_currentLabelColor NOTIFY labelColorChanged) + Q_PROPERTY(QStringList labelColors MEMBER m_labelColors CONSTANT) + Q_PROPERTY(QString currentLabelPosition MEMBER m_currentLabelPosition NOTIFY labelPositionChanged) + Q_PROPERTY(QStringList labelFormats MEMBER m_labelFormats CONSTANT) + Q_PROPERTY(QString currentLabelFormat MEMBER m_currentLabelFormat NOTIFY labelFormatChanged) + Q_PROPERTY(QStringList labelPositions MEMBER m_labelPositions CONSTANT) + +public: + explicit ShowGrid(QObject* parent = nullptr); + ~ShowGrid() override; + + static void init(); + + Q_INVOKABLE void setGridVisible(bool visible); + Q_INVOKABLE void setLabelsVisible(bool visible); + Q_INVOKABLE void setViewType(const QString& viewType); + Q_INVOKABLE void setGridType(const QString& gridType); + Q_INVOKABLE void setLineColor(const QString& lineColor); + Q_INVOKABLE void setLabelColor(const QString& labelColor); + Q_INVOKABLE void setLabelPosition(const QString& labelPosition); + Q_INVOKABLE void setLabelFormat(const QString& labelFormat); + +signals: + void mapViewChanged(); + void sceneViewChanged(); + void viewTypeChanged(); + void gridTypeChanged(); + void gridVisibleChanged(); + void labelsVisibleChanged(); + void lineColorChanged(); + void labelColorChanged(); + void labelPositionChanged(); + void labelFormatChanged(); + +private: + // Declare private methods + Esri::ArcGISRuntime::MapQuickView* mapView() const; + void setMapView(Esri::ArcGISRuntime::MapQuickView* mapView); + Esri::ArcGISRuntime::SceneQuickView* sceneView() const; + void setSceneView(Esri::ArcGISRuntime::SceneQuickView* sceneView); + + // Declare private members + Esri::ArcGISRuntime::Grid* m_grid = nullptr; + Esri::ArcGISRuntime::Map* m_map = nullptr; + Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr; + Esri::ArcGISRuntime::Scene* m_scene = nullptr; + Esri::ArcGISRuntime::SceneQuickView* m_sceneView = nullptr; + + // Properties + QString m_currentViewType; + QString m_currentGridType; + bool m_gridVisible = true; + bool m_labelsVisible = true; + QString m_currentLineColor; + QString m_currentLabelColor; + QString m_currentLabelPosition; + QString m_currentLabelFormat; + + // Constants + const QString s_mapView = QStringLiteral("MapView"); + const QString s_sceneView = QStringLiteral("SceneView"); + const QStringList m_viewTypes = {s_mapView, s_sceneView}; + + const QString s_latLong = QStringLiteral("LatLong"); + const QString s_mgrs = QStringLiteral("MGRS"); + const QString s_utm = QStringLiteral("UTM"); + const QString s_usng = QStringLiteral("USNG"); + const QStringList m_gridTypes = {s_latLong, s_mgrs, s_utm, s_usng}; + + const QString s_white = QStringLiteral("White"); + const QString s_red = QStringLiteral("Red"); + const QString s_blue = QStringLiteral("Blue"); + const QString s_black = QStringLiteral("Black"); + const QStringList m_lineColors = {s_white, s_red, s_blue}; + const QStringList m_labelColors = {s_black, s_red, s_blue}; + + const QString s_geographic = QStringLiteral("Geographic"); + const QString s_topLeft = QStringLiteral("Top Left"); + const QString s_topRight = QStringLiteral("Top Right"); + const QString s_bottomLeft = QStringLiteral("Bottom Left"); + const QString s_bottomRight = QStringLiteral("Bottom Right"); + const QString s_center = QStringLiteral("Center"); + const QString s_allSides = QStringLiteral("All sides"); + const QStringList m_labelPositions = {s_geographic, s_topLeft, s_topRight, s_bottomLeft, s_bottomRight, s_center, s_allSides}; + + const QString s_decimalDegrees = QStringLiteral("Decimal Degrees"); + const QString s_degreesMinutesSeconds = QStringLiteral("Degrees Minutes Seconds"); + const QStringList m_labelFormats = {s_decimalDegrees, s_degreesMinutesSeconds}; +}; + +#endif // SHOWGRID_H diff --git a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.pro b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.pro similarity index 79% rename from CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.pro rename to CppSamples/DisplayInformation/ShowGrid/ShowGrid.pro index 9eb1fb5182..3f4851e29e 100644 --- a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.pro +++ b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.pro @@ -1,5 +1,5 @@ #------------------------------------------------- -# Copyright 2015 Esri. +# Copyright 2024 Esri. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,31 +24,39 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app -TARGET = DisplayGrid +TARGET = ShowGrid + +ARCGIS_RUNTIME_VERSION = 200.6.0 +include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- -HEADERS += DisplayGrid.h +HEADERS += \ + ShowGrid.h -SOURCES += main.cpp DisplayGrid.cpp +SOURCES += \ + main.cpp \ + ShowGrid.cpp -RESOURCES += DisplayGrid.qrc +RESOURCES += ShowGrid.qrc #------------------------------------------------------------------------------- win32 { - LIBS += Ole32.lib + LIBS += \ + Ole32.lib } ios { INCLUDEPATH += $$PWD DEPENDPATH += $$PWD - OTHER_FILES += $$PWD/Info.plist + OTHER_FILES += \ + $$PWD/Info.plist QMAKE_INFO_PLIST = $$PWD/Info.plist } @@ -57,4 +65,3 @@ android { INCLUDEPATH += $$PWD DEPENDPATH += $$PWD } - diff --git a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qml b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qml similarity index 66% rename from CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qml rename to CppSamples/DisplayInformation/ShowGrid/ShowGrid.qml index 354d249ab7..e468633a3e 100644 --- a/CppSamples/DisplayInformation/DisplayGrid/DisplayGrid.qml +++ b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qml @@ -1,12 +1,12 @@ -// [WriteFile Name=DisplayGrid, Category=DisplayInformation] +// [WriteFile Name=ShowGrid, Category=DisplayInformation] // [Legal] -// Copyright 2016 Esri. - +// Copyright 2024 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. @@ -19,24 +19,115 @@ import QtQuick.Controls import QtQuick.Layouts import Esri.Samples -DisplayGridSample { - id: displayGrid - clip: true - width: 800 - height: 600 - - property real centerWindowY: (displayGrid.height / 2) - (styleWindow.height / 2) +Item { + id: root + property real centerWindowY: (root.height / 2) - (styleWindow.height / 2) MapView { id: mapQuickView anchors.fill: parent - + visible: gridSample.currentViewType == "MapView" Component.onCompleted: { - // Set the focus on MapView to initially enable keyboard navigation + // Set and keep the focus on SceneView to enable keyboard navigation forceActiveFocus(); } } - mapView: mapQuickView + + SceneView { + id: sceneQuickView + anchors.fill: parent + visible: gridSample.currentViewType == "SceneView" + } + + // Declare the C++ instance which creates the map, scene etc. and supply the views + ShowGridSample { + id: gridSample + mapView: mapQuickView + sceneView: sceneQuickView + + onCurrentViewTypeChanged: { + if (gridSample.currentViewType === "MapView") + mapQuickView.forceActiveFocus(); + else + sceneQuickView.forceActiveFocus(); + } + } + + Row { + id: viewButtonsRow + anchors { + top: parent.top + horizontalCenter: parent.horizontalCenter + topMargin: 5 + } + + spacing: 2 + + Rectangle { + id: mapViewButton + property bool selected: gridSample.currentViewType === "MapView" + + width: 100 + height: 30 + + color: selected ? "#959595" : "#D6D6D6" + radius: 8 + border { + color: selected ? "#7938b6" : "#585858" + width: selected ? 2 : 1 + } + + Text { + anchors.centerIn: parent + text: "Map View" + font.pixelSize: 14 + color: "#474747" + } + + MouseArea { + anchors.fill: parent + onClicked: { + gridSample.setViewType("MapView"); + positionCombo.enabled = true; + } + } + } + + Rectangle { + id: sceneViewButton + property bool selected: gridSample.currentViewType === "SceneView" + + width: 100 + height: 30 + + color: selected ? "#959595" : "#D6D6D6" + radius: 8 + border { + color: selected ? "#7938b6" : "#585858" + width: selected ? 2 : 1 + } + + Text { + anchors.centerIn: parent + text: "Scene View" + font.pixelSize: 14 + color: "#474747" + } + + MouseArea { + anchors.fill: parent + onClicked: { + gridSample.setViewType("SceneView"); + if (gridTypeComboBox.currentText !== "LatLong") { + positionCombo.currentIndex = 0; + positionCombo.enabled = false; + } else { + positionCombo.enabled = true; + } + } + } + } + } // Button to view the styling window Rectangle { @@ -95,7 +186,9 @@ DisplayGridSample { Rectangle { id: styleWindow - anchors.horizontalCenter: parent.horizontalCenter + anchors { + horizontalCenter: parent.horizontalCenter + } y: parent.height // initially display below the page height: childrenRect.height width: childrenRect.width @@ -114,7 +207,7 @@ DisplayGridSample { SequentialAnimation { id: hideAnimation - NumberAnimation { target: styleWindow; property: "y"; to: displayGrid.height; duration: 200 } + NumberAnimation { target: styleWindow; property: "y"; to: root.height; duration: 200 } } GridLayout { @@ -132,8 +225,16 @@ DisplayGridSample { Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10) Layout.rightMargin: 10 Layout.fillWidth: true - model: [latlonGrid, mgrsGrid, utmGrid, usngGrid] - onCurrentTextChanged: changeGrid(currentText) + model: gridSample.gridTypes + onCurrentTextChanged: { + gridSample.setGridType(currentText) + if (currentText !== "LatLong" && gridSample.currentViewType === "SceneView") { + positionCombo.currentIndex = 0; + positionCombo.enabled = false; + } else { + positionCombo.enabled = true; + } + } Component.onCompleted : { for (let i = 0; i < model.length; ++i) { metricsGridTypeComboBox.text = model[i]; @@ -147,30 +248,30 @@ DisplayGridSample { } Text { - text: "Labels visible" Layout.leftMargin: 10 - enabled: gridVisibleSwitch.checked - color: enabled ? "black" : "gray" + text: "Grid visible" } Switch { - id: labelVisibleSwitch + id: gridVisibleSwitch Layout.rightMargin: 10 - checked: true - enabled: gridVisibleSwitch.checked - onCheckedChanged: gridLabelVisibility = checked + checked: gridSample.gridVisible + onCheckedChanged: gridSample.setGridVisible(checked); } Text { + text: "Labels visible" Layout.leftMargin: 10 - text: "Grid visible" + enabled: gridVisibleSwitch.checked + color: enabled ? "black" : "gray" } Switch { - id: gridVisibleSwitch + id: labelVisibleSwitch Layout.rightMargin: 10 - checked: true - onCheckedChanged: gridVisibility = checked + checked: gridSample.labelsVisible + enabled: gridVisibleSwitch.checked + onCheckedChanged: gridSample.setLabelsVisible(checked); } Text { @@ -184,8 +285,8 @@ DisplayGridSample { Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10) Layout.rightMargin: 10 Layout.fillWidth: true - model: ["red", "white", "blue"] - onCurrentTextChanged: currentGridColor = currentText + model: gridSample.lineColors + onCurrentTextChanged: gridSample.setLineColor(currentText); Component.onCompleted : { for (let i = 0; i < model.length; ++i) { colorComboMetrics.text = model[i]; @@ -209,8 +310,8 @@ DisplayGridSample { Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10) Layout.rightMargin: 10 Layout.fillWidth: true - model: ["red", "black", "blue"] - onCurrentTextChanged: currentLabelColor = currentText; + model: gridSample.labelColors + onCurrentTextChanged: gridSample.setLabelColor(currentText); Component.onCompleted : { for (let i = 0; i < model.length; ++i) { colorCombo2Metrics.text = model[i]; @@ -226,6 +327,7 @@ DisplayGridSample { Text { Layout.leftMargin: 10 text: "Label position" + enabled: positionCombo.enabled color: enabled ? "black" : "gray" } @@ -235,8 +337,8 @@ DisplayGridSample { Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10) Layout.rightMargin: 10 Layout.fillWidth: true - model: [geographicPosition, bottomLeftPosition, bottomRightPosition, topLeftPosition, topRightPosition, centerPosition, allSidesPosition] - onCurrentTextChanged: currentLabelPosition = currentText; + model: gridSample.labelPositions + onCurrentTextChanged: gridSample.setLabelPosition(currentText); Component.onCompleted : { for (let i = 0; i < model.length; ++i) { positionComboMetrics.text = model[i]; @@ -252,7 +354,7 @@ DisplayGridSample { Text { Layout.leftMargin: 10 text: "Label format" - enabled: gridTypeComboBox.currentText == latlonGrid + enabled: formatCombo.enabled color: enabled ? "black" : "gray" } @@ -262,9 +364,9 @@ DisplayGridSample { Layout.minimumWidth: modelWidth + leftPadding + rightPadding + (indicator ? indicator.width : 10) Layout.rightMargin: 10 Layout.fillWidth: true - model: [ddFormat, dmsFormat] - enabled: gridTypeComboBox.currentText == latlonGrid - onCurrentTextChanged: currentLabelFormat = currentText; + model: gridSample.labelFormats + enabled: gridSample.currentGridType === "LatLong" + onCurrentTextChanged: gridSample.setLabelFormat(currentText); Component.onCompleted : { for (let i = 0; i < model.length; ++i) { formatComboMetrics.text = model[i]; @@ -307,7 +409,7 @@ DisplayGridSample { onReleased: hideButton.pressed = false onClicked: { background.visible = false; - hideAnimation.restart() + hideAnimation.restart(); } } } diff --git a/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qrc b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qrc new file mode 100644 index 0000000000..91524ad8ed --- /dev/null +++ b/CppSamples/DisplayInformation/ShowGrid/ShowGrid.qrc @@ -0,0 +1,11 @@ + + + README.metadata.json + ShowGrid.qml + ShowGrid.h + ShowGrid.cpp + main.qml + screenshot.png + README.md + + diff --git a/CppSamples/DisplayInformation/ShowGrid/arcgisruntime.pri b/CppSamples/DisplayInformation/ShowGrid/arcgisruntime.pri new file mode 100644 index 0000000000..23b71ebbe0 --- /dev/null +++ b/CppSamples/DisplayInformation/ShowGrid/arcgisruntime.pri @@ -0,0 +1,29 @@ +#------------------------------------------------- +# Copyright 2024 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. +#------------------------------------------------- + +contains(QMAKE_HOST.os, Windows):{ + iniPath = $$(ALLUSERSPROFILE)\EsriRuntimeQt\ArcGIS Runtime SDK for Qt $${ARCGIS_RUNTIME_VERSION}.ini +} +else { + userHome = $$system(echo $HOME) + iniPath = $${userHome}/.config/EsriRuntimeQt/ArcGIS Runtime SDK for Qt $${ARCGIS_RUNTIME_VERSION}.ini +} +iniLine = $$cat($${iniPath}, "lines") +dirPath = $$find(iniLine, "InstallDir") +cleanDirPath = $$replace(dirPath, "InstallDir=", "") +priLocation = $$replace(cleanDirPath, '"', "") +!include($$priLocation/sdk/ideintegration/arcgis_runtime_qml_cpp.pri) { + message("Error. Cannot locate ArcGIS Runtime PRI file") +} diff --git a/CppSamples/DisplayInformation/DisplayGrid/main.cpp b/CppSamples/DisplayInformation/ShowGrid/main.cpp similarity index 57% rename from CppSamples/DisplayInformation/DisplayGrid/main.cpp rename to CppSamples/DisplayInformation/ShowGrid/main.cpp index 3d3781ff9e..65b0deae27 100644 --- a/CppSamples/DisplayInformation/DisplayGrid/main.cpp +++ b/CppSamples/DisplayInformation/ShowGrid/main.cpp @@ -1,36 +1,33 @@ -// Copyright 2015 Esri. - +// Copyright 2024 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. -#include -#include +#include "ShowGrid.h" + +#include "ArcGISRuntimeEnvironment.h" + #include #include -#include +#include +#include #ifdef Q_OS_WIN #include #endif -#include "DisplayGrid.h" -#include "ArcGISRuntimeEnvironment.h" - -#define STRINGIZE(x) #x -#define QUOTE(x) STRINGIZE(x) - int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); - app.setApplicationName(QString("Display Grid")); + app.setApplicationName(QString("ShowGrid")); // Use of ArcGIS location services, such as basemap styles, geocoding, and routing services, // requires an access token. For more information see @@ -50,40 +47,28 @@ int main(int argc, char *argv[]) if (accessToken.isEmpty()) { - qWarning() << "Use of ArcGIS location services, such as the basemap styles service, requires" << - "you to authenticate with an ArcGIS account or set the API Key property."; + qWarning() << "Use of ArcGIS location services, such as the basemap styles service, requires" << + "you to authenticate with an ArcGIS account or set the API Key property."; } else { - Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::setApiKey(accessToken); + Esri::ArcGISRuntime::ArcGISRuntimeEnvironment::setApiKey(accessToken); } // Initialize the sample - DisplayGrid::init(); + ShowGrid::init(); // Initialize application view - QQuickView view; - view.setResizeMode(QQuickView::SizeRootObjectToView); - + QQmlApplicationEngine engine; // Add the import Path - view.engine()->addImportPath(QDir(QCoreApplication::applicationDirPath()).filePath("qml")); - - QString arcGISRuntimeImportPath = QUOTE(ARCGIS_RUNTIME_IMPORT_PATH); + engine.addImportPath(QDir(QCoreApplication::applicationDirPath()).filePath("qml")); - #if defined(LINUX_PLATFORM_REPLACEMENT) - // on some linux platforms the string 'linux' is replaced with 1 - // fix the replacement paths which were created - QString replaceString = QUOTE(LINUX_PLATFORM_REPLACEMENT); - arcGISRuntimeImportPath = arcGISRuntimeImportPath.replace(replaceString, "linux", Qt::CaseSensitive); - #endif - - // Add the Runtime and Extras path - view.engine()->addImportPath(arcGISRuntimeImportPath); +#ifdef ARCGIS_RUNTIME_IMPORT_PATH_2 + engine.addImportPath(ARCGIS_RUNTIME_IMPORT_PATH_2); +#endif // Set the source - view.setSource(QUrl("qrc:/Samples/DisplayInformation/DisplayGrid/DisplayGrid.qml")); - - view.show(); + engine.load(QUrl("qrc:/Samples/DisplayInformation/ShowGrid/main.qml")); return app.exec(); } diff --git a/CppSamples/DisplayInformation/ShowGrid/main.qml b/CppSamples/DisplayInformation/ShowGrid/main.qml new file mode 100644 index 0000000000..8f64dc79b6 --- /dev/null +++ b/CppSamples/DisplayInformation/ShowGrid/main.qml @@ -0,0 +1,25 @@ +// Copyright 2024 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. + +import QtQuick.Controls +import Esri.Samples + +ApplicationWindow { + visible: true + width: 800 + height: 600 + + ShowGrid { + anchors.fill: parent + } +} diff --git a/CppSamples/DisplayInformation/ShowGrid/screenshot.png b/CppSamples/DisplayInformation/ShowGrid/screenshot.png new file mode 100644 index 0000000000000000000000000000000000000000..16b138835b7b5d24e61137e80d8bcd6201a4df80 GIT binary patch literal 313111 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 S_X=5c+{xUWl~LIgFQ2(tBCa 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

    3qP76+@D?NXa);dBjO2 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 V@~Q&UUu*yX002ovPDHLkV1kORtzrNG literal 0 HcmV?d00001 diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp index 3e1f0ddfae..92236d6f3d 100644 --- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp +++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ShowLabelsOnLayers, Category=DisplayInformation] // [Legal] // Copyright 2018 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. @@ -18,25 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ShowLabelsOnLayers.h" +// ArcGIS Maps SDK headers #include "ArcadeLabelExpression.h" +#include "Envelope.h" +#include "Error.h" #include "FeatureLayer.h" #include "LabelDefinition.h" +#include "LabelDefinitionListModel.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "ServiceFeatureTable.h" -#include "TextSymbol.h" #include "MapTypes.h" -#include "Error.h" -#include "LayerListModel.h" -#include "LabelDefinitionListModel.h" -#include "SymbolTypes.h" -#include "Envelope.h" -#include "SpatialReference.h" #include "Point.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "SymbolTypes.h" +#include "TextSymbol.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h index 277f38ab7c..c77e6125c1 100644 --- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h +++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h @@ -1,12 +1,12 @@ // [WriteFile Name=ShowLabelsOnLayers, Category=DisplayInformation] // [Legal] // Copyright 2018 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. @@ -17,6 +17,9 @@ #ifndef SHOWLABELSONLAYERS_H #define SHOWLABELSONLAYERS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ class MapQuickView; class LabelDefinition; } -#include - class ShowLabelsOnLayers : public QQuickItem { Q_OBJECT diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.pro b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.pro index 08536d37d7..de5ddf774e 100644 --- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.pro +++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ShowLabelsOnLayers -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qml b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qml index 72f317b1d4..2f856640c2 100644 --- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qml +++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ShowLabelsOnLayers, Category=DisplayInformation] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/DisplayInformation/ShowLabelsOnLayers/main.cpp b/CppSamples/DisplayInformation/ShowLabelsOnLayers/main.cpp index 86f1da3384..9554c02d20 100644 --- a/CppSamples/DisplayInformation/ShowLabelsOnLayers/main.cpp +++ b/CppSamples/DisplayInformation/ShowLabelsOnLayers/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "ShowLabelsOnLayers.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ShowLabelsOnLayers.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.cpp b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.cpp index a8f0ffdc50..539721b9d6 100644 --- a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.cpp +++ b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ShowPopup, Category=DisplayInformation] // [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. @@ -18,23 +18,24 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ShowPopup.h" +// ArcGIS Maps SDK headers +#include "Error.h" +#include "Feature.h" #include "FeatureLayer.h" +#include "IdentifyLayerResult.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "PopupManager.h" -#include "PopupAttachmentListModel.h" -#include "IdentifyLayerResult.h" -#include "Error.h" #include "MapTypes.h" -#include "LayerListModel.h" -#include "Feature.h" -#include "PopupManager.h" +#include "PopupAttachmentListModel.h" #include "PopupAttachmentManager.h" #include "PopupAttributeListModel.h" -#include "PopupAttachmentListModel.h" +#include "PopupManager.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.h b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.h index de82320694..7169936153 100644 --- a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.h +++ b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.h @@ -1,12 +1,12 @@ // [WriteFile Name=ShowPopup, Category=DisplayInformation] // [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. @@ -17,6 +17,13 @@ #ifndef SHOWPOPUP_H #define SHOWPOPUP_H +// Qt headers +#include +#include +#include +#include +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -27,12 +34,6 @@ class MapQuickView; class PopupManager; } -#include -#include -#include -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("PopupManager.h") diff --git a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.pro b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.pro index a6f0d28437..ae3770d164 100644 --- a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.pro +++ b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ShowPopup -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.qml b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.qml index 8749f113df..98df711b9b 100644 --- a/CppSamples/DisplayInformation/ShowPopup/ShowPopup.qml +++ b/CppSamples/DisplayInformation/ShowPopup/ShowPopup.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ShowPopup, Category=DisplayInformation] // [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. diff --git a/CppSamples/DisplayInformation/ShowPopup/main.cpp b/CppSamples/DisplayInformation/ShowPopup/main.cpp index 7f81092058..b2e0d5ab73 100644 --- a/CppSamples/DisplayInformation/ShowPopup/main.cpp +++ b/CppSamples/DisplayInformation/ShowPopup/main.cpp @@ -1,29 +1,37 @@ +// [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 "ShowPopup.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Esri/ArcGISRuntime/Toolkit/register.h" - int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp index d7394e6b6f..6238bb541d 100644 --- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp +++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Simple_Marker_Symbol, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -18,20 +18,23 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Simple_Marker_Symbol.h" + +// ArcGIS Maps SDK headers #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" -#include "Point.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" +#include "Point.h" #include "SimpleMarkerSymbol.h" #include "SpatialReference.h" -#include "Viewpoint.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "GraphicListModel.h" -#include "GraphicsOverlayListModel.h" #include "SymbolTypes.h" +#include "Viewpoint.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h index c0993735cd..709bbb4734 100644 --- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h +++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h @@ -1,12 +1,12 @@ // [WriteFile Name=Simple_Marker_Symbol, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef SIMPLE_MARKER_SYMBOL_H #define SIMPLE_MARKER_SYMBOL_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime class GraphicsOverlay; } -#include - class Simple_Marker_Symbol : public QQuickItem { Q_OBJECT diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.pro b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.pro index 22bf31e135..ad959383f6 100644 --- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.pro +++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qml b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qml index 875d866a0a..7912e56d2d 100644 --- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qml +++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Simple_Marker_Symbol, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/Simple_Marker_Symbol/main.cpp b/CppSamples/DisplayInformation/Simple_Marker_Symbol/main.cpp index 5e9ff0987f..49e6aa1f0b 100644 --- a/CppSamples/DisplayInformation/Simple_Marker_Symbol/main.cpp +++ b/CppSamples/DisplayInformation/Simple_Marker_Symbol/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "Simple_Marker_Symbol.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Simple_Marker_Symbol.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.cpp b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.cpp index 250dd493dd..d7c6386308 100644 --- a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.cpp +++ b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Simple_Renderer, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -18,23 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Simple_Renderer.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "Point.h" -#include "GraphicsOverlay.h" -#include "Graphic.h" #include "SimpleMarkerSymbol.h" #include "SimpleRenderer.h" #include "SpatialReference.h" -#include "MapViewTypes.h" -#include "MapTypes.h" #include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Envelope.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h index 06eee6e6ff..83d946020e 100644 --- a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h +++ b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=Simple_Renderer, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef SIMPLE_RENDERER_H #define SIMPLE_RENDERER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class Point; } -#include - class Simple_Renderer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.pro b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.pro index 0c0544ec6b..7474afc07b 100644 --- a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.pro +++ b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.qml b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.qml index c2ff9237c6..56aad6b9d4 100644 --- a/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.qml +++ b/CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Simple_Renderer, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/Simple_Renderer/main.cpp b/CppSamples/DisplayInformation/Simple_Renderer/main.cpp index bc5faa6a70..61faa7b4fe 100644 --- a/CppSamples/DisplayInformation/Simple_Renderer/main.cpp +++ b/CppSamples/DisplayInformation/Simple_Renderer/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "Simple_Renderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Simple_Renderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchEditorButton.qml b/CppSamples/DisplayInformation/SketchOnMap/SketchEditorButton.qml index 2502549105..58efdd12b9 100644 --- a/CppSamples/DisplayInformation/SketchOnMap/SketchEditorButton.qml +++ b/CppSamples/DisplayInformation/SketchOnMap/SketchEditorButton.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SketchOnMap, Category=DisplayInformation] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.cpp b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.cpp index 8ee80ca643..8bec7686aa 100644 --- a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.cpp +++ b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SketchOnMap, Category=DisplayInformation] // [Legal] // Copyright 2021 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. @@ -18,25 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SketchOnMap.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "SimpleFillSymbol.h" -#include "SimpleMarkerSymbol.h" -#include "SketchEditor.h" #include "MapTypes.h" -#include "GraphicsOverlayListModel.h" #include "MapViewTypes.h" -#include "GraphicListModel.h" -#include "SymbolTypes.h" -#include "GraphicsOverlay.h" -#include "SpatialReference.h" #include "Point.h" +#include "SimpleFillSymbol.h" #include "SimpleLineSymbol.h" -#include "Envelope.h" -#include "Graphic.h" +#include "SimpleMarkerSymbol.h" +#include "SketchEditor.h" +#include "SpatialReference.h" +#include "SymbolTypes.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h index e076032dc6..36fbf79a90 100644 --- a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h +++ b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h @@ -1,12 +1,12 @@ // [WriteFile Name=SketchOnMap, Category=DisplayInformation] // [Legal] // Copyright 2021 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. @@ -17,6 +17,9 @@ #ifndef SKETCHONMAP_H #define SKETCHONMAP_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -29,8 +32,6 @@ class SimpleLineSymbol; class SimpleFillSymbol; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class SketchOnMap : public QObject diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.pro b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.pro index b4c3d0d5ff..0b8788775c 100644 --- a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.pro +++ b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = SketchOnMap -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.qml b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.qml index 3822989fea..40133de126 100644 --- a/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.qml +++ b/CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SketchOnMap, Category=DisplayInformation] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/DisplayInformation/SketchOnMap/main.cpp b/CppSamples/DisplayInformation/SketchOnMap/main.cpp index ded654a372..4cbcf5d9a2 100644 --- a/CppSamples/DisplayInformation/SketchOnMap/main.cpp +++ b/CppSamples/DisplayInformation/SketchOnMap/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 2021 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 "SketchOnMap.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.cpp b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.cpp index 66f415453a..9f7a265ec7 100644 --- a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.cpp +++ b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SymbolizeShapefile, Category=DisplayInformation] // [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. @@ -18,25 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SymbolizeShapefile.h" +// ArcGIS Maps SDK headers +#include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "Point.h" #include "ShapefileFeatureTable.h" -#include "FeatureLayer.h" -#include "SimpleRenderer.h" #include "SimpleFillSymbol.h" #include "SimpleLineSymbol.h" -#include "MapTypes.h" -#include "LayerListModel.h" -#include "SymbolTypes.h" +#include "SimpleRenderer.h" #include "SpatialReference.h" -#include "Point.h" +#include "SymbolTypes.h" #include "Viewpoint.h" +// Qt headers +#include #include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h index 46d2b754f8..ad86cc9dd3 100644 --- a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h +++ b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h @@ -1,12 +1,12 @@ // [WriteFile Name=SymbolizeShapefile, Category=DisplayInformation] // [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. @@ -17,6 +17,9 @@ #ifndef SYMBOLIZESHAPEFILE_H #define SYMBOLIZESHAPEFILE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ class MapQuickView; class FeatureLayer; } -#include - class SymbolizeShapefile : public QQuickItem { Q_OBJECT diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.pro b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.pro index c33043e950..55a7aad063 100644 --- a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.pro +++ b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = SymbolizeShapefile -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.qml b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.qml index 469f05dc87..05751e06e1 100644 --- a/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.qml +++ b/CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SymbolizeShapefile, Category=DisplayInformation] // [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. diff --git a/CppSamples/DisplayInformation/SymbolizeShapefile/main.cpp b/CppSamples/DisplayInformation/SymbolizeShapefile/main.cpp index 3d03fd17dc..04a1088ace 100644 --- a/CppSamples/DisplayInformation/SymbolizeShapefile/main.cpp +++ b/CppSamples/DisplayInformation/SymbolizeShapefile/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "SymbolizeShapefile.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "SymbolizeShapefile.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.cpp b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.cpp index a284f31125..fd5010e1c3 100644 --- a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.cpp +++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Unique_Value_Renderer, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -14,35 +14,36 @@ // limitations under the License. // [Legal] - #ifdef PCH_BUILD #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Unique_Value_Renderer.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "Envelope.h" +#include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" +#include "MapTypes.h" #include "ServiceFeatureTable.h" -#include "FeatureLayer.h" -#include "UniqueValueRenderer.h" #include "SimpleFillSymbol.h" -#include "Viewpoint.h" -#include "Envelope.h" -#include "MapTypes.h" -#include "LayerListModel.h" +#include "SimpleLineSymbol.h" +#include "SpatialReference.h" #include "SymbolTypes.h" #include "UniqueValue.h" #include "UniqueValueListModel.h" -#include "SimpleLineSymbol.h" -#include "SpatialReference.h" +#include "UniqueValueRenderer.h" +#include "Viewpoint.h" -#include +// Qt headers #include +#include #include - using namespace Esri::ArcGISRuntime; Unique_Value_Renderer::Unique_Value_Renderer(QQuickItem* parent) : diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h index 99df6c9e28..27b98e0dfb 100644 --- a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h +++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=Unique_Value_Renderer, Category=DisplayInformation] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef UNIQUE_VALUE_RENDERER_H #define UNIQUE_VALUE_RENDERER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -27,8 +30,6 @@ namespace Esri::ArcGISRuntime class SimpleFillSymbol; } -#include - class Unique_Value_Renderer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.pro b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.pro index a5f96c2729..1f5f3c98d5 100644 --- a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.pro +++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.qml b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.qml index f3e2057bf9..f8bd6c75c5 100644 --- a/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.qml +++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Unique_Value_Renderer, Category=DisplayInformation] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/DisplayInformation/Unique_Value_Renderer/main.cpp b/CppSamples/DisplayInformation/Unique_Value_Renderer/main.cpp index 3e12065c3c..40f45ad1d7 100644 --- a/CppSamples/DisplayInformation/Unique_Value_Renderer/main.cpp +++ b/CppSamples/DisplayInformation/Unique_Value_Renderer/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "Unique_Value_Renderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Unique_Value_Renderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.cpp b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.cpp index 857909758d..80fbdc8fbd 100644 --- a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.cpp +++ b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=AddFeaturesFeatureService, Category=EditData] // [Legal] // Copyright 2022 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "AddFeaturesFeatureService.h" +// ArcGIS Maps SDK headers #include "Basemap.h" #include "Feature.h" #include "FeatureEditResult.h" @@ -33,6 +35,7 @@ #include "SpatialReference.h" #include "Viewpoint.h" +// Qt headers #include #include #include diff --git a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h index fb2cbfb81f..cb3df6a055 100644 --- a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h +++ b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h @@ -1,12 +1,12 @@ // [WriteFile Name=AddFeaturesFeatureService, Category=EditData] // [Legal] // Copyright 2022 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. @@ -17,6 +17,9 @@ #ifndef ADDFEATURESFEATURESERVICE_H #define ADDFEATURESFEATURESERVICE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -25,8 +28,6 @@ class MapQuickView; class ServiceFeatureTable; } -#include - Q_MOC_INCLUDE("MapQuickView.h"); class AddFeaturesFeatureService : public QObject diff --git a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.pro b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.pro index 74d8b579cd..b4afd8c897 100644 --- a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.pro +++ b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = AddFeaturesFeatureService -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.qml b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.qml index f6c3a40553..b6457f235e 100644 --- a/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.qml +++ b/CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AddFeaturesFeatureService, Category=EditData] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/EditData/AddFeaturesFeatureService/main.cpp b/CppSamples/EditData/AddFeaturesFeatureService/main.cpp index 1618ad3993..dab94c0da7 100644 --- a/CppSamples/EditData/AddFeaturesFeatureService/main.cpp +++ b/CppSamples/EditData/AddFeaturesFeatureService/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "AddFeaturesFeatureService.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/EditData/ContingentValues/ContingentValues.cpp b/CppSamples/EditData/ContingentValues/ContingentValues.cpp index dd3301d7cb..d8535930a2 100644 --- a/CppSamples/EditData/ContingentValues/ContingentValues.cpp +++ b/CppSamples/EditData/ContingentValues/ContingentValues.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ContingentValues, Category=EditData] // [Legal] // Copyright 2022 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. @@ -18,44 +18,47 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ContingentValues.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" #include "ArcGISVectorTiledLayer.h" +#include "AttributeListModel.h" +#include "Basemap.h" #include "CodedValueDomain.h" #include "ContingentCodedValue.h" #include "ContingentRangeValue.h" #include "ContingentValuesDefinition.h" #include "ContingentValuesResult.h" +#include "FeatureIterator.h" #include "FeatureLayer.h" +#include "FeatureQueryResult.h" #include "Geodatabase.h" #include "GeodatabaseFeatureTable.h" +#include "GeodatabaseTypes.h" #include "GeometryEngine.h" -#include "Map.h" -#include "MapQuickView.h" -#include "SimpleRenderer.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" #include "GraphicsOverlayListModel.h" -#include "SymbolTypes.h" #include "LayerListModel.h" -#include "ArcGISFeature.h" +#include "Map.h" +#include "MapQuickView.h" #include "MapTypes.h" -#include "GeodatabaseTypes.h" -#include "AttributeListModel.h" -#include "GraphicListModel.h" -#include "QueryParameters.h" -#include "FeatureIterator.h" -#include "FeatureQueryResult.h" #include "Point.h" -#include "Basemap.h" -#include "Viewpoint.h" -#include "GraphicsOverlay.h" -#include "SimpleLineSymbol.h" -#include "SimpleFillSymbol.h" #include "Polygon.h" -#include "Graphic.h" +#include "QueryParameters.h" +#include "SimpleFillSymbol.h" +#include "SimpleLineSymbol.h" +#include "SimpleRenderer.h" +#include "SymbolTypes.h" +#include "Viewpoint.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/EditData/ContingentValues/ContingentValues.h b/CppSamples/EditData/ContingentValues/ContingentValues.h index a93de18946..f0621abe8b 100644 --- a/CppSamples/EditData/ContingentValues/ContingentValues.h +++ b/CppSamples/EditData/ContingentValues/ContingentValues.h @@ -1,12 +1,12 @@ // [WriteFile Name=ContingentValues, Category=EditData] // [Legal] // Copyright 2022 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. @@ -17,6 +17,10 @@ #ifndef CONTINGENTVALUES_H #define CONTINGENTVALUES_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class ArcGISFeature; @@ -28,9 +32,6 @@ class Map; class MapQuickView; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class ContingentValues : public QObject diff --git a/CppSamples/EditData/ContingentValues/ContingentValues.pro b/CppSamples/EditData/ContingentValues/ContingentValues.pro index 3a6fee005b..fb6dee4d9c 100644 --- a/CppSamples/EditData/ContingentValues/ContingentValues.pro +++ b/CppSamples/EditData/ContingentValues/ContingentValues.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ContingentValues -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/EditData/ContingentValues/ContingentValues.qml b/CppSamples/EditData/ContingentValues/ContingentValues.qml index 56302338d1..e868e19c02 100644 --- a/CppSamples/EditData/ContingentValues/ContingentValues.qml +++ b/CppSamples/EditData/ContingentValues/ContingentValues.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ContingentValues, Category=EditData] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/EditData/ContingentValues/main.cpp b/CppSamples/EditData/ContingentValues/main.cpp index 2e12ad1483..f1c5e7d590 100644 --- a/CppSamples/EditData/ContingentValues/main.cpp +++ b/CppSamples/EditData/ContingentValues/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "ContingentValues.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.cpp b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.cpp index 65a41df814..de13becbce 100644 --- a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.cpp +++ b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DeleteFeaturesFeatureService, Category=EditData] // [Legal] // Copyright 2016 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. @@ -18,35 +18,40 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DeleteFeaturesFeatureService.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" +#include "AttributeListModel.h" #include "Basemap.h" -#include "Viewpoint.h" -#include "Point.h" -#include "SpatialReference.h" -#include "ServiceFeatureTable.h" -#include "FeatureLayer.h" +#include "CalloutData.h" +#include "Envelope.h" #include "Feature.h" -#include "ArcGISFeature.h" #include "FeatureEditResult.h" +#include "FeatureIterator.h" +#include "FeatureLayer.h" #include "FeatureQueryResult.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "LayerListModel.h" #include "IdentifyLayerResult.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" +#include "Point.h" #include "QueryParameters.h" -#include "AttributeListModel.h" -#include "FeatureIterator.h" -#include "CalloutData.h" -#include "Envelope.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "Viewpoint.h" +// Qt headers #include -#include -#include #include #include +#include +#include + +// STL headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h index 5c677b99e1..69abb25ad4 100644 --- a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h +++ b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h @@ -1,12 +1,12 @@ // [WriteFile Name=DeleteFeaturesFeatureService, Category=EditData] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef DELETE_FEATURES_FEATURE_SERVICE_H #define DELETE_FEATURES_FEATURE_SERVICE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -30,8 +33,6 @@ namespace Esri::ArcGISRuntime class QString; -#include - class DeleteFeaturesFeatureService : public QQuickItem { Q_OBJECT @@ -62,4 +63,3 @@ class DeleteFeaturesFeatureService : public QQuickItem }; #endif // DELETE_FEATURES_FEATURE_SERVICE_H - diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.pro b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.pro index 1d73f1e82b..31c2090169 100644 --- a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.pro +++ b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.qml b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.qml index ac258a5b4e..8bd18df183 100644 --- a/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.qml +++ b/CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DeleteFeaturesFeatureService, Category=EditData] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/EditData/DeleteFeaturesFeatureService/main.cpp b/CppSamples/EditData/DeleteFeaturesFeatureService/main.cpp index 11951dd7f1..d827e26509 100644 --- a/CppSamples/EditData/DeleteFeaturesFeatureService/main.cpp +++ b/CppSamples/EditData/DeleteFeaturesFeatureService/main.cpp @@ -1,32 +1,40 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "DeleteFeaturesFeatureService.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Other headers #include "Esri/ArcGISRuntime/Toolkit/register.h" -#include "ArcGISRuntimeEnvironment.h" +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "DeleteFeaturesFeatureService.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.cpp b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.cpp index b655e454e4..eec24077af 100644 --- a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.cpp +++ b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=EditAndSyncFeatures, Category=EditData] // [Legal] // Copyright 2016 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. @@ -18,40 +18,43 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "EditAndSyncFeatures.h" -#include "Map.h" -#include "MapQuickView.h" -#include "TileCache.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" #include "ArcGISTiledLayer.h" #include "Basemap.h" -#include "Viewpoint.h" #include "Envelope.h" -#include "GenerateGeodatabaseParameters.h" -#include "ServiceFeatureTable.h" +#include "Error.h" #include "FeatureLayer.h" -#include "GeodatabaseSyncTask.h" +#include "GenerateGeodatabaseJob.h" +#include "GenerateGeodatabaseParameters.h" +#include "GenerateLayerOption.h" +#include "Geodatabase.h" #include "GeodatabaseFeatureTable.h" +#include "GeodatabaseSyncTask.h" #include "GeometryEngine.h" -#include "Geodatabase.h" -#include "Point.h" -#include "MapViewTypes.h" -#include "LayerListModel.h" -#include "ArcGISFeature.h" #include "IdentifyLayerResult.h" -#include "GenerateLayerOption.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapViewTypes.h" +#include "Point.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "SyncGeodatabaseJob.h" #include "SyncLayerOption.h" #include "TaskTypes.h" -#include "GenerateGeodatabaseJob.h" -#include "Error.h" -#include "SyncGeodatabaseJob.h" -#include "SpatialReference.h" +#include "TileCache.h" +#include "Viewpoint.h" +// Qt headers #include -#include +#include #include +#include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h index 5eee9b97b8..821e4ee817 100644 --- a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h +++ b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h @@ -1,12 +1,12 @@ // [WriteFile Name=EditAndSyncFeatures, Category=EditData] // [Legal] // Copyright 2016 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. @@ -17,6 +17,16 @@ #ifndef EDITANDSYNCFEATURES_H #define EDITANDSYNCFEATURES_H +// ArcGIS Maps SDK headers +#include "GenerateGeodatabaseParameters.h" +#include "SyncGeodatabaseParameters.h" + +// Qt headers +#include +#include +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -27,14 +37,6 @@ namespace Esri::ArcGISRuntime class Envelope; } -#include "GenerateGeodatabaseParameters.h" -#include "SyncGeodatabaseParameters.h" - -#include -#include -#include -#include - class EditAndSyncFeatures : public QQuickItem { Q_OBJECT diff --git a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.pro b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.pro index 56a1dc8d43..8be5a19044 100644 --- a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.pro +++ b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.qml b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.qml index 833df6eac0..13693e1340 100644 --- a/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.qml +++ b/CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.qml @@ -1,12 +1,12 @@ // [WriteFile Name=EditAndSyncFeatures, Category=EditData] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/EditData/EditAndSyncFeatures/main.cpp b/CppSamples/EditData/EditAndSyncFeatures/main.cpp index 68d7a67573..63060a21db 100644 --- a/CppSamples/EditData/EditAndSyncFeatures/main.cpp +++ b/CppSamples/EditData/EditAndSyncFeatures/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "EditAndSyncFeatures.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "EditAndSyncFeatures.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp index 6674c6d72a..a6a9e95d49 100644 --- a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp +++ b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=EditFeatureAttachments, Category=EditData] // [Legal] // Copyright 2016 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. @@ -18,38 +18,41 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "EditFeatureAttachments.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" +#include "Attachment.h" +#include "AttachmentListModel.h" +#include "AttributeListModel.h" #include "Basemap.h" -#include "Viewpoint.h" -#include "Point.h" -#include "SpatialReference.h" -#include "ServiceFeatureTable.h" -#include "FeatureLayer.h" +#include "CalloutData.h" +#include "Envelope.h" +#include "Error.h" #include "Feature.h" -#include "ArcGISFeature.h" #include "FeatureEditResult.h" +#include "FeatureIterator.h" +#include "FeatureLayer.h" #include "FeatureQueryResult.h" -#include "AttachmentListModel.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "LayerListModel.h" #include "IdentifyLayerResult.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" +#include "Point.h" #include "QueryParameters.h" -#include "AttributeListModel.h" -#include "FeatureIterator.h" -#include "CalloutData.h" -#include "Error.h" -#include "Attachment.h" -#include "Envelope.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "Viewpoint.h" -#include -#include -#include +// Qt headers #include #include +#include +#include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h index 536a453975..b7394ce675 100644 --- a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h +++ b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h @@ -1,12 +1,12 @@ // [WriteFile Name=EditFeatureAttachments, Category=EditData] // [Legal] // Copyright 2016 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. @@ -17,6 +17,11 @@ #ifndef EDIT_FEATURE_ATTACHMENTS_H #define EDIT_FEATURE_ATTACHMENTS_H +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class CalloutData; @@ -32,10 +37,6 @@ namespace Esri::ArcGISRuntime class QString; -#include -#include -#include - class EditFeatureAttachments : public QQuickItem { Q_OBJECT @@ -75,4 +76,3 @@ class EditFeatureAttachments : public QQuickItem }; #endif // EDIT_FEATURE_ATTACHMENTS_H - diff --git a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.pro b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.pro index 33e44ba6ca..0ff4329a7f 100644 --- a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.pro +++ b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.qml b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.qml index 39744dd519..6b4234185b 100644 --- a/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.qml +++ b/CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.qml @@ -1,12 +1,12 @@ // [WriteFile Name=EditFeatureAttachments, Category=EditData] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/EditData/EditFeatureAttachments/main.cpp b/CppSamples/EditData/EditFeatureAttachments/main.cpp index bd172b417f..eba10bb4b4 100644 --- a/CppSamples/EditData/EditFeatureAttachments/main.cpp +++ b/CppSamples/EditData/EditFeatureAttachments/main.cpp @@ -1,33 +1,41 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "EditFeatureAttachments.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include -#include +#include #include +#include +#include +#include +// Other headers #include "Esri/ArcGISRuntime/Toolkit/register.h" -#include "ArcGISRuntimeEnvironment.h" +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "EditFeatureAttachments.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.cpp b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.cpp index ae20887fc2..5390935efb 100644 --- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.cpp +++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=EditFeaturesWithFeatureLinkedAnnotation, Category=EditData] // [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. @@ -18,42 +18,44 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "EditFeaturesWithFeatureLinkedAnnotation.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Geodatabase.h" +// ArcGIS Maps SDK headers #include "AnnotationLayer.h" +#include "AttributeListModel.h" +#include "Feature.h" #include "FeatureLayer.h" -#include "AnnotationLayer.h" +#include "GeoElement.h" +#include "Geodatabase.h" #include "GeodatabaseFeatureTable.h" #include "GeometryEngine.h" -#include "PolylineBuilder.h" -#include "PartCollection.h" -#include "MapTypes.h" -#include "LayerListModel.h" #include "IdentifyLayerResult.h" -#include "GeoElement.h" -#include "Feature.h" -#include "ImmutablePartCollection.h" #include "ImmutablePart.h" -#include "AttributeListModel.h" -#include "ProximityResult.h" +#include "ImmutablePartCollection.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "Part.h" -#include "Viewpoint.h" +#include "PartCollection.h" #include "Polyline.h" +#include "PolylineBuilder.h" +#include "ProximityResult.h" #include "SpatialReference.h" +#include "Viewpoint.h" // Qt headers +#include #include +#include #include -#include -#include #include #include +#include +// STL headers #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h index de39c69ba9..4d1bad11e6 100644 --- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h +++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h @@ -1,12 +1,12 @@ // [WriteFile Name=EditFeaturesWithFeatureLinkedAnnotation, Category=EditData] // [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. @@ -17,6 +17,16 @@ #ifndef EDITFEATURESWITHFEATURELINKEDANNOTATION_H #define EDITFEATURESWITHFEATURELINKEDANNOTATION_H +// ArcGIS Maps SDK headers +#include "Error.h" +#include "Point.h" + +// Qt headers +#include +#include +#include +#include + namespace Esri::ArcGISRuntime { class AnnotationLayer; @@ -28,14 +38,6 @@ class Map; class MapQuickView; } -#include -#include -#include -#include - -#include "Point.h" -#include "Error.h" - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("IdentifyLayerResult.h") diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.pro b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.pro index 2dade24657..6034343add 100644 --- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.pro +++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = EditFeaturesWithFeatureLinkedAnnotation -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.qml b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.qml index 9f1f2009bb..0996a36ff1 100644 --- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.qml +++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.qml @@ -1,12 +1,12 @@ // [WriteFile Name=EditFeaturesWithFeatureLinkedAnnotation, Category=EditData] // [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. diff --git a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/main.cpp b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/main.cpp index 99679e1c83..b1cbc4281f 100644 --- a/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/main.cpp +++ b/CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/main.cpp @@ -1,23 +1,30 @@ +// [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 "EditFeaturesWithFeatureLinkedAnnotation.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.cpp b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.cpp index a17ab70419..d1ad315426 100644 --- a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.cpp +++ b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=EditKmlGroundOverlay, Category=EditData] // [Legal] // Copyright 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. @@ -18,25 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "EditKmlGroundOverlay.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "KmlLayer.h" -#include "KmlGroundOverlay.h" -#include "KmlDataset.h" -#include "KmlIcon.h" -#include "Envelope.h" +// ArcGIS Maps SDK headers #include "Camera.h" -#include "MapTypes.h" +#include "Envelope.h" #include "Error.h" +#include "KmlDataset.h" +#include "KmlGroundOverlay.h" +#include "KmlIcon.h" +#include "KmlLayer.h" #include "LayerListModel.h" -#include "SpatialReference.h" +#include "MapTypes.h" #include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "SpatialReference.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; @@ -124,4 +127,3 @@ void EditKmlGroundOverlay::setSceneView(SceneQuickView* sceneView) emit sceneViewChanged(); } - diff --git a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h index bfdf7e8b9d..32a74c4ebf 100644 --- a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h +++ b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h @@ -1,12 +1,12 @@ // [WriteFile Name=EditKmlGroundOverlay, Category=EditData] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef EDITKMLGROUNDOVERLAY_H #define EDITKMLGROUNDOVERLAY_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -24,8 +27,6 @@ class SceneQuickView; class KmlGroundOverlay; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class EditKmlGroundOverlay : public QObject diff --git a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.pro b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.pro index 7aea72c41b..e9ea4db9ae 100644 --- a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.pro +++ b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = EditKmlGroundOverlay -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.qml b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.qml index 9f69cba0e1..5e55bdee94 100644 --- a/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.qml +++ b/CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.qml @@ -1,12 +1,12 @@ // [WriteFile Name=EditKmlGroundOverlay, Category=EditData] // [Legal] // Copyright 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. diff --git a/CppSamples/EditData/EditKmlGroundOverlay/main.cpp b/CppSamples/EditData/EditKmlGroundOverlay/main.cpp index 006e610aee..07448decd8 100644 --- a/CppSamples/EditData/EditKmlGroundOverlay/main.cpp +++ b/CppSamples/EditData/EditKmlGroundOverlay/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "EditKmlGroundOverlay.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.cpp b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.cpp index b326d65ff1..bca2df2efd 100644 --- a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.cpp +++ b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=EditWithBranchVersioning, Category=EditData] // [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. @@ -18,33 +18,36 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "EditWithBranchVersioning.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" +#include "AttributeListModel.h" #include "AuthenticationManager.h" +#include "CalloutData.h" +#include "Credential.h" +#include "Envelope.h" #include "ErrorException.h" #include "FeatureEditResult.h" #include "FeatureLayer.h" #include "FeatureTableEditResult.h" +#include "IdentifyLayerResult.h" #include "Layer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "Point.h" +#include "Polyline.h" #include "ServiceFeatureTable.h" #include "ServiceGeodatabase.h" +#include "ServiceTypes.h" #include "ServiceVersionInfo.h" #include "ServiceVersionParameters.h" -#include "MapTypes.h" -#include "Credential.h" -#include "IdentifyLayerResult.h" -#include "ArcGISFeature.h" -#include "AttributeListModel.h" -#include "CalloutData.h" -#include "LayerListModel.h" -#include "ServiceTypes.h" -#include "Point.h" -#include "Envelope.h" -#include "Polyline.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h index 2479429138..ae16fa41c2 100644 --- a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h +++ b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h @@ -1,12 +1,12 @@ // [WriteFile Name=EditWithBranchVersioning, Category=EditData] // [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. @@ -17,6 +17,14 @@ #ifndef EDITWITHBRANCHVERSIONING_H #define EDITWITHBRANCHVERSIONING_H +// ArcGIS Maps SDK headers +#include "Error.h" + +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class AuthenticationManager; @@ -35,12 +43,6 @@ class ErrorException; class FeatureTableEditResult; } -#include "Error.h" - -#include -#include -#include - Q_MOC_INCLUDE("AuthenticationManager.h") Q_MOC_INCLUDE("MapQuickView.h") diff --git a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.pro b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.pro index 8bf84892be..cc8416ab6b 100644 --- a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.pro +++ b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = EditWithBranchVersioning -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TOOLKIT_PRI_PATH = $$PWD/../../../arcgis-maps-sdk-toolkit-qt diff --git a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.qml b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.qml index 297bc2d06a..020700913e 100644 --- a/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.qml +++ b/CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.qml @@ -1,12 +1,12 @@ // [WriteFile Name=EditWithBranchVersioning, Category=EditData] // [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. diff --git a/CppSamples/EditData/EditWithBranchVersioning/main.cpp b/CppSamples/EditData/EditWithBranchVersioning/main.cpp index a53841b2e4..29941033af 100644 --- a/CppSamples/EditData/EditWithBranchVersioning/main.cpp +++ b/CppSamples/EditData/EditWithBranchVersioning/main.cpp @@ -1,23 +1,30 @@ +// [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 "EditWithBranchVersioning.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/EditData/SnapGeometryEdits/GeometryEditorButton.qml b/CppSamples/EditData/SnapGeometryEdits/GeometryEditorButton.qml index 9216f9b023..834ed8f0f9 100644 --- a/CppSamples/EditData/SnapGeometryEdits/GeometryEditorButton.qml +++ b/CppSamples/EditData/SnapGeometryEdits/GeometryEditorButton.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SnapGeometryEdits, Category=EditData] // [Legal] // Copyright 2024 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. diff --git a/CppSamples/EditData/SnapGeometryEdits/README.md b/CppSamples/EditData/SnapGeometryEdits/README.md index abe60fc6d4..c687b66b64 100644 --- a/CppSamples/EditData/SnapGeometryEdits/README.md +++ b/CppSamples/EditData/SnapGeometryEdits/README.md @@ -12,7 +12,7 @@ A field worker can create new features by editing and snapping the vertices of a To create a geometry, press the create button to choose the geometry type you want to create (i.e. points, multipoints, polyline, or polygon) and interactively tap and drag on the map view to create the geometry. -To configure snapping, press the snap settings button to enable or disable snapping and choose which snap sources to snap to. +Snap settings can be configured by enabling and disabling snapping, feature snapping, geometry guides and snap sources. To interactively snap a vertex to a feature or graphic, ensure that snapping is enabled for the relevant snap source and move the mouse pointer or drag a vertex to nearby an existing feature or graphic. When the pointer is close to that existing geoelement, the edit position will be adjusted to coincide with (or snap to), edges and vertices of its geometry. Click or release the touch pointer to place the vertex at the snapped location. @@ -31,7 +31,8 @@ To save your edits, press the save button. 3. Create a `GeometryEditor` and connect it to the map view. 4. Call `syncSourceSettings` after the map's operational layers are loaded and the geometry editor connected to the map view. 5. Set `SnapSettings.isEnabled` and `SnapSourceSettings.isEnabled` to true for the `SnapSource` of interest. -6. Start the geometry editor with a `GeometryType`. +6. Toggle geometry guides using `SnapSettings.IsGeometryGuidesEnabled` and feature snapping using `SnapSettings.IsFeatureSnappingEnabled`. +7. Start the geometry editor with a `GeometryType`. ## Relevant API @@ -57,6 +58,10 @@ To snap to polygon and polyline layers, the recommended approach is to set the ` Snapping can be used during interactive edits that move existing vertices using the `VertexTool` or `ReticleVertexTool`. When adding new vertices, snapping also works with a hover event (such as a mouse move without a mouse button press). Using the `ReticleVertexTool` to add and move vertices allows users of touch screen devices to clearly see the visual cues for snapping. +Geometry guides are enabled by default when snapping is enabled. These allow for snapping to a point coinciding with, parallel to, perpendicular to or extending an existing geometry. + +On supported platforms haptic feedback on `SnapState::SnappedToFeature` and `SnapState::SnappedToGeometryGuide` is enabled by default when snapping is enabled. Custom haptic feedback can be configured by setting `SnapSettings::isHapticFeedbackEnabled` to false and listening to `GeometryEditor::snapChanged` events to provide specific feedback depending on the `SnapState`. + ## Tags edit, feature, geometry editor, graphics, layers, map, snapping diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp index 8b522f14ac..e0c1e0c1ac 100644 --- a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp +++ b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SnapGeometryEdits, Category=EditData] // [Legal] // Copyright 2024 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. @@ -18,8 +18,11 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SnapGeometryEdits.h" +#include "SnapSourceListModel.h" +// ArcGIS Maps SDK headers #include "FeatureLayer.h" #include "FeatureTable.h" #include "Geometry.h" @@ -43,16 +46,21 @@ #include "SimpleFillSymbol.h" #include "SimpleLineSymbol.h" #include "SimpleMarkerSymbol.h" -#include "SnapGeometryEdits.h" #include "SnapSettings.h" #include "SnapSourceSettings.h" #include "SymbolTypes.h" -#include "SnapSourceListModel.h" - +// Qt headers #include #include +#ifdef Q_OS_ANDROID +#include "ArcGISRuntimeEnvironment.h" + +#include +#include +#endif + using namespace Esri::ArcGISRuntime; SnapGeometryEdits::SnapGeometryEdits(QObject* parent /* = nullptr */) : @@ -62,6 +70,10 @@ SnapGeometryEdits::SnapGeometryEdits(QObject* parent /* = nullptr */) : PortalItem* portalItem = new PortalItem("b95fe18073bc4f7788f0375af2bb445e", this); m_map = new Map(portalItem, this); + #ifdef Q_OS_ANDROID + ArcGISRuntimeEnvironment::setAndroidApplicationContext(QJniObject{QNativeInterface::QAndroidApplication::context()}); + #endif + m_geometryEditor = new GeometryEditor(this); m_graphicsOverlay = new GraphicsOverlay(this); @@ -192,6 +204,18 @@ void SnapGeometryEdits::snappingEnabledStatus(bool snappingCheckedState) m_geometryEditor->snapSettings()->setEnabled(snappingCheckedState); } +// Toggles geometry guides using the enabled state from the snap settings +void SnapGeometryEdits::geometryGuidesEnabledStatus(bool geometryGuidesCheckedState) +{ + m_geometryEditor->snapSettings()->setGeometryGuidesEnabled(geometryGuidesCheckedState); +} + +// Toggles feature snapping using the enabled state from the snap settings +void SnapGeometryEdits::featureSnappingEnabledStatus(bool featureSnappingCheckedState) +{ + m_geometryEditor->snapSettings()->setFeatureSnappingEnabled(featureSnappingCheckedState); +} + // Starts the GeometryEditor using the selected geometry type void SnapGeometryEdits::startEditor(GeometryEditorMode geometryEditorMode) { diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h index 70fa5a9738..5b707a30ca 100644 --- a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h +++ b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h @@ -1,12 +1,12 @@ // [WriteFile Name=SnapGeometryEdits, Category=EditData] // [Legal] // Copyright 2024 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. @@ -17,6 +17,9 @@ #ifndef SNAPGEOMETRYEDITS_H #define SNAPGEOMETRYEDITS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Geometry; class GeometryEditor; @@ -37,8 +40,6 @@ namespace Esri::ArcGISRuntime { class SnapSourceListModel; class QAbstractListModel; -#include - Q_MOC_INCLUDE("MapQuickView.h"); Q_MOC_INCLUDE("QAbstractListModel"); @@ -72,6 +73,8 @@ class SnapGeometryEdits : public QObject Q_INVOKABLE void deleteSelection(); Q_INVOKABLE void editorUndo(); Q_INVOKABLE void snappingEnabledStatus(bool checkedValue); + Q_INVOKABLE void geometryGuidesEnabledStatus(bool checkedValue); + Q_INVOKABLE void featureSnappingEnabledStatus(bool checkedValue); Q_INVOKABLE void displaySnapSources(); Q_INVOKABLE void enableAllLayersInSection(const QString& section); @@ -98,7 +101,6 @@ class SnapGeometryEdits : public QObject QAbstractListModel* snapSourceListModel() const; Esri::ArcGISRuntime::Symbol* determineGeometrySymbol(const Esri::ArcGISRuntime::Geometry& geometry); - Esri::ArcGISRuntime::Map* m_map = nullptr; Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr; Esri::ArcGISRuntime::GraphicsOverlay* m_graphicsOverlay = nullptr; diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.pro b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.pro index 2261fa8992..ff344274bb 100644 --- a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.pro +++ b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = SnapGeometryEdits -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.qml b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.qml index 9ad2719a34..74f49aa84b 100644 --- a/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.qml +++ b/CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SnapGeometryEdits, Category=EditData] // [Legal] // Copyright 2024 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. @@ -222,9 +222,10 @@ Item { } } - RowLayout { + ColumnLayout { Layout.minimumWidth: optionPanel.width Layout.minimumHeight: 35 + spacing: 0 Rectangle { Layout.alignment: Qt.AlignLeft Layout.minimumWidth: snapSourceView.width - (snapSourceView.anchors.margins / 2) @@ -232,7 +233,7 @@ Item { color: "#E9DFEA" Text { - text: qsTr("Enabled") + text: qsTr("Snapping enabled") font.pixelSize: 15 anchors { left: parent.left @@ -250,6 +251,57 @@ Item { onCheckedChanged: snapGeometryEditsSampleModel.snappingEnabledStatus(checked) } } + Rectangle { + Layout.alignment: Qt.AlignLeft + Layout.minimumWidth: snapSourceView.width - (snapSourceView.anchors.margins / 2) + Layout.minimumHeight: 35 + color: "#E9DFEA" + + Text { + text: qsTr("Geometry guides") + font.pixelSize: 15 + anchors { + left: parent.left + margins: 10 + verticalCenter: parent.verticalCenter + } + } + + Switch { + anchors { + right: parent.right + margins: 10 + verticalCenter: parent.verticalCenter + } + onCheckedChanged: snapGeometryEditsSampleModel.geometryGuidesEnabledStatus(checked) + } + } + Rectangle { + Layout.alignment: Qt.AlignLeft + Layout.minimumWidth: snapSourceView.width - (snapSourceView.anchors.margins / 2) + Layout.minimumHeight: 35 + color: "#E9DFEA" + + + Text { + text: qsTr("Feature snapping") + font.pixelSize: 15 + anchors { + left: parent.left + margins: 10 + verticalCenter: parent.verticalCenter + } + } + + Switch { + anchors { + right: parent.right + margins: 10 + verticalCenter: parent.verticalCenter + } + onCheckedChanged: snapGeometryEditsSampleModel.featureSnappingEnabledStatus(checked) + } + } } } diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.cpp b/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.cpp index 7ac2d01a9f..d28d07875f 100644 --- a/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.cpp +++ b/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.cpp @@ -1,33 +1,38 @@ +// [Legal] // Copyright 2024 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 "SnapSourceListModel.h" + +// ArcGIS Maps SDK headers +#include "FeatureLayer.h" +#include "FeatureTable.h" +#include "GeometryTypes.h" +#include "GraphicsOverlay.h" +#include "SnapSourceSettings.h" +// Qt headers #include #include +#include +#include #include +#include #include #include #include -#include -#include -#include - -#include "GraphicsOverlay.h" -#include "GeometryTypes.h" -#include "FeatureTable.h" -#include "FeatureLayer.h" -#include "SnapSourceSettings.h" - -#include "SnapSourceListModel.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.h b/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.h index fb6f955147..3d24589250 100644 --- a/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.h +++ b/CppSamples/EditData/SnapGeometryEdits/SnapSourceListModel.h @@ -1,4 +1,17 @@ +// [Legal] // Copyright 2024 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] // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/CppSamples/EditData/SnapGeometryEdits/main.cpp b/CppSamples/EditData/SnapGeometryEdits/main.cpp index 4e7870cfb0..dbd3ed6425 100644 --- a/CppSamples/EditData/SnapGeometryEdits/main.cpp +++ b/CppSamples/EditData/SnapGeometryEdits/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 2024 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 "ArcGISRuntimeEnvironment.h" +// sample headers #include "SnapGeometryEdits.h" +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.cpp b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.cpp index 69e8ee30fb..53a6e02fe6 100644 --- a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.cpp +++ b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=UpdateAttributesFeatureService, Category=EditData] // [Legal] // Copyright 2016 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. @@ -18,34 +18,37 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "UpdateAttributesFeatureService.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" +#include "AttributeListModel.h" #include "Basemap.h" -#include "Viewpoint.h" -#include "Point.h" -#include "SpatialReference.h" -#include "ServiceFeatureTable.h" -#include "FeatureLayer.h" +#include "CalloutData.h" +#include "Envelope.h" #include "Feature.h" -#include "ArcGISFeature.h" #include "FeatureEditResult.h" +#include "FeatureIterator.h" +#include "FeatureLayer.h" #include "FeatureQueryResult.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "LayerListModel.h" #include "IdentifyLayerResult.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" +#include "Point.h" #include "QueryParameters.h" -#include "AttributeListModel.h" -#include "FeatureIterator.h" -#include "CalloutData.h" -#include "Envelope.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "Viewpoint.h" +// Qt headers #include +#include #include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h index dcf5fc0abc..1263a91937 100644 --- a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h +++ b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h @@ -1,12 +1,12 @@ // [WriteFile Name=UpdateAttributesFeatureService, Category=EditData] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef UPDATE_ATTRIBUTES_FEATURE_SERVICE_H #define UPDATE_ATTRIBUTES_FEATURE_SERVICE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -31,8 +34,6 @@ namespace Esri::ArcGISRuntime class QString; -#include - class UpdateAttributesFeatureService : public QQuickItem { Q_OBJECT @@ -69,4 +70,3 @@ class UpdateAttributesFeatureService : public QQuickItem }; #endif // UPDATE_ATTRIBUTES_FEATURE_SERVICE_H - diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.pro b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.pro index 07a3b5a0bc..ac99df7a2c 100644 --- a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.pro +++ b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.qml b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.qml index f9716ccd5b..a2e767dc38 100644 --- a/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.qml +++ b/CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.qml @@ -1,12 +1,12 @@ // [WriteFile Name=UpdateAttributesFeatureService, Category=EditData] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/EditData/UpdateAttributesFeatureService/main.cpp b/CppSamples/EditData/UpdateAttributesFeatureService/main.cpp index 55ff4c9103..c9291b16fb 100644 --- a/CppSamples/EditData/UpdateAttributesFeatureService/main.cpp +++ b/CppSamples/EditData/UpdateAttributesFeatureService/main.cpp @@ -1,32 +1,40 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "UpdateAttributesFeatureService.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Other headers #include "Esri/ArcGISRuntime/Toolkit/register.h" -#include "ArcGISRuntimeEnvironment.h" +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "UpdateAttributesFeatureService.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.cpp b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.cpp index 8cc99040d4..3dd48d6c4b 100644 --- a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.cpp +++ b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=UpdateGeometryFeatureService, Category=EditData] // [Legal] // Copyright 2016 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. @@ -18,27 +18,30 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "UpdateGeometryFeatureService.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers #include "Basemap.h" -#include "Viewpoint.h" -#include "Point.h" -#include "SpatialReference.h" -#include "ServiceFeatureTable.h" -#include "FeatureLayer.h" #include "Feature.h" #include "FeatureEditResult.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "LayerListModel.h" +#include "FeatureLayer.h" #include "IdentifyLayerResult.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" +#include "Point.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "Viewpoint.h" +// Qt headers #include -#include -#include #include +#include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h index 422710cd88..45d9c57cc7 100644 --- a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h +++ b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h @@ -1,12 +1,12 @@ // [WriteFile Name=UpdateGeometryFeatureService, Category=EditData] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef UPDATE_GEOMETRY_FEATURE_SERVICE_H #define UPDATE_GEOMETRY_FEATURE_SERVICE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,8 +29,6 @@ namespace Esri::ArcGISRuntime class Feature; } -#include - class UpdateGeometryFeatureService : public QQuickItem { Q_OBJECT @@ -52,4 +53,3 @@ class UpdateGeometryFeatureService : public QQuickItem }; #endif // UPDATE_GEOMETRY_FEATURE_SERVICE_H - diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.pro b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.pro index e4b9630b60..e0f970e4f7 100644 --- a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.pro +++ b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.qml b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.qml index b5e243330e..aab27ca47f 100644 --- a/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.qml +++ b/CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.qml @@ -1,12 +1,12 @@ // [WriteFile Name=UpdateGeometryFeatureService, Category=EditData] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/EditData/UpdateGeometryFeatureService/main.cpp b/CppSamples/EditData/UpdateGeometryFeatureService/main.cpp index 26ef7af339..13fcea0ea2 100644 --- a/CppSamples/EditData/UpdateGeometryFeatureService/main.cpp +++ b/CppSamples/EditData/UpdateGeometryFeatureService/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "UpdateGeometryFeatureService.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "UpdateGeometryFeatureService.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.cpp b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.cpp index fbd19533b7..2888fa0c85 100644 --- a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.cpp +++ b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ControlTimeExtentTimeSlider, Category=Features] // [Legal] // Copyright 2021 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. @@ -18,14 +18,16 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ControlTimeExtentTimeSlider.h" +// ArcGIS Maps SDK headers +#include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "FeatureLayer.h" -#include "ServiceFeatureTable.h" #include "MapTypes.h" -#include "LayerListModel.h" +#include "ServiceFeatureTable.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h index 3e1e76e8e5..0d774a5d25 100644 --- a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h +++ b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h @@ -1,12 +1,12 @@ // [WriteFile Name=ControlTimeExtentTimeSlider, Category=Features] // [Legal] // Copyright 2021 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. @@ -17,14 +17,15 @@ #ifndef CONTROLTIMEEXTENTTIMESLIDER_H #define CONTROLTIMEEXTENTTIMESLIDER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class ControlTimeExtentTimeSlider : public QObject diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.pro b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.pro index 510c63b580..449fe99fb1 100644 --- a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.pro +++ b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ControlTimeExtentTimeSlider -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.qml b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.qml index 9ab9f864d5..8e3a2150d5 100644 --- a/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.qml +++ b/CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ControlTimeExtentTimeSlider, Category=Features] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Features/ControlTimeExtentTimeSlider/main.cpp b/CppSamples/Features/ControlTimeExtentTimeSlider/main.cpp index 054003cefb..7c20ec99f0 100644 --- a/CppSamples/Features/ControlTimeExtentTimeSlider/main.cpp +++ b/CppSamples/Features/ControlTimeExtentTimeSlider/main.cpp @@ -1,26 +1,34 @@ +// [Legal] // Copyright 2021 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 "ControlTimeExtentTimeSlider.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" -#include "Esri/ArcGISRuntime/Toolkit/register.h" +// Qt headers #include #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.cpp b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.cpp index 8080414790..58a30d5528 100644 --- a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.cpp +++ b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateMobileGeodatabase, Category=Features] // [Legal] // Copyright 2022 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. @@ -18,10 +18,11 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CreateMobileGeodatabase.h" - #include "FeatureListModel.h" +// ArcGIS Maps SDK headers #include "FeatureIterator.h" #include "FeatureLayer.h" #include "FeatureQueryResult.h" @@ -36,17 +37,12 @@ #include "MapTypes.h" #include "Point.h" #include "QueryParameters.h" -#include "TableDescription.h" #include "ServiceTypes.h" -#include "LayerListModel.h" -#include "FieldDescriptionListModel.h" -#include "QueryParameters.h" -#include "FeatureIterator.h" -#include "FeatureQueryResult.h" -#include "Viewpoint.h" #include "SpatialReference.h" -#include "Point.h" +#include "TableDescription.h" +#include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h index dd7e18cc45..ed80b93446 100644 --- a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h +++ b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateMobileGeodatabase, Category=Features] // [Legal] // Copyright 2022 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. @@ -17,6 +17,14 @@ #ifndef CREATEMOBILEGEODATABASE_H #define CREATEMOBILEGEODATABASE_H +// sample headers +#include "FeatureListModel.h" + +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class FeatureTable; @@ -25,12 +33,6 @@ class Map; class MapQuickView; } -#include - -#include -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class CreateMobileGeodatabase : public QObject diff --git a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.pro b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.pro index 54ed590209..d01f76afc7 100644 --- a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.pro +++ b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateMobileGeodatabase -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.qml b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.qml index 866804436d..330784949f 100644 --- a/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.qml +++ b/CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateMobileGeodatabase, Category=Features] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.cpp b/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.cpp index 7c8f059206..07b9a4c1a4 100644 --- a/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.cpp +++ b/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureListModel, Category=Features] // [Legal] // Copyright 2016 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. @@ -14,10 +14,12 @@ // limitations under the License. // [Legal] +// sample headers #include "FeatureListModel.h" -#include "Feature.h" +// ArcGIS Maps SDK headers #include "AttributeListModel.h" +#include "Feature.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.h b/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.h index b9fd03fa82..36f9bee992 100644 --- a/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.h +++ b/CppSamples/Features/CreateMobileGeodatabase/FeatureListModel.h @@ -1,6 +1,22 @@ +// [Legal] +// Copyright 2024 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] + #ifndef FEATURELISTMODEL_H #define FEATURELISTMODEL_H +// Qt headers #include namespace Esri::ArcGISRuntime diff --git a/CppSamples/Features/CreateMobileGeodatabase/main.cpp b/CppSamples/Features/CreateMobileGeodatabase/main.cpp index d8d99babd5..01267b8e06 100644 --- a/CppSamples/Features/CreateMobileGeodatabase/main.cpp +++ b/CppSamples/Features/CreateMobileGeodatabase/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "CreateMobileGeodatabase.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.cpp b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.cpp index 2a78603336..511e594556 100644 --- a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.cpp +++ b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerChangeRenderer, Category=Features] // [Legal] // Copyright 2016 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. @@ -18,23 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FeatureLayerChangeRenderer.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "Envelope.h" +#include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "FeatureLayer.h" -#include "Basemap.h" -#include "SpatialReference.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "ServiceFeatureTable.h" -#include "Viewpoint.h" -#include "Envelope.h" #include "SimpleLineSymbol.h" #include "SimpleRenderer.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "LayerListModel.h" +#include "SpatialReference.h" #include "SymbolTypes.h" +#include "Viewpoint.h" +// Qt headers #include #include diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h index 6ec08f5b60..3ae5fee175 100644 --- a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h +++ b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerChangeRenderer, Category=Features] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef FEATURE_LAYER_CHANGE_RENDERER_H #define FEATURE_LAYER_CHANGE_RENDERER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime class FeatureLayer; } -#include - class FeatureLayerChangeRenderer : public QQuickItem { Q_OBJECT @@ -55,4 +56,3 @@ class FeatureLayerChangeRenderer : public QQuickItem }; #endif // FEATURE_LAYER_CHANGE_RENDERER_H - diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.pro b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.pro index d8ec449343..9f1d4d1338 100644 --- a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.pro +++ b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.qml b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.qml index 96944203b5..6c47be108f 100644 --- a/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.qml +++ b/CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerChangeRenderer, Category=Features] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Features/FeatureLayerChangeRenderer/main.cpp b/CppSamples/Features/FeatureLayerChangeRenderer/main.cpp index e6655228f5..ae9b66b835 100644 --- a/CppSamples/Features/FeatureLayerChangeRenderer/main.cpp +++ b/CppSamples/Features/FeatureLayerChangeRenderer/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "FeatureLayerChangeRenderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FeatureLayerChangeRenderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.cpp b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.cpp index 4b9f13dc47..e08ffa671b 100644 --- a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.cpp +++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerDictionaryRenderer, Category=Features] // [Legal] // Copyright 2016 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. @@ -18,23 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FeatureLayerDictionaryRenderer.h" +// ArcGIS Maps SDK headers #include "DictionaryRenderer.h" +#include "DictionarySymbolStyle.h" +#include "Envelope.h" #include "FeatureLayer.h" #include "Geodatabase.h" #include "GeodatabaseFeatureTable.h" #include "GeometryEngine.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "DictionarySymbolStyle.h" #include "MapTypes.h" -#include "LayerListModel.h" -#include "Envelope.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h index 014145409b..b761023d63 100644 --- a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h +++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerDictionaryRenderer, Category=Features] // [Legal] // Copyright 2016 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. @@ -17,6 +17,7 @@ #ifndef FEATURELAYERDICTIONARYRENDERER_H #define FEATURELAYERDICTIONARYRENDERER_H +// Qt headers #include namespace Esri::ArcGISRuntime diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.pro b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.pro index efd3abeadf..48c2c5701b 100644 --- a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.pro +++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.qml b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.qml index 7298bca65d..a19291dfaf 100644 --- a/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.qml +++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerDictionaryRenderer, Category=Features] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Features/FeatureLayerDictionaryRenderer/main.cpp b/CppSamples/Features/FeatureLayerDictionaryRenderer/main.cpp index 9a8ef7943e..c2fbe4e24d 100644 --- a/CppSamples/Features/FeatureLayerDictionaryRenderer/main.cpp +++ b/CppSamples/Features/FeatureLayerDictionaryRenderer/main.cpp @@ -1,28 +1,35 @@ +// [Legal] // Copyright 2015-2016 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 -#include +// sample headers +#include "FeatureLayerDictionaryRenderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FeatureLayerDictionaryRenderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.cpp b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.cpp index 1c34ec4886..e9f8f1d703 100644 --- a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.cpp +++ b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerQuery, Category=Features] // [Legal] // Copyright 2016 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. @@ -18,34 +18,38 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FeatureLayerQuery.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "Feature.h" +#include "FeatureIterator.h" +#include "FeatureLayer.h" +#include "FeatureQueryResult.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "FeatureLayer.h" -#include "Basemap.h" -#include "SpatialReference.h" -#include "ServiceFeatureTable.h" -#include "Viewpoint.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "Point.h" -#include "SimpleLineSymbol.h" +#include "QueryParameters.h" +#include "ServiceFeatureTable.h" #include "SimpleFillSymbol.h" +#include "SimpleLineSymbol.h" #include "SimpleRenderer.h" -#include "QueryParameters.h" -#include "FeatureQueryResult.h" -#include "Feature.h" -#include "MapViewTypes.h" -#include "MapTypes.h" +#include "SpatialReference.h" #include "SymbolTypes.h" -#include "LayerListModel.h" -#include "FeatureIterator.h" +#include "Viewpoint.h" +// Qt headers #include #include #include -#include #include +#include +// STL headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h index 9005d57311..6c6fceb9b2 100644 --- a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h +++ b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerQuery, Category=Features] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef FEATURE_LAYER_QUERY_H #define FEATURE_LAYER_QUERY_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class ServiceFeatureTable; } -#include - class FeatureLayerQuery : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.pro b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.pro index a25a445f6b..f6c58e259b 100644 --- a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.pro +++ b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.qml b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.qml index 141df37d17..0ec51a23ba 100644 --- a/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.qml +++ b/CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerQuery, Category=Features] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Features/FeatureLayerQuery/main.cpp b/CppSamples/Features/FeatureLayerQuery/main.cpp index e41f33963b..bbaad615e1 100644 --- a/CppSamples/Features/FeatureLayerQuery/main.cpp +++ b/CppSamples/Features/FeatureLayerQuery/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "FeatureLayerQuery.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FeatureLayerQuery.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.cpp b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.cpp index 6a2f3559df..7ddbdb9eb5 100644 --- a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.cpp +++ b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerSelection, Category=Features] // [Legal] // Copyright 2022 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FeatureLayerSelection.h" +// ArcGIS Maps SDK headers #include "Envelope.h" #include "Feature.h" #include "FeatureLayer.h" @@ -32,8 +34,11 @@ #include "SpatialReference.h" #include "Viewpoint.h" +// Qt headers #include #include + +// STL headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h index 0efff8eec6..225156087f 100644 --- a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h +++ b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerSelection, Category=Features] // [Legal] // Copyright 2022 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. @@ -17,6 +17,9 @@ #ifndef FEATURELAYERSELECTION_H #define FEATURELAYERSELECTION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -26,8 +29,6 @@ class ServiceFeatureTable; class IdentifyLayerResult; } -#include - Q_MOC_INCLUDE("MapQuickView.h"); class FeatureLayerSelection : public QObject diff --git a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.pro b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.pro index 18699313ad..ee10f05f8c 100644 --- a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.pro +++ b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FeatureLayerSelection -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.qml b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.qml index e78d20b7bf..7e476f24d5 100644 --- a/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.qml +++ b/CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerSelection, Category=Features] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Features/FeatureLayerSelection/main.cpp b/CppSamples/Features/FeatureLayerSelection/main.cpp index 057d9970a7..7f394ea6fc 100644 --- a/CppSamples/Features/FeatureLayerSelection/main.cpp +++ b/CppSamples/Features/FeatureLayerSelection/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "FeatureLayerSelection.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.cpp b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.cpp index 5697d1d263..a8151fd852 100644 --- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.cpp +++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FilterByDefinitionExpressionOrDisplayFilter, Category=Features] // [Legal] // Copyright 2016 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. @@ -18,27 +18,30 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FilterByDefinitionExpressionOrDisplayFilter.h" +// ArcGIS Maps SDK headers #include "Basemap.h" #include "DisplayFilter.h" #include "DisplayFilterDefinition.h" #include "FeatureLayer.h" +#include "LayerListModel.h" #include "ManualDisplayFilterDefinition.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "Point.h" -#include "SpatialReference.h" +#include "QueryParameters.h" #include "ServiceFeatureTable.h" +#include "SpatialReference.h" #include "Viewpoint.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "LayerListModel.h" -#include "QueryParameters.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h index 9e4973940f..4efd9ec9d8 100644 --- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h +++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h @@ -1,12 +1,12 @@ // [WriteFile Name=FilterByDefinitionExpressionOrDisplayFilter, Category=Features] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef FILTER_BY_DEFINITION_EXPRESSION_OR_DISPLAY_FILTER_H #define FILTER_BY_DEFINITION_EXPRESSION_OR_DISPLAY_FILTER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class ServiceFeatureTable; } -#include - class FilterByDefinitionExpressionOrDisplayFilter : public QQuickItem { Q_OBJECT @@ -68,4 +69,3 @@ class FilterByDefinitionExpressionOrDisplayFilter : public QQuickItem }; #endif // FILTER_BY_DEFINITION_EXPRESSION_OR_DISPLAY_FILTER_H - diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.pro b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.pro index 9ae42d9d09..9db2012a1e 100644 --- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.pro +++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.qml b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.qml index 0f5256da06..0f75759d2a 100644 --- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.qml +++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FilterByDefinitionExpressionOrDisplayFilter, Category=Features] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/main.cpp b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/main.cpp index c2e78f5eaf..291fa75810 100644 --- a/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/main.cpp +++ b/CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "FilterByDefinitionExpressionOrDisplayFilter.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FilterByDefinitionExpressionOrDisplayFilter.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.cpp b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.cpp index 1248f49a04..64b8c3b071 100644 --- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.cpp +++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateGeodatabaseReplicaFromFeatureService, Category=Features] // [Legal] // Copyright 2016 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. @@ -18,37 +18,40 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GenerateGeodatabaseReplicaFromFeatureService.h" -#include "Map.h" -#include "MapQuickView.h" -#include "FeatureLayer.h" -#include "Basemap.h" -#include "SpatialReference.h" -#include "ServiceFeatureTable.h" -#include "ArcGISTiledLayer.h" +// ArcGIS Maps SDK headers #include "ArcGISFeatureServiceInfo.h" +#include "ArcGISTiledLayer.h" +#include "Basemap.h" #include "Envelope.h" +#include "Error.h" +#include "FeatureLayer.h" +#include "GenerateGeodatabaseJob.h" #include "GenerateGeodatabaseParameters.h" -#include "GeodatabaseSyncTask.h" -#include "GeometryEngine.h" #include "GenerateLayerOption.h" +#include "Geodatabase.h" #include "GeodatabaseFeatureTable.h" -#include "MapViewTypes.h" -#include "TileCache.h" -#include "Error.h" +#include "GeodatabaseSyncTask.h" +#include "GeometryEngine.h" #include "IdInfo.h" #include "LayerListModel.h" -#include "GenerateGeodatabaseJob.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapViewTypes.h" +#include "Point.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" #include "TaskTypes.h" -#include "Geodatabase.h" +#include "TileCache.h" #include "Viewpoint.h" -#include "Point.h" +// Qt headers #include -#include -#include #include +#include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h index e477588cf0..1b7235e402 100644 --- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h +++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateGeodatabaseReplicaFromFeatureService, Category=Features] // [Legal] // Copyright 2016 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. @@ -17,6 +17,16 @@ #ifndef GENERATE_GEODATABASE_H #define GENERATE_GEODATABASE_H +// ArcGIS Maps SDK headers +#include "ArcGISFeatureServiceInfo.h" +#include "Envelope.h" +#include "GenerateGeodatabaseParameters.h" + +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,13 +35,6 @@ namespace Esri::ArcGISRuntime class Geodatabase; } -#include "Envelope.h" -#include "GenerateGeodatabaseParameters.h" -#include "ArcGISFeatureServiceInfo.h" -#include -#include -#include - class GenerateGeodatabaseReplicaFromFeatureService : public QQuickItem { Q_OBJECT @@ -65,4 +68,3 @@ class GenerateGeodatabaseReplicaFromFeatureService : public QQuickItem }; #endif // GENERATE_GEODATABASE_H - diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.pro b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.pro index b0fe651a95..d990bf7891 100644 --- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.pro +++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.qml b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.qml index 9d18968753..9b7c68699d 100644 --- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.qml +++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateGeodatabaseReplicaFromFeatureService, Category=Features] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/main.cpp b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/main.cpp index f3415678b1..7af1e220f5 100644 --- a/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/main.cpp +++ b/CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "GenerateGeodatabaseReplicaFromFeatureService.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "GenerateGeodatabaseReplicaFromFeatureService.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.cpp b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.cpp index 391524425a..aeac6e2a88 100644 --- a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.cpp +++ b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ListRelatedFeatures, Category=Features] // [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. @@ -18,35 +18,40 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ListRelatedFeatures.h" - -#include "Map.h" -#include "MapQuickView.h" -#include "FeatureLayer.h" -#include "ViewInsets.h" -#include "Envelope.h" -#include "QueryParameters.h" -#include "ArcGISFeature.h" -#include "ArcGISFeatureTable.h" -#include "RelatedFeatureQueryResult.h" -#include "FeatureQueryResult.h" #include "RelatedFeature.h" #include "RelatedFeatureListModel.h" -#include "SelectionProperties.h" -#include "Error.h" -#include "LayerListModel.h" -#include "FeatureIterator.h" + +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" #include "ArcGISFeatureLayerInfo.h" +#include "ArcGISFeatureTable.h" #include "AttributeListModel.h" -#include "SpatialReference.h" #include "CoreTypes.h" +#include "Envelope.h" +#include "Error.h" +#include "FeatureIterator.h" +#include "FeatureLayer.h" +#include "FeatureQueryResult.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" #include "MapTypes.h" #include "Point.h" +#include "QueryParameters.h" +#include "RelatedFeatureQueryResult.h" +#include "SelectionProperties.h" +#include "SpatialReference.h" +#include "ViewInsets.h" +// Qt headers #include -#include #include #include +#include + +// STL headers #include using namespace Esri::ArcGISRuntime; @@ -194,3 +199,8 @@ void ListRelatedFeatures::connectSignals() }); }); } + +QAbstractListModel* ListRelatedFeatures::relatedFeaturesModel() const +{ + return m_relatedFeaturesModel; +} diff --git a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h index 354a880388..bccea8b872 100644 --- a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h +++ b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h @@ -1,12 +1,12 @@ // [WriteFile Name=ListRelatedFeatures, Category=Features] // [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. @@ -17,6 +17,9 @@ #ifndef LISTRELATEDFEATURES_H #define LISTRELATEDFEATURES_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class ArcGISFeature; @@ -26,16 +29,15 @@ namespace Esri::ArcGISRuntime class MapQuickView; } class RelatedFeatureListModel; +class QAbstractListModel; -#include - -Q_MOC_INCLUDE("RelatedFeatureListModel.h") +Q_MOC_INCLUDE("QAbstractListModel") class ListRelatedFeatures : public QQuickItem { Q_OBJECT - Q_PROPERTY(RelatedFeatureListModel* relatedFeaturesModel MEMBER m_relatedFeaturesModel NOTIFY relatedFeaturesModelChanged) + Q_PROPERTY(QAbstractListModel* relatedFeaturesModel READ relatedFeaturesModel NOTIFY relatedFeaturesModelChanged) public: explicit ListRelatedFeatures(QQuickItem* parent = nullptr); @@ -51,8 +53,8 @@ class ListRelatedFeatures : public QQuickItem private: void connectSignals(); + QAbstractListModel* relatedFeaturesModel() const; -private: Esri::ArcGISRuntime::Map* m_map = nullptr; Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr; Esri::ArcGISRuntime::FeatureLayer* m_alaskaNationalParks = nullptr; diff --git a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.pro b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.pro index e0a5f76c50..6ce0961a91 100644 --- a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.pro +++ b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ListRelatedFeatures -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.qml b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.qml index 7fda7603d3..f595532d04 100644 --- a/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.qml +++ b/CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ListRelatedFeatures, Category=Features] // [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. diff --git a/CppSamples/Features/ListRelatedFeatures/RelatedFeature.cpp b/CppSamples/Features/ListRelatedFeatures/RelatedFeature.cpp index cf563fc2a4..9f54b8c839 100644 --- a/CppSamples/Features/ListRelatedFeatures/RelatedFeature.cpp +++ b/CppSamples/Features/ListRelatedFeatures/RelatedFeature.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ListRelatedFeatures, Category=Features] // [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. @@ -18,10 +18,12 @@ #include "pch.hpp" #endif // PCH_BUILD -#include - +// sample headers #include "RelatedFeature.h" +// Qt headers +#include + RelatedFeature::RelatedFeature(const QString& displayFieldName, const QString& displayFieldValue, const QString& serviceLayerName) : m_displayFieldName(displayFieldName), diff --git a/CppSamples/Features/ListRelatedFeatures/RelatedFeature.h b/CppSamples/Features/ListRelatedFeatures/RelatedFeature.h index d171fbaed7..2a62802139 100644 --- a/CppSamples/Features/ListRelatedFeatures/RelatedFeature.h +++ b/CppSamples/Features/ListRelatedFeatures/RelatedFeature.h @@ -1,12 +1,12 @@ // [WriteFile Name=ListRelatedFeatures, Category=Features] // [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. diff --git a/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.cpp b/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.cpp index 17d4a6b891..67e8d9cc8d 100644 --- a/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.cpp +++ b/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ListRelatedFeatures, Category=Features] // [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. @@ -18,6 +18,11 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers +#include "RelatedFeature.h" +#include "RelatedFeatureListModel.h" + +// Qt headers #include #include #include @@ -25,9 +30,6 @@ #include #include -#include "RelatedFeatureListModel.h" -#include "RelatedFeature.h" - RelatedFeatureListModel::RelatedFeatureListModel(QObject* parent) : QAbstractListModel(parent) { diff --git a/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.h b/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.h index f83e1889b0..5a699b2e1b 100644 --- a/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.h +++ b/CppSamples/Features/ListRelatedFeatures/RelatedFeatureListModel.h @@ -1,12 +1,12 @@ // [WriteFile Name=ListRelatedFeatures, Category=Features] // [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. @@ -17,11 +17,14 @@ #ifndef RELATEDFEATURELISTMODEL_H #define RELATEDFEATURELISTMODEL_H +// sample headers +#include "RelatedFeature.h" + +// Qt headers #include #include #include #include -#include class RelatedFeatureListModel : public QAbstractListModel { diff --git a/CppSamples/Features/ListRelatedFeatures/main.cpp b/CppSamples/Features/ListRelatedFeatures/main.cpp index bf9f2e5bd8..f78168ec46 100644 --- a/CppSamples/Features/ListRelatedFeatures/main.cpp +++ b/CppSamples/Features/ListRelatedFeatures/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "ListRelatedFeatures.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ListRelatedFeatures.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.cpp b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.cpp index 67f300a5d5..7d35de4faa 100644 --- a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.cpp +++ b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceFeatureTableCache, Category=Features] // [Legal] // Copyright 2016 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. @@ -18,19 +18,23 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ServiceFeatureTableCache.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "Envelope.h" +#include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "FeatureLayer.h" -#include "Basemap.h" -#include "SpatialReference.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "ServiceFeatureTable.h" +#include "SpatialReference.h" #include "Viewpoint.h" -#include "Envelope.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "LayerListModel.h" + +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h index 9f1145381f..bbc67cef81 100644 --- a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h +++ b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceFeatureTableCache, Category=Features] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef SERVICE_FEATURE_TABLE_CACHE_H #define SERVICE_FEATURE_TABLE_CACHE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class ServiceFeatureTable; } -#include - class ServiceFeatureTableCache : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.pro b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.pro index 9d3d0073f6..f7e973df6a 100644 --- a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.pro +++ b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.qml b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.qml index 3880682403..e2ec6c3e78 100644 --- a/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.qml +++ b/CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceFeatureTableCache, Category=Features] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Features/ServiceFeatureTableCache/main.cpp b/CppSamples/Features/ServiceFeatureTableCache/main.cpp index 3c4f237f5a..227edea29c 100644 --- a/CppSamples/Features/ServiceFeatureTableCache/main.cpp +++ b/CppSamples/Features/ServiceFeatureTableCache/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ServiceFeatureTableCache.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ServiceFeatureTableCache.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.cpp b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.cpp index e78f858eb6..136aca6c45 100644 --- a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.cpp +++ b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceFeatureTableManualCache, Category=Features] // [Legal] // Copyright 2016 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. @@ -18,22 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ServiceFeatureTableManualCache.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "FeatureLayer.h" +#include "GeodatabaseTypes.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "FeatureLayer.h" -#include "Basemap.h" -#include "SpatialReference.h" -#include "ServiceFeatureTable.h" -#include "Viewpoint.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "Point.h" #include "QueryParameters.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "GeodatabaseTypes.h" -#include "LayerListModel.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "Viewpoint.h" +// Qt headers #include #include #include diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h index b46ffafad3..66e149e243 100644 --- a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h +++ b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceFeatureTableManualCache, Category=Features] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef SERVICE_FEATURE_TABLE_MANUAL_CACHE_H #define SERVICE_FEATURE_TABLE_MANUAL_CACHE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class ServiceFeatureTable; } -#include - class ServiceFeatureTableManualCache : public QQuickItem { Q_OBJECT @@ -47,4 +48,3 @@ class ServiceFeatureTableManualCache : public QQuickItem }; #endif // SERVICE_FEATURE_TABLE_MANUAL_CACHE_H - diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.pro b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.pro index 6ccbd7599a..db048f6fbb 100644 --- a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.pro +++ b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.qml b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.qml index 3a0a124333..f4e1364f2f 100644 --- a/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.qml +++ b/CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceFeatureTableManualCache, Category=Features] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Features/ServiceFeatureTableManualCache/main.cpp b/CppSamples/Features/ServiceFeatureTableManualCache/main.cpp index cc4cdd728d..cfc91d5845 100644 --- a/CppSamples/Features/ServiceFeatureTableManualCache/main.cpp +++ b/CppSamples/Features/ServiceFeatureTableManualCache/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ServiceFeatureTableManualCache.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ServiceFeatureTableManualCache.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.cpp b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.cpp index ff5577d463..3c1dc7784a 100644 --- a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.cpp +++ b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceFeatureTableNoCache, Category=Features] // [Legal] // Copyright 2016 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. @@ -18,20 +18,24 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ServiceFeatureTableNoCache.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "Envelope.h" +#include "FeatureLayer.h" +#include "GeodatabaseTypes.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "FeatureLayer.h" -#include "Basemap.h" -#include "SpatialReference.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "ServiceFeatureTable.h" +#include "SpatialReference.h" #include "Viewpoint.h" -#include "Envelope.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "LayerListModel.h" -#include "GeodatabaseTypes.h" + +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h index c323ec8827..90e0352e0c 100644 --- a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h +++ b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceFeatureTableNoCache, Category=Features] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef SERVICE_FEATURE_TABLE_NO_CACHE_H #define SERVICE_FEATURE_TABLE_NO_CACHE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class ServiceFeatureTable; } -#include - class ServiceFeatureTableNoCache : public QQuickItem { Q_OBJECT @@ -46,4 +47,3 @@ class ServiceFeatureTableNoCache : public QQuickItem }; #endif // SERVICE_FEATURE_TABLE_NO_CACHE_H - diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.pro b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.pro index 5f7b35cc83..020c000d2f 100644 --- a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.pro +++ b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.qml b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.qml index 4e583d8768..ab9679366d 100644 --- a/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.qml +++ b/CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceFeatureTableNoCache, Category=Features] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Features/ServiceFeatureTableNoCache/main.cpp b/CppSamples/Features/ServiceFeatureTableNoCache/main.cpp index 6765c6ac01..e87b402dcc 100644 --- a/CppSamples/Features/ServiceFeatureTableNoCache/main.cpp +++ b/CppSamples/Features/ServiceFeatureTableNoCache/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ServiceFeatureTableNoCache.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ServiceFeatureTableNoCache.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/Buffer/Buffer.cpp b/CppSamples/Geometry/Buffer/Buffer.cpp index 3801172aeb..e7b8ddacb4 100644 --- a/CppSamples/Geometry/Buffer/Buffer.cpp +++ b/CppSamples/Geometry/Buffer/Buffer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Buffer, Category=Geometry] // [Legal] // Copyright 2022 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Buffer.h" +// ArcGIS Maps SDK headers #include "GeometryEngine.h" #include "Graphic.h" #include "GraphicListModel.h" @@ -37,6 +39,7 @@ #include "SimpleRenderer.h" #include "SymbolTypes.h" +// STL headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/Buffer/Buffer.h b/CppSamples/Geometry/Buffer/Buffer.h index a6f2a094c5..3f9c1c3a01 100644 --- a/CppSamples/Geometry/Buffer/Buffer.h +++ b/CppSamples/Geometry/Buffer/Buffer.h @@ -1,12 +1,12 @@ // [WriteFile Name=Buffer, Category=Geometry] // [Legal] // Copyright 2022 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. @@ -17,6 +17,10 @@ #ifndef BUFFER_H #define BUFFER_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class GraphicsOverlay; @@ -26,9 +30,6 @@ class SimpleMarkerSymbol; class SimpleFillSymbol; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h"); class Buffer : public QObject diff --git a/CppSamples/Geometry/Buffer/Buffer.pro b/CppSamples/Geometry/Buffer/Buffer.pro index 3586835c09..173521dd27 100644 --- a/CppSamples/Geometry/Buffer/Buffer.pro +++ b/CppSamples/Geometry/Buffer/Buffer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = Buffer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/Buffer/Buffer.qml b/CppSamples/Geometry/Buffer/Buffer.qml index 2f01f401be..bbc7f1e24c 100644 --- a/CppSamples/Geometry/Buffer/Buffer.qml +++ b/CppSamples/Geometry/Buffer/Buffer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Buffer, Category=Geometry] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Geometry/Buffer/main.cpp b/CppSamples/Geometry/Buffer/main.cpp index 0bcdb56a3d..7a630b7709 100644 --- a/CppSamples/Geometry/Buffer/main.cpp +++ b/CppSamples/Geometry/Buffer/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "Buffer.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Geometry/ClipGeometry/ClipGeometry.cpp b/CppSamples/Geometry/ClipGeometry/ClipGeometry.cpp index 12bae41033..c7011096b8 100644 --- a/CppSamples/Geometry/ClipGeometry/ClipGeometry.cpp +++ b/CppSamples/Geometry/ClipGeometry/ClipGeometry.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ClipGeometry, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -18,24 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ClipGeometry.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers #include "Geometry.h" -#include "Graphic.h" #include "GeometryEngine.h" -#include "Viewpoint.h" +#include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" -#include "SimpleLineSymbol.h" -#include "SimpleFillSymbol.h" -#include "MapTypes.h" #include "GraphicsOverlayListModel.h" -#include "SymbolTypes.h" -#include "GraphicListModel.h" -#include "SpatialReference.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "Point.h" - +#include "SimpleFillSymbol.h" +#include "SimpleLineSymbol.h" +#include "SpatialReference.h" +#include "SymbolTypes.h" +#include "Viewpoint.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/ClipGeometry/ClipGeometry.h b/CppSamples/Geometry/ClipGeometry/ClipGeometry.h index 9d287878f5..d4ee80e11b 100644 --- a/CppSamples/Geometry/ClipGeometry/ClipGeometry.h +++ b/CppSamples/Geometry/ClipGeometry/ClipGeometry.h @@ -1,12 +1,12 @@ // [WriteFile Name=ClipGeometry, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -17,6 +17,12 @@ #ifndef CLIPGEOMETRY_H #define CLIPGEOMETRY_H +// ArcGIS Maps SDK headers +#include "Envelope.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -27,9 +33,6 @@ class SimpleLineSymbol; class SimpleFillSymbol; } -#include -#include "Envelope.h" - class ClipGeometry : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Geometry/ClipGeometry/ClipGeometry.pro b/CppSamples/Geometry/ClipGeometry/ClipGeometry.pro index 89c5c5a879..30d167e146 100644 --- a/CppSamples/Geometry/ClipGeometry/ClipGeometry.pro +++ b/CppSamples/Geometry/ClipGeometry/ClipGeometry.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ClipGeometry -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/ClipGeometry/ClipGeometry.qml b/CppSamples/Geometry/ClipGeometry/ClipGeometry.qml index f4f24aadde..83656af400 100644 --- a/CppSamples/Geometry/ClipGeometry/ClipGeometry.qml +++ b/CppSamples/Geometry/ClipGeometry/ClipGeometry.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ClipGeometry, Category=Geometry] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Geometry/ClipGeometry/main.cpp b/CppSamples/Geometry/ClipGeometry/main.cpp index ebf1a48bcb..1c05030890 100644 --- a/CppSamples/Geometry/ClipGeometry/main.cpp +++ b/CppSamples/Geometry/ClipGeometry/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "ClipGeometry.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ClipGeometry.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/ConvexHull/ConvexHull.cpp b/CppSamples/Geometry/ConvexHull/ConvexHull.cpp index 9ed2234ae5..bef9416d50 100644 --- a/CppSamples/Geometry/ConvexHull/ConvexHull.cpp +++ b/CppSamples/Geometry/ConvexHull/ConvexHull.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ConvexHull, Category=Geometry] // [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. @@ -18,27 +18,29 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ConvexHull.h" +// ArcGIS Maps SDK headers +#include "Error.h" +#include "Geometry.h" #include "GeometryEngine.h" +#include "GeometryTypes.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "MultipointBuilder.h" +#include "Point.h" #include "PointCollection.h" #include "SimpleFillSymbol.h" -#include "SimpleMarkerSymbol.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "GraphicListModel.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "Geometry.h" -#include "GeometryTypes.h" #include "SimpleLineSymbol.h" -#include "Point.h" +#include "SimpleMarkerSymbol.h" #include "SpatialReference.h" +#include "SymbolTypes.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/ConvexHull/ConvexHull.h b/CppSamples/Geometry/ConvexHull/ConvexHull.h index d66bd52786..28a75a74ab 100644 --- a/CppSamples/Geometry/ConvexHull/ConvexHull.h +++ b/CppSamples/Geometry/ConvexHull/ConvexHull.h @@ -1,12 +1,12 @@ // [WriteFile Name=ConvexHull, Category=Geometry] // [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. @@ -17,6 +17,10 @@ #ifndef CONVEXHULL_H #define CONVEXHULL_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Graphic; @@ -29,9 +33,6 @@ class SimpleLineSymbol; class SimpleMarkerSymbol; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class ConvexHull : public QObject diff --git a/CppSamples/Geometry/ConvexHull/ConvexHull.pro b/CppSamples/Geometry/ConvexHull/ConvexHull.pro index eac65e6836..20f63a57d3 100644 --- a/CppSamples/Geometry/ConvexHull/ConvexHull.pro +++ b/CppSamples/Geometry/ConvexHull/ConvexHull.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ConvexHull -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/ConvexHull/ConvexHull.qml b/CppSamples/Geometry/ConvexHull/ConvexHull.qml index 46ec955712..fe590a195f 100644 --- a/CppSamples/Geometry/ConvexHull/ConvexHull.qml +++ b/CppSamples/Geometry/ConvexHull/ConvexHull.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ConvexHull, Category=Geometry] // [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. diff --git a/CppSamples/Geometry/ConvexHull/main.cpp b/CppSamples/Geometry/ConvexHull/main.cpp index bae4fc8aca..c5f0aae5a5 100644 --- a/CppSamples/Geometry/ConvexHull/main.cpp +++ b/CppSamples/Geometry/ConvexHull/main.cpp @@ -1,23 +1,30 @@ +// [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 "ConvexHull.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.cpp b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.cpp index 18b4fe7534..4fdfd301c2 100644 --- a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.cpp +++ b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndEditGeometries, Category=Geometry] // [Legal] // Copyright 2023 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CreateAndEditGeometries.h" +// ArcGIS Maps SDK headers #include "FreehandTool.h" #include "GeometryEditor.h" #include "GeometryEditorElement.h" @@ -51,6 +53,7 @@ #include "SymbolTypes.h" #include "VertexTool.h" +// Qt headers #include #include diff --git a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h index 7c8ee28c74..98b0dcdb52 100644 --- a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h +++ b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndEditGeometries, Category=Geometry] // [Legal] // Copyright 2023 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. @@ -17,6 +17,9 @@ #ifndef CREATEANDEDITGEOMETRIES_H #define CREATEANDEDITGEOMETRIES_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class GeometryEditor; @@ -33,8 +36,6 @@ namespace Esri::ArcGISRuntime class ReticleVertexTool; } -#include - Q_MOC_INCLUDE("MapQuickView.h"); class CreateAndEditGeometries : public QObject diff --git a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.pro b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.pro index 744f567b25..caa1ff0cb8 100644 --- a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.pro +++ b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateAndEditGeometries -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.qml b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.qml index a7edc722b6..98770b8cf9 100644 --- a/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.qml +++ b/CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndEditGeometries, Category=Geometry] // [Legal] // Copyright 2023 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. diff --git a/CppSamples/Geometry/CreateAndEditGeometries/GeometryEditorButton.qml b/CppSamples/Geometry/CreateAndEditGeometries/GeometryEditorButton.qml index d9c2f51428..98ec22042f 100644 --- a/CppSamples/Geometry/CreateAndEditGeometries/GeometryEditorButton.qml +++ b/CppSamples/Geometry/CreateAndEditGeometries/GeometryEditorButton.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndEditGeometries, Category=Geometry] // [Legal] // Copyright 2023 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. diff --git a/CppSamples/Geometry/CreateAndEditGeometries/main.cpp b/CppSamples/Geometry/CreateAndEditGeometries/main.cpp index 06d18b16e1..ef4b761f2f 100644 --- a/CppSamples/Geometry/CreateAndEditGeometries/main.cpp +++ b/CppSamples/Geometry/CreateAndEditGeometries/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2023 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 "CreateAndEditGeometries.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Geometry/CreateGeometries/CreateGeometries.cpp b/CppSamples/Geometry/CreateGeometries/CreateGeometries.cpp index bc3fe4e272..9ee8c60b5e 100644 --- a/CppSamples/Geometry/CreateGeometries/CreateGeometries.cpp +++ b/CppSamples/Geometry/CreateGeometries/CreateGeometries.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateGeometries, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -18,29 +18,32 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CreateGeometries.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "Error.h" +#include "Geometry.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" -#include "Geometry.h" +#include "GraphicsOverlayListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MultipointBuilder.h" #include "Point.h" +#include "PointCollection.h" #include "PolygonBuilder.h" #include "PolylineBuilder.h" -#include "MultipointBuilder.h" #include "SimpleFillSymbol.h" #include "SimpleLineSymbol.h" #include "SimpleMarkerSymbol.h" -#include "MapTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "SymbolTypes.h" -#include "GraphicListModel.h" -#include "PointCollection.h" #include "SpatialReference.h" -#include "Envelope.h" +#include "SymbolTypes.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/CreateGeometries/CreateGeometries.h b/CppSamples/Geometry/CreateGeometries/CreateGeometries.h index 2a5bdebe6e..6b3792746b 100644 --- a/CppSamples/Geometry/CreateGeometries/CreateGeometries.h +++ b/CppSamples/Geometry/CreateGeometries/CreateGeometries.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateGeometries, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -17,6 +17,12 @@ #ifndef CREATEGEOMETRIES_H #define CREATEGEOMETRIES_H +// ArcGIS Maps SDK headers +#include "Geometry.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,9 +30,6 @@ class MapQuickView; class GraphicsOverlay; } -#include "Geometry.h" -#include - class CreateGeometries : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Geometry/CreateGeometries/CreateGeometries.pro b/CppSamples/Geometry/CreateGeometries/CreateGeometries.pro index 79093f4856..cbe2008278 100644 --- a/CppSamples/Geometry/CreateGeometries/CreateGeometries.pro +++ b/CppSamples/Geometry/CreateGeometries/CreateGeometries.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateGeometries -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/CreateGeometries/CreateGeometries.qml b/CppSamples/Geometry/CreateGeometries/CreateGeometries.qml index 75d05e7e5a..e04cabb45b 100644 --- a/CppSamples/Geometry/CreateGeometries/CreateGeometries.qml +++ b/CppSamples/Geometry/CreateGeometries/CreateGeometries.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateGeometries, Category=Geometry] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Geometry/CreateGeometries/main.cpp b/CppSamples/Geometry/CreateGeometries/main.cpp index ec2104ced4..3233747e5e 100644 --- a/CppSamples/Geometry/CreateGeometries/main.cpp +++ b/CppSamples/Geometry/CreateGeometries/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "CreateGeometries.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "CreateGeometries.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/CutGeometry/CutGeometry.cpp b/CppSamples/Geometry/CutGeometry/CutGeometry.cpp index 630153ec9c..8c4d8f1ae6 100644 --- a/CppSamples/Geometry/CutGeometry/CutGeometry.cpp +++ b/CppSamples/Geometry/CutGeometry/CutGeometry.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CutGeometry, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -18,23 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CutGeometry.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers +#include "GeometryEngine.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" -#include "GeometryEngine.h" -#include "SpatialReference.h" -#include "PolylineBuilder.h" +#include "GraphicsOverlayListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "PolygonBuilder.h" -#include "SimpleLineSymbol.h" +#include "PolylineBuilder.h" #include "SimpleFillSymbol.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" +#include "SimpleLineSymbol.h" +#include "SpatialReference.h" #include "SymbolTypes.h" -#include "GraphicListModel.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/CutGeometry/CutGeometry.h b/CppSamples/Geometry/CutGeometry/CutGeometry.h index 3ecaec2810..279eecd23a 100644 --- a/CppSamples/Geometry/CutGeometry/CutGeometry.h +++ b/CppSamples/Geometry/CutGeometry/CutGeometry.h @@ -1,12 +1,12 @@ // [WriteFile Name=CutGeometry, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -17,6 +17,13 @@ #ifndef CUTGEOMETRY_H #define CUTGEOMETRY_H +// ArcGIS Maps SDK headers +#include "Polygon.h" +#include "Polyline.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,10 +32,6 @@ class Graphic; class GraphicsOverlay; } -#include -#include "Polygon.h" -#include "Polyline.h" - class CutGeometry : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Geometry/CutGeometry/CutGeometry.pro b/CppSamples/Geometry/CutGeometry/CutGeometry.pro index 9752b4a2b1..42fde2c63f 100644 --- a/CppSamples/Geometry/CutGeometry/CutGeometry.pro +++ b/CppSamples/Geometry/CutGeometry/CutGeometry.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CutGeometry -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/CutGeometry/CutGeometry.qml b/CppSamples/Geometry/CutGeometry/CutGeometry.qml index 9ec02e4e2e..5a1329094e 100644 --- a/CppSamples/Geometry/CutGeometry/CutGeometry.qml +++ b/CppSamples/Geometry/CutGeometry/CutGeometry.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CutGeometry, Category=Geometry] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Geometry/CutGeometry/main.cpp b/CppSamples/Geometry/CutGeometry/main.cpp index a37db41f66..6449742f8a 100644 --- a/CppSamples/Geometry/CutGeometry/main.cpp +++ b/CppSamples/Geometry/CutGeometry/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "CutGeometry.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "CutGeometry.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.cpp b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.cpp index ff0582d64c..119fd25ea6 100644 --- a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.cpp +++ b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DensifyAndGeneralize, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -18,31 +18,33 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DensifyAndGeneralize.h" -#include "Map.h" -#include "MapQuickView.h" -#include "PointCollection.h" -#include "SpatialReference.h" -#include "Graphic.h" -#include "SimpleMarkerSymbol.h" -#include "SimpleLineSymbol.h" -#include "MultipointBuilder.h" -#include "PolylineBuilder.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" #include "GeometryEngine.h" -#include "PointCollection.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" +#include "Graphic.h" #include "GraphicListModel.h" -#include "SymbolTypes.h" -#include "ImmutablePartCollection.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "ImmutablePart.h" +#include "ImmutablePartCollection.h" #include "ImmutablePointCollection.h" -#include "GraphicsOverlay.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MultipointBuilder.h" #include "Point.h" +#include "PointCollection.h" #include "Polyline.h" -#include "Envelope.h" +#include "PolylineBuilder.h" +#include "SimpleLineSymbol.h" +#include "SimpleMarkerSymbol.h" +#include "SpatialReference.h" +#include "SymbolTypes.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h index 2e29741512..017b5a8e6c 100644 --- a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h +++ b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h @@ -1,12 +1,12 @@ // [WriteFile Name=DensifyAndGeneralize, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -17,6 +17,12 @@ #ifndef DENSIFYANDGENERALIZE_H #define DENSIFYANDGENERALIZE_H +// Qt headers +#include + +// STL headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,9 +32,6 @@ class Graphic; class PointCollection; } -#include -#include - class DensifyAndGeneralize : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.pro b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.pro index f239aab6ea..0cd1c161ba 100644 --- a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.pro +++ b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DensifyAndGeneralize -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.qml b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.qml index e6dc385462..8b1088d76b 100644 --- a/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.qml +++ b/CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DensifyAndGeneralize, Category=Geometry] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Geometry/DensifyAndGeneralize/main.cpp b/CppSamples/Geometry/DensifyAndGeneralize/main.cpp index a878ae5c83..907c3258c7 100644 --- a/CppSamples/Geometry/DensifyAndGeneralize/main.cpp +++ b/CppSamples/Geometry/DensifyAndGeneralize/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "DensifyAndGeneralize.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "DensifyAndGeneralize.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.cpp b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.cpp index 9f9cf009fb..c008f2ee46 100644 --- a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.cpp +++ b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FormatCoordinates, Category=Geometry] // [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. @@ -18,20 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FormatCoordinates.h" +// ArcGIS Maps SDK headers #include "CoordinateFormatter.h" #include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "Point.h" #include "SimpleMarkerSymbol.h" -#include "MapTypes.h" -#include "GraphicListModel.h" -#include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" #include "SpatialReference.h" -#include "GraphicsOverlay.h" +#include "SymbolTypes.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h index 1ea6d1930d..161a00ab01 100644 --- a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h +++ b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h @@ -1,12 +1,12 @@ // [WriteFile Name=FormatCoordinates, Category=Geometry] // [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. @@ -17,6 +17,12 @@ #ifndef FORMATCOORDINATES_H #define FORMATCOORDINATES_H +// ArcGIS Maps SDK headers +#include "Point.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,10 +30,6 @@ class MapQuickView; class GraphicsOverlay; } -#include - -#include "Point.h" - Q_MOC_INCLUDE("MapQuickView.h") class FormatCoordinates : public QObject @@ -82,4 +84,3 @@ class FormatCoordinates : public QObject }; #endif // FORMATCOORDINATES_H - diff --git a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.pro b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.pro index 112e5aeb47..3706f2b177 100644 --- a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.pro +++ b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.qml b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.qml index 0b63e8e75f..27f5a42b12 100644 --- a/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.qml +++ b/CppSamples/Geometry/FormatCoordinates/FormatCoordinates.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FormatCoordinates, Category=Geometry] // [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. diff --git a/CppSamples/Geometry/FormatCoordinates/main.cpp b/CppSamples/Geometry/FormatCoordinates/main.cpp index af33332de5..8cc3fe2ae4 100644 --- a/CppSamples/Geometry/FormatCoordinates/main.cpp +++ b/CppSamples/Geometry/FormatCoordinates/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "FormatCoordinates.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FormatCoordinates.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/FormatCoordinates/main.qml b/CppSamples/Geometry/FormatCoordinates/main.qml index 822456cc62..184a230717 100644 --- a/CppSamples/Geometry/FormatCoordinates/main.qml +++ b/CppSamples/Geometry/FormatCoordinates/main.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FormatCoordinates, Category=Geometry] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.cpp b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.cpp index 8ea168bbbf..aeef77a540 100644 --- a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.cpp +++ b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GeodesicOperations, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -18,23 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GeodesicOperations.h" +// ArcGIS Maps SDK headers +#include "GeometryEngine.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LinearUnit.h" #include "Map.h" #include "MapQuickView.h" -#include "GraphicsOverlay.h" -#include "Graphic.h" -#include "SimpleMarkerSymbol.h" +#include "MapTypes.h" +#include "Point.h" +#include "PolylineBuilder.h" #include "SimpleLineSymbol.h" -#include "GeometryEngine.h" +#include "SimpleMarkerSymbol.h" #include "SpatialReference.h" -#include "PolylineBuilder.h" -#include "Point.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" #include "SymbolTypes.h" -#include "LinearUnit.h" using namespace Esri::ArcGISRuntime; @@ -129,4 +131,3 @@ QString GeodesicOperations::distanceText() const { return m_distanceText; } - diff --git a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h index e3e9f26a18..d55a55227a 100644 --- a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h +++ b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h @@ -1,12 +1,12 @@ // [WriteFile Name=GeodesicOperations, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -17,6 +17,13 @@ #ifndef GEODESICOPERATIONS_H #define GEODESICOPERATIONS_H +// ArcGIS Maps SDK headers +#include "Point.h" +#include "Polyline.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,10 +31,6 @@ class MapQuickView; class Graphic; } -#include "Point.h" -#include "Polyline.h" -#include - class GeodesicOperations : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.pro b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.pro index b79b24af42..d34df77685 100644 --- a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.pro +++ b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = GeodesicOperations -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.qml b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.qml index aaeb53de3c..be013528f8 100644 --- a/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.qml +++ b/CppSamples/Geometry/GeodesicOperations/GeodesicOperations.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GeodesicOperations, Category=Geometry] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Geometry/GeodesicOperations/main.cpp b/CppSamples/Geometry/GeodesicOperations/main.cpp index a6c551d522..6924540475 100644 --- a/CppSamples/Geometry/GeodesicOperations/main.cpp +++ b/CppSamples/Geometry/GeodesicOperations/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "GeodesicOperations.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "GeodesicOperations.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/ListTransformations/ListTransformations.cpp b/CppSamples/Geometry/ListTransformations/ListTransformations.cpp index e69284de77..c2102a2902 100644 --- a/CppSamples/Geometry/ListTransformations/ListTransformations.cpp +++ b/CppSamples/Geometry/ListTransformations/ListTransformations.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ListTransformations, Category=Geometry] // [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. @@ -18,33 +18,36 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ListTransformations.h" -#include "Map.h" -#include "MapQuickView.h" -#include "TransformationCatalog.h" +// ArcGIS Maps SDK headers +#include "DatumTransformation.h" +#include "Envelope.h" +#include "Error.h" +#include "GeographicTransformation.h" +#include "GeographicTransformationStep.h" #include "GeometryEngine.h" -#include "GraphicsOverlay.h" #include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "Point.h" +#include "Polygon.h" #include "SimpleMarkerSymbol.h" -#include "DatumTransformation.h" -#include "GeographicTransformationStep.h" -#include "GeographicTransformation.h" -#include "Error.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "SymbolTypes.h" #include "SpatialReference.h" +#include "SymbolTypes.h" +#include "TransformationCatalog.h" #include "Viewpoint.h" -#include "Envelope.h" -#include "Polygon.h" -#include -#include +// Qt headers #include +#include #include +#include using namespace Esri::ArcGISRuntime; @@ -146,7 +149,6 @@ void ListTransformations::addGraphics() overlay->graphics()->append(m_projectedGraphic); } - void ListTransformations::refreshTransformationList(bool orderBySuitability) { // get the input/output spatial reference diff --git a/CppSamples/Geometry/ListTransformations/ListTransformations.h b/CppSamples/Geometry/ListTransformations/ListTransformations.h index b8bce0c7b6..6257083df8 100644 --- a/CppSamples/Geometry/ListTransformations/ListTransformations.h +++ b/CppSamples/Geometry/ListTransformations/ListTransformations.h @@ -1,12 +1,12 @@ // [WriteFile Name=ListTransformations, Category=Geometry] // [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. @@ -17,6 +17,14 @@ #ifndef LISTTRANSFORMATIONS_H #define LISTTRANSFORMATIONS_H +// ArcGIS Maps SDK headers +#include "Point.h" + +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,12 +33,6 @@ class Graphic; class DatumTransformation; } -#include "Point.h" - -#include -#include -#include - class ListTransformations : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Geometry/ListTransformations/ListTransformations.pro b/CppSamples/Geometry/ListTransformations/ListTransformations.pro index d20a7148c5..f253585f36 100644 --- a/CppSamples/Geometry/ListTransformations/ListTransformations.pro +++ b/CppSamples/Geometry/ListTransformations/ListTransformations.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ListTransformations -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/ListTransformations/ListTransformations.qml b/CppSamples/Geometry/ListTransformations/ListTransformations.qml index c00c678c4a..eeb0a71e67 100644 --- a/CppSamples/Geometry/ListTransformations/ListTransformations.qml +++ b/CppSamples/Geometry/ListTransformations/ListTransformations.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ListTransformations, Category=Geometry] // [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. diff --git a/CppSamples/Geometry/ListTransformations/main.cpp b/CppSamples/Geometry/ListTransformations/main.cpp index 0aa42dd824..273ba97ec3 100644 --- a/CppSamples/Geometry/ListTransformations/main.cpp +++ b/CppSamples/Geometry/ListTransformations/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "ListTransformations.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ListTransformations.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/NearestVertex/NearestVertex.cpp b/CppSamples/Geometry/NearestVertex/NearestVertex.cpp index 2bb8429d8c..9fb20d26c7 100644 --- a/CppSamples/Geometry/NearestVertex/NearestVertex.cpp +++ b/CppSamples/Geometry/NearestVertex/NearestVertex.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=NearestVertex, Category=Geometry] // [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. @@ -18,29 +18,32 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "NearestVertex.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "Envelope.h" #include "FeatureLayer.h" #include "GeometryEngine.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "Point.h" #include "PolygonBuilder.h" #include "PortalItem.h" +#include "ProximityResult.h" #include "SimpleFillSymbol.h" #include "SimpleLineSymbol.h" #include "SimpleMarkerSymbol.h" #include "SpatialReference.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" #include "SymbolTypes.h" -#include "LayerListModel.h" -#include "ProximityResult.h" -#include "Basemap.h" -#include "Envelope.h" -#include "Point.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/NearestVertex/NearestVertex.h b/CppSamples/Geometry/NearestVertex/NearestVertex.h index 3d6047a941..2303d89480 100644 --- a/CppSamples/Geometry/NearestVertex/NearestVertex.h +++ b/CppSamples/Geometry/NearestVertex/NearestVertex.h @@ -1,12 +1,12 @@ // [WriteFile Name=NearestVertex, Category=Geometry] // [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. @@ -17,14 +17,15 @@ #ifndef NEARESTVERTEX_H #define NEARESTVERTEX_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class NearestVertex : public QObject diff --git a/CppSamples/Geometry/NearestVertex/NearestVertex.pro b/CppSamples/Geometry/NearestVertex/NearestVertex.pro index 431963173c..3ecf63c949 100644 --- a/CppSamples/Geometry/NearestVertex/NearestVertex.pro +++ b/CppSamples/Geometry/NearestVertex/NearestVertex.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = NearestVertex -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/NearestVertex/NearestVertex.qml b/CppSamples/Geometry/NearestVertex/NearestVertex.qml index 0082b23df5..51b6e167b8 100644 --- a/CppSamples/Geometry/NearestVertex/NearestVertex.qml +++ b/CppSamples/Geometry/NearestVertex/NearestVertex.qml @@ -1,12 +1,12 @@ // [WriteFile Name=NearestVertex, Category=Geometry] // [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. diff --git a/CppSamples/Geometry/NearestVertex/main.cpp b/CppSamples/Geometry/NearestVertex/main.cpp index 6459396b03..eca142b40c 100644 --- a/CppSamples/Geometry/NearestVertex/main.cpp +++ b/CppSamples/Geometry/NearestVertex/main.cpp @@ -1,23 +1,30 @@ +// [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 "NearestVertex.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.cpp b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.cpp index 6b3c23a9ac..38c65862b4 100644 --- a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.cpp +++ b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ProjectGeometry, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -18,23 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ProjectGeometry.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Viewpoint.h" +// ArcGIS Maps SDK headers +#include "CalloutData.h" #include "Envelope.h" #include "GeometryEngine.h" -#include "Point.h" -#include "SimpleMarkerSymbol.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" -#include "CalloutData.h" -#include "MapTypes.h" #include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "SymbolTypes.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "Point.h" +#include "SimpleMarkerSymbol.h" #include "SpatialReference.h" +#include "SymbolTypes.h" +#include "Viewpoint.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h index dd23bff0e3..6770eb97ae 100644 --- a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h +++ b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h @@ -1,12 +1,12 @@ // [WriteFile Name=ProjectGeometry, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -17,6 +17,10 @@ #ifndef PROJECTGEOMETRY_H #define PROJECTGEOMETRY_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,9 +29,6 @@ class Graphic; class CalloutData; } -#include -#include - class ProjectGeometry : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.pro b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.pro index a2d90de6f2..54495added 100644 --- a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.pro +++ b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ProjectGeometry -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.qml b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.qml index f72ad4f47f..5b4654897a 100644 --- a/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.qml +++ b/CppSamples/Geometry/ProjectGeometry/ProjectGeometry.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ProjectGeometry, Category=Geometry] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Geometry/ProjectGeometry/main.cpp b/CppSamples/Geometry/ProjectGeometry/main.cpp index 1b819dd4e4..11b1a4f2c3 100644 --- a/CppSamples/Geometry/ProjectGeometry/main.cpp +++ b/CppSamples/Geometry/ProjectGeometry/main.cpp @@ -1,31 +1,39 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "ProjectGeometry.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Other headers #include "Esri/ArcGISRuntime/Toolkit/register.h" -#include "ArcGISRuntimeEnvironment.h" +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ProjectGeometry.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/SpatialOperations/SpatialOperations.cpp b/CppSamples/Geometry/SpatialOperations/SpatialOperations.cpp index 7f523aaa09..585d1145fb 100755 --- a/CppSamples/Geometry/SpatialOperations/SpatialOperations.cpp +++ b/CppSamples/Geometry/SpatialOperations/SpatialOperations.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SpatialOperations, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -18,24 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SpatialOperations.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "GeometryEngine.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" -#include "Point.h" +#include "MapTypes.h" #include "Part.h" +#include "PartCollection.h" +#include "Point.h" #include "PolygonBuilder.h" #include "SimpleFillSymbol.h" -#include "GeometryEngine.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Graphic.h" -#include "SymbolTypes.h" -#include "PartCollection.h" -#include "GraphicsOverlay.h" #include "SpatialReference.h" +#include "SymbolTypes.h" #include "Viewpoint.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/SpatialOperations/SpatialOperations.h b/CppSamples/Geometry/SpatialOperations/SpatialOperations.h index 051ec167ed..f51a5435eb 100755 --- a/CppSamples/Geometry/SpatialOperations/SpatialOperations.h +++ b/CppSamples/Geometry/SpatialOperations/SpatialOperations.h @@ -1,12 +1,12 @@ // [WriteFile Name=SpatialOperations, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -17,6 +17,13 @@ #ifndef SpatialOperations_H #define SpatialOperations_H +// ArcGIS Maps SDK headers +#include "Geometry.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,10 +31,6 @@ namespace Esri::ArcGISRuntime class GraphicsOverlay; } -#include -#include -#include "Geometry.h" - Q_MOC_INCLUDE("MapQuickView.h") class SpatialOperations : public QQuickItem diff --git a/CppSamples/Geometry/SpatialOperations/SpatialOperations.pro b/CppSamples/Geometry/SpatialOperations/SpatialOperations.pro index 7b17c3fc64..b3af46cd98 100644 --- a/CppSamples/Geometry/SpatialOperations/SpatialOperations.pro +++ b/CppSamples/Geometry/SpatialOperations/SpatialOperations.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = SpatialOperations -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/SpatialOperations/SpatialOperations.qml b/CppSamples/Geometry/SpatialOperations/SpatialOperations.qml index 1cac07c1ea..186dfa63e6 100755 --- a/CppSamples/Geometry/SpatialOperations/SpatialOperations.qml +++ b/CppSamples/Geometry/SpatialOperations/SpatialOperations.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SpatialOperations, Category=Geometry] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Geometry/SpatialOperations/main.cpp b/CppSamples/Geometry/SpatialOperations/main.cpp index 419a7c2bab..3a2e757f95 100755 --- a/CppSamples/Geometry/SpatialOperations/main.cpp +++ b/CppSamples/Geometry/SpatialOperations/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "SpatialOperations.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "SpatialOperations.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.cpp b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.cpp index 87b6f7e73f..02de4d6f7f 100644 --- a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.cpp +++ b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SpatialRelationships, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -18,33 +18,38 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SpatialRelationships.h" +// ArcGIS Maps SDK headers +#include "GeometryEngine.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "IdentifyGraphicsOverlayResult.h" #include "Map.h" #include "MapQuickView.h" -#include "GraphicsOverlay.h" -#include "Graphic.h" -#include "SimpleFillSymbol.h" -#include "SimpleLineSymbol.h" -#include "SimpleMarkerSymbol.h" +#include "MapTypes.h" #include "Point.h" -#include "PolylineBuilder.h" -#include "Polyline.h" -#include "PolygonBuilder.h" #include "Polygon.h" -#include "GeometryEngine.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "SymbolTypes.h" +#include "PolygonBuilder.h" +#include "Polyline.h" +#include "PolylineBuilder.h" #include "SelectionProperties.h" -#include "IdentifyGraphicsOverlayResult.h" +#include "SimpleFillSymbol.h" +#include "SimpleLineSymbol.h" +#include "SimpleMarkerSymbol.h" #include "SpatialReference.h" -#include -#include -#include +#include "SymbolTypes.h" +// Qt headers #include +#include +#include + +// STL headers +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h index 74d3bbc45c..16e5758b78 100644 --- a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h +++ b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h @@ -1,12 +1,12 @@ // [WriteFile Name=SpatialRelationships, Category=Geometry] // [Legal] // Copyright 2018 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. @@ -17,6 +17,12 @@ #ifndef SPATIALRELATIONSHIPS_H #define SPATIALRELATIONSHIPS_H +// ArcGIS Maps SDK headers +#include "Geometry.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,9 +31,6 @@ class Graphic; class GraphicsOverlay; } -#include "Geometry.h" -#include - class SpatialRelationships : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.pro b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.pro index 3a099419a1..d8b86da0c9 100644 --- a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.pro +++ b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = SpatialRelationships -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.qml b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.qml index c28d3d48e8..2ed02b2e3d 100644 --- a/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.qml +++ b/CppSamples/Geometry/SpatialRelationships/SpatialRelationships.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SpatialRelationships, Category=Geometry] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Geometry/SpatialRelationships/main.cpp b/CppSamples/Geometry/SpatialRelationships/main.cpp index 0eee45981b..21cc7e2515 100644 --- a/CppSamples/Geometry/SpatialRelationships/main.cpp +++ b/CppSamples/Geometry/SpatialRelationships/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "SpatialRelationships.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "SpatialRelationships.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.cpp b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.cpp index b29a12628d..1eaeadfa77 100644 --- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.cpp +++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=AddCustomDynamicEntityDataSource, Category=Layers] // [Legal] // Copyright 2023 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. @@ -18,33 +18,35 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "AddCustomDynamicEntityDataSource.h" - #include "CustomDataSource.h" -#include "ServiceTypes.h" + +// ArcGIS Maps SDK headers +#include "ArcGISMapImageLayer.h" +#include "AttributeListModel.h" +#include "Basemap.h" +#include "CalloutData.h" +#include "DynamicEntity.h" +#include "DynamicEntityChangedInfo.h" #include "DynamicEntityDataSource.h" +#include "DynamicEntityDataSourcePurgeOptions.h" #include "DynamicEntityLayer.h" +#include "DynamicEntityObservation.h" +#include "IdentifyLayerResult.h" +#include "LabelDefinition.h" +#include "LabelDefinitionListModel.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" #include "MapTypes.h" -#include "Viewpoint.h" -#include "LayerListModel.h" -#include "Basemap.h" -#include "ArcGISMapImageLayer.h" -#include "TrackDisplayProperties.h" +#include "ServiceTypes.h" #include "SimpleLabelExpression.h" #include "TextSymbol.h" -#include "LabelDefinition.h" -#include "ServiceTypes.h" -#include "LabelDefinitionListModel.h" -#include "CalloutData.h" -#include "IdentifyLayerResult.h" -#include "DynamicEntityObservation.h" -#include "DynamicEntity.h" -#include "AttributeListModel.h" -#include "DynamicEntityChangedInfo.h" -#include "DynamicEntityDataSourcePurgeOptions.h" +#include "TrackDisplayProperties.h" +#include "Viewpoint.h" +// Qt headers #include #include diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h index 23a1611eb1..9c8294abed 100644 --- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h +++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h @@ -1,12 +1,12 @@ // [WriteFile Name=AddCustomDynamicEntityDataSource, Category=Layers] // [Legal] // Copyright 2023 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. @@ -17,6 +17,10 @@ #ifndef ADDCUSTOMDYNAMICENTITYDATASOURCE_H #define ADDCUSTOMDYNAMICENTITYDATASOURCE_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class DynamicEntity; @@ -25,9 +29,6 @@ class Map; class MapQuickView; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h"); class AddCustomDynamicEntityDataSource : public QObject diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.pro b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.pro index e525598476..8dc56baf56 100644 --- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.pro +++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = AddCustomDynamicEntityDataSource -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.qml b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.qml index 9823d41cbd..b7a1ac6b51 100644 --- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.qml +++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AddCustomDynamicEntityDataSource, Category=Layers] // [Legal] // Copyright 2023 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. diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.cpp b/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.cpp index 8d37738d85..08e150fe01 100644 --- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.cpp +++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.cpp @@ -1,16 +1,35 @@ +// [Legal] +// Copyright 2024 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 "CustomDataSource.h" + +// ArcGIS Maps SDK headers #include "Domain.h" +#include "DynamicEntityDataSource.h" #include "DynamicEntityDataSourceInfo.h" #include "Field.h" +#include "Point.h" #include "ServiceTypes.h" -#include "CustomDataSource.h" -#include "DynamicEntityDataSource.h" #include "SpatialReference.h" -#include "Point.h" -#include +// Qt headers #include #include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.h b/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.h index b06cfa01a7..ff5a211b7b 100644 --- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.h +++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/CustomDataSource.h @@ -1,21 +1,35 @@ +// [Legal] +// Copyright 2024 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] + #ifndef CUSTOMDATASOURCE_H #define CUSTOMDATASOURCE_H +// ArcGIS Maps SDK headers #include "DynamicEntityDataSource.h" #include "Field.h" -#include "Geometry.h" -#include "RealTimeTypes.h" -#include -#include +// Qt headers +#include #include #include +#include #include #include -#include +#include +#include #include -#include -#include namespace Esri::ArcGISRuntime { diff --git a/CppSamples/Layers/AddCustomDynamicEntityDataSource/main.cpp b/CppSamples/Layers/AddCustomDynamicEntityDataSource/main.cpp index aef9956075..2e172ad37b 100644 --- a/CppSamples/Layers/AddCustomDynamicEntityDataSource/main.cpp +++ b/CppSamples/Layers/AddCustomDynamicEntityDataSource/main.cpp @@ -1,26 +1,34 @@ +// [Legal] // Copyright 2023 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 "AddCustomDynamicEntityDataSource.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" -#include "Esri/ArcGISRuntime/Toolkit/register.h" +// Qt headers #include #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.cpp b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.cpp index 6ca0688aeb..a912f0734c 100644 --- a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.cpp +++ b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=AddDynamicEntityLayer, Category=Layers] // [Legal] // Copyright 2023 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. @@ -18,7 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "AddDynamicEntityLayer.h" + +// ArcGIS Maps SDK headers #include "ArcGISStreamService.h" #include "ArcGISStreamServiceFilter.h" #include "CalloutData.h" @@ -49,6 +52,7 @@ #include "UniqueValueRenderer.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h index 0d2fd4cf77..a6c0b4a8ff 100644 --- a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h +++ b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=AddDynamicEntityLayer, Category=Layers] // [Legal] // Copyright 2023 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. @@ -17,6 +17,9 @@ #ifndef ADDDYNAMICENTITYLAYER_H #define ADDDYNAMICENTITYLAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class ArcGISStreamService; @@ -27,8 +30,6 @@ class MapQuickView; class QMouseEvent; -#include - Q_MOC_INCLUDE("MapQuickView.h"); class AddDynamicEntityLayer : public QObject diff --git a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.pro b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.pro index 5a5515e6f2..f1b00bbe1f 100644 --- a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.pro +++ b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = AddDynamicEntityLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.qml b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.qml index ed4e2e33c1..4ea7fa09d8 100644 --- a/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.qml +++ b/CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AddDynamicEntityLayer, Category=Layers] // [Legal] // Copyright 2023 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. diff --git a/CppSamples/Layers/AddDynamicEntityLayer/main.cpp b/CppSamples/Layers/AddDynamicEntityLayer/main.cpp index c87fbf46e8..6dfbce43ce 100644 --- a/CppSamples/Layers/AddDynamicEntityLayer/main.cpp +++ b/CppSamples/Layers/AddDynamicEntityLayer/main.cpp @@ -1,25 +1,31 @@ -// COPYRIGHT 2023 ESRI - +// [Legal] +// Copyright 2023 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 "AddDynamicEntityLayer.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.cpp b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.cpp index 2f59190d1a..dff425c849 100644 --- a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.cpp +++ b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=AddEncExchangeSet, Category=Layers] // [Legal] // Copyright 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. @@ -18,25 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "AddEncExchangeSet.h" -#include "Map.h" -#include "MapQuickView.h" -#include "EncExchangeSet.h" -#include "EncLayer.h" -#include "EncDataset.h" +// ArcGIS Maps SDK headers #include "EncCell.h" +#include "EncDataset.h" #include "EncEnvironmentSettings.h" +#include "EncExchangeSet.h" +#include "EncLayer.h" #include "Envelope.h" -#include "GeometryEngine.h" #include "Error.h" -#include "MapTypes.h" +#include "GeometryEngine.h" #include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "Viewpoint.h" -#include +// Qt headers #include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h index b2b25bbdd3..1f1909ab92 100644 --- a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h +++ b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h @@ -1,12 +1,12 @@ // [WriteFile Name=AddEncExchangeSet, Category=Layers] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef ADDENCEXCHANGESET_H #define ADDENCEXCHANGESET_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ class EncExchangeSet; class Geometry; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class AddEncExchangeSet : public QObject diff --git a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.pro b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.pro index 80b5456214..c0434806e6 100644 --- a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.pro +++ b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = AddEncExchangeSet -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.qml b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.qml index 60007bb64d..f3cfb04b01 100644 --- a/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.qml +++ b/CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AddEncExchangeSet, Category=Layers] // [Legal] // Copyright 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. diff --git a/CppSamples/Layers/AddEncExchangeSet/README.metadata.json b/CppSamples/Layers/AddEncExchangeSet/README.metadata.json index 3ecd3c5c7c..18070425c4 100644 --- a/CppSamples/Layers/AddEncExchangeSet/README.metadata.json +++ b/CppSamples/Layers/AddEncExchangeSet/README.metadata.json @@ -6,7 +6,7 @@ "path": "~/ArcGIS/Runtime/Data/ENC/ExchangeSetwithoutUpdates.zip" }, { - "itemId": "af74ccbb69c846ef97085e4bebd3e76a", + "itemId": "5028bf3513ff4c38b28822d010a4937c", "path": "~/ArcGIS/Runtime/Data/ENC/hydrography.zip" } ], diff --git a/CppSamples/Layers/AddEncExchangeSet/main.cpp b/CppSamples/Layers/AddEncExchangeSet/main.cpp index 0d841bbd9a..6d3a294d30 100644 --- a/CppSamples/Layers/AddEncExchangeSet/main.cpp +++ b/CppSamples/Layers/AddEncExchangeSet/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "AddEncExchangeSet.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.cpp b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.cpp index 4b9e27f96a..3275138c81 100644 --- a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.cpp +++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ApplyMosaicRuleToRasters, Category=Layers] // [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. @@ -18,20 +18,23 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ApplyMosaicRuleToRasters.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "Error.h" #include "ImageServiceRaster.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "MosaicRule.h" +#include "Point.h" #include "RasterLayer.h" -#include "Error.h" -#include "MapTypes.h" -#include "LayerListModel.h" #include "RasterTypes.h" -#include "Envelope.h" -#include "Point.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h index 194dc70d81..04d77ef301 100644 --- a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h +++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h @@ -1,12 +1,12 @@ // [WriteFile Name=ApplyMosaicRuleToRasters, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef APPLYMOSAICRULETORASTERS_H #define APPLYMOSAICRULETORASTERS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class ImageServiceRaster; @@ -26,8 +29,6 @@ class MosaicRule; class RasterLayer; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class ApplyMosaicRuleToRasters : public QObject diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.pro b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.pro index df5f1e3e9d..952ac27e40 100644 --- a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.pro +++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ApplyMosaicRuleToRasters -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.qml b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.qml index 042915e983..1dec98a782 100644 --- a/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.qml +++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ApplyMosaicRuleToRasters, Category=Layers] // [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. diff --git a/CppSamples/Layers/ApplyMosaicRuleToRasters/main.cpp b/CppSamples/Layers/ApplyMosaicRuleToRasters/main.cpp index cac6741c45..d95b8ca713 100644 --- a/CppSamples/Layers/ApplyMosaicRuleToRasters/main.cpp +++ b/CppSamples/Layers/ApplyMosaicRuleToRasters/main.cpp @@ -1,23 +1,30 @@ +// [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 "ApplyMosaicRuleToRasters.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.cpp b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.cpp index 53d9fffa30..dc8acf2bc9 100644 --- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.cpp +++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ApplyUniqueValuesWithAlternateSymbols, Category=Layers] // [Legal] // Copyright 2022 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. @@ -18,26 +18,29 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ApplyUniqueValuesWithAlternateSymbols.h" +// ArcGIS Maps SDK headers #include "Basemap.h" #include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "MultilayerPointSymbol.h" +#include "Point.h" #include "ServiceFeatureTable.h" #include "SimpleMarkerSymbol.h" +#include "SpatialReference.h" #include "SymbolReferenceProperties.h" -#include "UniqueValueRenderer.h" -#include "MapTypes.h" #include "SymbolTypes.h" -#include "LayerListModel.h" -#include "UniqueValueListModel.h" #include "UniqueValue.h" -#include "SpatialReference.h" +#include "UniqueValueListModel.h" +#include "UniqueValueRenderer.h" #include "Viewpoint.h" -#include "Point.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h index cc02395b76..0ba7064d5b 100644 --- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h +++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h @@ -1,12 +1,12 @@ // [WriteFile Name=ApplyUniqueValuesWithAlternateSymbols, Category=Layers] // [Legal] // Copyright 2022 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. @@ -17,6 +17,9 @@ #ifndef APPLYUNIQUEVALUESWITHALTERNATESYMBOLS_H #define APPLYUNIQUEVALUESWITHALTERNATESYMBOLS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -28,8 +31,6 @@ class Symbol; class UniqueValueRenderer; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class ApplyUniqueValuesWithAlternateSymbols : public QObject diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.pro b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.pro index 642b49cb84..d94b961538 100644 --- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.pro +++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ApplyUniqueValuesWithAlternateSymbols -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.qml b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.qml index b5060c2eda..a89357495d 100644 --- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.qml +++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ApplyUniqueValuesWithAlternateSymbols, Category=Layers] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/main.cpp b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/main.cpp index 05dd48a5f2..9f6a9ccd05 100644 --- a/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/main.cpp +++ b/CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "ApplyUniqueValuesWithAlternateSymbols.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.cpp b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.cpp index a89f82a0fd..2cdc5f649a 100644 --- a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.cpp +++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ArcGISMapImageLayerUrl, Category=Layers] // [Legal] // Copyright 2016 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. @@ -18,12 +18,16 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ArcGISMapImageLayerUrl.h" +// ArcGIS Maps SDK headers +#include "ArcGISMapImageLayer.h" +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" -#include "ArcGISMapImageLayer.h" + +// Qt headers #include using namespace Esri::ArcGISRuntime; @@ -60,4 +64,3 @@ void ArcGISMapImageLayerUrl::componentComplete() // set map on the map view m_mapView->setMap(m_map); } - diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h index b1c794e72c..2f27678d79 100644 --- a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h +++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h @@ -1,12 +1,12 @@ // [WriteFile Name=ArcGISMapImageLayerUrl, Category=Layers] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef ARCGIS_MAP_IMAGE_LAYER_URL_H #define ARCGIS_MAP_IMAGE_LAYER_URL_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class ArcGISMapImageLayerUrl : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.pro b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.pro index 961059198c..a867a1bc2d 100644 --- a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.pro +++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.qml b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.qml index f4fee8b3e2..8fed0082bd 100644 --- a/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.qml +++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ArcGISMapImageLayerUrl, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/ArcGISMapImageLayerUrl/main.cpp b/CppSamples/Layers/ArcGISMapImageLayerUrl/main.cpp index ddaadc81b2..f1d7f70683 100644 --- a/CppSamples/Layers/ArcGISMapImageLayerUrl/main.cpp +++ b/CppSamples/Layers/ArcGISMapImageLayerUrl/main.cpp @@ -1,31 +1,38 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ArcGISMapImageLayerUrl.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" +#include "MapQuickView.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "MapQuickView.h" -#include "ArcGISMapImageLayerUrl.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.cpp b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.cpp index 9110cc3eb5..117d271e34 100644 --- a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.cpp +++ b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ArcGISTiledLayerUrl, Category=Layers] // [Legal] // Copyright 2016 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. @@ -18,12 +18,16 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ArcGISTiledLayerUrl.h" +// ArcGIS Maps SDK headers +#include "ArcGISTiledLayer.h" +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" -#include "ArcGISTiledLayer.h" + +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h index 9c1ecf5fa8..5a0337c3bb 100644 --- a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h +++ b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h @@ -1,12 +1,12 @@ // [WriteFile Name=ArcGISTiledLayerUrl, Category=Layers] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef ARCGIS_TILED_LAYER_URL_H #define ARCGIS_TILED_LAYER_URL_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class ArcGISTiledLayerUrl : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro index 99414a4c63..2a1016421c 100644 --- a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro +++ b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.qml b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.qml index f986b17a82..02beddf0f5 100644 --- a/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.qml +++ b/CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ArcGISTiledLayerUrl, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/ArcGISTiledLayerUrl/main.cpp b/CppSamples/Layers/ArcGISTiledLayerUrl/main.cpp index e041d5ef38..f5a3ad47d9 100644 --- a/CppSamples/Layers/ArcGISTiledLayerUrl/main.cpp +++ b/CppSamples/Layers/ArcGISTiledLayerUrl/main.cpp @@ -1,31 +1,38 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ArcGISTiledLayerUrl.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" +#include "MapQuickView.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "MapQuickView.h" -#include "ArcGISTiledLayerUrl.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.cpp b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.cpp index f853ca0075..f6185037d4 100644 --- a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.cpp +++ b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=BlendRasterLayer, Category=Layers] // [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. @@ -18,20 +18,23 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "BlendRasterLayer.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "BlendRenderer.h" +#include "ColorRamp.h" #include "Map.h" #include "MapQuickView.h" +#include "MapViewTypes.h" #include "Raster.h" #include "RasterLayer.h" -#include "BlendRenderer.h" -#include "MapViewTypes.h" #include "RasterTypes.h" -#include "ColorRamp.h" -#include "Basemap.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h index 4cf5d265ac..b0eb1586b6 100644 --- a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h +++ b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=BlendRasterLayer, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef BLENDRASTERLAYER_H #define BLENDRASTERLAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Basemap; @@ -26,8 +29,6 @@ namespace Esri::ArcGISRuntime class RasterLayer; } -#include - class BlendRasterLayer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.pro b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.pro index 0426e03d18..a56ca39613 100644 --- a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.pro +++ b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = BlendRasterLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.qml b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.qml index 398eaadd22..8f98aae72f 100644 --- a/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.qml +++ b/CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=BlendRasterLayer, Category=Layers] // [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. diff --git a/CppSamples/Layers/BlendRasterLayer/ColorRampModel.qml b/CppSamples/Layers/BlendRasterLayer/ColorRampModel.qml index 6d217488c1..0db9293853 100644 --- a/CppSamples/Layers/BlendRasterLayer/ColorRampModel.qml +++ b/CppSamples/Layers/BlendRasterLayer/ColorRampModel.qml @@ -1,12 +1,12 @@ // [WriteFile Name=BlendRasterLayer, Category=Layers] // [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. diff --git a/CppSamples/Layers/BlendRasterLayer/SlopeTypeModel.qml b/CppSamples/Layers/BlendRasterLayer/SlopeTypeModel.qml index 7311b16fbb..ae355d915d 100644 --- a/CppSamples/Layers/BlendRasterLayer/SlopeTypeModel.qml +++ b/CppSamples/Layers/BlendRasterLayer/SlopeTypeModel.qml @@ -1,12 +1,12 @@ // [WriteFile Name=BlendRasterLayer, Category=Layers] // [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. diff --git a/CppSamples/Layers/BlendRasterLayer/main.cpp b/CppSamples/Layers/BlendRasterLayer/main.cpp index 9aca51e353..79c92ad4c9 100644 --- a/CppSamples/Layers/BlendRasterLayer/main.cpp +++ b/CppSamples/Layers/BlendRasterLayer/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "BlendRasterLayer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "BlendRasterLayer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp index 5443aaf1bb..b8909fd1bc 100644 --- a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp +++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=BrowseOGCAPIFeatureService, Category=Layers] // [Legal] // Copyright 2021 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. @@ -18,22 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "BrowseOGCAPIFeatureService.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "Error.h" #include "FeatureLayer.h" +#include "GeodatabaseTypes.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "OgcFeatureCollectionInfo.h" #include "OgcFeatureCollectionTable.h" #include "OgcFeatureService.h" #include "OgcFeatureServiceInfo.h" -#include "Error.h" -#include "MapTypes.h" -#include "LayerListModel.h" #include "QueryParameters.h" -#include "GeodatabaseTypes.h" -#include "Envelope.h" +// Qt headers #include #include diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h index 40823e0590..4f2d33d16e 100644 --- a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h +++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h @@ -1,12 +1,12 @@ // [WriteFile Name=BrowseOGCAPIFeatureService, Category=Layers] // [Legal] // Copyright 2021 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. @@ -17,6 +17,10 @@ #ifndef BROWSEOGCAPIFEATURESERVICE_H #define BROWSEOGCAPIFEATURESERVICE_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Error; @@ -29,9 +33,6 @@ class OgcFeatureService; class OgcFeatureServiceInfo; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class BrowseOGCAPIFeatureService : public QObject diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.pro b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.pro index bf6443eeaf..81f5eb0a8d 100644 --- a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.pro +++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = BrowseOGCAPIFeatureService -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml index 83f73a2047..e92f88585d 100644 --- a/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml +++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.qml @@ -1,12 +1,12 @@ // [WriteFile Name=BrowseOGCAPIFeatureService, Category=Layers] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Layers/BrowseOGCAPIFeatureService/main.cpp b/CppSamples/Layers/BrowseOGCAPIFeatureService/main.cpp index b81e948eef..bd51ed0e12 100644 --- a/CppSamples/Layers/BrowseOGCAPIFeatureService/main.cpp +++ b/CppSamples/Layers/BrowseOGCAPIFeatureService/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 2021 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 "BrowseOGCAPIFeatureService.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.cpp b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.cpp index 52f4628cfb..af39306799 100644 --- a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.cpp +++ b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=BrowseWfsLayers, Category=Layers] // [Legal] // Copyright 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. @@ -18,29 +18,32 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "BrowseWfsLayers.h" +// ArcGIS Maps SDK headers +#include "CoreTypes.h" +#include "Envelope.h" +#include "Error.h" +#include "FeatureLayer.h" +#include "FeatureQueryResult.h" +#include "GeodatabaseTypes.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "WfsFeatureTable.h" -#include "FeatureLayer.h" +#include "MapTypes.h" +#include "Polygon.h" #include "QueryParameters.h" -#include "SimpleRenderer.h" #include "SimpleLineSymbol.h" #include "SimpleMarkerSymbol.h" +#include "SimpleRenderer.h" +#include "SymbolTypes.h" +#include "WfsFeatureTable.h" +#include "WfsLayerInfo.h" #include "WfsService.h" #include "WfsServiceInfo.h" -#include "WfsLayerInfo.h" -#include "Error.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "LayerListModel.h" -#include "GeodatabaseTypes.h" -#include "CoreTypes.h" -#include "FeatureQueryResult.h" -#include "Polygon.h" -#include "Envelope.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h index 18b688df01..3164a4924a 100644 --- a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h +++ b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h @@ -1,12 +1,12 @@ // [WriteFile Name=BrowseWfsLayers, Category=Layers] // [Legal] // Copyright 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. @@ -17,6 +17,11 @@ #ifndef BROWSEWFSLAYERS_H #define BROWSEWFSLAYERS_H +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -27,10 +32,6 @@ class WfsLayerInfo; class LayerListModel; } -#include -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class BrowseWfsLayers : public QObject @@ -69,7 +70,6 @@ class BrowseWfsLayers : public QObject bool m_loadingIndicator = false; bool m_swapAxis = false; - }; #endif // BROWSEWFSLAYERS_H diff --git a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.pro b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.pro index 0fadee7ebf..9496eed274 100644 --- a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.pro +++ b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = BrowseWfsLayers -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.qml b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.qml index 0b50803e06..5a2fbb9eab 100644 --- a/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.qml +++ b/CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.qml @@ -1,12 +1,12 @@ // [WriteFile Name=BrowseWfsLayers, Category=Layers] // [Legal] // Copyright 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. diff --git a/CppSamples/Layers/BrowseWfsLayers/main.cpp b/CppSamples/Layers/BrowseWfsLayers/main.cpp index 94f09018b1..5b970c8836 100644 --- a/CppSamples/Layers/BrowseWfsLayers/main.cpp +++ b/CppSamples/Layers/BrowseWfsLayers/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "BrowseWfsLayers.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.cpp b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.cpp index e531193df4..3d3721f81c 100644 --- a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.cpp +++ b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeSublayerRenderer, Category=Layers] // [Legal] // Copyright 2018 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. @@ -18,23 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ChangeSublayerRenderer.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers #include "ArcGISMapImageLayer.h" #include "ArcGISMapImageSublayer.h" -#include "Viewpoint.h" +#include "ArcGISSublayerListModel.h" #include "ClassBreaksRenderer.h" -#include "SimpleFillSymbol.h" -#include "SimpleLineSymbol.h" +#include "Envelope.h" #include "Error.h" -#include "MapTypes.h" -#include "SymbolTypes.h" #include "LayerListModel.h" -#include "ArcGISSublayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "SimpleFillSymbol.h" +#include "SimpleLineSymbol.h" #include "SpatialReference.h" -#include "Envelope.h" +#include "SymbolTypes.h" +#include "Viewpoint.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h index 9b2fe016ff..c50199b0d5 100644 --- a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h +++ b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeSublayerRenderer, Category=Layers] // [Legal] // Copyright 2018 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. @@ -17,6 +17,9 @@ #ifndef CHANGESUBLAYERRENDERER_H #define CHANGESUBLAYERRENDERER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -27,8 +30,6 @@ class ArcGISMapImageSublayer; class ClassBreak; } -#include - class ChangeSublayerRenderer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.pro b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.pro index 36bde76a16..6c23d6ac8c 100644 --- a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.pro +++ b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ChangeSublayerRenderer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.qml b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.qml index b602934bf2..21e2847c62 100644 --- a/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.qml +++ b/CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeSublayerRenderer, Category=Layers] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Layers/ChangeSublayerRenderer/main.cpp b/CppSamples/Layers/ChangeSublayerRenderer/main.cpp index e1efa0a706..09601225f7 100644 --- a/CppSamples/Layers/ChangeSublayerRenderer/main.cpp +++ b/CppSamples/Layers/ChangeSublayerRenderer/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "ChangeSublayerRenderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ChangeSublayerRenderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.cpp b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.cpp index c514701a07..b2b4517201 100644 --- a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.cpp +++ b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeSublayerVisibility, Category=Layers] // [Legal] // Copyright 2016 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. @@ -18,18 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ChangeSublayerVisibility.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Basemap.h" +// ArcGIS Maps SDK headers #include "ArcGISMapImageLayer.h" #include "ArcGISSublayerListModel.h" +#include "Basemap.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "Point.h" -#include "Viewpoint.h" #include "SpatialReference.h" -#include "MapTypes.h" -#include "LayerListModel.h" +#include "Viewpoint.h" + +// Qt headers #include using namespace Esri::ArcGISRuntime; @@ -75,4 +79,3 @@ QAbstractListModel* ChangeSublayerVisibility::sublayerModel() { return m_sublayerModel; } - diff --git a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h index ee746a1395..6d711a87e0 100644 --- a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h +++ b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeSublayerVisibility, Category=Layers] // [Legal] // Copyright 2016 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. @@ -17,6 +17,10 @@ #ifndef CHANGE_SUBLAYER_VISIBILITY_H #define CHANGE_SUBLAYER_VISIBILITY_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,9 +28,6 @@ namespace Esri::ArcGISRuntime class ArcGISMapImageLayer; } -#include -#include - class ChangeSublayerVisibility : public QQuickItem { Q_OBJECT @@ -54,4 +55,3 @@ class ChangeSublayerVisibility : public QQuickItem }; #endif // CHANGE_SUBLAYER_VISIBILITY_H - diff --git a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.pro b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.pro index 95cce6dd2d..fa40834e8e 100644 --- a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.pro +++ b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.qml b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.qml index 42536d74cb..e454c93e9b 100644 --- a/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.qml +++ b/CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeSublayerVisibility, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/ChangeSublayerVisibility/main.cpp b/CppSamples/Layers/ChangeSublayerVisibility/main.cpp index 14bdbcafe6..eb37917b1d 100644 --- a/CppSamples/Layers/ChangeSublayerVisibility/main.cpp +++ b/CppSamples/Layers/ChangeSublayerVisibility/main.cpp @@ -1,32 +1,39 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ChangeSublayerVisibility.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" +#include "ArcGISSublayerListModel.h" +#include "MapQuickView.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "MapQuickView.h" -#include "ArcGISSublayerListModel.h" -#include "ChangeSublayerVisibility.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.cpp b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.cpp index f3c33c698f..b40db52751 100644 --- a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.cpp +++ b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ConfigureClusters, Category=Layers] // [Legal] // Copyright 2023 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. @@ -18,11 +18,13 @@ #include "pch.hpp" // IWYU pragma: keep #endif // PCH_BUILD +// sample headers #include "ConfigureClusters.h" -#include "AggregateGeoElement.h" +// ArcGIS Maps SDK headers #include "AggregateField.h" #include "AggregateFieldListModel.h" +#include "AggregateGeoElement.h" #include "AttributeListModel.h" #include "ClassBreaksRenderer.h" #include "ClusteringFeatureReduction.h" @@ -46,6 +48,7 @@ #include "TextSymbol.h" #include "Viewpoint.h" +// Qt headers #include #include diff --git a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.h b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.h index 588a240b61..ff58abc507 100644 --- a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.h +++ b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.h @@ -1,12 +1,12 @@ // [WriteFile Name=ConfigureClusters, Category=Layers] // [Legal] // Copyright 2023 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. @@ -17,6 +17,9 @@ #ifndef ConfigureClusters_H #define ConfigureClusters_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class AggregateGeoElement; @@ -28,8 +31,6 @@ namespace Esri::ArcGISRuntime class QMouseEvent; -#include - Q_MOC_INCLUDE("MapQuickView.h"); class ConfigureClusters : public QObject diff --git a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.pro b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.pro index f4d5b9cadc..b10e626381 100644 --- a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.pro +++ b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.pro @@ -27,7 +27,7 @@ QT += opengl qml quick gui TEMPLATE = app TARGET = ConfigureClusters -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.qml b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.qml index 3a3e4f01f5..c4fb8d865e 100644 --- a/CppSamples/Layers/ConfigureClusters/ConfigureClusters.qml +++ b/CppSamples/Layers/ConfigureClusters/ConfigureClusters.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ConfigureClusters, Category=Layers] // [Legal] // Copyright 2023 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. diff --git a/CppSamples/Layers/ConfigureClusters/main.cpp b/CppSamples/Layers/ConfigureClusters/main.cpp index f7ce5aaa9f..2430ca0e5b 100644 --- a/CppSamples/Layers/ConfigureClusters/main.cpp +++ b/CppSamples/Layers/ConfigureClusters/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2023 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 "ConfigureClusters.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.cpp b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.cpp index da3605593f..661cb36d06 100644 --- a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.cpp +++ b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndSaveKmlFile, Category=Layers] // [Legal] // Copyright 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. @@ -18,30 +18,33 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CreateAndSaveKmlFile.h" -#include "Map.h" -#include "MapQuickView.h" -#include "PolygonBuilder.h" -#include "PolylineBuilder.h" -#include "KmlDocument.h" -#include "KmlPlacemark.h" -#include "KmlNodeListModel.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "Error.h" #include "KmlDataset.h" -#include "KmlLayer.h" -#include "KmlLineStyle.h" +#include "KmlDocument.h" +#include "KmlGeometry.h" #include "KmlIcon.h" #include "KmlIconStyle.h" +#include "KmlLayer.h" +#include "KmlLineStyle.h" +#include "KmlNodeListModel.h" +#include "KmlPlacemark.h" #include "KmlPolygonStyle.h" #include "KmlStyle.h" -#include "Error.h" -#include "MapTypes.h" #include "LayerListModel.h" -#include "KmlGeometry.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "PolygonBuilder.h" +#include "PolylineBuilder.h" #include "SpatialReference.h" #include "Viewpoint.h" -#include "Envelope.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h index 6310a33a8e..63f31074ca 100644 --- a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h +++ b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndSaveKmlFile, Category=Layers] // [Legal] // Copyright 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. @@ -17,6 +17,17 @@ #ifndef CREATEANDSAVEKMLFILE_H #define CREATEANDSAVEKMLFILE_H +// ArcGIS Maps SDK headers +#include "Geometry.h" +#include "Point.h" +#include "Polygon.h" +#include "Polyline.h" + +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -27,15 +38,6 @@ class KmlLayer; class KmlStyle; } -#include -#include -#include - -#include "Geometry.h" -#include "Point.h" -#include "Polyline.h" -#include "Polygon.h" - Q_MOC_INCLUDE("MapQuickView.h") class CreateAndSaveKmlFile : public QObject diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.pro b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.pro index a5557e5e28..b3c225f1bf 100644 --- a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.pro +++ b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateAndSaveKmlFile -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.qml b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.qml index fd49406ac4..46a884d950 100644 --- a/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.qml +++ b/CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndSaveKmlFile, Category=Layers] // [Legal] // Copyright 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. diff --git a/CppSamples/Layers/CreateAndSaveKmlFile/main.cpp b/CppSamples/Layers/CreateAndSaveKmlFile/main.cpp index 39f4952647..0046c4e0b6 100644 --- a/CppSamples/Layers/CreateAndSaveKmlFile/main.cpp +++ b/CppSamples/Layers/CreateAndSaveKmlFile/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "CreateAndSaveKmlFile.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.cpp b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.cpp index 23444edaee..8fcd08cd6a 100644 --- a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.cpp +++ b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayAnnotation, Category=Layers] // [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. @@ -18,17 +18,19 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayAnnotation.h" +// ArcGIS Maps SDK headers #include "AnnotationLayer.h" #include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "ServiceFeatureTable.h" #include "MapTypes.h" -#include "LayerListModel.h" -#include "SpatialReference.h" #include "Point.h" +#include "ServiceFeatureTable.h" +#include "SpatialReference.h" #include "Viewpoint.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h index 1d1f04a650..682820e3d0 100644 --- a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h +++ b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayAnnotation, Category=Layers] // [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. @@ -17,14 +17,15 @@ #ifndef DISPLAYANNOTATION_H #define DISPLAYANNOTATION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class DisplayAnnotation : public QObject diff --git a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.pro b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.pro index 8b201cb6c2..9c9f342d41 100644 --- a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.pro +++ b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayAnnotation -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.qml b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.qml index 77a9fa1a1e..f4155bd8dd 100644 --- a/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.qml +++ b/CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayAnnotation, Category=Layers] // [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. diff --git a/CppSamples/Layers/DisplayAnnotation/main.cpp b/CppSamples/Layers/DisplayAnnotation/main.cpp index 0e783c8825..f06f7f389b 100644 --- a/CppSamples/Layers/DisplayAnnotation/main.cpp +++ b/CppSamples/Layers/DisplayAnnotation/main.cpp @@ -1,23 +1,30 @@ +// [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 "DisplayAnnotation.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.cpp b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.cpp index 22bf13f9fd..cd37c01b3d 100644 --- a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.cpp +++ b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDimensions, Category=Layers] // [Legal] // Copyright 2021 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. @@ -18,16 +18,19 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayDimensions.h" +// ArcGIS Maps SDK headers #include "DimensionLayer.h" +#include "Error.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "MobileMapPackage.h" -#include "Error.h" #include "MapTypes.h" -#include "LayerListModel.h" +#include "MobileMapPackage.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.h b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.h index 6d509c8721..922bea4e51 100644 --- a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.h +++ b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDimensions, Category=Layers] // [Legal] // Copyright 2021 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. @@ -17,6 +17,9 @@ #ifndef DISPLAYDIMENSIONS_H #define DISPLAYDIMENSIONS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class DimensionLayer; @@ -26,8 +29,6 @@ class MapQuickView; class MobileMapPackage; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class DisplayDimensions : public QObject diff --git a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.pro b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.pro index 6cc1334e30..05c562a0ad 100644 --- a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.pro +++ b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayDimensions -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.qml b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.qml index 108e8efbb3..318fb4c85d 100644 --- a/CppSamples/Layers/DisplayDimensions/DisplayDimensions.qml +++ b/CppSamples/Layers/DisplayDimensions/DisplayDimensions.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDimensions, Category=Layers] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Layers/DisplayDimensions/main.cpp b/CppSamples/Layers/DisplayDimensions/main.cpp index 3fedd0953c..131e8fd7a5 100644 --- a/CppSamples/Layers/DisplayDimensions/main.cpp +++ b/CppSamples/Layers/DisplayDimensions/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2021 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 "DisplayDimensions.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.cpp b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.cpp index b959ccf09b..71df5dc9b0 100644 --- a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.cpp +++ b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayFeatureLayers, Category=Layers] // [Legal] // Copyright 2022 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. @@ -18,15 +18,17 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayFeatureLayers.h" +// ArcGIS Maps SDK headers #include "Envelope.h" #include "Error.h" #include "FeatureLayer.h" -#include "Geodatabase.h" -#include "GeodatabaseFeatureTable.h" #include "GeoPackage.h" #include "GeoPackageFeatureTable.h" +#include "Geodatabase.h" +#include "GeodatabaseFeatureTable.h" #include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" @@ -39,6 +41,7 @@ #include "SpatialReference.h" #include "Viewpoint.h" +// Qt headers #include #include diff --git a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h index a1ec542ddb..b943f92433 100644 --- a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h +++ b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayFeatureLayers, Category=Layers] // [Legal] // Copyright 2022 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. @@ -17,6 +17,9 @@ #ifndef DISPLAYFEATURELAYERS_H #define DISPLAYFEATURELAYERS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -24,8 +27,6 @@ class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h"); class DisplayFeatureLayers : public QObject diff --git a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.pro b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.pro index d871ad85be..a50165a0cc 100644 --- a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.pro +++ b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.pro @@ -27,7 +27,7 @@ QT += qml quick TEMPLATE = app TARGET = DisplayFeatureLayers -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.qml b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.qml index fdf4dcad40..f74255ffcc 100644 --- a/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.qml +++ b/CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayFeatureLayers, Category=Layers] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Layers/DisplayFeatureLayers/main.cpp b/CppSamples/Layers/DisplayFeatureLayers/main.cpp index ffc7eea56c..e38a6a0dd4 100644 --- a/CppSamples/Layers/DisplayFeatureLayers/main.cpp +++ b/CppSamples/Layers/DisplayFeatureLayers/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "DisplayFeatureLayers.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/DisplayKml/DisplayKml.cpp b/CppSamples/Layers/DisplayKml/DisplayKml.cpp index 626c3996cd..5098c07920 100644 --- a/CppSamples/Layers/DisplayKml/DisplayKml.cpp +++ b/CppSamples/Layers/DisplayKml/DisplayKml.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayKml, Category=Layers] // [Legal] // Copyright 2018 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. @@ -18,26 +18,29 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayKml.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "Viewpoint.h" #include "Camera.h" -#include "SpatialReference.h" -#include "KmlLayer.h" +#include "ElevationSourceListModel.h" #include "KmlDataset.h" -#include "PortalItem.h" -#include "MapTypes.h" +#include "KmlLayer.h" #include "LayerListModel.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" +#include "MapTypes.h" #include "Point.h" +#include "PortalItem.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "SpatialReference.h" +#include "Surface.h" +#include "Viewpoint.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/DisplayKml/DisplayKml.h b/CppSamples/Layers/DisplayKml/DisplayKml.h index 09c0f74e93..0699b7f34a 100644 --- a/CppSamples/Layers/DisplayKml/DisplayKml.h +++ b/CppSamples/Layers/DisplayKml/DisplayKml.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayKml, Category=Layers] // [Legal] // Copyright 2018 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. @@ -17,6 +17,12 @@ #ifndef DISPLAYKML_H #define DISPLAYKML_H +// ArcGIS Maps SDK headers +#include "Viewpoint.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; @@ -26,9 +32,6 @@ class KmlDataset; class PortalItem; } -#include "Viewpoint.h" -#include - class DisplayKml : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/DisplayKml/DisplayKml.pro b/CppSamples/Layers/DisplayKml/DisplayKml.pro index 6c24e100e3..910f8f2cf8 100644 --- a/CppSamples/Layers/DisplayKml/DisplayKml.pro +++ b/CppSamples/Layers/DisplayKml/DisplayKml.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayKml -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/DisplayKml/DisplayKml.qml b/CppSamples/Layers/DisplayKml/DisplayKml.qml index 8130a5bd8b..037f36f7b7 100644 --- a/CppSamples/Layers/DisplayKml/DisplayKml.qml +++ b/CppSamples/Layers/DisplayKml/DisplayKml.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayKml, Category=Layers] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Layers/DisplayKml/main.cpp b/CppSamples/Layers/DisplayKml/main.cpp index f65ca25d20..fe50e432ab 100644 --- a/CppSamples/Layers/DisplayKml/main.cpp +++ b/CppSamples/Layers/DisplayKml/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "DisplayKml.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "DisplayKml.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.cpp b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.cpp index 3566d1079a..056fc7e4c4 100644 --- a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.cpp +++ b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayKmlNetworkLinks, Category=Layers] // [Legal] // Copyright 2018 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. @@ -18,19 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayKmlNetworkLinks.h" +// ArcGIS Maps SDK headers #include "KmlDataset.h" #include "KmlLayer.h" +#include "KmlNetworkLink.h" +#include "LayerListModel.h" +#include "MapTypes.h" +#include "Point.h" #include "Scene.h" #include "SceneQuickView.h" -#include "MapTypes.h" -#include "LayerListModel.h" -#include "KmlNetworkLink.h" #include "SpatialReference.h" -#include "Point.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; @@ -85,4 +88,3 @@ void DisplayKmlNetworkLinks::componentComplete() m_sceneView->setViewpointAsync(Viewpoint { Point { 8.150526, 50.472421, SpatialReference::wgs84() }, 20000000 } ); m_sceneView->setArcGISScene(scene); } - diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h index c6712118ed..5fad6fb0bd 100644 --- a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h +++ b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayKmlNetworkLinks, Category=Layers] // [Legal] // Copyright 2018 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. @@ -17,13 +17,14 @@ #ifndef DISPLAYKMLNETWORKLINKS_H #define DISPLAYKMLNETWORKLINKS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; } -#include - class DisplayKmlNetworkLinks : public QQuickItem { Q_PROPERTY(QString currentKmlNetworkMessage READ currentKmlNetworkMessage WRITE setCurrentKmlNetworkMessage NOTIFY kmlMessageRecieved) diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.pro b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.pro index 76855c96a9..bc68046d3f 100644 --- a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.pro +++ b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayKmlNetworkLinks -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.qml b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.qml index b768c8e234..a4ed2f8867 100644 --- a/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.qml +++ b/CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayKmlNetworkLinks, Category=Layers] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/MessageButton.qml b/CppSamples/Layers/DisplayKmlNetworkLinks/MessageButton.qml index 1b73e7b99a..7c4f3070de 100644 --- a/CppSamples/Layers/DisplayKmlNetworkLinks/MessageButton.qml +++ b/CppSamples/Layers/DisplayKmlNetworkLinks/MessageButton.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayKmlNetworkLinks, Category=Layers] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Layers/DisplayKmlNetworkLinks/main.cpp b/CppSamples/Layers/DisplayKmlNetworkLinks/main.cpp index d3814e1deb..efdf552f36 100644 --- a/CppSamples/Layers/DisplayKmlNetworkLinks/main.cpp +++ b/CppSamples/Layers/DisplayKmlNetworkLinks/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "DisplayKmlNetworkLinks.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "DisplayKmlNetworkLinks.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.cpp b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.cpp index 88c233cf8a..b0d4492ac4 100644 --- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.cpp +++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayOgcApiFeatureCollection, Category=Layers] // [Legal] // Copyright 2021 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. @@ -18,23 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayOgcApiFeatureCollection.h" +// ArcGIS Maps SDK headers +#include "CoreTypes.h" #include "FeatureLayer.h" +#include "GeodatabaseTypes.h" +#include "Geometry.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "OgcFeatureCollectionTable.h" #include "QueryParameters.h" #include "SimpleLineSymbol.h" #include "SimpleRenderer.h" -#include "MapTypes.h" #include "SymbolTypes.h" -#include "LayerListModel.h" -#include "CoreTypes.h" -#include "GeodatabaseTypes.h" #include "Viewpoint.h" -#include "Geometry.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h index 64e66bfcb4..456b9501dd 100644 --- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h +++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayOgcApiFeatureCollection, Category=Layers] // [Legal] // Copyright 2021 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. @@ -17,8 +17,12 @@ #ifndef DisplayOgcApiFeatureCollection_H #define DisplayOgcApiFeatureCollection_H +// ArcGIS Maps SDK headers #include "QueryParameters.h" +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -28,8 +32,6 @@ class OgcFeatureCollectionTable; class QueryParameters; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class DisplayOgcApiFeatureCollection : public QObject diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.pro b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.pro index 293ed939ec..7b3bd77c10 100644 --- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.pro +++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayOgcApiFeatureCollection -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.qml b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.qml index 67b5d4c98e..ad05dadc1d 100644 --- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.qml +++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayOgcApiFeatureCollection, Category=Layers] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Layers/DisplayOgcApiFeatureCollection/main.cpp b/CppSamples/Layers/DisplayOgcApiFeatureCollection/main.cpp index 8cf4e1bacf..02ff11942a 100644 --- a/CppSamples/Layers/DisplayOgcApiFeatureCollection/main.cpp +++ b/CppSamples/Layers/DisplayOgcApiFeatureCollection/main.cpp @@ -1,24 +1,30 @@ +// [Legal] // Copyright 2021 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 "DisplayOgcApiFeatureCollection.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.cpp b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.cpp index 75c8f2a67b..b277c11f16 100644 --- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.cpp +++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplaySubtypeFeatureLayer, Category=Layers] // [Legal] // Copyright 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. @@ -18,29 +18,31 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplaySubtypeFeatureLayer.h" +// ArcGIS Maps SDK headers +#include "Credential.h" +#include "Envelope.h" +#include "Error.h" #include "FeatureLayer.h" #include "LabelDefinition.h" +#include "LabelDefinitionListModel.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "ServiceFeatureTable.h" +#include "ServiceTypes.h" #include "SimpleLabelExpression.h" +#include "SimpleMarkerSymbol.h" #include "SimpleRenderer.h" +#include "SpatialReference.h" #include "SubtypeFeatureLayer.h" #include "SubtypeSublayer.h" -#include "TextSymbol.h" -#include "Error.h" -#include "MapTypes.h" #include "SymbolTypes.h" -#include "LayerListModel.h" -#include "Credential.h" -#include "LabelDefinitionListModel.h" -#include "ServiceTypes.h" -#include "SimpleMarkerSymbol.h" -#include "SpatialReference.h" +#include "TextSymbol.h" #include "Viewpoint.h" -#include "Envelope.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h index 304b2f2dfa..92db3b6e4f 100644 --- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h +++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplaySubtypeFeatureLayer, Category=Layers] // [Legal] // Copyright 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. @@ -17,6 +17,12 @@ #ifndef DISPLAYSUBTYPEFEATURELAYER_H #define DISPLAYSUBTYPEFEATURELAYER_H +// ArcGIS Maps SDK headers +#include "SubtypeSublayer.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -30,10 +36,6 @@ class SubtypeFeatureLayer; class SubtypeSublayer; } -#include - -#include "SubtypeSublayer.h" - Q_MOC_INCLUDE("MapQuickView.h") class DisplaySubtypeFeatureLayer : public QObject diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.pro b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.pro index 73d942634c..68a06ede16 100644 --- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.pro +++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplaySubtypeFeatureLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.qml b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.qml index 70dfae5018..e49749fb7a 100644 --- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.qml +++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplaySubtypeFeatureLayer, Category=Layers] // [Legal] // Copyright 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. diff --git a/CppSamples/Layers/DisplaySubtypeFeatureLayer/main.cpp b/CppSamples/Layers/DisplaySubtypeFeatureLayer/main.cpp index a23f336e32..60c86b2d70 100644 --- a/CppSamples/Layers/DisplaySubtypeFeatureLayer/main.cpp +++ b/CppSamples/Layers/DisplaySubtypeFeatureLayer/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "DisplaySubtypeFeatureLayer.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.cpp b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.cpp index 0259e43b87..3e2049066e 100644 --- a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.cpp +++ b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayWfsLayer, Category=Layers] // [Legal] // Copyright 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. @@ -18,26 +18,29 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayWfsLayer.h" +// ArcGIS Maps SDK headers +#include "CoreTypes.h" +#include "Envelope.h" +#include "Error.h" +#include "FeatureLayer.h" +#include "GeodatabaseTypes.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "WfsFeatureTable.h" -#include "FeatureLayer.h" +#include "MapTypes.h" +#include "Polygon.h" #include "QueryParameters.h" -#include "SimpleRenderer.h" #include "SimpleLineSymbol.h" -#include "Error.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "LayerListModel.h" -#include "GeodatabaseTypes.h" -#include "CoreTypes.h" +#include "SimpleRenderer.h" #include "SpatialReference.h" -#include "Envelope.h" +#include "SymbolTypes.h" #include "Viewpoint.h" -#include "Polygon.h" +#include "WfsFeatureTable.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h index ebfbc60ea9..db0017d45f 100644 --- a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h +++ b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayWfsLayer, Category=Layers] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef DISPLAYWFSLAYER_H #define DISPLAYWFSLAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ class MapQuickView; class WfsFeatureTable; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class DisplayWfsLayer : public QObject diff --git a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.pro b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.pro index 94880fc074..0cc22f61f8 100644 --- a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.pro +++ b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayWfsLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.qml b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.qml index bc735d0c82..7c8ed0246d 100644 --- a/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.qml +++ b/CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayWfsLayer, Category=Layers] // [Legal] // Copyright 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. diff --git a/CppSamples/Layers/DisplayWfsLayer/main.cpp b/CppSamples/Layers/DisplayWfsLayer/main.cpp index 5a6c6a6730..f68cf78e47 100644 --- a/CppSamples/Layers/DisplayWfsLayer/main.cpp +++ b/CppSamples/Layers/DisplayWfsLayer/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "DisplayWfsLayer.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/ExportTiles/ExportTiles.cpp b/CppSamples/Layers/ExportTiles/ExportTiles.cpp index 2349e324b0..04bcadd8d4 100644 --- a/CppSamples/Layers/ExportTiles/ExportTiles.cpp +++ b/CppSamples/Layers/ExportTiles/ExportTiles.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ExportTiles, Category=Layers] // [Legal] // Copyright 2016 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. @@ -18,28 +18,29 @@ #include "pch.hpp" #endif // PCH_BUILD -// C++ API headers -#include "ExportTileCacheParameters.h" - -#include "Map.h" -#include "MapQuickView.h" -#include "Basemap.h" +// sample headers #include "ExportTiles.h" + +// ArcGIS Maps SDK headers #include "ArcGISTiledLayer.h" -#include "ExportTileCacheTask.h" +#include "Basemap.h" #include "Envelope.h" -#include "GeometryEngine.h" -#include "SpatialReference.h" -#include "TileCache.h" #include "Error.h" -#include "MapTypes.h" -#include "LayerListModel.h" #include "ExportTileCacheJob.h" -#include "TaskTypes.h" +#include "ExportTileCacheParameters.h" +#include "ExportTileCacheTask.h" +#include "GeometryEngine.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "Point.h" -#include "Envelope.h" +#include "SpatialReference.h" +#include "TaskTypes.h" +#include "TileCache.h" #include "Viewpoint.h" +// Qt headers #include #include #include diff --git a/CppSamples/Layers/ExportTiles/ExportTiles.h b/CppSamples/Layers/ExportTiles/ExportTiles.h index 8bf728679d..ce05e7fd49 100644 --- a/CppSamples/Layers/ExportTiles/ExportTiles.h +++ b/CppSamples/Layers/ExportTiles/ExportTiles.h @@ -1,12 +1,12 @@ // [WriteFile Name=ExportTiles, Category=Layers] // [Legal] // Copyright 2016 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. @@ -17,6 +17,10 @@ #ifndef EXPORT_TILES #define EXPORT_TILES +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class ExportTileCacheParameters; @@ -26,9 +30,6 @@ namespace Esri::ArcGISRuntime class TileCache; } -#include -#include - class ExportTiles : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/ExportTiles/ExportTiles.pro b/CppSamples/Layers/ExportTiles/ExportTiles.pro index f3ab8f051a..8d76d45cf4 100644 --- a/CppSamples/Layers/ExportTiles/ExportTiles.pro +++ b/CppSamples/Layers/ExportTiles/ExportTiles.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Layers/ExportTiles/ExportTiles.qml b/CppSamples/Layers/ExportTiles/ExportTiles.qml index c96e3d3c70..bc6fbd7050 100644 --- a/CppSamples/Layers/ExportTiles/ExportTiles.qml +++ b/CppSamples/Layers/ExportTiles/ExportTiles.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ExportTiles, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/ExportTiles/main.cpp b/CppSamples/Layers/ExportTiles/main.cpp index 4730a3ea46..455fd76a0a 100644 --- a/CppSamples/Layers/ExportTiles/main.cpp +++ b/CppSamples/Layers/ExportTiles/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ExportTiles.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ExportTiles.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.cpp b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.cpp index 0a0dc02e5c..7d65d68967 100644 --- a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.cpp +++ b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ExportVectorTiles, Category=Layers] // [Legal] // Copyright 2022 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. @@ -18,32 +18,35 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ExportVectorTiles.h" +// ArcGIS Maps SDK headers #include "ArcGISVectorTiledLayer.h" -#include "ExportVectorTilesTask.h" +#include "Basemap.h" +#include "Envelope.h" +#include "Error.h" +#include "ExportVectorTilesJob.h" #include "ExportVectorTilesParameters.h" +#include "ExportVectorTilesResult.h" +#include "ExportVectorTilesTask.h" #include "GeometryEngine.h" +#include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "SimpleLineSymbol.h" #include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "SymbolTypes.h" -#include "LayerListModel.h" -#include "ServiceTypes.h" -#include "ExportVectorTilesJob.h" -#include "Error.h" -#include "ExportVectorTilesResult.h" -#include "Viewpoint.h" -#include "Graphic.h" -#include "Envelope.h" #include "Point.h" -#include "Basemap.h" +#include "ServiceTypes.h" +#include "SimpleLineSymbol.h" #include "SpatialReference.h" +#include "SymbolTypes.h" +#include "Viewpoint.h" +// Qt headers #include #include #include diff --git a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h index 15e458c573..ce6ef97bb2 100644 --- a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h +++ b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h @@ -1,12 +1,12 @@ // [WriteFile Name=ExportVectorTiles, Category=Layers] // [Legal] // Copyright 2022 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. @@ -17,6 +17,10 @@ #ifndef EXPORTVECTORTILES_H #define EXPORTVECTORTILES_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class ExportVectorTilesJob; @@ -26,9 +30,6 @@ class Map; class MapQuickView; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class ExportVectorTiles : public QObject diff --git a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.pro b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.pro index 3b64e2999f..e33700c714 100644 --- a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.pro +++ b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ExportVectorTiles -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.qml b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.qml index 25c5768505..a175f4e7fd 100644 --- a/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.qml +++ b/CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ExportVectorTiles, Category=Layers] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Layers/ExportVectorTiles/main.cpp b/CppSamples/Layers/ExportVectorTiles/main.cpp index 73c8da4bcc..2a58abaace 100644 --- a/CppSamples/Layers/ExportVectorTiles/main.cpp +++ b/CppSamples/Layers/ExportVectorTiles/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "ExportVectorTiles.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.cpp b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.cpp index db60a1b45b..ce4c130b78 100644 --- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.cpp +++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureCollectionLayerFromPortal, Category=Layers] // [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. @@ -18,17 +18,19 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FeatureCollectionLayerFromPortal.h" +// ArcGIS Maps SDK headers +#include "Error.h" #include "FeatureCollection.h" #include "FeatureCollectionLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "Portal.h" #include "PortalItem.h" -#include "Error.h" -#include "MapTypes.h" -#include "LayerListModel.h" #include "PortalTypes.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h index 7ed677aeaf..1fc56b854c 100644 --- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h +++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureCollectionLayerFromPortal, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef FEATURECOLLECTIONLAYERFROMPORTAL_H #define FEATURECOLLECTIONLAYERFROMPORTAL_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ class MapQuickView; class PortalItem; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class FeatureCollectionLayerFromPortal : public QObject diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.pro b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.pro index 0e4211d0d0..9b75ce231f 100644 --- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.pro +++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FeatureCollectionLayerFromPortal -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.qml b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.qml index f547497e01..b3ece8ed60 100644 --- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.qml +++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureCollectionLayerFromPortal, Category=Layers] // [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. diff --git a/CppSamples/Layers/FeatureCollectionLayerFromPortal/main.cpp b/CppSamples/Layers/FeatureCollectionLayerFromPortal/main.cpp index 592807ecf9..445d7b078b 100644 --- a/CppSamples/Layers/FeatureCollectionLayerFromPortal/main.cpp +++ b/CppSamples/Layers/FeatureCollectionLayerFromPortal/main.cpp @@ -1,23 +1,30 @@ +// [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 "FeatureCollectionLayerFromPortal.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.cpp b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.cpp index 82f4953f68..572ab3fe78 100644 --- a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.cpp +++ b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureCollectionLayerQuery, Category=Layers] // [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. @@ -18,20 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FeatureCollectionLayerQuery.h" +// ArcGIS Maps SDK headers #include "FeatureCollection.h" #include "FeatureCollectionLayer.h" #include "FeatureCollectionTable.h" +#include "FeatureQueryResult.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "ServiceFeatureTable.h" #include "MapTypes.h" -#include "LayerListModel.h" #include "QueryParameters.h" -#include "FeatureCollectionTable.h" -#include "FeatureQueryResult.h" +#include "ServiceFeatureTable.h" +// Qt headers #include #include #include diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h index ab0988d068..1614d561cd 100644 --- a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h +++ b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureCollectionLayerQuery, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef FEATURECOLLECTIONLAYERQUERY_H #define FEATURECOLLECTIONLAYERQUERY_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime class ServiceFeatureTable; } -#include - class FeatureCollectionLayerQuery : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.pro b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.pro index 3df71d47ce..7a1db756c1 100644 --- a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.pro +++ b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FeatureCollectionLayerQuery -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.qml b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.qml index 2eb84e6ddf..62c919b9b5 100644 --- a/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.qml +++ b/CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureCollectionLayerQuery, Category=Layers] // [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. diff --git a/CppSamples/Layers/FeatureCollectionLayerQuery/main.cpp b/CppSamples/Layers/FeatureCollectionLayerQuery/main.cpp index 316f94ec7d..7dea43d6e9 100644 --- a/CppSamples/Layers/FeatureCollectionLayerQuery/main.cpp +++ b/CppSamples/Layers/FeatureCollectionLayerQuery/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "FeatureCollectionLayerQuery.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FeatureCollectionLayerQuery.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.cpp b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.cpp index df262dfea9..cdffceeef7 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.cpp +++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerRenderingModeMap, Category=Layers] // [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. @@ -18,18 +18,21 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FeatureLayerRenderingModeMap.h" +// ArcGIS Maps SDK headers +#include "FeatureLayer.h" +#include "LayerListModel.h" +#include "LoadSettings.h" #include "Map.h" #include "MapQuickView.h" -#include "ServiceFeatureTable.h" -#include "FeatureLayer.h" +#include "MapTypes.h" #include "Point.h" +#include "ServiceFeatureTable.h" #include "SpatialReference.h" -#include "MapTypes.h" -#include "LayerListModel.h" -#include "LoadSettings.h" +// Qt headers #include #include #include diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h index 438d6bb419..3ac1d63a9f 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h +++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerRenderingModeMap, Category=Layers] // [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. @@ -17,6 +17,12 @@ #ifndef FEATURELAYERRENDERINGMODEMAP_H #define FEATURELAYERRENDERINGMODEMAP_H +// ArcGIS Maps SDK headers +#include "Viewpoint.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class MapQuickView; @@ -25,9 +31,6 @@ class Map; class QTimer; -#include "Viewpoint.h" -#include - class FeatureLayerRenderingModeMap : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.pro b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.pro index ef48873702..80f4e2a3b2 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.pro +++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FeatureLayerRenderingModeMap -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.qml b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.qml index 5117cac67c..2ea4960ce3 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.qml +++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerRenderingModeMap, Category=Layers] // [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. diff --git a/CppSamples/Layers/FeatureLayerRenderingModeMap/main.cpp b/CppSamples/Layers/FeatureLayerRenderingModeMap/main.cpp index c8608486ed..747fb78c76 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeMap/main.cpp +++ b/CppSamples/Layers/FeatureLayerRenderingModeMap/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "FeatureLayerRenderingModeMap.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FeatureLayerRenderingModeMap.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.cpp b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.cpp index aa7c2f5416..0d5dd9cfcc 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.cpp +++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerRenderingModeScene, Category=Layers] // [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. @@ -18,19 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FeatureLayerRenderingModeScene.h" +// ArcGIS Maps SDK headers +#include "Camera.h" +#include "FeatureLayer.h" +#include "LayerListModel.h" +#include "LoadSettings.h" +#include "MapTypes.h" +#include "Point.h" #include "Scene.h" #include "SceneQuickView.h" -#include "LoadSettings.h" #include "ServiceFeatureTable.h" -#include "FeatureLayer.h" -#include "Point.h" #include "SpatialReference.h" -#include "Camera.h" -#include "MapTypes.h" -#include "LayerListModel.h" +// Qt headers #include #include #include diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h index bd2d501a60..46c98ce5f4 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h +++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerRenderingModeScene, Category=Layers] // [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. @@ -17,6 +17,12 @@ #ifndef FEATURELAYERRENDERINGMODESCENE_H #define FEATURELAYERRENDERINGMODESCENE_H +// ArcGIS Maps SDK headers +#include "Camera.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; @@ -25,9 +31,6 @@ class Scene; class QTimer; -#include "Camera.h" -#include - class FeatureLayerRenderingModeScene : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.pro b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.pro index e3fe5ffd30..171008b454 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.pro +++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FeatureLayerRenderingModeScene -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.qml b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.qml index 97920e394c..5453a343cc 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.qml +++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerRenderingModeScene, Category=Layers] // [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. diff --git a/CppSamples/Layers/FeatureLayerRenderingModeScene/main.cpp b/CppSamples/Layers/FeatureLayerRenderingModeScene/main.cpp index 677828ae14..44901a15ae 100644 --- a/CppSamples/Layers/FeatureLayerRenderingModeScene/main.cpp +++ b/CppSamples/Layers/FeatureLayerRenderingModeScene/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "FeatureLayerRenderingModeScene.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FeatureLayerRenderingModeScene.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.cpp b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.cpp index 8be5716f9e..8732222171 100644 --- a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.cpp +++ b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Feature_Collection_Layer, Category=Layers] // [Legal] // Copyright 2016 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. @@ -18,33 +18,36 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Feature_Collection_Layer.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Viewpoint.h" -#include "Envelope.h" +// ArcGIS Maps SDK headers +#include "AttributeListModel.h" #include "Basemap.h" +#include "Envelope.h" #include "Feature.h" #include "FeatureCollection.h" #include "FeatureCollectionLayer.h" #include "FeatureCollectionTable.h" +#include "FeatureCollectionTableListModel.h" #include "Field.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "Point.h" #include "PolygonBuilder.h" #include "PolylineBuilder.h" -#include "SpatialReference.h" -#include "SimpleRenderer.h" -#include "SimpleMarkerSymbol.h" #include "SimpleFillSymbol.h" #include "SimpleLineSymbol.h" -#include "MapTypes.h" -#include "MapViewTypes.h" +#include "SimpleMarkerSymbol.h" +#include "SimpleRenderer.h" +#include "SpatialReference.h" #include "SymbolTypes.h" -#include "LayerListModel.h" -#include "FeatureCollectionTableListModel.h" -#include "AttributeListModel.h" +#include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h index cb6fb34080..e4c6d01d37 100644 --- a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h +++ b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h @@ -1,12 +1,12 @@ // [WriteFile Name=Feature_Collection_Layer, Category=Layers] // [Legal] // Copyright 2016 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. @@ -17,6 +17,13 @@ #ifndef FEATURE_COLLECTION_LAYER_H #define FEATURE_COLLECTION_LAYER_H +// ArcGIS Maps SDK headers +#include "Point.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,10 +33,6 @@ namespace Esri::ArcGISRuntime class FeatureCollectionTable; } -#include "Point.h" -#include -#include - class Feature_Collection_Layer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.pro b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.pro index 1548e1c50f..796b18199b 100644 --- a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.pro +++ b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.qml b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.qml index c1c0fdef8c..ffe78991e0 100644 --- a/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.qml +++ b/CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Feature_Collection_Layer, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/Feature_Collection_Layer/main.cpp b/CppSamples/Layers/Feature_Collection_Layer/main.cpp index e28bbf1758..8d851aa983 100644 --- a/CppSamples/Layers/Feature_Collection_Layer/main.cpp +++ b/CppSamples/Layers/Feature_Collection_Layer/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "Feature_Collection_Layer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Feature_Collection_Layer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/GroupLayers/GroupLayers.cpp b/CppSamples/Layers/GroupLayers/GroupLayers.cpp index ecd79f748c..05c4d417a3 100644 --- a/CppSamples/Layers/GroupLayers/GroupLayers.cpp +++ b/CppSamples/Layers/GroupLayers/GroupLayers.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GroupLayers, Category=Layers] // [Legal] // Copyright 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. @@ -18,23 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GroupLayers.h" -#include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "GroupLayer.h" +// ArcGIS Maps SDK headers #include "ArcGISSceneLayer.h" -#include "FeatureLayer.h" -#include "ServiceFeatureTable.h" -#include "Viewpoint.h" +#include "ArcGISTiledElevationSource.h" +#include "ElevationSourceListModel.h" #include "Envelope.h" #include "Error.h" -#include "MapTypes.h" +#include "FeatureLayer.h" +#include "GroupLayer.h" #include "LayerListModel.h" +#include "MapTypes.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "ServiceFeatureTable.h" #include "Surface.h" -#include "ElevationSourceListModel.h" +#include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/GroupLayers/GroupLayers.h b/CppSamples/Layers/GroupLayers/GroupLayers.h index b8435d6318..1b1d86bec5 100644 --- a/CppSamples/Layers/GroupLayers/GroupLayers.h +++ b/CppSamples/Layers/GroupLayers/GroupLayers.h @@ -1,12 +1,12 @@ // [WriteFile Name=GroupLayers, Category=Layers] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef GROUPLAYERS_H #define GROUPLAYERS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -26,8 +29,6 @@ class LayerListModel; class QAbstractListModel; -#include - Q_MOC_INCLUDE("SceneQuickView.h") Q_MOC_INCLUDE("LayerListModel.h") diff --git a/CppSamples/Layers/GroupLayers/GroupLayers.pro b/CppSamples/Layers/GroupLayers/GroupLayers.pro index 62ba8e0061..12825dcae6 100644 --- a/CppSamples/Layers/GroupLayers/GroupLayers.pro +++ b/CppSamples/Layers/GroupLayers/GroupLayers.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = GroupLayers -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/GroupLayers/GroupLayers.qml b/CppSamples/Layers/GroupLayers/GroupLayers.qml index 113f487764..7a3b909a35 100644 --- a/CppSamples/Layers/GroupLayers/GroupLayers.qml +++ b/CppSamples/Layers/GroupLayers/GroupLayers.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GroupLayers, Category=Layers] // [Legal] // Copyright 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. diff --git a/CppSamples/Layers/GroupLayers/main.cpp b/CppSamples/Layers/GroupLayers/main.cpp index 348ce13801..01d24f34a0 100644 --- a/CppSamples/Layers/GroupLayers/main.cpp +++ b/CppSamples/Layers/GroupLayers/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "GroupLayers.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/Hillshade_Renderer/HillshadeSettings.qml b/CppSamples/Layers/Hillshade_Renderer/HillshadeSettings.qml index 401d8ca1bd..73327a8553 100644 --- a/CppSamples/Layers/Hillshade_Renderer/HillshadeSettings.qml +++ b/CppSamples/Layers/Hillshade_Renderer/HillshadeSettings.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Hillshade_Renderer, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/Hillshade_Renderer/HillshadeSlopeTypeModel.qml b/CppSamples/Layers/Hillshade_Renderer/HillshadeSlopeTypeModel.qml index 3fd3d4b759..f5dfa11731 100644 --- a/CppSamples/Layers/Hillshade_Renderer/HillshadeSlopeTypeModel.qml +++ b/CppSamples/Layers/Hillshade_Renderer/HillshadeSlopeTypeModel.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Hillshade_Renderer, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.cpp b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.cpp index af8fc0c196..2e4e1b1f81 100644 --- a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.cpp +++ b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Hillshade_Renderer, Category=Layers] // [Legal] // Copyright 2016 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. @@ -18,22 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Hillshade_Renderer.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Raster.h" -#include "RasterLayer.h" +// ArcGIS Maps SDK headers #include "Basemap.h" #include "HillshadeRenderer.h" +#include "Map.h" +#include "MapQuickView.h" #include "MapTypes.h" #include "MapViewTypes.h" +#include "Raster.h" +#include "RasterLayer.h" #include "RasterTypes.h" +// Qt headers #include +#include #include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h index 31717fb0c1..3b5d899733 100644 --- a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h +++ b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=Hillshade_Renderer, Category=Layers] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef HILLSHADE_RENDERER_H #define HILLSHADE_RENDERER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class MapQuickView; class RasterLayer; } -#include - class Hillshade_Renderer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.pro b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.pro index cc6f1c9530..51b96a49ad 100644 --- a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.pro +++ b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.qml b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.qml index 838155512e..409fdf6dfa 100644 --- a/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.qml +++ b/CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Hillshade_Renderer, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/Hillshade_Renderer/main.cpp b/CppSamples/Layers/Hillshade_Renderer/main.cpp index 68a2d00b76..536e028424 100644 --- a/CppSamples/Layers/Hillshade_Renderer/main.cpp +++ b/CppSamples/Layers/Hillshade_Renderer/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "Hillshade_Renderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Hillshade_Renderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.cpp b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.cpp index 557fa6018f..7b30037f65 100644 --- a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.cpp +++ b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyKmlFeatures, Category=Layers] // [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. @@ -18,20 +18,23 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "IdentifyKmlFeatures.h" +// ArcGIS Maps SDK headers #include "CalloutData.h" +#include "Envelope.h" +#include "IdentifyLayerResult.h" #include "KmlDataset.h" #include "KmlLayer.h" +#include "KmlPlacemark.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" #include "MapTypes.h" -#include "LayerListModel.h" -#include "IdentifyLayerResult.h" -#include "KmlPlacemark.h" #include "SpatialReference.h" -#include "Envelope.h" +// Qt headers #include #include diff --git a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h index 3a019fd47a..a71ae6f5d6 100644 --- a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h +++ b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyKmlFeatures, Category=Layers] // [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. @@ -17,8 +17,13 @@ #ifndef IDENTIFYKMLFEATURES_H #define IDENTIFYKMLFEATURES_H +// ArcGIS Maps SDK headers #include "Point.h" +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class CalloutData; @@ -27,9 +32,6 @@ class Map; class MapQuickView; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("CalloutData.h") diff --git a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.pro b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.pro index d293795a42..a301b74995 100644 --- a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.pro +++ b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = IdentifyKmlFeatures -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.qml b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.qml index a5eced35c3..1d16b2bbcd 100644 --- a/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.qml +++ b/CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.qml @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyKmlFeatures, Category=Layers] // [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. diff --git a/CppSamples/Layers/IdentifyKmlFeatures/main.cpp b/CppSamples/Layers/IdentifyKmlFeatures/main.cpp index e4c961be44..b5f1237fbc 100644 --- a/CppSamples/Layers/IdentifyKmlFeatures/main.cpp +++ b/CppSamples/Layers/IdentifyKmlFeatures/main.cpp @@ -1,29 +1,37 @@ +// [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 "IdentifyKmlFeatures.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Esri/ArcGISRuntime/Toolkit/register.h" - int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); diff --git a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.cpp b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.cpp index 58c6b11335..3030e94755 100644 --- a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.cpp +++ b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyRasterCell, Category=Layers] // [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. @@ -18,26 +18,31 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "IdentifyRasterCell.h" +// ArcGIS Maps SDK headers +#include "AttributeListModel.h" #include "CalloutData.h" +#include "Envelope.h" +#include "Error.h" +#include "IdentifyLayerResult.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "Raster.h" -#include "RasterLayer.h" -#include "Error.h" #include "MapTypes.h" -#include "LayerListModel.h" +#include "Raster.h" #include "RasterCell.h" -#include "IdentifyLayerResult.h" -#include "AttributeListModel.h" -#include "Envelope.h" +#include "RasterLayer.h" -#include +// Qt headers #include +#include #include #include -#include + +// STL headers +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h index e7d8cbc40b..fc305f399b 100644 --- a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h +++ b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyRasterCell, Category=Layers] // [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. @@ -17,8 +17,10 @@ #ifndef IDENTIFYRASTERCELL_H #define IDENTIFYRASTERCELL_H +// ArcGIS Maps SDK headers #include "Point.h" +// Qt headers #include namespace Esri::ArcGISRuntime diff --git a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.pro b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.pro index 95a24ba7f9..a9c8991782 100644 --- a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.pro +++ b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = IdentifyRasterCell -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.qml b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.qml index 060082c6ae..8ca5bf5cbc 100644 --- a/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.qml +++ b/CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.qml @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyRasterCell, Category=Layers] // [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. diff --git a/CppSamples/Layers/IdentifyRasterCell/main.cpp b/CppSamples/Layers/IdentifyRasterCell/main.cpp index 1bc9500e5f..6787d33c73 100644 --- a/CppSamples/Layers/IdentifyRasterCell/main.cpp +++ b/CppSamples/Layers/IdentifyRasterCell/main.cpp @@ -1,29 +1,37 @@ +// [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 "IdentifyRasterCell.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Esri/ArcGISRuntime/Toolkit/register.h" - int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); diff --git a/CppSamples/Layers/ListKmlContents/ListKmlContents.cpp b/CppSamples/Layers/ListKmlContents/ListKmlContents.cpp index 6d201a5c38..0ef1d3ee1b 100644 --- a/CppSamples/Layers/ListKmlContents/ListKmlContents.cpp +++ b/CppSamples/Layers/ListKmlContents/ListKmlContents.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ListKmlContents, Category=Layers] // [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. @@ -18,32 +18,37 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ListKmlContents.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "Camera.h" +#include "ElevationSourceListModel.h" +#include "Envelope.h" +#include "Error.h" #include "KmlContainer.h" #include "KmlDataset.h" #include "KmlLayer.h" #include "KmlNetworkLink.h" #include "KmlNode.h" #include "KmlNodeListModel.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "Error.h" -#include "MapTypes.h" -#include "LayerListModel.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" #include "KmlViewpoint.h" -#include "Camera.h" -#include "Envelope.h" +#include "LayerListModel.h" +#include "MapTypes.h" #include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SpatialReference.h" +#include "Surface.h" -#include +// Qt headers #include -#include #include +#include + +// STL headers +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/ListKmlContents/ListKmlContents.h b/CppSamples/Layers/ListKmlContents/ListKmlContents.h index 0fc53bf083..3c8f198c95 100644 --- a/CppSamples/Layers/ListKmlContents/ListKmlContents.h +++ b/CppSamples/Layers/ListKmlContents/ListKmlContents.h @@ -1,12 +1,12 @@ // [WriteFile Name=ListKmlContents, Category=Layers] // [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. @@ -17,8 +17,14 @@ #ifndef LISTKMLCONTENTS_H #define LISTKMLCONTENTS_H +// ArcGIS Maps SDK headers #include "Viewpoint.h" +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class KmlDataset; @@ -28,10 +34,6 @@ class Scene; class SceneQuickView; } -#include -#include -#include - Q_MOC_INCLUDE("SceneQuickView.h") class ListKmlContents : public QObject diff --git a/CppSamples/Layers/ListKmlContents/ListKmlContents.pro b/CppSamples/Layers/ListKmlContents/ListKmlContents.pro index 6f2a9c10ba..dd537ce4e9 100644 --- a/CppSamples/Layers/ListKmlContents/ListKmlContents.pro +++ b/CppSamples/Layers/ListKmlContents/ListKmlContents.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ListKmlContents -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/ListKmlContents/ListKmlContents.qml b/CppSamples/Layers/ListKmlContents/ListKmlContents.qml index b9a9a803f2..2fa85f1a6d 100644 --- a/CppSamples/Layers/ListKmlContents/ListKmlContents.qml +++ b/CppSamples/Layers/ListKmlContents/ListKmlContents.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ListKmlContents, Category=Layers] // [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. diff --git a/CppSamples/Layers/ListKmlContents/main.cpp b/CppSamples/Layers/ListKmlContents/main.cpp index ac2b234a45..4c6e72b57e 100644 --- a/CppSamples/Layers/ListKmlContents/main.cpp +++ b/CppSamples/Layers/ListKmlContents/main.cpp @@ -1,24 +1,31 @@ +// [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 "ListKmlContents.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.cpp b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.cpp index 55f9b58087..24201d71dd 100644 --- a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.cpp +++ b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=LoadWfsXmlQuery, Category=Layers] // [Legal] // Copyright 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. @@ -18,18 +18,21 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "LoadWfsXmlQuery.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "Error.h" +#include "FeatureLayer.h" +#include "GeodatabaseTypes.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "FeatureLayer.h" -#include "WfsFeatureTable.h" -#include "Error.h" #include "MapTypes.h" -#include "LayerListModel.h" -#include "GeodatabaseTypes.h" -#include "Envelope.h" +#include "WfsFeatureTable.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h index 90e6bbb93c..5be7ed28d5 100644 --- a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h +++ b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h @@ -1,12 +1,12 @@ // [WriteFile Name=LoadWfsXmlQuery, Category=Layers] // [Legal] // Copyright 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. @@ -17,14 +17,15 @@ #ifndef LOADWFSXMLQUERY_H #define LOADWFSXMLQUERY_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class LoadWfsXmlQuery : public QObject diff --git a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.pro b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.pro index 0acd1c7d97..61c2a99ca6 100644 --- a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.pro +++ b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = LoadWfsXmlQuery -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.qml b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.qml index f67099dae9..ce0281f554 100644 --- a/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.qml +++ b/CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.qml @@ -1,12 +1,12 @@ // [WriteFile Name=LoadWfsXmlQuery, Category=Layers] // [Legal] // Copyright 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. diff --git a/CppSamples/Layers/LoadWfsXmlQuery/main.cpp b/CppSamples/Layers/LoadWfsXmlQuery/main.cpp index 3d932eafc2..530e18a744 100644 --- a/CppSamples/Layers/LoadWfsXmlQuery/main.cpp +++ b/CppSamples/Layers/LoadWfsXmlQuery/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "LoadWfsXmlQuery.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.cpp b/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.cpp index bc203e538b..e40e59b4e6 100644 --- a/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.cpp +++ b/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.cpp @@ -1,16 +1,19 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "DrawOrderLayerListModel.h" DrawOrderLayerListModel::DrawOrderLayerListModel(QObject* parent): diff --git a/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h b/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h index 007bc20839..81e639cec6 100644 --- a/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h +++ b/CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h @@ -1,4 +1,17 @@ +// [Legal] // Copyright 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. +// [Legal] // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,6 +27,7 @@ #ifndef DRAWORDERLAYERLISTMODEL_H #define DRAWORDERLAYERLISTMODEL_H +// Qt headers #include class DrawOrderLayerListModel : public QSortFilterProxyModel diff --git a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.cpp b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.cpp index bb82b02827..4978a9d314 100644 --- a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.cpp +++ b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ManageOperationalLayers, Category=Layers] // [Legal] // Copyright 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. @@ -18,14 +18,16 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers +#include "DrawOrderLayerListModel.h" #include "ManageOperationalLayers.h" +// ArcGIS Maps SDK headers +#include "ArcGISMapImageLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "ArcGISMapImageLayer.h" -#include "DrawOrderLayerListModel.h" #include "MapTypes.h" -#include "LayerListModel.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h index 5a57edc097..bbb7a72329 100644 --- a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h +++ b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h @@ -1,12 +1,12 @@ // [WriteFile Name=ManageOperationalLayers, Category=Layers] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef MANAGEOPERATIONALLAYERS_H #define MANAGEOPERATIONALLAYERS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -28,8 +31,6 @@ class Layer; class DrawOrderLayerListModel; class QAbstractItemModel; -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("QAbstractItemModel") diff --git a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.pro b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.pro index 7d029153b3..d610030172 100644 --- a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.pro +++ b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ManageOperationalLayers -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.qml b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.qml index 96575e6810..ef6b8cd15a 100644 --- a/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.qml +++ b/CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ManageOperationalLayers, Category=Layers] // [Legal] // Copyright 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. diff --git a/CppSamples/Layers/ManageOperationalLayers/main.cpp b/CppSamples/Layers/ManageOperationalLayers/main.cpp index 02fe18a206..71cc5a11d2 100644 --- a/CppSamples/Layers/ManageOperationalLayers/main.cpp +++ b/CppSamples/Layers/ManageOperationalLayers/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "ManageOperationalLayers.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/OSM_Layer/OSM_Layer.cpp b/CppSamples/Layers/OSM_Layer/OSM_Layer.cpp index 7906666360..f6f9fd07d2 100644 --- a/CppSamples/Layers/OSM_Layer/OSM_Layer.cpp +++ b/CppSamples/Layers/OSM_Layer/OSM_Layer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=OSM_Layer, Category=Layers] // [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. @@ -18,13 +18,15 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "OSM_Layer.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" #include "OpenStreetMapLayer.h" -#include "Basemap.h" -#include "LayerListModel.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/OSM_Layer/OSM_Layer.h b/CppSamples/Layers/OSM_Layer/OSM_Layer.h index f4e015d465..556006a993 100644 --- a/CppSamples/Layers/OSM_Layer/OSM_Layer.h +++ b/CppSamples/Layers/OSM_Layer/OSM_Layer.h @@ -1,12 +1,12 @@ // [WriteFile Name=OSM_Layer, Category=Layers] // [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. @@ -17,14 +17,15 @@ #ifndef OSM_LAYER_H #define OSM_LAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class OSM_Layer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/OSM_Layer/OSM_Layer.pro b/CppSamples/Layers/OSM_Layer/OSM_Layer.pro index 1a8fd49a41..2620751124 100644 --- a/CppSamples/Layers/OSM_Layer/OSM_Layer.pro +++ b/CppSamples/Layers/OSM_Layer/OSM_Layer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = OSM_Layer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/OSM_Layer/OSM_Layer.qml b/CppSamples/Layers/OSM_Layer/OSM_Layer.qml index c5133a5bd0..c828e69a85 100644 --- a/CppSamples/Layers/OSM_Layer/OSM_Layer.qml +++ b/CppSamples/Layers/OSM_Layer/OSM_Layer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=OSM_Layer, Category=Layers] // [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. diff --git a/CppSamples/Layers/OSM_Layer/main.cpp b/CppSamples/Layers/OSM_Layer/main.cpp index 080977519d..bea797c84f 100644 --- a/CppSamples/Layers/OSM_Layer/main.cpp +++ b/CppSamples/Layers/OSM_Layer/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "OSM_Layer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "OSM_Layer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.cpp b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.cpp index 4c8f0f4565..0d73d5c99c 100644 --- a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.cpp +++ b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=PlayAKmlTour, Category=Layers] // [Legal] // Copyright 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. @@ -18,25 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "PlayAKmlTour.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "KmlTour.h" -#include "KmlTourController.h" -#include "KmlLayer.h" +#include "ElevationSourceListModel.h" +#include "Error.h" #include "KmlContainer.h" +#include "KmlDataset.h" +#include "KmlLayer.h" #include "KmlNodeListModel.h" -#include "Error.h" -#include "MapTypes.h" +#include "KmlTour.h" +#include "KmlTourController.h" #include "LayerListModel.h" +#include "MapTypes.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "Surface.h" -#include "ElevationSourceListModel.h" -#include "KmlDataset.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h index dfd714c130..98c5010589 100644 --- a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h +++ b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h @@ -1,12 +1,12 @@ // [WriteFile Name=PlayAKmlTour, Category=Layers] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef PLAYAKMLTOUR_H #define PLAYAKMLTOUR_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -29,8 +32,6 @@ class KmlNode; class KmlNodeListModel; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class PlayAKmlTour : public QObject @@ -64,7 +65,6 @@ class PlayAKmlTour : public QObject Esri::ArcGISRuntime::KmlTour* findFirstKMLTour(const QList& nodes); Esri::ArcGISRuntime::KmlTour* findFirstKMLTourFromListModel(const Esri::ArcGISRuntime::KmlNodeListModel& nodes); - Esri::ArcGISRuntime::Scene* m_scene = nullptr; Esri::ArcGISRuntime::SceneQuickView* m_sceneView = nullptr; Esri::ArcGISRuntime::KmlTour* m_kmlTour = nullptr; diff --git a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.pro b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.pro index 5e42edff23..69c7b14622 100644 --- a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.pro +++ b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = PlayAKmlTour -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.qml b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.qml index 827800e165..1c62a0cce5 100644 --- a/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.qml +++ b/CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.qml @@ -1,12 +1,12 @@ // [WriteFile Name=PlayAKmlTour, Category=Layers] // [Legal] // Copyright 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. diff --git a/CppSamples/Layers/PlayAKmlTour/main.cpp b/CppSamples/Layers/PlayAKmlTour/main.cpp index 9acf36ff79..772bd6d3de 100644 --- a/CppSamples/Layers/PlayAKmlTour/main.cpp +++ b/CppSamples/Layers/PlayAKmlTour/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "PlayAKmlTour.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.cpp b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.cpp index 01cc254edc..8e1365a5a8 100644 --- a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.cpp +++ b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=QueryMapImageSublayer, Category=Layers] // [Legal] // Copyright 2018 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. @@ -18,36 +18,38 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "QueryMapImageSublayer.h" -#include "Basemap.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers #include "ArcGISMapImageLayer.h" #include "ArcGISMapImageSublayer.h" -#include "SimpleFillSymbol.h" -#include "SimpleLineSymbol.h" -#include "SimpleMarkerSymbol.h" -#include "QueryParameters.h" +#include "ArcGISSublayerListModel.h" +#include "Basemap.h" +#include "Envelope.h" +#include "Error.h" +#include "Feature.h" +#include "FeatureIterator.h" +#include "FeatureQueryResult.h" #include "Graphic.h" -#include "GraphicsOverlay.h" #include "GraphicListModel.h" -#include "Error.h" -#include "MapTypes.h" +#include "GraphicsOverlay.h" #include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "SymbolTypes.h" #include "LayerListModel.h" -#include "ArcGISSublayerListModel.h" -#include "FeatureQueryResult.h" -#include "FeatureIterator.h" -#include "Feature.h" -#include "SpatialReference.h" -#include "Viewpoint.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "Point.h" +#include "QueryParameters.h" #include "ServiceFeatureTable.h" -#include "Envelope.h" +#include "SimpleFillSymbol.h" +#include "SimpleLineSymbol.h" +#include "SimpleMarkerSymbol.h" +#include "SpatialReference.h" +#include "SymbolTypes.h" +#include "Viewpoint.h" +// Qt headers #include #include diff --git a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h index 0295214918..9272120a55 100644 --- a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h +++ b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=QueryMapImageSublayer, Category=Layers] // [Legal] // Copyright 2018 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. @@ -17,6 +17,9 @@ #ifndef QUERYMAPIMAGESUBLAYER_H #define QUERYMAPIMAGESUBLAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -30,8 +33,6 @@ class Symbol; class FeatureQueryResult; } -#include - class QueryMapImageSublayer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.pro b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.pro index 27b325a954..190bbdb7b3 100644 --- a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.pro +++ b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = QueryMapImageSublayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.qml b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.qml index b4b5329aab..6139738c67 100644 --- a/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.qml +++ b/CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=QueryMapImageSublayer, Category=Layers] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Layers/QueryMapImageSublayer/main.cpp b/CppSamples/Layers/QueryMapImageSublayer/main.cpp index e2faaf51d8..fca3297f55 100644 --- a/CppSamples/Layers/QueryMapImageSublayer/main.cpp +++ b/CppSamples/Layers/QueryMapImageSublayer/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "QueryMapImageSublayer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "QueryMapImageSublayer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.cpp b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.cpp index 5b43a19e64..5909918ccc 100644 --- a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.cpp +++ b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Query_OGC, Category=Layers] // [Legal] // Copyright 2021 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. @@ -18,22 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "QueryOGCAPICQLFilters.h" +// ArcGIS Maps SDK headers #include "FeatureLayer.h" +#include "GeodatabaseTypes.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "OgcFeatureCollectionTable.h" +#include "QueryParameters.h" #include "SimpleLineSymbol.h" #include "SimpleRenderer.h" -#include "MapTypes.h" #include "SymbolTypes.h" -#include "LayerListModel.h" -#include "GeodatabaseTypes.h" -#include "QueryParameters.h" #include "TimeExtent.h" #include "Viewpoint.h" +// Qt headers #include #include diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h index 8f35c23bfe..21623801f5 100644 --- a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h +++ b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h @@ -1,12 +1,12 @@ // [WriteFile Name=QueryOGCAPICQLFiltersQuery_OGC, Category=Layers] // [Legal] // Copyright 2021 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. @@ -17,8 +17,12 @@ #ifndef QUERYOGCAPICQLFILTERS_H #define QUERYOGCAPICQLFILTERS_H +// ArcGIS Maps SDK headers #include "Envelope.h" +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -27,8 +31,6 @@ class MapQuickView; class OgcFeatureCollectionTable; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class QueryOGCAPICQLFilters : public QObject diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.pro b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.pro index 48727b5ced..660e8cac48 100644 --- a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.pro +++ b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = QueryOGCAPICQLFilters -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.qml b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.qml index 314898d974..3114478aa9 100644 --- a/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.qml +++ b/CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Query_OGC, Category=Layers] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Layers/QueryOGCAPICQLFilters/main.cpp b/CppSamples/Layers/QueryOGCAPICQLFilters/main.cpp index 3545b73c2a..d665a5c012 100644 --- a/CppSamples/Layers/QueryOGCAPICQLFilters/main.cpp +++ b/CppSamples/Layers/QueryOGCAPICQLFilters/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2021 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 "QueryOGCAPICQLFilters.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.cpp b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.cpp index d9efb64886..d7aa3f5bc4 100644 --- a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.cpp +++ b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RasterColormapRenderer, Category=Layers] // [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. @@ -18,22 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RasterColormapRenderer.h" +// ArcGIS Maps SDK headers #include "ColormapRenderer.h" +#include "Envelope.h" +#include "Error.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "Raster.h" -#include "RasterLayer.h" -#include "Error.h" #include "MapTypes.h" #include "MapViewTypes.h" -#include "LayerListModel.h" -#include "Envelope.h" +#include "Raster.h" +#include "RasterLayer.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h index a53e78c2f2..ca06744fe5 100644 --- a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h +++ b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=RasterColormapRenderer, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef COLORMAPRENDERER_H #define COLORMAPRENDERER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class ColormapRenderer; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class RasterLayer; } -#include - class RasterColormapRenderer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.pro b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.pro index 9ca3295cff..defa91ec18 100644 --- a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.pro +++ b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RasterColormapRenderer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.qml b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.qml index db3ad4131e..3a987bcc84 100644 --- a/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.qml +++ b/CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterColormapRenderer, Category=Layers] // [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. diff --git a/CppSamples/Layers/RasterColormapRenderer/main.cpp b/CppSamples/Layers/RasterColormapRenderer/main.cpp index ca0441243e..2b8562e00b 100644 --- a/CppSamples/Layers/RasterColormapRenderer/main.cpp +++ b/CppSamples/Layers/RasterColormapRenderer/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "RasterColormapRenderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "RasterColormapRenderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.cpp b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.cpp index 212a0b2a1d..138ff07168 100644 --- a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.cpp +++ b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RasterFunctionFile, Category=Layers] // [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. @@ -18,24 +18,27 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RasterFunctionFile.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers #include "Basemap.h" -#include "Raster.h" -#include "RasterLayer.h" -#include "RasterFunction.h" #include "Envelope.h" -#include "MapTypes.h" #include "Error.h" #include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "Raster.h" +#include "RasterFunction.h" #include "RasterFunctionArguments.h" +#include "RasterLayer.h" #include "Viewpoint.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h index d7e5d07d03..dd5a70118c 100644 --- a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h +++ b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h @@ -1,12 +1,12 @@ // [WriteFile Name=RasterFunctionFile, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef RASTERFUNCTIONFILE_H #define RASTERFUNCTIONFILE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class RasterFunction; } -#include - class RasterFunctionFile : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.pro b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.pro index ac8b19cddf..2e00fb3b95 100644 --- a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.pro +++ b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RasterFunctionFile -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.qml b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.qml index 26be672876..35ecaaf412 100644 --- a/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.qml +++ b/CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterFunctionFile, Category=Layers] // [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. diff --git a/CppSamples/Layers/RasterFunctionFile/main.cpp b/CppSamples/Layers/RasterFunctionFile/main.cpp index 5e36b537c3..649d039c85 100644 --- a/CppSamples/Layers/RasterFunctionFile/main.cpp +++ b/CppSamples/Layers/RasterFunctionFile/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "RasterFunctionFile.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "RasterFunctionFile.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.cpp b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.cpp index 8ed0d2c82f..5ed1f3df01 100644 --- a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.cpp +++ b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RasterFunctionService, Category=Layers] // [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. @@ -18,28 +18,31 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RasterFunctionService.h" -#include "Map.h" -#include "MapQuickView.h" -#include "RasterLayer.h" +// ArcGIS Maps SDK headers +#include "ArcGISImageServiceInfo.h" #include "Basemap.h" -#include "ImageServiceRaster.h" -#include "RasterFunction.h" +#include "Envelope.h" #include "Error.h" +#include "ImageServiceRaster.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" #include "MapTypes.h" #include "MapViewTypes.h" -#include "LayerListModel.h" -#include "RasterFunctionArguments.h" -#include "ArcGISImageServiceInfo.h" -#include "Envelope.h" #include "Point.h" +#include "RasterFunction.h" +#include "RasterFunctionArguments.h" +#include "RasterLayer.h" #include "Viewpoint.h" -#include +// Qt headers #include #include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.h b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.h index 94486421e7..f1dbc59b57 100644 --- a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.h +++ b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.h @@ -1,12 +1,12 @@ // [WriteFile Name=RasterFunctionService, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef RASTERFUNCTIONSERVICE_H #define RASTERFUNCTIONSERVICE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Basemap; @@ -26,8 +29,6 @@ namespace Esri::ArcGISRuntime class RasterLayer; } -#include - class RasterFunctionService : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.pro b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.pro index cd067154b6..ac18165a7b 100644 --- a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.pro +++ b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RasterFunctionService -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.qml b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.qml index d7bf1adb92..03641597f4 100644 --- a/CppSamples/Layers/RasterFunctionService/RasterFunctionService.qml +++ b/CppSamples/Layers/RasterFunctionService/RasterFunctionService.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterFunctionService, Category=Layers] // [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. diff --git a/CppSamples/Layers/RasterFunctionService/main.cpp b/CppSamples/Layers/RasterFunctionService/main.cpp index 3b1d4a4f8c..83ea8f9d82 100644 --- a/CppSamples/Layers/RasterFunctionService/main.cpp +++ b/CppSamples/Layers/RasterFunctionService/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "RasterFunctionService.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "RasterFunctionService.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.cpp b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.cpp index d8aa93a257..700d55f17c 100644 --- a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.cpp +++ b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerFile, Category=Analysis] // [Legal] // Copyright 2016 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. @@ -18,24 +18,27 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RasterLayerFile.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Raster.h" -#include "RasterLayer.h" +// ArcGIS Maps SDK headers #include "Basemap.h" +#include "Envelope.h" #include "Error.h" +#include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" #include "MapTypes.h" #include "MapViewTypes.h" -#include "LayerListModel.h" -#include "Envelope.h" #include "Point.h" +#include "Raster.h" +#include "RasterLayer.h" +// Qt headers #include +#include #include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.h b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.h index 393990c256..5ce4a9a5bb 100644 --- a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.h +++ b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.h @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerFile, Category=Analysis] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef RASTERLAYERFILE_H #define RASTERLAYERFILE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class RasterLayerFile : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.pro b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.pro index f5e401ae37..e5abfa2d1d 100644 --- a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.pro +++ b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.qml b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.qml index 3abfb805ba..1190eb7a4e 100644 --- a/CppSamples/Layers/RasterLayerFile/RasterLayerFile.qml +++ b/CppSamples/Layers/RasterLayerFile/RasterLayerFile.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerFile, Category=Analysis] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/RasterLayerFile/RasterLoader.qml b/CppSamples/Layers/RasterLayerFile/RasterLoader.qml index c3f1c88d7a..10dc7dd896 100644 --- a/CppSamples/Layers/RasterLayerFile/RasterLoader.qml +++ b/CppSamples/Layers/RasterLayerFile/RasterLoader.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerFile, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/RasterLayerFile/main.cpp b/CppSamples/Layers/RasterLayerFile/main.cpp index 8c738deddc..9522631e54 100644 --- a/CppSamples/Layers/RasterLayerFile/main.cpp +++ b/CppSamples/Layers/RasterLayerFile/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "RasterLayerFile.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include -#include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "RasterLayerFile.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.cpp b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.cpp index 6f856d99d7..473b897406 100644 --- a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.cpp +++ b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerGeoPackage, Category=Layers] // [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. @@ -18,23 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RasterLayerGeoPackage.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers +#include "Error.h" #include "GeoPackage.h" #include "GeoPackageRaster.h" -#include "RasterLayer.h" -#include "Point.h" -#include "Viewpoint.h" -#include "Error.h" -#include "MapTypes.h" #include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "Point.h" +#include "RasterLayer.h" #include "SpatialReference.h" +#include "Viewpoint.h" +// Qt headers +#include #include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h index c228c8213d..366181015d 100644 --- a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h +++ b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerGeoPackage, Category=Layers] // [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. @@ -17,14 +17,15 @@ #ifndef RASTERLAYERGEOPACKAGE_H #define RASTERLAYERGEOPACKAGE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class RasterLayerGeoPackage : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.pro b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.pro index 80d0c5e4f9..2534492da5 100644 --- a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.pro +++ b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RasterLayerGeoPackage -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.qml b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.qml index 2631a7f717..cb0f1b11b3 100644 --- a/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.qml +++ b/CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerGeoPackage, Category=Layers] // [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. diff --git a/CppSamples/Layers/RasterLayerGeoPackage/main.cpp b/CppSamples/Layers/RasterLayerGeoPackage/main.cpp index 53044bfc74..420dcd5652 100644 --- a/CppSamples/Layers/RasterLayerGeoPackage/main.cpp +++ b/CppSamples/Layers/RasterLayerGeoPackage/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "RasterLayerGeoPackage.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "RasterLayerGeoPackage.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/RasterLayerService/RasterLayerService.cpp b/CppSamples/Layers/RasterLayerService/RasterLayerService.cpp index 9656af384f..185ff43184 100644 --- a/CppSamples/Layers/RasterLayerService/RasterLayerService.cpp +++ b/CppSamples/Layers/RasterLayerService/RasterLayerService.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerService, Category=Layers] // [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. @@ -18,22 +18,25 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RasterLayerService.h" -#include "Map.h" -#include "MapQuickView.h" -#include "RasterLayer.h" -#include "Basemap.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledLayer.h" -#include "ImageServiceRaster.h" +#include "Basemap.h" #include "Error.h" -#include "MapViewTypes.h" +#include "ImageServiceRaster.h" #include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" +#include "Point.h" +#include "RasterLayer.h" #include "SpatialReference.h" #include "Viewpoint.h" -#include "Point.h" -#include "MapTypes.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/RasterLayerService/RasterLayerService.h b/CppSamples/Layers/RasterLayerService/RasterLayerService.h index b8ab777032..612005155d 100644 --- a/CppSamples/Layers/RasterLayerService/RasterLayerService.h +++ b/CppSamples/Layers/RasterLayerService/RasterLayerService.h @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerService, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef RASTERLAYERSERVICE_H #define RASTERLAYERSERVICE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Basemap; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class RasterLayer; } -#include - class RasterLayerService : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/RasterLayerService/RasterLayerService.pro b/CppSamples/Layers/RasterLayerService/RasterLayerService.pro index 40931bf98e..32472a06e7 100644 --- a/CppSamples/Layers/RasterLayerService/RasterLayerService.pro +++ b/CppSamples/Layers/RasterLayerService/RasterLayerService.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RasterLayerService -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/RasterLayerService/RasterLayerService.qml b/CppSamples/Layers/RasterLayerService/RasterLayerService.qml index 90b32bd128..75ac4616d8 100644 --- a/CppSamples/Layers/RasterLayerService/RasterLayerService.qml +++ b/CppSamples/Layers/RasterLayerService/RasterLayerService.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterLayerService, Category=Layers] // [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. diff --git a/CppSamples/Layers/RasterLayerService/main.cpp b/CppSamples/Layers/RasterLayerService/main.cpp index 65d7009cf7..bf52984065 100644 --- a/CppSamples/Layers/RasterLayerService/main.cpp +++ b/CppSamples/Layers/RasterLayerService/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "RasterLayerService.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "RasterLayerService.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.cpp b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.cpp index 680a83bf6f..9a4da2cbff 100644 --- a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.cpp +++ b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RasterRenderingRule, Category=Layers] // [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. @@ -18,26 +18,29 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RasterRenderingRule.h" +// ArcGIS Maps SDK headers +#include "ArcGISImageServiceInfo.h" +#include "Basemap.h" +#include "Envelope.h" +#include "Error.h" +#include "ImageServiceRaster.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "RasterLayer.h" -#include "Basemap.h" -#include "ImageServiceRaster.h" #include "RenderingRule.h" #include "RenderingRuleInfo.h" -#include "Error.h" -#include "MapTypes.h" -#include "MapViewTypes.h" -#include "LayerListModel.h" -#include "ArcGISImageServiceInfo.h" -#include "Envelope.h" #include "Viewpoint.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h index 4bc9627455..0f91fcb165 100644 --- a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h +++ b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h @@ -1,12 +1,12 @@ // [WriteFile Name=RasterRenderingRule, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef RasterRenderingRule_H #define RasterRenderingRule_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Basemap; @@ -26,8 +29,6 @@ namespace Esri::ArcGISRuntime class ImageServiceRaster; } -#include - class RasterRenderingRule : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.pro b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.pro index 8e5667ddd6..bccb86cb16 100644 --- a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.pro +++ b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RasterRenderingRule -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.qml b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.qml index bc917f63a3..c88ad86df3 100644 --- a/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.qml +++ b/CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterRenderingRule, Category=Layers] // [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. diff --git a/CppSamples/Layers/RasterRenderingRule/main.cpp b/CppSamples/Layers/RasterRenderingRule/main.cpp index 7184f81699..c3fe1f2158 100644 --- a/CppSamples/Layers/RasterRenderingRule/main.cpp +++ b/CppSamples/Layers/RasterRenderingRule/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "RasterRenderingRule.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "RasterRenderingRule.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.cpp b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.cpp index f341f84ed9..913657bbfe 100644 --- a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.cpp +++ b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RasterRgbRenderer, Category=Layers] // [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. @@ -18,21 +18,24 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RasterRgbRenderer.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" +#include "MapViewTypes.h" #include "MinMaxStretchParameters.h" #include "PercentClipStretchParameters.h" +#include "RGBRenderer.h" #include "Raster.h" #include "RasterLayer.h" -#include "RGBRenderer.h" #include "StandardDeviationStretchParameters.h" -#include "MapViewTypes.h" -#include "Basemap.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h index 06bdef24c2..05fe55d6c3 100644 --- a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h +++ b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=RasterRgbRenderer, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef RGBRENDERER_H #define RGBRENDERER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime class RasterLayer; } -#include - class RasterRgbRenderer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.pro b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.pro index 458b45efba..15e81006f3 100644 --- a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.pro +++ b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RgbRenderer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.qml b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.qml index 1a7b871552..6b93a567bd 100644 --- a/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.qml +++ b/CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterRgbRenderer, Category=Layers] // [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. diff --git a/CppSamples/Layers/RasterRgbRenderer/main.cpp b/CppSamples/Layers/RasterRgbRenderer/main.cpp index 2b5ae3fe65..2d7d66345f 100644 --- a/CppSamples/Layers/RasterRgbRenderer/main.cpp +++ b/CppSamples/Layers/RasterRgbRenderer/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "RasterRgbRenderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "RasterRgbRenderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/RasterStretchRenderer/InputWithLabel.qml b/CppSamples/Layers/RasterStretchRenderer/InputWithLabel.qml index 2ba81324f9..abcab43e67 100644 --- a/CppSamples/Layers/RasterStretchRenderer/InputWithLabel.qml +++ b/CppSamples/Layers/RasterStretchRenderer/InputWithLabel.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterRgbRenderer, Category=Layers] // [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. diff --git a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.cpp b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.cpp index 738ec6d760..fa4d2bae5c 100644 --- a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.cpp +++ b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RasterStretchRenderer, Category=Layers] // [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. @@ -18,21 +18,24 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RasterStretchRenderer.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" +#include "MapViewTypes.h" #include "MinMaxStretchParameters.h" #include "PercentClipStretchParameters.h" #include "Raster.h" #include "RasterLayer.h" -#include "StretchRenderer.h" #include "StandardDeviationStretchParameters.h" -#include "MapViewTypes.h" -#include "Basemap.h" +#include "StretchRenderer.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h index 107ea0dec4..f8e3c033ba 100644 --- a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h +++ b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h @@ -1,12 +1,12 @@ // [WriteFile Name=RasterStretchRenderer, Category=Layers] // [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. @@ -17,6 +17,9 @@ #ifndef STRETCHRENDERER_H #define STRETCHRENDERER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime class RasterLayer; } -#include - class RasterStretchRenderer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.pro b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.pro index b099b3d6ad..655212b1b6 100644 --- a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.pro +++ b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RasterStretchRenderer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.qml b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.qml index eed1bc3471..166a61b46c 100644 --- a/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.qml +++ b/CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RasterStretchRenderer, Category=Layers] // [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. diff --git a/CppSamples/Layers/RasterStretchRenderer/main.cpp b/CppSamples/Layers/RasterStretchRenderer/main.cpp index adc40671c7..e1acf959f3 100644 --- a/CppSamples/Layers/RasterStretchRenderer/main.cpp +++ b/CppSamples/Layers/RasterStretchRenderer/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "RasterStretchRenderer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "RasterStretchRenderer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.cpp b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.cpp index bd5d0a26ae..dec9addb69 100644 --- a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.cpp +++ b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=StyleWmsLayer, Category=Layers] // [Legal] // Copyright 2018 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. @@ -18,18 +18,21 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "StyleWmsLayer.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "Error.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" #include "SpatialReference.h" #include "WmsLayer.h" -#include "WmsSublayer.h" #include "WmsLayerInfo.h" -#include "Error.h" -#include "LayerListModel.h" -#include "Envelope.h" +#include "WmsSublayer.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h index 04a1c66eff..5119f94168 100644 --- a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h +++ b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=StyleWmsLayer, Category=Layers] // [Legal] // Copyright 2018 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. @@ -17,6 +17,9 @@ #ifndef STYLEWMSLAYER_H #define STYLEWMSLAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ class MapQuickView; class WmsSublayer; } -#include - class StyleWmsLayer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.pro b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.pro index 8df91c47e2..9b65325a5d 100644 --- a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.pro +++ b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = StyleWmsLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.qml b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.qml index 163c206b21..1835dd59b5 100644 --- a/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.qml +++ b/CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=StyleWmsLayer, Category=Layers] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Layers/StyleWmsLayer/main.cpp b/CppSamples/Layers/StyleWmsLayer/main.cpp index 0ba11fbbb4..b864fd5a01 100644 --- a/CppSamples/Layers/StyleWmsLayer/main.cpp +++ b/CppSamples/Layers/StyleWmsLayer/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "StyleWmsLayer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "StyleWmsLayer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.cpp b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.cpp index 4d8ea3fcef..73d31f7bca 100644 --- a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.cpp +++ b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=TileCacheLayer, Category=Layers] // [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. @@ -18,13 +18,17 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "TileCacheLayer.h" + +// ArcGIS Maps SDK headers #include "ArcGISTiledLayer.h" +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" #include "TileCache.h" -#include "Basemap.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.h b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.h index a526a4da66..6a55af9cc6 100644 --- a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.h +++ b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=TileCacheLayer, Category=Layers] // [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. @@ -17,14 +17,15 @@ #ifndef TILECACHELAYER_H #define TILECACHELAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class TileCacheLayer : public QObject diff --git a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.pro b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.pro index 084f59fb10..852c698977 100644 --- a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.pro +++ b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = TileCacheLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.qml b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.qml index 211af4f392..08e91681d3 100644 --- a/CppSamples/Layers/TileCacheLayer/TileCacheLayer.qml +++ b/CppSamples/Layers/TileCacheLayer/TileCacheLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=TileCacheLayer, Category=Layers] // [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. diff --git a/CppSamples/Layers/TileCacheLayer/main.cpp b/CppSamples/Layers/TileCacheLayer/main.cpp index 90949f3a88..da646b0e9e 100644 --- a/CppSamples/Layers/TileCacheLayer/main.cpp +++ b/CppSamples/Layers/TileCacheLayer/main.cpp @@ -1,23 +1,30 @@ +// [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 "TileCacheLayer.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.cpp b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.cpp index 53f7671d54..32cd9c89f9 100644 --- a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.cpp +++ b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=VectorTiledLayerUrl, Category=Layers] // [Legal] // Copyright 2016 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. @@ -18,18 +18,21 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "VectorTiledLayerUrl.h" -#include - +// ArcGIS Maps SDK headers +#include "ArcGISVectorTiledLayer.h" +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" -#include "ArcGISVectorTiledLayer.h" -#include "Point.h" -#include "Viewpoint.h" #include "MapTypes.h" +#include "Point.h" #include "SpatialReference.h" +#include "Viewpoint.h" + +// Qt headers +#include using namespace Esri::ArcGISRuntime; @@ -89,4 +92,3 @@ void VectorTiledLayerUrl::changeBasemap(const QString& basemap) m_map->setBasemap(basemap); } } - diff --git a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h index a62d483873..3b9304691e 100644 --- a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h +++ b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h @@ -1,12 +1,12 @@ // [WriteFile Name=VectorTiledLayerUrl, Category=Layers] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef VECTOR_TILED_LAYER_URL #define VECTOR_TILED_LAYER_URL +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class VectorTiledLayerUrl : public QQuickItem { Q_OBJECT @@ -43,4 +44,3 @@ class VectorTiledLayerUrl : public QQuickItem }; #endif // VECTOR_TILED_LAYER_URL - diff --git a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.pro b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.pro index bd53c83ea6..202cf7d32c 100644 --- a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.pro +++ b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.qml b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.qml index c467eda955..37a16b679c 100644 --- a/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.qml +++ b/CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.qml @@ -1,12 +1,12 @@ // [WriteFile Name=VectorTiledLayerUrl, Category=Layers] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Layers/VectorTiledLayerUrl/main.cpp b/CppSamples/Layers/VectorTiledLayerUrl/main.cpp index 046ab8eb00..d93feb10f2 100644 --- a/CppSamples/Layers/VectorTiledLayerUrl/main.cpp +++ b/CppSamples/Layers/VectorTiledLayerUrl/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "VectorTiledLayerUrl.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "VectorTiledLayerUrl.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.cpp b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.cpp index 0308b0ee22..6bc9640db9 100644 --- a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.cpp +++ b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=WMTS_Layer, Category=Layers] // [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. @@ -18,16 +18,18 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "WMTS_Layer.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "Error.h" #include "Map.h" #include "MapQuickView.h" #include "WmtsLayer.h" +#include "WmtsLayerInfo.h" #include "WmtsService.h" #include "WmtsServiceInfo.h" -#include "WmtsLayerInfo.h" -#include "Basemap.h" -#include "Error.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.h b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.h index 3323cc0598..5c8cfded9f 100644 --- a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.h +++ b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.h @@ -1,12 +1,12 @@ // [WriteFile Name=WMTS_Layer, Category=Layers] // [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. @@ -17,14 +17,15 @@ #ifndef WMTS_LAYER_H #define WMTS_LAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class MapQuickView; class WmtsService; } -#include - class WMTS_Layer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.pro b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.pro index 0b37f99146..2cbb43ec91 100644 --- a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.pro +++ b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = WMTS_Layer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.qml b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.qml index 69e4902a0d..3e9c3e6a8a 100644 --- a/CppSamples/Layers/WMTS_Layer/WMTS_Layer.qml +++ b/CppSamples/Layers/WMTS_Layer/WMTS_Layer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=WMTS_Layer, Category=Layers] // [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. diff --git a/CppSamples/Layers/WMTS_Layer/main.cpp b/CppSamples/Layers/WMTS_Layer/main.cpp index 4abb824152..d957c6c357 100644 --- a/CppSamples/Layers/WMTS_Layer/main.cpp +++ b/CppSamples/Layers/WMTS_Layer/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "WMTS_Layer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "WMTS_Layer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.cpp b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.cpp index 1dc245394f..42434882b2 100644 --- a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.cpp +++ b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Web_Tiled_Layer, Category=Layers] // [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. @@ -18,16 +18,19 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Web_Tiled_Layer.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" -#include "WebTiledLayer.h" -#include "Viewpoint.h" #include "Point.h" #include "SpatialReference.h" +#include "Viewpoint.h" +#include "WebTiledLayer.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h index 9bb4817093..7959078f39 100644 --- a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h +++ b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h @@ -1,12 +1,12 @@ // [WriteFile Name=Web_Tiled_Layer, Category=Layers] // [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. @@ -17,14 +17,15 @@ #ifndef WEB_TILED_LAYER_H #define WEB_TILED_LAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class Web_Tiled_Layer : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.pro b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.pro index f08274eafb..fcd3aa85da 100644 --- a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.pro +++ b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = Web_Tiled_Layer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.qml b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.qml index 455a136143..3951fa46a0 100644 --- a/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.qml +++ b/CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Web_Tiled_Layer, Category=Layers] // [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. diff --git a/CppSamples/Layers/Web_Tiled_Layer/main.cpp b/CppSamples/Layers/Web_Tiled_Layer/main.cpp index 661a40da10..ac90237920 100644 --- a/CppSamples/Layers/Web_Tiled_Layer/main.cpp +++ b/CppSamples/Layers/Web_Tiled_Layer/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "Web_Tiled_Layer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Web_Tiled_Layer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.cpp b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.cpp index c4a39f8330..ff7a3d86fd 100644 --- a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.cpp +++ b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=WmsLayerUrl, Category=Layers] // [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. @@ -18,19 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "WmsLayerUrl.h" +// ArcGIS Maps SDK headers #include "Envelope.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "WmsLayer.h" #include "MapTypes.h" -#include "LayerListModel.h" #include "SpatialReference.h" +#include "WmsLayer.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h index 796b4e8581..be3d5bdcf9 100644 --- a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h +++ b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h @@ -1,12 +1,12 @@ // [WriteFile Name=WmsLayerUrl, Category=Layers] // [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. @@ -17,14 +17,15 @@ #ifndef WMSLAYERURL_H #define WMSLAYERURL_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class WmsLayerUrl : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.pro b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.pro index 2b6efdee4a..c2bb84edad 100644 --- a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.pro +++ b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = WmsLayerUrl -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.qml b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.qml index 46555dd8d1..017dfd5f50 100644 --- a/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.qml +++ b/CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.qml @@ -1,12 +1,12 @@ // [WriteFile Name=WmsLayerUrl, Category=Layers] // [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. diff --git a/CppSamples/Layers/WmsLayerUrl/main.cpp b/CppSamples/Layers/WmsLayerUrl/main.cpp index a70f9024c5..016a1c26db 100644 --- a/CppSamples/Layers/WmsLayerUrl/main.cpp +++ b/CppSamples/Layers/WmsLayerUrl/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "WmsLayerUrl.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "WmsLayerUrl.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.cpp b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.cpp index 45587d9a42..a13ad7b749 100644 --- a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.cpp +++ b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerFeatureLayer, Category=LocalServer] // [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. @@ -18,26 +18,29 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "LocalServerFeatureLayer.h" +// ArcGIS Maps SDK headers #include "Basemap.h" #include "Envelope.h" -#include "MapQuickView.h" -#include "Map.h" -#include "LocalServer.h" +#include "FeatureLayer.h" +#include "LayerListModel.h" #include "LocalFeatureService.h" +#include "LocalServer.h" +#include "LocalServerTypes.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "ServiceFeatureTable.h" -#include "FeatureLayer.h" #include "Viewpoint.h" -#include "MapViewTypes.h" -#include "MapTypes.h" -#include "LocalServerTypes.h" -#include "LayerListModel.h" +// Qt headers #include +#include #include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h index 18322e1553..bd2c511a77 100644 --- a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h +++ b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerFeatureLayer, Category=LocalServer] // [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. @@ -17,6 +17,10 @@ #ifndef LOCAL_SERVER_FEATURELAYER_H #define LOCAL_SERVER_FEATURELAYER_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -28,9 +32,6 @@ namespace Esri::ArcGISRuntime class QTemporaryDir; -#include -#include - class LocalServerFeatureLayer : public QQuickItem { Q_OBJECT @@ -55,4 +56,3 @@ class LocalServerFeatureLayer : public QQuickItem }; #endif // LOCAL_SERVER_FEATURELAYER_H - diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.pro b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.pro index 88888d7846..e3a06af9df 100644 --- a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.pro +++ b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.qml b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.qml index 54df777432..0eb7877965 100644 --- a/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.qml +++ b/CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerFeatureLayer, Category=LocalServer] // [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. diff --git a/CppSamples/LocalServer/LocalServerFeatureLayer/main.cpp b/CppSamples/LocalServer/LocalServerFeatureLayer/main.cpp index 43a44cfdea..cd9e1f791d 100644 --- a/CppSamples/LocalServer/LocalServerFeatureLayer/main.cpp +++ b/CppSamples/LocalServer/LocalServerFeatureLayer/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include -#include +// sample headers +#include "LocalServerFeatureLayer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "LocalServerFeatureLayer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.cpp b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.cpp index d45cc5d8cb..c556678bd0 100644 --- a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.cpp +++ b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerGeoprocessing, Category=LocalServer] // [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. @@ -18,30 +18,33 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "LocalServerGeoprocessing.h" +// ArcGIS Maps SDK headers +#include "ArcGISMapImageLayer.h" +#include "ArcGISTiledLayer.h" #include "Basemap.h" #include "Envelope.h" -#include "MapQuickView.h" -#include "Map.h" -#include "LocalServer.h" -#include "Viewpoint.h" -#include "TileCache.h" -#include "LocalGeoprocessingService.h" -#include "ArcGISTiledLayer.h" -#include "GeoprocessingTask.h" +#include "GeoprocessingDouble.h" #include "GeoprocessingJob.h" #include "GeoprocessingParameter.h" #include "GeoprocessingParameters.h" -#include "GeoprocessingDouble.h" -#include "ArcGISMapImageLayer.h" -#include "MapViewTypes.h" -#include "MapTypes.h" +#include "GeoprocessingTask.h" +#include "GeoprocessingTypes.h" #include "LayerListModel.h" +#include "LocalGeoprocessingService.h" +#include "LocalServer.h" #include "LocalServerTypes.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "TaskTypes.h" -#include "GeoprocessingTypes.h" +#include "TileCache.h" +#include "Viewpoint.h" +// Qt headers #include #include #include diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h index 33101a6260..7ada8b0814 100644 --- a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h +++ b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerGeoprocessing, Category=LocalServer] // [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. @@ -17,6 +17,13 @@ #ifndef LOCAL_SERVER_GEOPROCESSING_H #define LOCAL_SERVER_GEOPROCESSING_H +// Qt headers +#include +#include + +// STL headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -29,10 +36,6 @@ class GeoprocessingTask; class QTemporaryDir; -#include -#include -#include - class LocalServerGeoprocessing : public QQuickItem { Q_OBJECT @@ -67,4 +70,3 @@ class LocalServerGeoprocessing : public QQuickItem }; #endif // LOCAL_SERVER_GEOPROCESSING_H - diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.pro b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.pro index 8b70a05170..84e0ecc425 100644 --- a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.pro +++ b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.qml b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.qml index f3205e8bc0..0a4ad991d9 100644 --- a/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.qml +++ b/CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.qml @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerFeatureLayer, Category=LocalServer] // [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. diff --git a/CppSamples/LocalServer/LocalServerGeoprocessing/main.cpp b/CppSamples/LocalServer/LocalServerGeoprocessing/main.cpp index 3ff60f8fe7..6a00ce8a06 100644 --- a/CppSamples/LocalServer/LocalServerGeoprocessing/main.cpp +++ b/CppSamples/LocalServer/LocalServerGeoprocessing/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include -#include +// sample headers +#include "LocalServerGeoprocessing.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "LocalServerGeoprocessing.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.cpp b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.cpp index 26d9ab06d0..d85843b0c1 100644 --- a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.cpp +++ b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerMapImageLayer, Category=LocalServer] // [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. @@ -18,21 +18,24 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "LocalServerMapImageLayer.h" +// ArcGIS Maps SDK headers +#include "ArcGISMapImageLayer.h" #include "Basemap.h" #include "Envelope.h" -#include "MapQuickView.h" -#include "Map.h" -#include "LocalServer.h" -#include "LocalMapService.h" -#include "ArcGISMapImageLayer.h" -#include "Viewpoint.h" -#include "MapViewTypes.h" -#include "MapTypes.h" #include "LayerListModel.h" +#include "LocalMapService.h" +#include "LocalServer.h" #include "LocalServerTypes.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" +#include "Viewpoint.h" +// Qt headers #include #include #include diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h index b639b6ad9b..de4edecf34 100644 --- a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h +++ b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerMapImageLayer, Category=LocalServer] // [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. @@ -17,6 +17,9 @@ #ifndef LOCAL_SERVER_MAPIMAGELAYER_H #define LOCAL_SERVER_MAPIMAGELAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -27,8 +30,6 @@ namespace Esri::ArcGISRuntime class QTemporaryDir; -#include - class LocalServerMapImageLayer : public QQuickItem { Q_OBJECT @@ -52,4 +53,3 @@ class LocalServerMapImageLayer : public QQuickItem }; #endif // LOCAL_SERVER_MAPIMAGELAYER_H - diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.pro b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.pro index ee75781df1..aba5d2b82f 100644 --- a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.pro +++ b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.qml b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.qml index 642f73d651..849ce41c28 100644 --- a/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.qml +++ b/CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerMapImageLayer, Category=LocalServer] // [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. diff --git a/CppSamples/LocalServer/LocalServerMapImageLayer/main.cpp b/CppSamples/LocalServer/LocalServerMapImageLayer/main.cpp index 9c38de33fb..1e4c12a21b 100644 --- a/CppSamples/LocalServer/LocalServerMapImageLayer/main.cpp +++ b/CppSamples/LocalServer/LocalServerMapImageLayer/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include -#include +// sample headers +#include "LocalServerMapImageLayer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "LocalServerMapImageLayer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.cpp b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.cpp index d1e3811fa8..1fed682892 100644 --- a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.cpp +++ b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerServices, Category=LocalServer] // [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. @@ -18,14 +18,17 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "LocalServerServices.h" -#include "LocalServer.h" -#include "LocalMapService.h" +// ArcGIS Maps SDK headers #include "LocalFeatureService.h" #include "LocalGeoprocessingService.h" +#include "LocalMapService.h" +#include "LocalServer.h" #include "LocalServerTypes.h" +// Qt headers #include #include #include diff --git a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.h b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.h index b386e16769..c5697baaaa 100644 --- a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.h +++ b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.h @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerServices, Category=LocalServer] // [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. @@ -17,6 +17,12 @@ #ifndef LOCAL_SERVER_SERVICES_H #define LOCAL_SERVER_SERVICES_H +// Qt headers +#include + +// STL headers +#include + namespace Esri::ArcGISRuntime { class LocalServer; @@ -28,9 +34,6 @@ namespace Esri::ArcGISRuntime class QTemporaryDir; -#include -#include - class LocalServerServices : public QQuickItem { Q_OBJECT @@ -81,4 +84,3 @@ class LocalServerServices : public QQuickItem }; #endif // LOCAL_SERVER_SERVICES_H - diff --git a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.pro b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.pro index 24f2984d62..c84b62cbc7 100644 --- a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.pro +++ b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.qml b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.qml index f3729b74a1..6c14ae178d 100644 --- a/CppSamples/LocalServer/LocalServerServices/LocalServerServices.qml +++ b/CppSamples/LocalServer/LocalServerServices/LocalServerServices.qml @@ -1,12 +1,12 @@ // [WriteFile Name=LocalServerServices, Category=LocalServer] // [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. diff --git a/CppSamples/LocalServer/LocalServerServices/main.cpp b/CppSamples/LocalServer/LocalServerServices/main.cpp index 37664840fa..6f1d3e90a5 100644 --- a/CppSamples/LocalServer/LocalServerServices/main.cpp +++ b/CppSamples/LocalServer/LocalServerServices/main.cpp @@ -1,31 +1,38 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include -#include +// sample headers +#include "LocalServerServices.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include -#include +#include #include +#include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "LocalServerServices.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.cpp b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.cpp index 8d470ed2e4..a48473c5a9 100644 --- a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.cpp +++ b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ApplyScheduledMapUpdates, Category=Maps] // [Legal] // Copyright 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. @@ -18,26 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ApplyScheduledMapUpdates.h" +// ArcGIS Maps SDK headers +#include "Error.h" #include "Map.h" #include "MapQuickView.h" #include "MobileMapPackage.h" -#include "OfflineMapSyncTask.h" -#include "OfflineMapUpdatesInfo.h" -#include "OfflineMapSyncParameters.h" #include "OfflineMapSyncJob.h" -#include "Error.h" -#include "OfflineMapUpdatesInfo.h" -#include "OfflineMapTypes.h" +#include "OfflineMapSyncParameters.h" #include "OfflineMapSyncResult.h" +#include "OfflineMapSyncTask.h" +#include "OfflineMapTypes.h" +#include "OfflineMapUpdatesInfo.h" +// Qt headers #include #include #include -#include -#include #include +#include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h index 4a33699190..63ee08b4ca 100644 --- a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h +++ b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h @@ -1,12 +1,12 @@ // [WriteFile Name=ApplyScheduledMapUpdates, Category=Maps] // [Legal] // Copyright 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. @@ -17,6 +17,13 @@ #ifndef APPLYSCHEDULEDMAPUPDATES_H #define APPLYSCHEDULEDMAPUPDATES_H +// ArcGIS Maps SDK headers +#include "Error.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,11 +33,6 @@ class OfflineMapSyncTask; class OfflineMapSyncJob; } -#include -#include - -#include "Error.h" - Q_MOC_INCLUDE("MapQuickView.h") class ApplyScheduledMapUpdates : public QObject diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.pro b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.pro index 859719a8a2..87e5507205 100644 --- a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.pro +++ b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ApplyScheduledMapUpdates -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.qml b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.qml index bc61f015dd..50c2293d7e 100644 --- a/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.qml +++ b/CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ApplyScheduledMapUpdates, Category=Maps] // [Legal] // Copyright 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. diff --git a/CppSamples/Maps/ApplyScheduledMapUpdates/main.cpp b/CppSamples/Maps/ApplyScheduledMapUpdates/main.cpp index acd0a3c4f3..32c7843184 100644 --- a/CppSamples/Maps/ApplyScheduledMapUpdates/main.cpp +++ b/CppSamples/Maps/ApplyScheduledMapUpdates/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "ApplyScheduledMapUpdates.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.cpp b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.cpp index 476ba0cc68..bc8e5a4801 100644 --- a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.cpp +++ b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=BrowseBuildingFloors, Category=Maps] // [Legal] // Copyright 2022 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. @@ -18,13 +18,15 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "BrowseBuildingFloors.h" +// ArcGIS Maps SDK headers +#include "Error.h" #include "FloorLevel.h" #include "FloorManager.h" #include "Map.h" #include "MapQuickView.h" -#include "Error.h" #include "MapTypes.h" #include "Portal.h" #include "PortalItem.h" diff --git a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h index a33784f01e..dbed2b12b4 100644 --- a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h +++ b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h @@ -1,12 +1,12 @@ // [WriteFile Name=BrowseBuildingFloors, Category=Maps] // [Legal] // Copyright 2022 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. @@ -17,6 +17,9 @@ #ifndef BROWSEBUILDINGFLOORS_H #define BROWSEBUILDINGFLOORS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ class FloorManager; class FloorLevel; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class BrowseBuildingFloors : public QObject diff --git a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.pro b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.pro index b7fed5871e..94a7749d8d 100644 --- a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.pro +++ b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = BrowseBuildingFloors -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.qml b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.qml index 1527582a80..f478d4507e 100644 --- a/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.qml +++ b/CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.qml @@ -1,12 +1,12 @@ // [WriteFile Name=BrowseBuildingFloors, Category=Maps] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Maps/BrowseBuildingFloors/main.cpp b/CppSamples/Maps/BrowseBuildingFloors/main.cpp index 7f7ecb05aa..8528fdbb11 100644 --- a/CppSamples/Maps/BrowseBuildingFloors/main.cpp +++ b/CppSamples/Maps/BrowseBuildingFloors/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "BrowseBuildingFloors.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.cpp b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.cpp index 8957b63022..55b94d2bc6 100644 --- a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.cpp +++ b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeBasemap, Category=Maps] // [Legal] // Copyright 2021 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ChangeBasemap.h" +// ArcGIS Maps SDK headers #include "Map.h" #include "MapQuickView.h" #include "MapTypes.h" @@ -30,7 +32,6 @@ ChangeBasemap::ChangeBasemap(QObject* parent /* = nullptr */): QObject(parent), m_map(new Map(BasemapStyle::ArcGISTopographic, this)) { - } ChangeBasemap::~ChangeBasemap() = default; diff --git a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.h b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.h index d1dd3fa943..ff4221d4c6 100644 --- a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.h +++ b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.h @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeBasemap, Category=Maps] // [Legal] // Copyright 2021 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. @@ -17,14 +17,15 @@ #ifndef CHANGEBASEMAP_H #define CHANGEBASEMAP_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class ChangeBasemap : public QObject diff --git a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.pro b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.pro index fe0c77db69..2b26fc2ff2 100644 --- a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.pro +++ b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ChangeBasemap -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.qml b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.qml index eb835639a4..3aadd37eff 100644 --- a/CppSamples/Maps/ChangeBasemap/ChangeBasemap.qml +++ b/CppSamples/Maps/ChangeBasemap/ChangeBasemap.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeBasemap, Category=Maps] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Maps/ChangeBasemap/main.cpp b/CppSamples/Maps/ChangeBasemap/main.cpp index ecf84be3e3..c659e60822 100644 --- a/CppSamples/Maps/ChangeBasemap/main.cpp +++ b/CppSamples/Maps/ChangeBasemap/main.cpp @@ -1,26 +1,34 @@ +// [Legal] // Copyright 2021 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 "ChangeBasemap.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" -#include "Esri/ArcGISRuntime/Toolkit/register.h" +// Qt headers #include #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.cpp b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.cpp index d91e7e79cd..ee72815534 100644 --- a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.cpp +++ b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeViewpoint, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,18 +18,21 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ChangeViewpoint.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "Envelope.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "Point.h" #include "SpatialReference.h" -#include "Envelope.h" #include "Viewpoint.h" -#include "MapTypes.h" -#include "MapViewTypes.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h index 494325e556..d5f65b80d4 100644 --- a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h +++ b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeViewpoint, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef CHANGE_VIEWPOINT_H #define CHANGE_VIEWPOINT_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class ChangeViewpoint : public QQuickItem diff --git a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro index 52ea74f3c1..255f5d3258 100644 --- a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro +++ b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.qml b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.qml index 8836a7d56e..c4f1717709 100644 --- a/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.qml +++ b/CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeViewpoint, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/ChangeViewpoint/main.cpp b/CppSamples/Maps/ChangeViewpoint/main.cpp index 55fb408b8e..405849345c 100644 --- a/CppSamples/Maps/ChangeViewpoint/main.cpp +++ b/CppSamples/Maps/ChangeViewpoint/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ChangeViewpoint.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ChangeViewpoint.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.cpp b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.cpp index 7fdfc8ea22..2caa9efc69 100644 --- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.cpp +++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ConfigureBasemapStyleLanguage, Category=Maps] // [Legal] // Copyright 2024 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. @@ -18,9 +18,12 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers +#include "ConfigureBasemapStyleLanguage.h" + +// ArcGIS Maps SDK headers #include "Basemap.h" #include "BasemapStyleParameters.h" -#include "ConfigureBasemapStyleLanguage.h" #include "Map.h" #include "MapQuickView.h" #include "MapTypes.h" @@ -28,6 +31,7 @@ #include "SpatialReference.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h index 837f471cdb..20f141221e 100644 --- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h +++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h @@ -1,12 +1,12 @@ // [WriteFile Name=ConfigureBasemapStyleLanguage, Category=Maps] // [Legal] // Copyright 2024 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. @@ -17,6 +17,9 @@ #ifndef CONFIGUREBASEMAPSTYLELANGUAGE_H #define CONFIGUREBASEMAPSTYLELANGUAGE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Basemap; class BasemapStyleParameters; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime { class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h"); class ConfigureBasemapStyleLanguage : public QObject diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.pro b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.pro index 13f4557a6e..8acd2149a3 100644 --- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.pro +++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ConfigureBasemapStyleLanguage -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.qml b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.qml index c408bb8913..aa03e686ad 100644 --- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.qml +++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ConfigureBasemapStyleLanguage, Category=Maps] // [Legal] // Copyright 2024 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. diff --git a/CppSamples/Maps/ConfigureBasemapStyleLanguage/main.cpp b/CppSamples/Maps/ConfigureBasemapStyleLanguage/main.cpp index 504204efa7..7dbb0f4e5e 100644 --- a/CppSamples/Maps/ConfigureBasemapStyleLanguage/main.cpp +++ b/CppSamples/Maps/ConfigureBasemapStyleLanguage/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2024 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 "ConfigureBasemapStyleLanguage.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.cpp b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.cpp index 4b3dd2a468..4577637657 100644 --- a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.cpp +++ b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndSaveMap, Category=Maps] // [Legal] // Copyright 2018 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. @@ -18,19 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CreateAndSaveMap.h" +// ArcGIS Maps SDK headers +#include "ArcGISMapImageLayer.h" +#include "Basemap.h" +#include "Error.h" #include "ErrorException.h" +#include "Item.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" -#include "ArcGISMapImageLayer.h" -#include "Portal.h" #include "MapTypes.h" -#include "LayerListModel.h" -#include "Error.h" -#include "Item.h" +#include "Portal.h" +// Qt headers #include #include diff --git a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h index 31692b1859..06b1426f9d 100644 --- a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h +++ b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndSaveMap, Category=Maps] // [Legal] // Copyright 2018 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. @@ -17,6 +17,9 @@ #ifndef CREATEANDSAVEMAP_H #define CREATEANDSAVEMAP_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ class MapQuickView; class Portal; } -#include - class CreateAndSaveMap : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.pro b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.pro index 0ebb55b5c3..9d91d18e04 100644 --- a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.pro +++ b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateAndSaveMap -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.qml b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.qml index 974e7917b2..fd9029b59a 100644 --- a/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.qml +++ b/CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateAndSaveMap, Category=Maps] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Maps/CreateAndSaveMap/main.cpp b/CppSamples/Maps/CreateAndSaveMap/main.cpp index 381ac7d45f..a05baee5ce 100644 --- a/CppSamples/Maps/CreateAndSaveMap/main.cpp +++ b/CppSamples/Maps/CreateAndSaveMap/main.cpp @@ -1,21 +1,24 @@ +// [Legal] // Copyright 2018 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 -#include +// Qt headers #include #include +#include #include +#include #ifdef QT_WEBVIEW_WEBENGINE_BACKEND #include diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp b/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp index a00f171930..091c76b259 100644 --- a/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp +++ b/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps] // [Legal] // Copyright 2024 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. @@ -14,8 +14,10 @@ // limitations under the License. // [Legal] +// sample headers #include "BasemapStyleListModel.h" +// ArcGIS Maps SDK headers #include "BasemapStyleInfo.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.h b/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.h index 6fe25fc157..6eeeecd564 100644 --- a/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.h +++ b/CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps] // [Legal] // Copyright 2024 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. @@ -17,6 +17,7 @@ #ifndef BASEMAPSTYLELISTMODEL_H #define BASEMAPSTYLELISTMODEL_H +// Qt headers #include #include #include diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.cpp b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.cpp index a5da025bef..46243ca0b2 100644 --- a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.cpp +++ b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps] // [Legal] // Copyright 2024 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. @@ -18,12 +18,14 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers +#include "BasemapStyleListModel.h" #include "CreateDynamicBasemapGallery.h" +// ArcGIS Maps SDK headers #include "Basemap.h" #include "BasemapStyleInfo.h" #include "BasemapStyleLanguageInfo.h" -#include "BasemapStyleListModel.h" #include "BasemapStyleParameters.h" #include "BasemapStylesService.h" #include "BasemapStylesServiceInfo.h" @@ -34,6 +36,7 @@ #include "Viewpoint.h" #include "Worldview.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h index f95ec6dcea..493d6bdcb3 100644 --- a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h +++ b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps] // [Legal] // Copyright 2024 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. @@ -17,14 +17,13 @@ #ifndef CREATEDYNAMICBASEMAPGALLERY_H #define CREATEDYNAMICBASEMAPGALLERY_H +// Qt headers #include #include #include #include Q_MOC_INCLUDE("MapQuickView.h") -Q_MOC_INCLUDE("BasemapStyleInfo.h") -Q_MOC_INCLUDE("BasemapStyleListModel.h") class BasemapStyleListModel; class QAbstractListModel; diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.pro b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.pro index 745827ded9..cdd1e27a56 100644 --- a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.pro +++ b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateDynamicBasemapGallery -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.qml b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.qml index c164e8c354..da2290023a 100644 --- a/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.qml +++ b/CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateDynamicBasemapGallery, Category=Maps] // [Legal] // Copyright 2024 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. diff --git a/CppSamples/Maps/CreateDynamicBasemapGallery/main.cpp b/CppSamples/Maps/CreateDynamicBasemapGallery/main.cpp index 06f9ba19b6..09e5993ad5 100644 --- a/CppSamples/Maps/CreateDynamicBasemapGallery/main.cpp +++ b/CppSamples/Maps/CreateDynamicBasemapGallery/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2024 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 "CreateDynamicBasemapGallery.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.cpp b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.cpp index e5c6b3c581..a151355d70 100644 --- a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.cpp +++ b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDeviceLocation, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,14 +18,16 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayDeviceLocation.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "LocationDisplay.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" #include "MapTypes.h" #include "MapViewTypes.h" -#include "LocationDisplay.h" #if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) || defined(Q_OS_IOS) || defined(Q_OS_MACOS) || defined(Q_OS_ANDROID) #define PERMISSIONS_PLATFORM diff --git a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h index f204fcb10f..bf8fe286da 100644 --- a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h +++ b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDeviceLocation, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef DISPLAY_DEVICE_LOCATION_H #define DISPLAY_DEVICE_LOCATION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class DisplayDeviceLocation : public QQuickItem { Q_OBJECT @@ -76,4 +77,3 @@ class DisplayDeviceLocation : public QQuickItem }; #endif // DISPLAY_DEVICE_LOCATION_H - diff --git a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro index 5258999645..7c7c4dfb09 100644 --- a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro +++ b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.qml b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.qml index 428d34e2fa..46915161a1 100644 --- a/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.qml +++ b/CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDeviceLocation, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/DisplayDeviceLocation/main.cpp b/CppSamples/Maps/DisplayDeviceLocation/main.cpp index 8f210b1212..32e56af451 100644 --- a/CppSamples/Maps/DisplayDeviceLocation/main.cpp +++ b/CppSamples/Maps/DisplayDeviceLocation/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "DisplayDeviceLocation.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "DisplayDeviceLocation.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.cpp b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.cpp index 11364e221a..18251adbd0 100644 --- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.cpp +++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDeviceLocationWithNmeaDataSources, Category=Maps] // [Legal] // Copyright 2021 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. @@ -18,17 +18,20 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayDeviceLocationWithNmeaDataSources.h" +// ArcGIS Maps SDK headers +#include "LocationDisplay.h" #include "Map.h" #include "MapQuickView.h" -#include "NmeaLocationDataSource.h" #include "MapTypes.h" #include "MapViewTypes.h" -#include "LocationDisplay.h" -#include "SpatialReference.h" +#include "NmeaLocationDataSource.h" #include "Point.h" +#include "SpatialReference.h" +// Qt headers #include #include #include @@ -155,4 +158,3 @@ bool DisplayDeviceLocationWithNmeaDataSources::loadMockDataFile(const QString& f mockDataFile.close(); return true; } - diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h index 782b10903d..72b63f5215 100644 --- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h +++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDeviceLocationWithNmeaDataSources, Category=Maps] // [Legal] // Copyright 2021 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. @@ -17,6 +17,12 @@ #ifndef DISPLAYDEVICELOCATIONWITHNMEADATASOURCES_H #define DISPLAYDEVICELOCATIONWITHNMEADATASOURCES_H +// Qt headers +#include +#include +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,11 +30,6 @@ class MapQuickView; class NmeaLocationDataSource; } -#include -#include -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class DisplayDeviceLocationWithNmeaDataSources : public QObject diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.qml b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.qml index dfc7ff4807..46cdef15ac 100644 --- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.qml +++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDeviceLocationWithNmeaDataSources, Category=Maps] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/displayDeviceLocationWithNmeaDataSources.pro b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/displayDeviceLocationWithNmeaDataSources.pro index cfbbea0cc5..935dfae861 100644 --- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/displayDeviceLocationWithNmeaDataSources.pro +++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/displayDeviceLocationWithNmeaDataSources.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayDeviceLocationWithNmeaDataSources -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/main.cpp b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/main.cpp index 688e1e9de3..8747e3e86a 100644 --- a/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/main.cpp +++ b/CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 2021 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 "DisplayDeviceLocationWithNmeaDataSources.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.cpp b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.cpp index 7e2eefa87d..597bf3616b 100644 --- a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.cpp +++ b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDrawingStatus, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,19 +18,22 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayDrawingStatus.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "FeatureLayer.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "FeatureLayer.h" -#include "ServiceFeatureTable.h" #include "MapTypes.h" #include "MapViewTypes.h" -#include "LayerListModel.h" +#include "ServiceFeatureTable.h" #include "SpatialReference.h" -#include "Envelope.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h index c1c936a6cf..c27ed46a82 100644 --- a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h +++ b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDrawingStatus, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef DISPLAYDRAWINGSTATUS_H #define DISPLAYDRAWINGSTATUS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime class FeatureLayer; } -#include - class DisplayDrawingStatus : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.pro b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.pro index 85f0bcd8e5..3925cced10 100644 --- a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.pro +++ b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.qml b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.qml index e5f20708fa..918b392bf5 100644 --- a/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.qml +++ b/CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayDrawingStatus, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/DisplayDrawingStatus/main.cpp b/CppSamples/Maps/DisplayDrawingStatus/main.cpp index 84c6e53609..527c156c6f 100644 --- a/CppSamples/Maps/DisplayDrawingStatus/main.cpp +++ b/CppSamples/Maps/DisplayDrawingStatus/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "DisplayDrawingStatus.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "DisplayDrawingStatus.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.cpp b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.cpp index 16f7b0ce9f..9e0cc068ec 100644 --- a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.cpp +++ b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayLayerViewDrawState, Category=Maps] // [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. @@ -18,23 +18,24 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayLayerViewDrawState.h" +// ArcGIS Maps SDK headers +#include "Error.h" #include "FeatureLayer.h" +#include "LayerListModel.h" +#include "LayerViewState.h" #include "Map.h" #include "MapQuickView.h" -#include "PortalItem.h" -#include "Viewpoint.h" -#include "Point.h" -#include "Error.h" #include "MapTypes.h" -#include "LayerListModel.h" +#include "Point.h" #include "Portal.h" -#include "LayerViewState.h" +#include "PortalItem.h" #include "SpatialReference.h" -#include "Point.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h index c68ca774b2..95d9200489 100644 --- a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h +++ b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayLayerViewDrawState, Category=Maps] // [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. @@ -17,6 +17,9 @@ #ifndef DISPLAYLAYERVIEWDRAWSTATE_H #define DISPLAYLAYERVIEWDRAWSTATE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -27,8 +30,6 @@ class Layer; class LayerViewState; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class DisplayLayerViewDrawState : public QObject diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.pro b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.pro index f26c9553ed..6f0837611d 100644 --- a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.pro +++ b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayLayerViewDrawState -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.qml b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.qml index 33755bc475..f9d4148906 100644 --- a/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.qml +++ b/CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayLayerViewDrawState, Category=Maps] // [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. diff --git a/CppSamples/Maps/DisplayLayerViewDrawState/main.cpp b/CppSamples/Maps/DisplayLayerViewDrawState/main.cpp index 492691503c..36e08c056c 100644 --- a/CppSamples/Maps/DisplayLayerViewDrawState/main.cpp +++ b/CppSamples/Maps/DisplayLayerViewDrawState/main.cpp @@ -1,29 +1,37 @@ +// [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 "DisplayLayerViewDrawState.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Esri/ArcGISRuntime/Toolkit/register.h" - int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); diff --git a/CppSamples/Maps/DisplayMap/DisplayMap.cpp b/CppSamples/Maps/DisplayMap/DisplayMap.cpp index 7c927e3ad2..d455647f38 100644 --- a/CppSamples/Maps/DisplayMap/DisplayMap.cpp +++ b/CppSamples/Maps/DisplayMap/DisplayMap.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayMap, Category=Maps] // [Legal] // Copyright 2022 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayMap.h" +// ArcGIS Maps SDK headers #include "Map.h" #include "MapQuickView.h" #include "MapTypes.h" diff --git a/CppSamples/Maps/DisplayMap/DisplayMap.h b/CppSamples/Maps/DisplayMap/DisplayMap.h index 5d8c6a9a01..4d25445e85 100644 --- a/CppSamples/Maps/DisplayMap/DisplayMap.h +++ b/CppSamples/Maps/DisplayMap/DisplayMap.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayMap, Category=Maps] // [Legal] // Copyright 2022 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. @@ -17,14 +17,15 @@ #ifndef DISPLAYMAP_H #define DISPLAYMAP_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h"); class DisplayMap : public QObject diff --git a/CppSamples/Maps/DisplayMap/DisplayMap.pro b/CppSamples/Maps/DisplayMap/DisplayMap.pro index ccd9d9af0a..3049579558 100644 --- a/CppSamples/Maps/DisplayMap/DisplayMap.pro +++ b/CppSamples/Maps/DisplayMap/DisplayMap.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayMap -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/DisplayMap/DisplayMap.qml b/CppSamples/Maps/DisplayMap/DisplayMap.qml index 93c971a8c4..db53c93123 100644 --- a/CppSamples/Maps/DisplayMap/DisplayMap.qml +++ b/CppSamples/Maps/DisplayMap/DisplayMap.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayMap, Category=Maps] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Maps/DisplayMap/main.cpp b/CppSamples/Maps/DisplayMap/main.cpp index eb6dc942eb..f2a1a80c5d 100644 --- a/CppSamples/Maps/DisplayMap/main.cpp +++ b/CppSamples/Maps/DisplayMap/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "DisplayMap.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.cpp b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.cpp index 192d24a999..c976e6367e 100644 --- a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.cpp +++ b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayOverviewMap, Category=Maps] // [Legal] // Copyright 2021 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. @@ -18,17 +18,19 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayOverviewMap.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" #include "FeatureLayer.h" +#include "GeodatabaseTypes.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "ServiceFeatureTable.h" #include "Viewpoint.h" -#include "MapTypes.h" -#include "LayerListModel.h" -#include "GeodatabaseTypes.h" -#include "Basemap.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h index bc5c1c5d45..1a4df598ed 100644 --- a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h +++ b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayOverviewMap, Category=Maps] // [Legal] // Copyright 2021 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. @@ -17,14 +17,15 @@ #ifndef DISPLAYOVERVIEWMAP_H #define DISPLAYOVERVIEWMAP_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class DisplayOverviewMap : public QObject diff --git a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.pro b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.pro index 2cd40bbfc8..ab3d3c776a 100644 --- a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.pro +++ b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayOverviewMap -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.qml b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.qml index 074df76995..360b386e9d 100644 --- a/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.qml +++ b/CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayOverviewMap, Category=Maps] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Maps/DisplayOverviewMap/main.cpp b/CppSamples/Maps/DisplayOverviewMap/main.cpp index b5b3c98218..dac0db8983 100644 --- a/CppSamples/Maps/DisplayOverviewMap/main.cpp +++ b/CppSamples/Maps/DisplayOverviewMap/main.cpp @@ -1,26 +1,34 @@ +// [Legal] // Copyright 2021 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 "DisplayOverviewMap.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" -#include "Esri/ArcGISRuntime/Toolkit/register.h" +// Qt headers #include #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.cpp b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.cpp index 20eb61d9b4..fbf6dd2800 100644 --- a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.cpp +++ b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DownloadPreplannedMap, Category=Maps] // [Legal] // Copyright 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. @@ -18,30 +18,33 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DownloadPreplannedMap.h" +// ArcGIS Maps SDK headers #include "DownloadPreplannedOfflineMapJob.h" #include "DownloadPreplannedOfflineMapResult.h" +#include "Error.h" +#include "Geometry.h" #include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MobileMapPackage.h" #include "OfflineMapTask.h" +#include "OfflineMapTypes.h" +#include "PortalItem.h" #include "PreplannedMapArea.h" #include "PreplannedMapAreaListModel.h" #include "SimpleLineSymbol.h" #include "SimpleRenderer.h" -#include "Error.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" #include "SymbolTypes.h" -#include "OfflineMapTypes.h" #include "TaskTypes.h" -#include "MobileMapPackage.h" -#include "GraphicsOverlay.h" -#include "PortalItem.h" -#include "Geometry.h" +// Qt headers #include #include diff --git a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h index 1910fcc916..7d72e2323e 100644 --- a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h +++ b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h @@ -1,12 +1,12 @@ // [WriteFile Name=DownloadPreplannedMap, Category=Maps] // [Legal] // Copyright 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. @@ -17,6 +17,13 @@ #ifndef DOWNLOADPREPLANNEDMAP_H #define DOWNLOADPREPLANNEDMAP_H +// ArcGIS Maps SDK headers +#include "DownloadPreplannedOfflineMapParameters.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -31,14 +38,9 @@ class SimpleLineSymbol; class PreplannedMapAreaListModel; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("PreplannedMapAreaListModel.h") -#include "DownloadPreplannedOfflineMapParameters.h" - class DownloadPreplannedMap : public QObject { Q_OBJECT diff --git a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.pro b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.pro index 9516437b48..cf8240b7a2 100644 --- a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.pro +++ b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DownloadPreplannedMap -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.qml b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.qml index 95105f31ed..e0a49396cd 100644 --- a/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.qml +++ b/CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DownloadPreplannedMap, Category=Maps] // [Legal] // Copyright 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. diff --git a/CppSamples/Maps/DownloadPreplannedMap/main.cpp b/CppSamples/Maps/DownloadPreplannedMap/main.cpp index 8f757300d0..a6492e2308 100644 --- a/CppSamples/Maps/DownloadPreplannedMap/main.cpp +++ b/CppSamples/Maps/DownloadPreplannedMap/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "DownloadPreplannedMap.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.cpp b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.cpp index bf1718bc3b..00d9e1a7b2 100644 --- a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.cpp +++ b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateOfflineMap, Category=Maps] // [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. @@ -18,24 +18,27 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GenerateOfflineMap.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Portal.h" -#include "PortalItem.h" -#include "OfflineMapTask.h" -#include "GeometryEngine.h" +// ArcGIS Maps SDK headers #include "Envelope.h" -#include "Point.h" #include "Error.h" -#include "TaskTypes.h" #include "GenerateOfflineMapJob.h" #include "GenerateOfflineMapParameters.h" #include "GenerateOfflineMapResult.h" -#include "SpatialReference.h" +#include "GeometryEngine.h" #include "Layer.h" +#include "Map.h" +#include "MapQuickView.h" +#include "OfflineMapTask.h" +#include "Point.h" +#include "Portal.h" +#include "PortalItem.h" +#include "SpatialReference.h" +#include "TaskTypes.h" +// Qt headers #include #include diff --git a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h index 1719ef875a..c1ad8ed665 100644 --- a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h +++ b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateOfflineMap, Category=Maps] // [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. @@ -17,6 +17,10 @@ #ifndef GENERATEOFFLINEMAP_H #define GENERATEOFFLINEMAP_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,9 +28,6 @@ class MapQuickView; class OfflineMapTask; } -#include -#include - class GenerateOfflineMap : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.pro b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.pro index d7a81ac091..34b680f1fa 100644 --- a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.pro +++ b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = GenerateOfflineMap -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.qml b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.qml index d500b330b4..a77d29fe9a 100644 --- a/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.qml +++ b/CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateOfflineMap, Category=Maps] // [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. diff --git a/CppSamples/Maps/GenerateOfflineMap/main.cpp b/CppSamples/Maps/GenerateOfflineMap/main.cpp index e22701b35b..fffc63cd45 100644 --- a/CppSamples/Maps/GenerateOfflineMap/main.cpp +++ b/CppSamples/Maps/GenerateOfflineMap/main.cpp @@ -1,30 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "GenerateOfflineMap.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include -#include "ArcGISRuntimeEnvironment.h" - +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "GenerateOfflineMap.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.cpp b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.cpp index 384ceb3104..43d76bfff1 100644 --- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.cpp +++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateOfflineMapLocalBasemap, Category=Maps] // [Legal] // Copyright 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. @@ -18,29 +18,31 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GenerateOfflineMapLocalBasemap.h" -#include "Map.h" -#include "MapQuickView.h" -#include "PortalItem.h" -#include "OfflineMapTask.h" -#include "GeometryEngine.h" +// ArcGIS Maps SDK headers #include "Envelope.h" -#include "Point.h" #include "Error.h" #include "GenerateOfflineMapJob.h" -#include "TaskTypes.h" -#include "GenerateOfflineMapResult.h" -#include "Error.h" #include "GenerateOfflineMapParameters.h" -#include "SpatialReference.h" +#include "GenerateOfflineMapResult.h" +#include "GeometryEngine.h" #include "Layer.h" +#include "Map.h" +#include "MapQuickView.h" +#include "OfflineMapTask.h" +#include "Point.h" +#include "PortalItem.h" +#include "SpatialReference.h" +#include "TaskTypes.h" +// Qt headers #include +#include #include -#include #include -#include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h index 3ba5329c18..f2ecd4c773 100644 --- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h +++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateOfflineMapLocalBasemap, Category=Maps] // [Legal] // Copyright 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. @@ -17,6 +17,10 @@ #ifndef GENERATEOFFLINEMAPLOCALBASEMAP_H #define GENERATEOFFLINEMAPLOCALBASEMAP_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,9 +29,6 @@ class PortalItem; class OfflineMapTask; } -#include -#include - class GenerateOfflineMapLocalBasemap : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.pro b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.pro index 5ff0e90fbf..ac3598aaac 100644 --- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.pro +++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = GenerateOfflineMapLocalBasemap -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.qml b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.qml index 0553a808bc..6ab6f88d61 100644 --- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.qml +++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateOfflineMapLocalBasemap, Category=Maps] // [Legal] // Copyright 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. diff --git a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/main.cpp b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/main.cpp index e19e7f69f2..4f7161c510 100644 --- a/CppSamples/Maps/GenerateOfflineMapLocalBasemap/main.cpp +++ b/CppSamples/Maps/GenerateOfflineMapLocalBasemap/main.cpp @@ -1,30 +1,36 @@ +// [Legal] // Copyright 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. +// [Legal] -#include -#include +// sample headers +#include "GenerateOfflineMapLocalBasemap.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include -#include "ArcGISRuntimeEnvironment.h" - +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "GenerateOfflineMapLocalBasemap.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.cpp b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.cpp index 6f48775dab..ca75dd2eee 100644 --- a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.cpp +++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateOfflineMap_Overrides, Category=Maps] // [Legal] // Copyright 2018 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. @@ -18,36 +18,38 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GenerateOfflineMap_Overrides.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeatureLayerInfo.h" +#include "Basemap.h" #include "Envelope.h" +#include "Error.h" +#include "ExportTileCacheParameters.h" #include "FeatureLayer.h" +#include "GenerateGeodatabaseParameters.h" +#include "GenerateLayerOption.h" +#include "GenerateOfflineMapJob.h" +#include "GenerateOfflineMapParameterOverrides.h" +#include "GenerateOfflineMapResult.h" #include "GeometryEngine.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "Portal.h" -#include "PortalItem.h" -#include "OfflineMapTask.h" -#include "Point.h" -#include "Error.h" #include "MapTypes.h" -#include "LayerListModel.h" #include "OfflineMapParametersKey.h" +#include "OfflineMapTask.h" #include "OfflineMapTypes.h" -#include "ExportTileCacheParameters.h" -#include "GenerateOfflineMapParameterOverrides.h" -#include "ArcGISFeatureLayerInfo.h" -#include "GenerateLayerOption.h" -#include "GenerateGeodatabaseParameters.h" -#include "GenerateLayerOption.h" -#include "TaskTypes.h" -#include "GenerateOfflineMapJob.h" -#include "GenerateOfflineMapResult.h" -#include "SpatialReference.h" -#include "Basemap.h" +#include "Point.h" #include "Polygon.h" +#include "Portal.h" +#include "PortalItem.h" #include "ServiceFeatureTable.h" +#include "SpatialReference.h" +#include "TaskTypes.h" +// Qt headers #include #include diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h index 43c3b9e5bc..e60355b761 100644 --- a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h +++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateOfflineMap_Overrides, Category=Maps] // [Legal] // Copyright 2018 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. @@ -17,9 +17,13 @@ #ifndef GENERATEOFFLINEMAP_OVERRIDES_H #define GENERATEOFFLINEMAP_OVERRIDES_H -// C++ API headers +// ArcGIS Maps SDK headers #include "GenerateOfflineMapParameters.h" +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -30,9 +34,6 @@ class OfflineMapTask; class PortalItem; } -#include -#include - class GenerateOfflineMap_Overrides: public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.pro b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.pro index fba9448c47..7640fb1602 100644 --- a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.pro +++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = GenerateOfflineMap_Overrides -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.qml b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.qml index 228067af6e..b76cf1fc91 100644 --- a/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.qml +++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GenerateOfflineMap, Category=Maps] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Maps/GenerateOfflineMap_Overrides/main.cpp b/CppSamples/Maps/GenerateOfflineMap_Overrides/main.cpp index bc1bd3b323..a4839633a0 100644 --- a/CppSamples/Maps/GenerateOfflineMap_Overrides/main.cpp +++ b/CppSamples/Maps/GenerateOfflineMap_Overrides/main.cpp @@ -1,30 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "GenerateOfflineMap_Overrides.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include -#include "ArcGISRuntimeEnvironment.h" - +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "GenerateOfflineMap_Overrides.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.cpp b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.cpp index 588516c39a..28cfdd5cbb 100644 --- a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.cpp +++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=HonorMobileMapPackageExpiration, Category=Maps] // [Legal] // Copyright 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. @@ -18,17 +18,20 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "HonorMobileMapPackageExpiration.h" -#include "MobileMapPackage.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers +#include "CoreTypes.h" #include "Error.h" #include "Expiration.h" -#include "CoreTypes.h" +#include "MapQuickView.h" +#include "MobileMapPackage.h" -#include +// Qt headers #include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h index bfd040dec9..3f9bfa3859 100644 --- a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h +++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h @@ -1,12 +1,12 @@ // [WriteFile Name=HonorMobileMapPackageExpiration, Category=Maps] // [Legal] // Copyright 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. @@ -17,14 +17,15 @@ #ifndef HONORMOBILEMAPPACKAGEEXPIRATION_H #define HONORMOBILEMAPPACKAGEEXPIRATION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class MapQuickView; class MobileMapPackage; } -#include - Q_MOC_INCLUDE("MapQuickView.h") class HonorMobileMapPackageExpiration : public QObject diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.pro b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.pro index 370febf9a0..5fc5c64ec6 100644 --- a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.pro +++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.pro @@ -26,7 +26,7 @@ QT += opengl qml quick positioning sensors TEMPLATE = app TARGET = HonorMobileMapPackageExpiration -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.qml b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.qml index 55a354ba15..b9d9e0554a 100644 --- a/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.qml +++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.qml @@ -1,12 +1,12 @@ // [WriteFile Name=HonorMobileMapPackageExpiration, Category=Maps] // [Legal] // Copyright 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. diff --git a/CppSamples/Maps/HonorMobileMapPackageExpiration/main.cpp b/CppSamples/Maps/HonorMobileMapPackageExpiration/main.cpp index 0c2c5b62a5..15fd74260e 100644 --- a/CppSamples/Maps/HonorMobileMapPackageExpiration/main.cpp +++ b/CppSamples/Maps/HonorMobileMapPackageExpiration/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "HonorMobileMapPackageExpiration.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.cpp b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.cpp index d3d5fb782b..0000a57cf6 100644 --- a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.cpp +++ b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyLayers, Category=Maps] // [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. @@ -18,27 +18,30 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "IdentifyLayers.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Basemap.h" +// ArcGIS Maps SDK headers #include "ArcGISMapImageLayer.h" +#include "ArcGISSublayer.h" +#include "ArcGISSublayerListModel.h" +#include "Basemap.h" +#include "Error.h" #include "FeatureLayer.h" -#include "ServiceFeatureTable.h" -#include "Viewpoint.h" -#include "Point.h" #include "IdentifyLayerResult.h" -#include "Error.h" -#include "MapTypes.h" #include "LayerListModel.h" -#include "ArcGISSublayerListModel.h" -#include "ArcGISSublayer.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "Point.h" +#include "ServiceFeatureTable.h" #include "SpatialReference.h" +#include "Viewpoint.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.h b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.h index 83e38cc1a2..71ce97fcaf 100644 --- a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.h +++ b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.h @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyLayers, Category=Maps] // [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. @@ -17,14 +17,15 @@ #ifndef IDENTIFYLAYERS_H #define IDENTIFYLAYERS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class IdentifyLayers : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.pro b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.pro index e3b2ee9242..81117b719b 100644 --- a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.pro +++ b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = IdentifyLayers -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.qml b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.qml index bb7354b20e..e2e4428d55 100644 --- a/CppSamples/Maps/IdentifyLayers/IdentifyLayers.qml +++ b/CppSamples/Maps/IdentifyLayers/IdentifyLayers.qml @@ -1,12 +1,12 @@ // [WriteFile Name=IdentifyLayers, Category=Maps] // [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. diff --git a/CppSamples/Maps/IdentifyLayers/main.cpp b/CppSamples/Maps/IdentifyLayers/main.cpp index f61c35f09e..577931e89c 100644 --- a/CppSamples/Maps/IdentifyLayers/main.cpp +++ b/CppSamples/Maps/IdentifyLayers/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "IdentifyLayers.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "IdentifyLayers.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.cpp b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.cpp index d1f87a69bd..b520b4c01a 100644 --- a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.cpp +++ b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ManageBookmarks, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,18 +18,21 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ManageBookmarks.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" +#include "Bookmark.h" +#include "BookmarkListModel.h" +#include "Envelope.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" +#include "MapTypes.h" #include "SpatialReference.h" -#include "Envelope.h" #include "Viewpoint.h" -#include "Bookmark.h" -#include "MapTypes.h" -#include "BookmarkListModel.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.h b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.h index 557effb0ce..3675885214 100644 --- a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.h +++ b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.h @@ -1,12 +1,12 @@ // [WriteFile Name=ManageBookmarks, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,6 +17,10 @@ #ifndef MANAGE_BOOKMARKS_H #define MANAGE_BOOKMARKS_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,9 +30,6 @@ namespace Esri::ArcGISRuntime class QString; -#include -#include - class ManageBookmarks : public QQuickItem { Q_OBJECT @@ -62,4 +63,3 @@ class ManageBookmarks : public QQuickItem }; #endif // MANAGE_BOOKMARKS_H - diff --git a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.pro b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.pro index 1c716d18d0..01732ddbd3 100644 --- a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.pro +++ b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.qml b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.qml index 7d6efab43c..e19c585c86 100644 --- a/CppSamples/Maps/ManageBookmarks/ManageBookmarks.qml +++ b/CppSamples/Maps/ManageBookmarks/ManageBookmarks.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ManageBookmarks, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/ManageBookmarks/main.cpp b/CppSamples/Maps/ManageBookmarks/main.cpp index bd4809c2ca..6de51206d9 100644 --- a/CppSamples/Maps/ManageBookmarks/main.cpp +++ b/CppSamples/Maps/ManageBookmarks/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ManageBookmarks.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ManageBookmarks.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/MapLoaded/MapLoaded.cpp b/CppSamples/Maps/MapLoaded/MapLoaded.cpp index 0f4d6dbbd2..c9c4a16421 100644 --- a/CppSamples/Maps/MapLoaded/MapLoaded.cpp +++ b/CppSamples/Maps/MapLoaded/MapLoaded.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=MapLoaded, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,11 +18,13 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "MapLoaded.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" #include "MapTypes.h" using namespace Esri::ArcGISRuntime; @@ -82,4 +84,3 @@ QString MapLoaded::mapLoadStatus() const { return m_loadStatus; } - diff --git a/CppSamples/Maps/MapLoaded/MapLoaded.h b/CppSamples/Maps/MapLoaded/MapLoaded.h index 9706d682dc..38e916e821 100644 --- a/CppSamples/Maps/MapLoaded/MapLoaded.h +++ b/CppSamples/Maps/MapLoaded/MapLoaded.h @@ -1,12 +1,12 @@ // [WriteFile Name=MapLoaded, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef MAP_LOADED_H #define MAP_LOADED_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class QString; -#include - class MapLoaded : public QQuickItem { Q_OBJECT @@ -53,4 +54,3 @@ class MapLoaded : public QQuickItem }; #endif // MAP_LOADED_H - diff --git a/CppSamples/Maps/MapLoaded/MapLoaded.pro b/CppSamples/Maps/MapLoaded/MapLoaded.pro index 64b3c1a2ba..a05f6ccdef 100644 --- a/CppSamples/Maps/MapLoaded/MapLoaded.pro +++ b/CppSamples/Maps/MapLoaded/MapLoaded.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/MapLoaded/MapLoaded.qml b/CppSamples/Maps/MapLoaded/MapLoaded.qml index 1798a584c4..8e2cd5489c 100644 --- a/CppSamples/Maps/MapLoaded/MapLoaded.qml +++ b/CppSamples/Maps/MapLoaded/MapLoaded.qml @@ -1,12 +1,12 @@ // [WriteFile Name=MapLoaded, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/MapLoaded/main.cpp b/CppSamples/Maps/MapLoaded/main.cpp index 0a13942154..242a0f2308 100644 --- a/CppSamples/Maps/MapLoaded/main.cpp +++ b/CppSamples/Maps/MapLoaded/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "MapLoaded.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "MapLoaded.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.cpp b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.cpp index 4f21b70c0d..6c33de2b59 100644 --- a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.cpp +++ b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=MapReferenceScale, Category=Maps] // [Legal] // Copyright 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. @@ -18,17 +18,20 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "MapReferenceScale.h" -#include "Portal.h" -#include "PortalItem.h" -#include "Map.h" -#include "Layer.h" +// ArcGIS Maps SDK headers +#include "Error.h" #include "FeatureLayer.h" +#include "Layer.h" #include "LayerListModel.h" +#include "Map.h" #include "MapQuickView.h" -#include "Error.h" +#include "Portal.h" +#include "PortalItem.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; @@ -67,7 +70,6 @@ void MapReferenceScale::init() qmlRegisterUncreatableType("Esri.Samples", 1, 0, "AbstractListModel", "AbstractListModel is uncreateable"); } - double MapReferenceScale::currentMapScale() const { if (!m_mapView) diff --git a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.h b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.h index 2b084020ca..9fa1655e0d 100644 --- a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.h +++ b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.h @@ -1,12 +1,12 @@ // [WriteFile Name=MapReferenceScale, Category=Maps] // [Legal] // Copyright 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. @@ -17,6 +17,10 @@ #ifndef MAPREFERENCESCALE_H #define MAPREFERENCESCALE_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,9 +30,6 @@ class PortalItem; class LayerListModel; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class MapReferenceScale : public QObject diff --git a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.pro b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.pro index a42d431223..08f0a1d7ce 100644 --- a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.pro +++ b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = MapReferenceScale -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.qml b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.qml index e5cd41313b..2f869f298c 100644 --- a/CppSamples/Maps/MapReferenceScale/MapReferenceScale.qml +++ b/CppSamples/Maps/MapReferenceScale/MapReferenceScale.qml @@ -1,12 +1,12 @@ // [WriteFile Name=MapReferenceScale, Category=Maps] // [Legal] // Copyright 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. diff --git a/CppSamples/Maps/MapReferenceScale/main.cpp b/CppSamples/Maps/MapReferenceScale/main.cpp index 21c8a19dff..28803265a5 100644 --- a/CppSamples/Maps/MapReferenceScale/main.cpp +++ b/CppSamples/Maps/MapReferenceScale/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "MapReferenceScale.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/MapRotation/MapRotation.cpp b/CppSamples/Maps/MapRotation/MapRotation.cpp index 4dee3d3d7c..f1f8a9c639 100644 --- a/CppSamples/Maps/MapRotation/MapRotation.cpp +++ b/CppSamples/Maps/MapRotation/MapRotation.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=MapRotation, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,16 +18,19 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "MapRotation.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" -#include "Viewpoint.h" +#include "MapTypes.h" #include "Point.h" #include "SpatialReference.h" -#include "MapTypes.h" +#include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/MapRotation/MapRotation.h b/CppSamples/Maps/MapRotation/MapRotation.h index 305ebacde8..32efcaf764 100644 --- a/CppSamples/Maps/MapRotation/MapRotation.h +++ b/CppSamples/Maps/MapRotation/MapRotation.h @@ -1,12 +1,12 @@ // [WriteFile Name=MapRotation, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef MAP_ROTATION_H #define MAP_ROTATION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class MapRotation : public QQuickItem { Q_OBJECT @@ -43,4 +44,3 @@ class MapRotation : public QQuickItem }; #endif // MAP_ROTATION_H - diff --git a/CppSamples/Maps/MapRotation/MapRotation.pro b/CppSamples/Maps/MapRotation/MapRotation.pro index 1525ceffef..787bda8124 100644 --- a/CppSamples/Maps/MapRotation/MapRotation.pro +++ b/CppSamples/Maps/MapRotation/MapRotation.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/MapRotation/MapRotation.qml b/CppSamples/Maps/MapRotation/MapRotation.qml index 2b2b2131f1..ebe445176c 100644 --- a/CppSamples/Maps/MapRotation/MapRotation.qml +++ b/CppSamples/Maps/MapRotation/MapRotation.qml @@ -1,12 +1,12 @@ // [WriteFile Name=MapRotation, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/MapRotation/main.cpp b/CppSamples/Maps/MapRotation/main.cpp index accaf89330..65e34aed13 100644 --- a/CppSamples/Maps/MapRotation/main.cpp +++ b/CppSamples/Maps/MapRotation/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "MapRotation.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "MapRotation.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/MinMaxScale/MinMaxScale.cpp b/CppSamples/Maps/MinMaxScale/MinMaxScale.cpp index 931b2f0344..fb9d859ecf 100644 --- a/CppSamples/Maps/MinMaxScale/MinMaxScale.cpp +++ b/CppSamples/Maps/MinMaxScale/MinMaxScale.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=MinMaxScale, Category=Maps] // [Legal] // Copyright 2018 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. @@ -18,14 +18,17 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "MinMaxScale.h" +// ArcGIS Maps SDK headers #include "Map.h" #include "MapQuickView.h" #include "MapTypes.h" -#include "SpatialReference.h" #include "Point.h" +#include "SpatialReference.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/MinMaxScale/MinMaxScale.h b/CppSamples/Maps/MinMaxScale/MinMaxScale.h index 78e730d90c..fa31857567 100644 --- a/CppSamples/Maps/MinMaxScale/MinMaxScale.h +++ b/CppSamples/Maps/MinMaxScale/MinMaxScale.h @@ -1,12 +1,12 @@ // [WriteFile Name=MinMaxScale, Category=Maps] // [Legal] // Copyright 2018 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. @@ -17,14 +17,15 @@ #ifndef MINMAXSCALE_H #define MINMAXSCALE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class MinMaxScale : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/MinMaxScale/MinMaxScale.pro b/CppSamples/Maps/MinMaxScale/MinMaxScale.pro index 3f8601af23..2e9bff5938 100644 --- a/CppSamples/Maps/MinMaxScale/MinMaxScale.pro +++ b/CppSamples/Maps/MinMaxScale/MinMaxScale.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = MinMaxScale -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/MinMaxScale/MinMaxScale.qml b/CppSamples/Maps/MinMaxScale/MinMaxScale.qml index f467dd3e42..1b3e275ecc 100644 --- a/CppSamples/Maps/MinMaxScale/MinMaxScale.qml +++ b/CppSamples/Maps/MinMaxScale/MinMaxScale.qml @@ -1,12 +1,12 @@ // [WriteFile Name=MinMaxScale, Category=Maps] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Maps/MinMaxScale/main.cpp b/CppSamples/Maps/MinMaxScale/main.cpp index e4bda31a33..dcf1aff912 100644 --- a/CppSamples/Maps/MinMaxScale/main.cpp +++ b/CppSamples/Maps/MinMaxScale/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "MinMaxScale.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "MinMaxScale.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.cpp b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.cpp index 8aeb75dcc5..9770ae3afd 100644 --- a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.cpp +++ b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=MobileMap_SearchAndRoute, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,44 +18,47 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "MobileMap_SearchAndRoute.h" -#include "Map.h" -#include "Stop.h" +// ArcGIS Maps SDK headers +#include "AttributeListModel.h" +#include "CalloutData.h" +#include "Error.h" +#include "GeocodeResult.h" #include "Graphic.h" -#include "RouteTask.h" -#include "TextSymbol.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "IdentifyGraphicsOverlayResult.h" +#include "Item.h" #include "LocatorTask.h" -#include "RouteResult.h" +#include "Map.h" #include "MapQuickView.h" -#include "GeocodeResult.h" -#include "GraphicsOverlay.h" -#include "RouteParameters.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "MobileMapPackage.h" #include "PictureMarkerSymbol.h" +#include "Polyline.h" #include "ReverseGeocodeParameters.h" -#include "Error.h" -#include "MapTypes.h" -#include "MapViewTypes.h" -#include "CalloutData.h" -#include "GraphicsOverlayListModel.h" -#include "IdentifyGraphicsOverlayResult.h" -#include "SymbolTypes.h" -#include "AttributeListModel.h" -#include "GraphicListModel.h" #include "Route.h" -#include "SimpleRenderer.h" +#include "RouteParameters.h" +#include "RouteResult.h" +#include "RouteTask.h" #include "SimpleLineSymbol.h" -#include "Item.h" -#include "Polyline.h" +#include "SimpleRenderer.h" +#include "Stop.h" +#include "SymbolTypes.h" +#include "TextSymbol.h" -#include -#include +// Qt headers +#include #include +#include #include -#include -#include #include +#include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h index 1cd568cfb0..00899b2c22 100644 --- a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h +++ b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h @@ -1,12 +1,12 @@ // [WriteFile Name=MobileMap_SearchAndRoute, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,6 +17,17 @@ #ifndef MOBILEMAP_SEARCHANDROUTE_H #define MOBILEMAP_SEARCHANDROUTE_H +// ArcGIS Maps SDK headers +#include "Point.h" +#include "ReverseGeocodeParameters.h" +#include "RouteParameters.h" +#include "Stop.h" + +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -29,15 +40,6 @@ namespace Esri::ArcGISRuntime class ReverseGeocodeParameters; } -#include "Stop.h" -#include "Point.h" -#include "RouteParameters.h" -#include "ReverseGeocodeParameters.h" - -#include -#include -#include - class MobileMap_SearchAndRoute : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.pro b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.pro index c8fd63e80b..218a1bdb90 100644 --- a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.pro +++ b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.qml b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.qml index 822464c364..865fe7b92a 100644 --- a/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.qml +++ b/CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.qml @@ -1,12 +1,12 @@ // [WriteFile Name=MobileMap_SearchAndRoute, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/MobileMap_SearchAndRoute/main.cpp b/CppSamples/Maps/MobileMap_SearchAndRoute/main.cpp index 3da3a27d53..55f1982bf4 100644 --- a/CppSamples/Maps/MobileMap_SearchAndRoute/main.cpp +++ b/CppSamples/Maps/MobileMap_SearchAndRoute/main.cpp @@ -1,31 +1,39 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "MobileMap_SearchAndRoute.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Other headers #include "Esri/ArcGISRuntime/Toolkit/register.h" -#include "ArcGISRuntimeEnvironment.h" +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "MobileMap_SearchAndRoute.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.cpp b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.cpp index 1e456d5098..a21b93a903 100644 --- a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.cpp +++ b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=OpenMapUrl, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,11 +18,13 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "OpenMapUrl.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" #include "MapTypes.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.h b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.h index 083296aa20..99c0236ac9 100644 --- a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.h +++ b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.h @@ -1,12 +1,12 @@ // [WriteFile Name=OpenMapUrl, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef OPEN_MAP_URL_H #define OPEN_MAP_URL_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class MapQuickView; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime class QString; -#include - class OpenMapUrl : public QQuickItem { Q_OBJECT @@ -43,4 +44,3 @@ class OpenMapUrl : public QQuickItem }; #endif // OPEN_MAP_URL_H - diff --git a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.pro b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.pro index eebf195109..f649143fe7 100644 --- a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.pro +++ b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.qml b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.qml index 9d9ea0800f..be4cb4ebca 100644 --- a/CppSamples/Maps/OpenMapUrl/OpenMapUrl.qml +++ b/CppSamples/Maps/OpenMapUrl/OpenMapUrl.qml @@ -1,12 +1,12 @@ // [WriteFile Name=OpenMapUrl, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/OpenMapUrl/main.cpp b/CppSamples/Maps/OpenMapUrl/main.cpp index 732c5c5579..f16b229807 100644 --- a/CppSamples/Maps/OpenMapUrl/main.cpp +++ b/CppSamples/Maps/OpenMapUrl/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "OpenMapUrl.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "OpenMapUrl.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.cpp b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.cpp index cd7038ba25..2b4282aff6 100644 --- a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.cpp +++ b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=OpenMobileMap_MapPackage, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,15 +18,18 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "OpenMobileMap_MapPackage.h" +// ArcGIS Maps SDK headers #include "Basemap.h" #include "Error.h" #include "MapQuickView.h" #include "MobileMapPackage.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h index 144fe56e43..5bc4cb2a00 100644 --- a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h +++ b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h @@ -1,12 +1,12 @@ // [WriteFile Name=OpenMobileMap_MapPackage, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef OPEN_MOBILE_MAP_MAP_PACKAGE_H #define OPEN_MOBILE_MAP_MAP_PACKAGE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Error; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class MobileMapPackage; } -#include - class OpenMobileMap_MapPackage : public QQuickItem { Q_OBJECT @@ -46,4 +47,3 @@ class OpenMobileMap_MapPackage : public QQuickItem }; #endif // OPEN_MOBILE_MAP_MAP_PACKAGE_H - diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.pro b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.pro index 2079752c1d..e8fd0cb3fa 100644 --- a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.pro +++ b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.qml b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.qml index d7af50fac0..a7ef26d033 100644 --- a/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.qml +++ b/CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.qml @@ -1,12 +1,12 @@ // [WriteFile Name=OpenMobileMap_MapPackage, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/OpenMobileMap_MapPackage/main.cpp b/CppSamples/Maps/OpenMobileMap_MapPackage/main.cpp index 04f933abf3..c1b3b27bac 100644 --- a/CppSamples/Maps/OpenMobileMap_MapPackage/main.cpp +++ b/CppSamples/Maps/OpenMobileMap_MapPackage/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "OpenMobileMap_MapPackage.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "OpenMobileMap_MapPackage.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.cpp b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.cpp index d1c1c1b6b4..30432a8908 100644 --- a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.cpp +++ b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ReadGeoPackage, Category=Maps] // [Legal] // Copyright 2018 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. @@ -18,24 +18,27 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ReadGeoPackage.h" -#include "Map.h" -#include "Layer.h" -#include "GeoPackage.h" -#include "RasterLayer.h" -#include "MapQuickView.h" -#include "FeatureTable.h" +// ArcGIS Maps SDK headers +#include "Error.h" #include "FeatureLayer.h" -#include "GeoPackageRaster.h" +#include "FeatureTable.h" +#include "GeoPackage.h" #include "GeoPackageFeatureTable.h" -#include "Error.h" -#include "MapTypes.h" +#include "GeoPackageRaster.h" +#include "Layer.h" #include "LayerListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "RasterLayer.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h index 236c6a15be..013e900ab5 100644 --- a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h +++ b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h @@ -1,12 +1,12 @@ // [WriteFile Name=ReadGeoPackage, Category=Maps] // [Legal] // Copyright 2018 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. @@ -17,6 +17,12 @@ #ifndef READGEOPACKAGE_H #define READGEOPACKAGE_H +// Qt headers +#include + +// STL headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -24,9 +30,6 @@ namespace Esri::ArcGISRuntime class GeoPackage; } -#include -#include - class ReadGeoPackage : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.pro b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.pro index 71ea3c7800..9a7e3de967 100644 --- a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.pro +++ b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ReadGeoPackage -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.qml b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.qml index 616f1c8a0d..c0c215d2b3 100644 --- a/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.qml +++ b/CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ReadGeoPackage, Category=Maps] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Maps/ReadGeoPackage/main.cpp b/CppSamples/Maps/ReadGeoPackage/main.cpp index aa97677ebc..efd5c0c2d3 100644 --- a/CppSamples/Maps/ReadGeoPackage/main.cpp +++ b/CppSamples/Maps/ReadGeoPackage/main.cpp @@ -1,29 +1,36 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "ReadGeoPackage.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ReadGeoPackage.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.cpp b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.cpp index 11f594b418..ada3a9ae1c 100644 --- a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.cpp +++ b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SetInitialMapArea, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,15 +18,17 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SetInitialMapArea.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers #include "Basemap.h" -#include "Viewpoint.h" #include "Envelope.h" +#include "Map.h" +#include "MapQuickView.h" #include "MapTypes.h" #include "SpatialReference.h" +#include "Viewpoint.h" using namespace Esri::ArcGISRuntime; @@ -60,4 +62,3 @@ void SetInitialMapArea::componentComplete() // set map on the map view m_mapView->setMap(m_map); } - diff --git a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h index 9c4126e5e5..b6beb24911 100644 --- a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h +++ b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h @@ -1,12 +1,12 @@ // [WriteFile Name=SetInitialMapArea, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef SET_INITIAL_MAP_AREA_H #define SET_INITIAL_MAP_AREA_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class SetInitialMapArea : public QQuickItem { Q_OBJECT @@ -42,4 +43,3 @@ class SetInitialMapArea : public QQuickItem }; #endif // SET_INITIAL_MAP_AREA_H - diff --git a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro index c503dfc45f..436e5099ff 100644 --- a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro +++ b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.qml b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.qml index 0d3e66c743..ad4e65a049 100644 --- a/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.qml +++ b/CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SetInitialMapArea, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/SetInitialMapArea/main.cpp b/CppSamples/Maps/SetInitialMapArea/main.cpp index a94a3c2ddc..6a932ca13e 100644 --- a/CppSamples/Maps/SetInitialMapArea/main.cpp +++ b/CppSamples/Maps/SetInitialMapArea/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "SetInitialMapArea.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "SetInitialMapArea.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.cpp b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.cpp index 49b449506f..28a92543d1 100644 --- a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.cpp +++ b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SetInitialMapLocation, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SetInitialMapLocation.h" +// ArcGIS Maps SDK headers #include "Map.h" #include "MapQuickView.h" #include "MapTypes.h" @@ -57,4 +59,3 @@ void SetInitialMapLocation::componentComplete() // set map on the map view m_mapView->setMap(m_map); } - diff --git a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h index aee3b611b6..24c01f589f 100644 --- a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h +++ b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h @@ -1,12 +1,12 @@ // [WriteFile Name=SetInitialMapLocation, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef SET_INITIAL_MAP_LOCATION_H #define SET_INITIAL_MAP_LOCATION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class SetInitialMapLocation : public QQuickItem { Q_OBJECT @@ -42,4 +43,3 @@ class SetInitialMapLocation : public QQuickItem }; #endif // SET_INITIAL_MAP_LOCATION_H - diff --git a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro index 2100335339..535b266a3a 100644 --- a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro +++ b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.qml b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.qml index a481bd5abe..b27e14e965 100644 --- a/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.qml +++ b/CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SetInitialMapLocation, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/SetInitialMapLocation/main.cpp b/CppSamples/Maps/SetInitialMapLocation/main.cpp index 8c9a018ea8..7b1cad502f 100644 --- a/CppSamples/Maps/SetInitialMapLocation/main.cpp +++ b/CppSamples/Maps/SetInitialMapLocation/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "SetInitialMapLocation.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "SetInitialMapLocation.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.cpp b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.cpp index 7ffbb2f7c9..ef178d6d3e 100644 --- a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.cpp +++ b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SetMapSpatialReference, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,14 +18,18 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SetMapSpatialReference.h" +// ArcGIS Maps SDK headers +#include "ArcGISMapImageLayer.h" +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" -#include "SpatialReference.h" -#include "ArcGISMapImageLayer.h" #include "MapViewTypes.h" +#include "SpatialReference.h" + +// Qt headers #include using namespace Esri::ArcGISRuntime; @@ -68,4 +72,3 @@ void SetMapSpatialReference::componentComplete() // set map on the map view m_mapView->setMap(m_map); } - diff --git a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h index b80adb40ae..284f5a8dc7 100644 --- a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h +++ b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h @@ -1,12 +1,12 @@ // [WriteFile Name=SetMapSpatialReference, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef SET_MAP_SPATIAL_REFERENCE_H #define SET_MAP_SPATIAL_REFERENCE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ namespace Esri::ArcGISRuntime class ArcGISMapImageLayer; } -#include - class SetMapSpatialReference : public QQuickItem { Q_OBJECT @@ -46,4 +47,3 @@ class SetMapSpatialReference : public QQuickItem }; #endif // SET_MAP_SPATIAL_REFERENCE_H - diff --git a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro index 0dcd020273..23099d2a7b 100644 --- a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro +++ b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.qml b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.qml index 31772fa890..ad8ea997f3 100644 --- a/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.qml +++ b/CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SetMapSpatialReference, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/SetMapSpatialReference/main.cpp b/CppSamples/Maps/SetMapSpatialReference/main.cpp index b77416803a..3280a0a8d9 100644 --- a/CppSamples/Maps/SetMapSpatialReference/main.cpp +++ b/CppSamples/Maps/SetMapSpatialReference/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "SetMapSpatialReference.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "SetMapSpatialReference.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.cpp b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.cpp index 615802be0e..fbc86c23b4 100644 --- a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.cpp +++ b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SetMaxExtent, Category=Maps] // [Legal] // Copyright 2022 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. @@ -18,20 +18,23 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SetMaxExtent.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" -#include "SimpleLineSymbol.h" #include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "SymbolTypes.h" -#include "GraphicListModel.h" +#include "SimpleLineSymbol.h" #include "SpatialReference.h" -#include "Envelope.h" +#include "SymbolTypes.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.h b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.h index 8d35fb2994..57cce273ad 100644 --- a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.h +++ b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.h @@ -1,12 +1,12 @@ // [WriteFile Name=SetMaxExtent, Category=Maps] // [Legal] // Copyright 2022 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. @@ -17,6 +17,12 @@ #ifndef SETMAXEXTENT_H #define SETMAXEXTENT_H +// ArcGIS Maps SDK headers +#include "Envelope.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Envelope; @@ -27,9 +33,6 @@ class MapQuickView; class SimpleLineSymbol; } -#include -#include "Envelope.h" - Q_MOC_INCLUDE("MapQuickView.h") class SetMaxExtent : public QObject diff --git a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.pro b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.pro index 9b30ffd075..1d4ec06d57 100644 --- a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.pro +++ b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = SetMaxExtent -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.qml b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.qml index 16805c3d7b..b794a4d587 100644 --- a/CppSamples/Maps/SetMaxExtent/SetMaxExtent.qml +++ b/CppSamples/Maps/SetMaxExtent/SetMaxExtent.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SetMaxExtent, Category=Maps] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Maps/SetMaxExtent/main.cpp b/CppSamples/Maps/SetMaxExtent/main.cpp index 5f0f4db8fd..14bd9cb421 100644 --- a/CppSamples/Maps/SetMaxExtent/main.cpp +++ b/CppSamples/Maps/SetMaxExtent/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "SetMaxExtent.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.cpp b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.cpp index 2e9c4df65c..7070a2cd50 100644 --- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.cpp +++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.cpp @@ -1,26 +1,30 @@ +// [Legal] // Copyright 2022 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 "IndoorsLocationDataSourceCreator.h" +// ArcGIS Maps SDK headers #include "ArcGISFeatureTable.h" -#include "IndoorsLocationDataSource.h" -#include "Map.h" #include "Error.h" -#include "MapTypes.h" #include "FeatureLayer.h" #include "FeatureTableListModel.h" +#include "IndoorsLocationDataSource.h" #include "LayerListModel.h" +#include "Map.h" +#include "MapTypes.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.h b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.h index 7c5023c3a9..fe6bc95713 100644 --- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.h +++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/IndoorsLocationDataSourceCreator.h @@ -1,4 +1,17 @@ +// [Legal] // Copyright 2022 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] // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,6 +27,10 @@ #ifndef INDOORSLOCATIONDATASOURCECREATOR_H #define INDOORSLOCATIONDATASOURCECREATOR_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class ArcGISFeatureTable; @@ -22,10 +39,6 @@ class IndoorsLocationDataSource; class Map; } -#include -#include - - class IndoorsLocationDataSourceCreator : public QObject { Q_OBJECT diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp index 08f92961e7..25fa375527 100644 --- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp +++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ShowDeviceLocationUsingIndoorPositioning, Category=Maps] // [Legal] // Copyright 2022 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. @@ -18,17 +18,32 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "IndoorsLocationDataSourceCreator.h" #include "ShowDeviceLocationUsingIndoorPositioning.h" + +// ArcGIS Maps SDK headers +#include "FeatureLayer.h" #include "IndoorsLocationDataSource.h" +#include "LayerListModel.h" +#include "LocationDisplay.h" #include "Map.h" #include "MapQuickView.h" -#include "MapViewTypes.h" -#include "LocationDisplay.h" -#include "LayerListModel.h" #include "MapTypes.h" +#include "MapViewTypes.h" #include "PortalItem.h" -#include "FeatureLayer.h" + +#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) || defined(Q_OS_IOS) || defined(Q_OS_MACOS) || defined(Q_OS_ANDROID) +#define PERMISSIONS_PLATFORM +#include +#endif + +#ifdef Q_OS_ANDROID +#include "ArcGISRuntimeEnvironment.h" + +#include +#include +#endif using namespace Esri::ArcGISRuntime; @@ -76,14 +91,67 @@ void ShowDeviceLocationUsingIndoorPositioning::setMapView(MapQuickView* mapView) m_mapView = mapView; m_mapView->setMap(m_map); - setupIndoorsLocationDataSource(); + // Issue expected with Android - https://bugreports.qt.io/browse/QTBUG-130301 + #ifdef PERMISSIONS_PLATFORM + requestBluetoothThenLocationPermissions(); + #else + setupIndoorsLocationDataSource(); + #endif emit mapViewChanged(); } +void ShowDeviceLocationUsingIndoorPositioning::requestBluetoothThenLocationPermissions() +{ + #ifdef PERMISSIONS_PLATFORM + qApp->requestPermission(QBluetoothPermission{}, [this](const QPermission& permission) + { + Q_UNUSED(permission); + requestLocationPermissionThenSetupILDS(); + }); + #endif // PERMISSIONS_PLATFORM +} + +void ShowDeviceLocationUsingIndoorPositioning::requestLocationPermissionThenSetupILDS() +{ + #ifdef PERMISSIONS_PLATFORM + QLocationPermission locationPermission{}; + locationPermission.setAccuracy(QLocationPermission::Accuracy::Precise); + locationPermission.setAvailability(QLocationPermission::Availability::WhenInUse); + qApp->requestPermission(locationPermission, [this](const QPermission& permission) + { + Q_UNUSED(permission); + checkPermissions(); + setupIndoorsLocationDataSource(); + }); + #endif // PERMISSIONS_PLATFORM +} + +void ShowDeviceLocationUsingIndoorPositioning::checkPermissions() +{ + #ifdef PERMISSIONS_PLATFORM + if (qApp->checkPermission(QBluetoothPermission{}) == Qt::PermissionStatus::Denied) + { + emit bluetoothPermissionDenied(); + } + + QLocationPermission locationPermission{}; + locationPermission.setAccuracy(QLocationPermission::Accuracy::Precise); + locationPermission.setAvailability(QLocationPermission::Availability::WhenInUse); + if (qApp->checkPermission(locationPermission) == Qt::PermissionStatus::Denied) + { + emit locationPermissionDenied(); + } + #endif // PERMISSIONS_PLATFORM +} + // This function uses a helper class `IndoorsLocationDataSourceCreator` to construct the IndoorsLocationDataSource void ShowDeviceLocationUsingIndoorPositioning::setupIndoorsLocationDataSource() { + #ifdef Q_OS_ANDROID + ArcGISRuntimeEnvironment::setAndroidApplicationContext(QJniObject{QNativeInterface::QAndroidApplication::context()}); + #endif + IndoorsLocationDataSourceCreator* indoorsLocationDataSourceCreator = new IndoorsLocationDataSourceCreator(this); connect(indoorsLocationDataSourceCreator, &IndoorsLocationDataSourceCreator::createIndoorsLocationDataSourceCompleted, this, [this](IndoorsLocationDataSource* indoorsLDS) diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h index 963f611309..423a39af61 100644 --- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h +++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h @@ -1,12 +1,12 @@ // [WriteFile Name=ShowDeviceLocationUsingIndoorPositioning, Category=Maps] // [Legal] // Copyright 2022 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. @@ -17,6 +17,13 @@ #ifndef SHOWDEVICELOCATIONUSINGINDOORPOSITIONING_H #define SHOWDEVICELOCATIONUSINGINDOORPOSITIONING_H +// ArcGIS Maps SDK headers +#include "Location.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class ArcGISFeatureTable; @@ -25,11 +32,6 @@ class Map; class MapQuickView; } -#include "Location.h" - -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class ShowDeviceLocationUsingIndoorPositioning : public QObject @@ -50,6 +52,8 @@ class ShowDeviceLocationUsingIndoorPositioning : public QObject signals: void mapViewChanged(); void locationPropertiesChanged(); + void locationPermissionDenied(); + void bluetoothPermissionDenied(); private: Esri::ArcGISRuntime::MapQuickView* mapView() const; @@ -59,6 +63,9 @@ class ShowDeviceLocationUsingIndoorPositioning : public QObject void setupIndoorsLocationDataSource(); void locationChangedHandler(const Esri::ArcGISRuntime::Location& loc); void changeFloorDisplay(); + void requestLocationPermissionThenSetupILDS(); + void requestBluetoothThenLocationPermissions(); + void checkPermissions(); Esri::ArcGISRuntime::Map* m_map = nullptr; Esri::ArcGISRuntime::MapQuickView* m_mapView = nullptr; diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro index 81a5c478b4..1ae74540d2 100644 --- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro +++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.pro @@ -23,11 +23,12 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick +android|ios: QT += bluetooth TEMPLATE = app TARGET = ShowDeviceLocationUsingIndoorPositioning -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- @@ -57,7 +58,11 @@ ios { OTHER_FILES += \ $$PWD/Info.plist - QMAKE_INFO_PLIST = $$PWD/Info.plist + QMAKE_INFO_PLIST = $$PWD/ios/Info.plist +} + +macx { + QMAKE_INFO_PLIST = $$PWD/mac/Info.plist } android { diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml index aae678a2e5..4c7cfed477 100644 --- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml +++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ShowDeviceLocationUsingIndoorPositioning, Category=Maps] // [Legal] // Copyright 2022 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. @@ -18,6 +18,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import Esri.Samples +import QtQuick.Dialogs Item { @@ -80,4 +81,46 @@ Item { id: model mapView: view } + + Connections { + target: model + function onLocationPermissionDenied() { + locationPermissionDeniedDialog.open() + } + } + + Dialog { + id: locationPermissionDeniedDialog + title: "Location Permission Denied" + modal: true + standardButtons: Dialog.Ok + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + + Text { + text: "This application requires location permission." + color: "white" + } + } + + Connections { + target: model + function onBluetoothPermissionDenied() { + bluetoothPermissionDeniedDialog.open() + } + } + + Dialog { + id: bluetoothPermissionDeniedDialog + title: "Bluetooth Permission Denied" + modal: true + standardButtons: Dialog.Ok + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + + Text { + text: "This application requires bluetooth permission." + color: "white" + } + } } diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ios/Info.plist b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ios/Info.plist new file mode 100644 index 0000000000..dad491cbc3 --- /dev/null +++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ios/Info.plist @@ -0,0 +1,56 @@ + + + + + CFBundleDisplayName + ShowDeviceLocationUsingIndoorPositioning + CFBundleExecutable + ShowDeviceLocationUsingIndoorPositioning + CFBundleGetInfoString + ArcGIS + CFBundleIcons~ipad + + CFBundleIdentifier + com.esri.${PRODUCT_NAME:rfc1034identifier} + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + NOTE + This app is cool + UIFileSharingEnabled + FALSE + UIRequiresPersistentWiFi + NO + LSRequiresIPhoneOS + + NSLocationWhenInUseUsageDescription + Location required for application + NSLocationAlwaysAndWhenInUseUsageDescription + Location required for application + NSBluetoothAlwaysUsageDescription + Bluetooth access is required for Indoor Positioning + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UILaunchStoryboardName + LaunchScreen + + diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/mac/Info.plist b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/mac/Info.plist new file mode 100644 index 0000000000..13b9fcaaa5 --- /dev/null +++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/mac/Info.plist @@ -0,0 +1,33 @@ + + + + + CFBundleDisplayName + ShowDeviceLocationUsingIndoorPositioning + CFBundleExecutable + ShowDeviceLocationUsingIndoorPositioning + CFBundleGetInfoString + ArcGIS + CFBundleIdentifier + com.esri.ShowDeviceLocationUsingIndoorPositioning + CFBundleName + ShowDeviceLocationUsingIndoorPositioning + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + NSLocationUsageDescription + Location required for application + NSLocationWhenInUseUsageDescription + Location required for application + NSLocationAlwaysAndWhenInUseUsageDescription + Location required for application + NSBluetoothAlwaysUsageDescription + Bluetooth access is required for Indoor Positioning + + + diff --git a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/main.cpp b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/main.cpp index 0ba79094b4..8e5453887d 100644 --- a/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/main.cpp +++ b/CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "ShowDeviceLocationUsingIndoorPositioning.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.cpp b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.cpp index be8634b68e..0274bd4d06 100644 --- a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.cpp +++ b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ShowLocationHistory, Category=Maps] // [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. @@ -18,12 +18,20 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ShowLocationHistory.h" +// ArcGIS Maps SDK headers #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "Location.h" +#include "LocationDisplay.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "Polyline.h" #include "PolylineBuilder.h" #include "SimpleLineSymbol.h" @@ -31,15 +39,10 @@ #include "SimpleRenderer.h" #include "SimulatedLocationDataSource.h" #include "SimulationParameters.h" -#include "MapTypes.h" -#include "MapViewTypes.h" -#include "GraphicsOverlayListModel.h" -#include "SymbolTypes.h" -#include "GraphicListModel.h" -#include "LocationDisplay.h" -#include "Location.h" #include "SpatialReference.h" +#include "SymbolTypes.h" +// Qt headers #include #include diff --git a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h index c5679bf22f..2357b8aa8e 100644 --- a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h +++ b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h @@ -1,12 +1,12 @@ // [WriteFile Name=ShowLocationHistory, Category=Maps] // [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. @@ -17,8 +17,10 @@ #ifndef SHOWLOCATIONHISTORY_H #define SHOWLOCATIONHISTORY_H +// ArcGIS Maps SDK headers #include "Point.h" +// Qt headers #include namespace Esri::ArcGISRuntime diff --git a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.pro b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.pro index 9c55e3b997..fd02b5b314 100644 --- a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.pro +++ b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ShowLocationHistory -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.qml b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.qml index 0a3e5f0081..44283a349f 100644 --- a/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.qml +++ b/CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ShowLocationHistory, Category=Maps] // [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. diff --git a/CppSamples/Maps/ShowLocationHistory/main.cpp b/CppSamples/Maps/ShowLocationHistory/main.cpp index 2ee18d6958..5392c2c5c9 100644 --- a/CppSamples/Maps/ShowLocationHistory/main.cpp +++ b/CppSamples/Maps/ShowLocationHistory/main.cpp @@ -1,23 +1,30 @@ +// [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 "ShowLocationHistory.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.cpp b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.cpp index e668864f75..26edb15c3f 100644 --- a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.cpp +++ b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ShowMagnifier, Category=Maps] // [Legal] // Copyright 2016 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. @@ -18,15 +18,17 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ShowMagnifier.h" +// ArcGIS Maps SDK headers +#include "Basemap.h" #include "Map.h" #include "MapQuickView.h" -#include "Basemap.h" -#include "Viewpoint.h" #include "MapTypes.h" -#include "SpatialReference.h" #include "Point.h" +#include "SpatialReference.h" +#include "Viewpoint.h" using namespace Esri::ArcGISRuntime; @@ -63,4 +65,3 @@ void ShowMagnifier::componentComplete() // enable magnifier m_mapView->setMagnifierEnabled(true); } - diff --git a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.h b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.h index 3dc6a99dcb..bc541ba48a 100644 --- a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.h +++ b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.h @@ -1,12 +1,12 @@ // [WriteFile Name=ShowMagnifier, Category=Maps] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef SHOW_MAGNIFIER_H #define SHOW_MAGNIFIER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; class MapQuickView; } -#include - class ShowMagnifier : public QQuickItem { Q_OBJECT @@ -42,4 +43,3 @@ class ShowMagnifier : public QQuickItem }; #endif // SHOW_MAGNIFIER_H - diff --git a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.pro b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.pro index 9478d97581..25318f178c 100644 --- a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.pro +++ b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.qml b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.qml index 3295941d1d..942e82574f 100644 --- a/CppSamples/Maps/ShowMagnifier/ShowMagnifier.qml +++ b/CppSamples/Maps/ShowMagnifier/ShowMagnifier.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ShowMagnifier, Category=Maps] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Maps/ShowMagnifier/main.cpp b/CppSamples/Maps/ShowMagnifier/main.cpp index 1c60a0a4e5..d5c28ea6ca 100644 --- a/CppSamples/Maps/ShowMagnifier/main.cpp +++ b/CppSamples/Maps/ShowMagnifier/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ShowMagnifier.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ShowMagnifier.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Maps/TakeScreenshot/MapImageProvider.cpp b/CppSamples/Maps/TakeScreenshot/MapImageProvider.cpp index a7661b85de..0c7816584b 100644 --- a/CppSamples/Maps/TakeScreenshot/MapImageProvider.cpp +++ b/CppSamples/Maps/TakeScreenshot/MapImageProvider.cpp @@ -1,18 +1,22 @@ +// [Legal] // Copyright 2018 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 "MapImageProvider.h" +// Qt headers #include MapImageProvider::MapImageProvider() : diff --git a/CppSamples/Maps/TakeScreenshot/MapImageProvider.h b/CppSamples/Maps/TakeScreenshot/MapImageProvider.h index e6a6cbe917..e09f9ba891 100644 --- a/CppSamples/Maps/TakeScreenshot/MapImageProvider.h +++ b/CppSamples/Maps/TakeScreenshot/MapImageProvider.h @@ -1,4 +1,17 @@ +// [Legal] // Copyright 2018 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] // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.cpp b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.cpp index cb94163bc0..b856d2def4 100644 --- a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.cpp +++ b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=TakeScreenshot, Category=Maps] // [Legal] // Copyright 2018 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. @@ -18,13 +18,16 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers +#include "MapImageProvider.h" #include "TakeScreenshot.h" +// ArcGIS Maps SDK headers #include "Map.h" #include "MapQuickView.h" -#include "MapImageProvider.h" #include "MapTypes.h" +// Qt headers #include #include #include diff --git a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.h b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.h index 6c4256f1a6..7571c73873 100644 --- a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.h +++ b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.h @@ -1,12 +1,12 @@ // [WriteFile Name=TakeScreenshot, Category=Maps] // [Legal] // Copyright 2018 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. @@ -17,6 +17,9 @@ #ifndef TAKESCREENSHOT_H #define TAKESCREENSHOT_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -25,8 +28,6 @@ class MapQuickView; class MapImageProvider; -#include - class TakeScreenshot : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.pro b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.pro index d0fa1e23b0..49f2d3ff2b 100644 --- a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.pro +++ b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = TakeScreenshot -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.qml b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.qml index ed716810b2..8121f5457d 100644 --- a/CppSamples/Maps/TakeScreenshot/TakeScreenshot.qml +++ b/CppSamples/Maps/TakeScreenshot/TakeScreenshot.qml @@ -1,12 +1,12 @@ // [WriteFile Name=TakeScreenshot, Category=Maps] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Maps/TakeScreenshot/main.cpp b/CppSamples/Maps/TakeScreenshot/main.cpp index 183c91db59..c4be2b290d 100644 --- a/CppSamples/Maps/TakeScreenshot/main.cpp +++ b/CppSamples/Maps/TakeScreenshot/main.cpp @@ -1,31 +1,38 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "MapImageProvider.h" +#include "TakeScreenshot.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include -#include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "TakeScreenshot.h" -#include "MapImageProvider.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Routing/ClosestFacility/ClosestFacility.cpp b/CppSamples/Routing/ClosestFacility/ClosestFacility.cpp index 7aff0a46f5..4c68fc1d87 100644 --- a/CppSamples/Routing/ClosestFacility/ClosestFacility.cpp +++ b/CppSamples/Routing/ClosestFacility/ClosestFacility.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FindClosestFacilityToAnIncidentInteractive, Category=Routing] // [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. @@ -18,33 +18,36 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ClosestFacility.h" +// ArcGIS Maps SDK headers #include "ClosestFacilityParameters.h" +#include "ClosestFacilityResult.h" +#include "ClosestFacilityRoute.h" #include "ClosestFacilityTask.h" +#include "Error.h" #include "Facility.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "Incident.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "PictureMarkerSymbol.h" +#include "Point.h" +#include "Polyline.h" +#include "SimpleLineSymbol.h" #include "SimpleMarkerSymbol.h" #include "SimpleRenderer.h" -#include "Error.h" -#include "MapTypes.h" -#include "MapViewTypes.h" -#include "GraphicsOverlayListModel.h" -#include "SymbolTypes.h" -#include "GraphicListModel.h" -#include "ClosestFacilityResult.h" -#include "ClosestFacilityRoute.h" -#include "Incident.h" #include "SpatialReference.h" -#include "Point.h" +#include "SymbolTypes.h" #include "Viewpoint.h" -#include "GraphicsOverlay.h" -#include "Graphic.h" -#include "SimpleLineSymbol.h" -#include "Polyline.h" +// Qt headers #include #include diff --git a/CppSamples/Routing/ClosestFacility/ClosestFacility.h b/CppSamples/Routing/ClosestFacility/ClosestFacility.h index 6ec8324a71..eb7cabd045 100644 --- a/CppSamples/Routing/ClosestFacility/ClosestFacility.h +++ b/CppSamples/Routing/ClosestFacility/ClosestFacility.h @@ -1,12 +1,12 @@ // [WriteFile Name=FindClosestFacilityToAnIncidentInteractive, Category=Routing] // [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. @@ -17,6 +17,14 @@ #ifndef CLOSESTFACILITY_H #define CLOSESTFACILITY_H +// ArcGIS Maps SDK headers +#include "ClosestFacilityParameters.h" + +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class ClosestFacilityTask; @@ -28,12 +36,6 @@ namespace Esri::ArcGISRuntime class Point; } -#include "ClosestFacilityParameters.h" - -#include -#include -#include - class ClosestFacility : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Routing/ClosestFacility/ClosestFacility.pro b/CppSamples/Routing/ClosestFacility/ClosestFacility.pro index 9174dbd727..91779d7c6b 100644 --- a/CppSamples/Routing/ClosestFacility/ClosestFacility.pro +++ b/CppSamples/Routing/ClosestFacility/ClosestFacility.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ClosestFacility -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Routing/ClosestFacility/ClosestFacility.qml b/CppSamples/Routing/ClosestFacility/ClosestFacility.qml index 35fb0d479d..477f1d708d 100644 --- a/CppSamples/Routing/ClosestFacility/ClosestFacility.qml +++ b/CppSamples/Routing/ClosestFacility/ClosestFacility.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FindClosestFacilityToAnIncidentInteractive, Category=Routing] // [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. diff --git a/CppSamples/Routing/ClosestFacility/main.cpp b/CppSamples/Routing/ClosestFacility/main.cpp index 97b19ebb96..63c2aab813 100644 --- a/CppSamples/Routing/ClosestFacility/main.cpp +++ b/CppSamples/Routing/ClosestFacility/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "ClosestFacility.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ClosestFacility.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.cpp b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.cpp index 8dc7d9831d..13afd60557 100644 --- a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.cpp +++ b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayRouteLayer, Category=Routing] // [Legal] // Copyright 2022 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. @@ -18,30 +18,33 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayRouteLayer.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" +#include "AttributeListModel.h" +#include "Error.h" +#include "Feature.h" #include "FeatureCollection.h" #include "FeatureCollectionLayer.h" +#include "FeatureCollectionTable.h" +#include "FeatureCollectionTableListModel.h" +#include "FeatureIterator.h" +#include "FeatureQueryResult.h" +#include "FeatureTable.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "Point.h" #include "Portal.h" #include "PortalItem.h" -#include "Error.h" -#include "MapTypes.h" #include "PortalTypes.h" -#include "LayerListModel.h" -#include "FeatureCollectionTableListModel.h" -#include "FeatureTable.h" -#include "FeatureQueryResult.h" -#include "FeatureIterator.h" #include "QueryParameters.h" -#include "Feature.h" -#include "ArcGISFeature.h" -#include "AttributeListModel.h" -#include "FeatureCollectionTable.h" #include "SpatialReference.h" -#include "Point.h" +// Qt headers #include #include diff --git a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h index d936adc920..d58ec771fe 100644 --- a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h +++ b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayRouteLayer, Category=Routing] // [Legal] // Copyright 2022 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. @@ -17,6 +17,10 @@ #ifndef DISPLAYROUTELAYER_H #define DISPLAYROUTELAYER_H +// Qt headers +#include + +// STL headers #include namespace Esri @@ -34,8 +38,6 @@ class PortalItem; } } -#include - Q_MOC_INCLUDE("MapQuickView.h") class DisplayRouteLayer : public QObject diff --git a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.pro b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.pro index 0db96b69b7..6432448ecb 100644 --- a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.pro +++ b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayRouteLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.qml b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.qml index 29c3c3e6a9..6fa656e250 100644 --- a/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.qml +++ b/CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayRouteLayer, Category=Routing] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Routing/DisplayRouteLayer/main.cpp b/CppSamples/Routing/DisplayRouteLayer/main.cpp index dc1d7b3c69..e8efde168c 100644 --- a/CppSamples/Routing/DisplayRouteLayer/main.cpp +++ b/CppSamples/Routing/DisplayRouteLayer/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "DisplayRouteLayer.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.cpp b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.cpp index d12c7b66e2..2cf990a26d 100644 --- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.cpp +++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FindClosestFacilityToMultipleIncidentsService, Category=Routing] // [Legal] // Copyright 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. @@ -18,32 +18,35 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FindClosestFacilityToMultipleIncidentsService.h" -#include "Map.h" -#include "MapQuickView.h" -#include "PictureMarkerSymbol.h" -#include "SimpleLineSymbol.h" -#include "SimpleRenderer.h" -#include "ServiceFeatureTable.h" -#include "FeatureLayer.h" -#include "GraphicsOverlay.h" -#include "Graphic.h" -#include "GeometryEngine.h" -#include "ClosestFacilityTask.h" +// ArcGIS Maps SDK headers #include "ClosestFacilityParameters.h" #include "ClosestFacilityResult.h" #include "ClosestFacilityRoute.h" -#include "MapTypes.h" -#include "SymbolTypes.h" +#include "ClosestFacilityTask.h" +#include "Envelope.h" #include "Error.h" -#include "GraphicsOverlayListModel.h" +#include "FeatureLayer.h" +#include "GeometryEngine.h" +#include "Graphic.h" #include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "LayerListModel.h" -#include "QueryParameters.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "PictureMarkerSymbol.h" #include "Polyline.h" -#include "Envelope.h" +#include "QueryParameters.h" +#include "ServiceFeatureTable.h" +#include "SimpleLineSymbol.h" +#include "SimpleRenderer.h" +#include "SymbolTypes.h" +// Qt headers #include #include diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h index 2032a18d0a..49138de8ff 100644 --- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h +++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h @@ -1,12 +1,12 @@ // [WriteFile Name=FindClosestFacilityToMultipleIncidentsService, Category=Routing] // [Legal] // Copyright 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. @@ -17,6 +17,13 @@ #ifndef FINDCLOSESTFACILITYTOMULTIPLEINCIDENTSSERVICE_H #define FINDCLOSESTFACILITYTOMULTIPLEINCIDENTSSERVICE_H +// ArcGIS Maps SDK headers +#include "ClosestFacilityParameters.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Map; @@ -34,11 +41,6 @@ class QueryParameters; class Error; } -#include - -#include "ClosestFacilityParameters.h" -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("Error.h") diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.pro b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.pro index 39cd5b0472..2e08aad4da 100644 --- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.pro +++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FindClosestFacilityToMultipleIncidentsService -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.qml b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.qml index 46a245257b..6f64a9686a 100644 --- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.qml +++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FindClosestFacilityToMultipleIncidentsService, Category=Routing] // [Legal] // Copyright 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. diff --git a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/main.cpp b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/main.cpp index 1862463f99..a18966bf73 100644 --- a/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/main.cpp +++ b/CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "FindClosestFacilityToMultipleIncidentsService.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Routing/FindRoute/FindRoute.cpp b/CppSamples/Routing/FindRoute/FindRoute.cpp index 7ae218ef36..80c7cb5b73 100644 --- a/CppSamples/Routing/FindRoute/FindRoute.cpp +++ b/CppSamples/Routing/FindRoute/FindRoute.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FindRoute, Category=Routing] // [Legal] // Copyright 2016 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. @@ -18,32 +18,35 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FindRoute.h" -#include "Map.h" -#include "MapQuickView.h" -#include "Basemap.h" +// ArcGIS Maps SDK headers #include "ArcGISVectorTiledLayer.h" +#include "Basemap.h" +#include "DirectionManeuverListModel.h" +#include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" -#include "Viewpoint.h" -#include "Point.h" -#include "SpatialReference.h" -#include "SimpleRenderer.h" -#include "SimpleLineSymbol.h" +#include "GraphicsOverlayListModel.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "PictureMarkerSymbol.h" -#include "RouteTask.h" +#include "Point.h" +#include "Polyline.h" +#include "Route.h" #include "RouteParameters.h" +#include "RouteResult.h" +#include "RouteTask.h" +#include "SimpleLineSymbol.h" +#include "SimpleRenderer.h" +#include "SpatialReference.h" #include "Stop.h" -#include "MapTypes.h" #include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "RouteResult.h" -#include "Route.h" -#include "DirectionManeuverListModel.h" -#include "Graphic.h" -#include "Polyline.h" +#include "Viewpoint.h" +// Qt headers #include #include diff --git a/CppSamples/Routing/FindRoute/FindRoute.h b/CppSamples/Routing/FindRoute/FindRoute.h index 90c2456e30..6b2c39f343 100644 --- a/CppSamples/Routing/FindRoute/FindRoute.h +++ b/CppSamples/Routing/FindRoute/FindRoute.h @@ -1,12 +1,12 @@ // [WriteFile Name=FindRoute, Category=Routing] // [Legal] // Copyright 2016 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. @@ -17,6 +17,13 @@ #ifndef FIND_ROUTE_H #define FIND_ROUTE_H +// Qt headers +#include +#include + +// STL headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,10 +33,6 @@ namespace Esri::ArcGISRuntime class RouteTask; } -#include -#include -#include - class QAbstractListModel; Q_MOC_INCLUDE("QAbstractListModel") @@ -68,4 +71,3 @@ class FindRoute : public QQuickItem }; #endif // FIND_ROUTE_H - diff --git a/CppSamples/Routing/FindRoute/FindRoute.pro b/CppSamples/Routing/FindRoute/FindRoute.pro index 3af5d8b164..62d46af295 100644 --- a/CppSamples/Routing/FindRoute/FindRoute.pro +++ b/CppSamples/Routing/FindRoute/FindRoute.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Routing/FindRoute/FindRoute.qml b/CppSamples/Routing/FindRoute/FindRoute.qml index 85e9e0eb0b..5b3171a3ae 100644 --- a/CppSamples/Routing/FindRoute/FindRoute.qml +++ b/CppSamples/Routing/FindRoute/FindRoute.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FindRoute, Category=Routing] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Routing/FindRoute/main.cpp b/CppSamples/Routing/FindRoute/main.cpp index 1a1175269b..10081739e9 100644 --- a/CppSamples/Routing/FindRoute/main.cpp +++ b/CppSamples/Routing/FindRoute/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "FindRoute.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FindRoute.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.cpp b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.cpp index ff123b5da5..90e0a8e4a1 100644 --- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.cpp +++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FindServiceAreasForMultipleFacilities, Category=Routing] // [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. @@ -18,14 +18,27 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FindServiceAreasForMultipleFacilities.h" +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "Error.h" +#include "ErrorException.h" #include "FeatureLayer.h" +#include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "NetworkAnalystTypes.h" #include "PictureMarkerSymbol.h" +#include "Polygon.h" #include "QueryParameters.h" +#include "ServiceAreaFacility.h" #include "ServiceAreaParameters.h" #include "ServiceAreaPolygon.h" #include "ServiceAreaResult.h" @@ -33,21 +46,11 @@ #include "ServiceFeatureTable.h" #include "SimpleFillSymbol.h" #include "SimpleRenderer.h" -#include "MapTypes.h" #include "SymbolTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "NetworkAnalystTypes.h" -#include "LayerListModel.h" -#include "ServiceAreaFacility.h" -#include "Envelope.h" -#include "Polygon.h" -#include "Graphic.h" -#include "ErrorException.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h index 7c27fc73e9..4fc331c332 100644 --- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h +++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h @@ -1,12 +1,12 @@ // [WriteFile Name=FindServiceAreasForMultipleFacilities, Category=Routing] // [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. @@ -17,8 +17,13 @@ #ifndef FINDSERVICEAREASFORMULTIPLEFACILITIES_H #define FINDSERVICEAREASFORMULTIPLEFACILITIES_H +// ArcGIS Maps SDK headers #include "ServiceAreaResult.h" +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -31,9 +36,6 @@ class ServiceFeatureTable; class SimpleFillSymbol; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class FindServiceAreasForMultipleFacilities : public QObject diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.pro b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.pro index 768c0a32f4..cca32adcef 100644 --- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.pro +++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FindServiceAreasForMultipleFacilities -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.qml b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.qml index 1de5859d23..a569dc31db 100644 --- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.qml +++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FindServiceAreasForMultipleFacilities, Category=Routing] // [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. diff --git a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/main.cpp b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/main.cpp index b8e0044e92..191cf51604 100644 --- a/CppSamples/Routing/FindServiceAreasForMultipleFacilities/main.cpp +++ b/CppSamples/Routing/FindServiceAreasForMultipleFacilities/main.cpp @@ -1,23 +1,30 @@ +// [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 "FindServiceAreasForMultipleFacilities.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.cpp b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.cpp index 61e0c09568..41360872af 100644 --- a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.cpp +++ b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=NavigateARouteWithRerouting, Category=Routing] // [Legal] // Copyright 2022 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "NavigateARouteWithRerouting.h" +// ArcGIS Maps SDK headers #include "DirectionManeuverListModel.h" #include "Error.h" #include "ErrorException.h" @@ -48,23 +50,26 @@ #include "SimpleMarkerSymbol.h" #include "SimulatedLocationDataSource.h" #include "SimulationParameters.h" +#include "SpatialReference.h" #include "Stop.h" +#include "SymbolTypes.h" #include "TrackingDistance.h" #include "TrackingProgress.h" #include "TrackingStatus.h" -#include "SpatialReference.h" -#include "SymbolTypes.h" #include "VoiceGuidance.h" -#include +// Qt headers #include #include #include #include #include -#include #include #include +#include + +// STL headers +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h index ed5cd057b0..81b7fc5e66 100644 --- a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h +++ b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h @@ -1,12 +1,12 @@ // [WriteFile Name=NavigateARouteWithRerouting, Category=Routing] // [Legal] // Copyright 2022 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. @@ -17,10 +17,14 @@ #ifndef NAVIGATEAROUTEWITHREROUTING_H #define NAVIGATEAROUTEWITHREROUTING_H +// ArcGIS Maps SDK headers +#include "DirectionManeuver.h" #include "Route.h" -#include "RouteResult.h" #include "RouteParameters.h" -#include "DirectionManeuver.h" +#include "RouteResult.h" + +// Qt headers +#include class QTextToSpeech; @@ -39,8 +43,6 @@ class SimulatedLocationDataSource; } } -#include - Q_MOC_INCLUDE("MapQuickView.h") class NavigateARouteWithRerouting : public QObject diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.pro b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.pro index a487fa774a..6fe4289d29 100644 --- a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.pro +++ b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.pro @@ -28,7 +28,7 @@ QT += texttospeech TEMPLATE = app TARGET = NavigateARouteWithRerouting -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.qml b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.qml index a0c46a8a5e..f0b8335eb7 100644 --- a/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.qml +++ b/CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.qml @@ -1,12 +1,12 @@ // [WriteFile Name=NavigateARouteWithRerouting, Category=Routing] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Routing/NavigateARouteWithRerouting/main.cpp b/CppSamples/Routing/NavigateARouteWithRerouting/main.cpp index e4d5d0d0ab..e81d3b448c 100644 --- a/CppSamples/Routing/NavigateARouteWithRerouting/main.cpp +++ b/CppSamples/Routing/NavigateARouteWithRerouting/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2022 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 "NavigateARouteWithRerouting.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Routing/NavigateRoute/NavigateRoute.cpp b/CppSamples/Routing/NavigateRoute/NavigateRoute.cpp index 79bc5f417b..1f5ed89e81 100644 --- a/CppSamples/Routing/NavigateRoute/NavigateRoute.cpp +++ b/CppSamples/Routing/NavigateRoute/NavigateRoute.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=NavigateRoute, Category=Routing] // [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. @@ -18,50 +18,54 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "NavigateRoute.h" +// ArcGIS Maps SDK headers +#include "DirectionManeuver.h" #include "DirectionManeuverListModel.h" +#include "Error.h" +#include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LinearUnit.h" #include "Location.h" #include "LocationDisplay.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" #include "NavigationTypes.h" #include "Point.h" +#include "Polyline.h" #include "Route.h" +#include "RouteParameters.h" #include "RouteResult.h" #include "RouteTask.h" #include "RouteTracker.h" +#include "SimpleLineSymbol.h" #include "SimpleMarkerSymbol.h" #include "SimulatedLocationDataSource.h" #include "SimulationParameters.h" +#include "SpatialReference.h" #include "Stop.h" +#include "SymbolTypes.h" #include "TrackingDistance.h" #include "TrackingProgress.h" #include "TrackingStatus.h" #include "VoiceGuidance.h" -#include "MapTypes.h" -#include "MapViewTypes.h" -#include "SymbolTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "RouteTask.h" -#include "LinearUnit.h" -#include "RouteParameters.h" -#include "DirectionManeuver.h" -#include "SpatialReference.h" -#include "Polyline.h" -#include "Graphic.h" -#include "SimpleLineSymbol.h" -#include +// Qt headers #include #include #include -#include #include #include +#include + +// STL headers +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Routing/NavigateRoute/NavigateRoute.h b/CppSamples/Routing/NavigateRoute/NavigateRoute.h index b55daa20a3..e5321d6ffe 100644 --- a/CppSamples/Routing/NavigateRoute/NavigateRoute.h +++ b/CppSamples/Routing/NavigateRoute/NavigateRoute.h @@ -1,12 +1,12 @@ // [WriteFile Name=NavigateRoute, Category=Routing] // [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. @@ -17,9 +17,14 @@ #ifndef NAVIGATEROUTE_H #define NAVIGATEROUTE_H +// ArcGIS Maps SDK headers #include "Route.h" #include "RouteResult.h" +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Graphic; @@ -33,9 +38,6 @@ class SimulatedLocationDataSource; class QTextToSpeech; -#include -#include - class QAbstractListModel; Q_MOC_INCLUDE("MapQuickView.h") diff --git a/CppSamples/Routing/NavigateRoute/NavigateRoute.pro b/CppSamples/Routing/NavigateRoute/NavigateRoute.pro index b868742258..40af6a23d9 100644 --- a/CppSamples/Routing/NavigateRoute/NavigateRoute.pro +++ b/CppSamples/Routing/NavigateRoute/NavigateRoute.pro @@ -28,7 +28,7 @@ QT += texttospeech TEMPLATE = app TARGET = NavigateRoute -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Routing/NavigateRoute/NavigateRoute.qml b/CppSamples/Routing/NavigateRoute/NavigateRoute.qml index 260d2b75bc..0bc3a5c8b1 100644 --- a/CppSamples/Routing/NavigateRoute/NavigateRoute.qml +++ b/CppSamples/Routing/NavigateRoute/NavigateRoute.qml @@ -1,12 +1,12 @@ // [WriteFile Name=NavigateRoute, Category=Routing] // [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. diff --git a/CppSamples/Routing/NavigateRoute/main.cpp b/CppSamples/Routing/NavigateRoute/main.cpp index 7bc4a7aa58..d3845e4fd0 100644 --- a/CppSamples/Routing/NavigateRoute/main.cpp +++ b/CppSamples/Routing/NavigateRoute/main.cpp @@ -1,23 +1,30 @@ +// [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 "NavigateRoute.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Routing/OfflineRouting/OfflineRouting.cpp b/CppSamples/Routing/OfflineRouting/OfflineRouting.cpp index 1ab88abfb8..562c99b5ff 100644 --- a/CppSamples/Routing/OfflineRouting/OfflineRouting.cpp +++ b/CppSamples/Routing/OfflineRouting/OfflineRouting.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=OfflineRouting, Category=Routing] // [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. @@ -18,44 +18,49 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "OfflineRouting.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledLayer.h" +#include "Basemap.h" #include "CompositeSymbol.h" #include "Envelope.h" +#include "Error.h" #include "GeometryEngine.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "IdentifyGraphicsOverlayResult.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "PictureMarkerSymbol.h" +#include "Point.h" #include "Polyline.h" +#include "Route.h" #include "RouteParameters.h" #include "RouteResult.h" #include "RouteTask.h" +#include "RouteTaskInfo.h" #include "SimpleLineSymbol.h" #include "SimpleRenderer.h" +#include "SpatialReference.h" #include "Stop.h" +#include "SymbolTypes.h" #include "TextSymbol.h" #include "TileCache.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "RouteTaskInfo.h" #include "TravelMode.h" -#include "IdentifyGraphicsOverlayResult.h" -#include "Route.h" -#include "Basemap.h" -#include "Point.h" -#include "SpatialReference.h" -#include -#include -#include +// Qt headers #include +#include #include +#include + +// STL headers +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Routing/OfflineRouting/OfflineRouting.h b/CppSamples/Routing/OfflineRouting/OfflineRouting.h index 482900169f..b989ebcc8d 100644 --- a/CppSamples/Routing/OfflineRouting/OfflineRouting.h +++ b/CppSamples/Routing/OfflineRouting/OfflineRouting.h @@ -1,12 +1,12 @@ // [WriteFile Name=OfflineRouting, Category=Routing] // [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. @@ -17,10 +17,15 @@ #ifndef OFFLINEROUTING_H #define OFFLINEROUTING_H +// ArcGIS Maps SDK headers #include "Envelope.h" #include "RouteParameters.h" #include "RouteResult.h" +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Graphic; @@ -31,9 +36,6 @@ class PictureMarkerSymbol; class RouteTask; } -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") class OfflineRouting : public QObject diff --git a/CppSamples/Routing/OfflineRouting/OfflineRouting.pro b/CppSamples/Routing/OfflineRouting/OfflineRouting.pro index aa81de9e98..557b4276b4 100644 --- a/CppSamples/Routing/OfflineRouting/OfflineRouting.pro +++ b/CppSamples/Routing/OfflineRouting/OfflineRouting.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = OfflineRouting -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Routing/OfflineRouting/OfflineRouting.qml b/CppSamples/Routing/OfflineRouting/OfflineRouting.qml index c993724f1a..ab5472b099 100644 --- a/CppSamples/Routing/OfflineRouting/OfflineRouting.qml +++ b/CppSamples/Routing/OfflineRouting/OfflineRouting.qml @@ -1,12 +1,12 @@ // [WriteFile Name=OfflineRouting, Category=Routing] // [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. diff --git a/CppSamples/Routing/OfflineRouting/main.cpp b/CppSamples/Routing/OfflineRouting/main.cpp index 948de74293..f33308c672 100644 --- a/CppSamples/Routing/OfflineRouting/main.cpp +++ b/CppSamples/Routing/OfflineRouting/main.cpp @@ -1,23 +1,30 @@ +// [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 "OfflineRouting.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.cpp b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.cpp index c32e640fac..81c9d5f909 100644 --- a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.cpp +++ b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RouteAroundBarriers, Category=Routing] // [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. @@ -18,17 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RouteAroundBarriers.h" +// ArcGIS Maps SDK headers #include "CompositeSymbol.h" +#include "DirectionManeuverListModel.h" +#include "Error.h" #include "GeometryEngine.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "PictureMarkerSymbol.h" +#include "Point.h" #include "Polygon.h" #include "PolygonBarrier.h" +#include "Polyline.h" #include "Route.h" #include "RouteResult.h" #include "RouteTask.h" @@ -36,20 +45,14 @@ #include "SimpleLineSymbol.h" #include "SimpleRenderer.h" #include "Stop.h" -#include "TextSymbol.h" -#include "MapTypes.h" #include "SymbolTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "DirectionManeuverListModel.h" +#include "TextSymbol.h" #include "Viewpoint.h" -#include "Point.h" -#include "Polyline.h" +// Qt headers +#include #include #include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h index 0017e6b233..044c42a092 100644 --- a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h +++ b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h @@ -1,12 +1,12 @@ // [WriteFile Name=RouteAroundBarriers, Category=Routing] // [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. @@ -17,10 +17,14 @@ #ifndef ROUTEAROUNDBARRIERS_H #define ROUTEAROUNDBARRIERS_H +// ArcGIS Maps SDK headers #include "PolygonBarrier.h" #include "RouteParameters.h" #include "Stop.h" +// Qt headers +#include + namespace Esri::ArcGISRuntime { class GraphicsOverlay; @@ -31,8 +35,6 @@ class RouteTask; class SimpleFillSymbol; } -#include - class QAbstractListModel; Q_MOC_INCLUDE("MapQuickView.h") diff --git a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.pro b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.pro index 228b39f1ab..2d4e77a786 100644 --- a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.pro +++ b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RouteAroundBarriers -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.qml b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.qml index fcc42cefb4..05b75bbaad 100644 --- a/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.qml +++ b/CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RouteAroundBarriers, Category=Routing] // [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. diff --git a/CppSamples/Routing/RouteAroundBarriers/main.cpp b/CppSamples/Routing/RouteAroundBarriers/main.cpp index 7ee90f2511..56e469f793 100644 --- a/CppSamples/Routing/RouteAroundBarriers/main.cpp +++ b/CppSamples/Routing/RouteAroundBarriers/main.cpp @@ -1,23 +1,30 @@ +// [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 "RouteAroundBarriers.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Routing/ServiceArea/ServiceArea.cpp b/CppSamples/Routing/ServiceArea/ServiceArea.cpp index b6478692a5..c8acce1a5c 100644 --- a/CppSamples/Routing/ServiceArea/ServiceArea.cpp +++ b/CppSamples/Routing/ServiceArea/ServiceArea.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceArea, Category=Routing] // [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. @@ -18,35 +18,38 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ServiceArea.h" +// ArcGIS Maps SDK headers +#include "Error.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "MapViewTypes.h" +#include "NetworkAnalystTypes.h" #include "PictureMarkerSymbol.h" +#include "Point.h" +#include "Polygon.h" +#include "Polyline.h" +#include "PolylineBarrier.h" #include "PolylineBuilder.h" +#include "ServiceAreaFacility.h" +#include "ServiceAreaPolygon.h" +#include "ServiceAreaResult.h" #include "ServiceAreaTask.h" #include "SimpleFillSymbol.h" #include "SimpleLineSymbol.h" #include "SimpleRenderer.h" -#include "MapTypes.h" -#include "MapViewTypes.h" -#include "SymbolTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Graphic.h" -#include "ServiceAreaFacility.h" -#include "PolylineBarrier.h" -#include "NetworkAnalystTypes.h" -#include "ServiceAreaResult.h" -#include "ServiceAreaPolygon.h" #include "SpatialReference.h" -#include "Point.h" +#include "SymbolTypes.h" #include "Viewpoint.h" -#include "GraphicsOverlay.h" -#include "Polyline.h" -#include "Polygon.h" +// Qt headers #include #include diff --git a/CppSamples/Routing/ServiceArea/ServiceArea.h b/CppSamples/Routing/ServiceArea/ServiceArea.h index 981c028a37..c5e90554f9 100644 --- a/CppSamples/Routing/ServiceArea/ServiceArea.h +++ b/CppSamples/Routing/ServiceArea/ServiceArea.h @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceArea, Category=Routing] // [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. @@ -17,6 +17,13 @@ #ifndef SERVICEAREA_H #define SERVICEAREA_H +// ArcGIS Maps SDK headers +#include "ServiceAreaParameters.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class GraphicsOverlay; @@ -27,11 +34,6 @@ namespace Esri::ArcGISRuntime class ServiceAreaTask; } -#include "ServiceAreaParameters.h" - -#include -#include - class ServiceArea : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Routing/ServiceArea/ServiceArea.pro b/CppSamples/Routing/ServiceArea/ServiceArea.pro index 3824936e94..ce8552b066 100644 --- a/CppSamples/Routing/ServiceArea/ServiceArea.pro +++ b/CppSamples/Routing/ServiceArea/ServiceArea.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ServiceArea -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Routing/ServiceArea/ServiceArea.qml b/CppSamples/Routing/ServiceArea/ServiceArea.qml index e64c7609c8..af441093d5 100644 --- a/CppSamples/Routing/ServiceArea/ServiceArea.qml +++ b/CppSamples/Routing/ServiceArea/ServiceArea.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ServiceArea, Category=Routing] // [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. diff --git a/CppSamples/Routing/ServiceArea/main.cpp b/CppSamples/Routing/ServiceArea/main.cpp index 9bfb7ef57a..23665fc27d 100644 --- a/CppSamples/Routing/ServiceArea/main.cpp +++ b/CppSamples/Routing/ServiceArea/main.cpp @@ -1,29 +1,36 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "ServiceArea.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ServiceArea.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.cpp b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.cpp index d6e69b38f2..4028f6830e 100644 --- a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.cpp +++ b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Add3DTilesLayer, Category=Scenes] // [Legal] // Copyright 2023 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Add3DTilesLayer.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" #include "Basemap.h" #include "Camera.h" diff --git a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h index b7a1cd0bf2..2b5b6a3176 100644 --- a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h +++ b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=Add3DTilesLayer, Category=Scenes] // [Legal] // Copyright 2023 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. @@ -17,6 +17,9 @@ #ifndef ADD3DTILESLAYER_H #define ADD3DTILESLAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -24,8 +27,6 @@ class SceneQuickView; class Ogc3dTilesLayer; } -#include - Q_MOC_INCLUDE("SceneQuickView.h"); class Add3DTilesLayer : public QObject diff --git a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.pro b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.pro index d12b6bbe6c..d3101c63d4 100644 --- a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.pro +++ b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.pro @@ -28,7 +28,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = Add3DTilesLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.qml b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.qml index 349bce7e61..b09a33b10d 100644 --- a/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.qml +++ b/CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Add3DTilesLayer, Category=Scenes] // [Legal] // Copyright 2023 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. diff --git a/CppSamples/Scenes/Add3DTilesLayer/main.cpp b/CppSamples/Scenes/Add3DTilesLayer/main.cpp index c020149a95..fd93b87f3e 100644 --- a/CppSamples/Scenes/Add3DTilesLayer/main.cpp +++ b/CppSamples/Scenes/Add3DTilesLayer/main.cpp @@ -1,26 +1,32 @@ +// [Legal] // Copyright 2023 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 "Add3DTilesLayer.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.cpp b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.cpp index 44b2848747..5c841d0076 100644 --- a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.cpp +++ b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=AddAPointSceneLayer, Category=Scenes] // [Legal] // Copyright 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. @@ -18,18 +18,20 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "AddAPointSceneLayer.h" -#include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" +// ArcGIS Maps SDK headers #include "ArcGISSceneLayer.h" -#include "MapTypes.h" -#include "Surface.h" +#include "ArcGISTiledElevationSource.h" #include "ElevationSourceListModel.h" #include "LayerListModel.h" #include "MapTypes.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "Surface.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h index 06f06bd383..92d8a9200a 100644 --- a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h +++ b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=AddAPointSceneLayer, Category=Scenes] // [Legal] // Copyright 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. @@ -17,14 +17,15 @@ #ifndef ADDAPOINTSCENELAYER_H #define ADDAPOINTSCENELAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class AddAPointSceneLayer : public QObject diff --git a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.pro b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.pro index 41c96e1d0d..3ebed4663a 100644 --- a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.pro +++ b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = AddAPointSceneLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.qml b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.qml index b6f71c8e06..245c2589e6 100644 --- a/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.qml +++ b/CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AddAPointSceneLayer, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/AddAPointSceneLayer/main.cpp b/CppSamples/Scenes/AddAPointSceneLayer/main.cpp index 66b4a7bd5f..f89137f4a7 100644 --- a/CppSamples/Scenes/AddAPointSceneLayer/main.cpp +++ b/CppSamples/Scenes/AddAPointSceneLayer/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "AddAPointSceneLayer.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.cpp b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.cpp index 4ba4308e00..16f2cc6e7f 100644 --- a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.cpp +++ b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=AddIntegratedMeshLayer, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -18,18 +18,21 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "AddIntegratedMeshLayer.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "IntegratedMeshLayer.h" +// ArcGIS Maps SDK headers +#include "Camera.h" #include "Error.h" +#include "IntegratedMeshLayer.h" #include "LayerListModel.h" -#include "Camera.h" -#include "SpatialReference.h" #include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "SpatialReference.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h index ec220bda52..6c794139de 100644 --- a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h +++ b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=AddIntegratedMeshLayer, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -17,6 +17,9 @@ #ifndef ADDINTEGRATEDMESHLAYER_H #define ADDINTEGRATEDMESHLAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Error; @@ -25,8 +28,6 @@ class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class AddIntegratedMeshLayer : public QObject diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.pro b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.pro index d915b8e6ef..3e13e02a41 100644 --- a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.pro +++ b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = AddIntegratedMeshLayer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.qml b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.qml index f898554c1a..897a49880c 100644 --- a/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.qml +++ b/CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AddIntegratedMeshLayer, Category=Scenes] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Scenes/AddIntegratedMeshLayer/main.cpp b/CppSamples/Scenes/AddIntegratedMeshLayer/main.cpp index b2a8f8e33a..6dfc1e0372 100644 --- a/CppSamples/Scenes/AddIntegratedMeshLayer/main.cpp +++ b/CppSamples/Scenes/AddIntegratedMeshLayer/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 2018 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 "AddIntegratedMeshLayer.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.cpp b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.cpp index 8684bda852..878bb7310a 100644 --- a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.cpp +++ b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Animate3DSymbols, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -18,46 +18,49 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Animate3DSymbols.h" +#include "MissionData.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "AttributeListModel.h" #include "Camera.h" #include "DistanceCompositeSceneSymbol.h" +#include "ElevationSourceListModel.h" #include "GlobeCameraController.h" +#include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerSceneProperties.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "ModelSceneSymbol.h" #include "OrbitGeoElementCameraController.h" #include "PointCollection.h" #include "Polyline.h" #include "PolylineBuilder.h" +#include "RendererSceneProperties.h" #include "Scene.h" #include "SceneQuickView.h" #include "SceneViewTypes.h" -#include "SimpleMarkerSymbol.h" +#include "SimpleLineSymbol.h" #include "SimpleMarkerSceneSymbol.h" +#include "SimpleMarkerSymbol.h" #include "SimpleRenderer.h" #include "SpatialReference.h" -#include "MissionData.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" #include "Surface.h" -#include "ElevationSourceListModel.h" -#include "LayerSceneProperties.h" -#include "RendererSceneProperties.h" -#include "AttributeListModel.h" -#include "Graphic.h" +#include "SymbolTypes.h" #include "Viewpoint.h" -#include "SimpleLineSymbol.h" +// Qt headers #include #include +#include #include #include -#include using namespace Esri::ArcGISRuntime; @@ -388,4 +391,3 @@ double Animate3DSymbols::minZoom() const { return m_followingController ? m_followingController->minCameraDistance() : 0; } - diff --git a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h index f472e849d0..e1515cd622 100644 --- a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h +++ b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h @@ -1,12 +1,12 @@ // [WriteFile Name=Animate3DSymbols, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -17,6 +17,13 @@ #ifndef ANIMATE3DSYMBOLS_H #define ANIMATE3DSYMBOLS_H +// Qt headers +#include +#include + +// STL headers +#include + class MissionData; namespace Esri::ArcGISRuntime @@ -34,10 +41,6 @@ namespace Esri::ArcGISRuntime class QAbstractListModel; class MissionData; -#include -#include -#include - Q_MOC_INCLUDE("QAbstractListModel") class Animate3DSymbols : public QQuickItem diff --git a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.pro b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.pro index 1ccab082b4..eb0e30dc9b 100644 --- a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.pro +++ b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.qml b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.qml index 12db043a34..3b5098d5ca 100644 --- a/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.qml +++ b/CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Animate3DSymbols, Category=Scenes] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Scenes/Animate3DSymbols/MissionData.cpp b/CppSamples/Scenes/Animate3DSymbols/MissionData.cpp index a16e28e9b3..fda0b2b7fb 100644 --- a/CppSamples/Scenes/Animate3DSymbols/MissionData.cpp +++ b/CppSamples/Scenes/Animate3DSymbols/MissionData.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Animate3DSymbols, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "MissionData.h" +// Qt headers #include // MissionData diff --git a/CppSamples/Scenes/Animate3DSymbols/MissionData.h b/CppSamples/Scenes/Animate3DSymbols/MissionData.h index 4333dd4b86..d5b50464bc 100644 --- a/CppSamples/Scenes/Animate3DSymbols/MissionData.h +++ b/CppSamples/Scenes/Animate3DSymbols/MissionData.h @@ -1,22 +1,23 @@ // [WriteFile Name=Animate3DSymbols, Category=Scenes] // [Legal] // Copyright 2018 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] + #ifndef MISSIONDATA_H #define MISSIONDATA_H -// C++ API headers +// ArcGIS Maps SDK headers #include "Point.h" #include "SpatialReference.h" diff --git a/CppSamples/Scenes/Animate3DSymbols/main.cpp b/CppSamples/Scenes/Animate3DSymbols/main.cpp index 042839d55d..d9f979252a 100644 --- a/CppSamples/Scenes/Animate3DSymbols/main.cpp +++ b/CppSamples/Scenes/Animate3DSymbols/main.cpp @@ -1,34 +1,40 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "Animate3DSymbols.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" +#include "MapQuickView.h" +#include "SceneQuickView.h" + +// Qt headers #include #include -#include +#include #include +#include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "MapQuickView.h" -#include "SceneQuickView.h" -#include "ArcGISRuntimeEnvironment.h" - -#include "Animate3DSymbols.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.cpp b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.cpp index fecf5cd449..cbe83514b4 100644 --- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.cpp +++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=AnimateImagesWithImageOverlay, Category=Scenes] // [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. @@ -18,35 +18,38 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "AnimateImagesWithImageOverlay.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" #include "ArcGISTiledLayer.h" -#include "Scene.h" -#include "SceneQuickView.h" +#include "Camera.h" +#include "ElevationSourceListModel.h" +#include "Envelope.h" #include "ImageFrame.h" #include "ImageOverlay.h" #include "ImageOverlayListModel.h" -#include "SceneView.h" -#include "Envelope.h" -#include "Point.h" -#include "Camera.h" -#include "Viewpoint.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" #include "LayerListModel.h" -#include "SpatialReference.h" #include "MapTypes.h" +#include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "SceneView.h" +#include "SpatialReference.h" +#include "Surface.h" +#include "Viewpoint.h" // Qt headers -#include #include #include #include #include #include #include +#include +// STL headers #include using namespace Esri::ArcGISRuntime; @@ -83,7 +86,6 @@ AnimateImagesWithImageOverlay::AnimateImagesWithImageOverlay(QObject* parent /* ArcGISTiledElevationSource* elevationSource = new ArcGISTiledElevationSource( QUrl("https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer"), this); - // add the elevation source to the scene to display elevation m_scene->baseSurface()->elevationSources()->append(elevationSource); diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h index a8591b2716..55842701b3 100644 --- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h +++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h @@ -1,12 +1,12 @@ // [WriteFile Name=AnimateImagesWithImageOverlay, Category=Scenes] // [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. @@ -17,6 +17,13 @@ #ifndef ANIMATEIMAGESWITHIMAGEOVERLAY_H #define ANIMATEIMAGESWITHIMAGEOVERLAY_H +// ArcGIS Maps SDK headers +#include "Envelope.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -27,11 +34,6 @@ class ImageOverlay; class QTimer; -#include -#include - -#include "Envelope.h" - Q_MOC_INCLUDE("SceneQuickView.h") class AnimateImagesWithImageOverlay : public QObject diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.pro b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.pro index 205f0d47c0..3222b44123 100644 --- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.pro +++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = AnimateImagesWithImageOverlay -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.qml b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.qml index 58d2f6e6a4..8206c0b69c 100644 --- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.qml +++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.qml @@ -1,12 +1,12 @@ // [WriteFile Name=AnimateImagesWithImageOverlay, Category=Scenes] // [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. diff --git a/CppSamples/Scenes/AnimateImagesWithImageOverlay/main.cpp b/CppSamples/Scenes/AnimateImagesWithImageOverlay/main.cpp index c99ff8d54d..1d77146821 100644 --- a/CppSamples/Scenes/AnimateImagesWithImageOverlay/main.cpp +++ b/CppSamples/Scenes/AnimateImagesWithImageOverlay/main.cpp @@ -1,24 +1,31 @@ +// [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 "AnimateImagesWithImageOverlay.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/BasicSceneView/BasicSceneView.cpp b/CppSamples/Scenes/BasicSceneView/BasicSceneView.cpp index 606e3491b8..3e9cd713b5 100644 --- a/CppSamples/Scenes/BasicSceneView/BasicSceneView.cpp +++ b/CppSamples/Scenes/BasicSceneView/BasicSceneView.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=BasicSceneView, Category=Scenes] // [Legal] // Copyright 2022 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "BasicSceneView.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" #include "Camera.h" #include "ElevationSourceListModel.h" @@ -84,4 +86,3 @@ void BasicSceneView::setSceneView(SceneQuickView* sceneView) emit sceneViewChanged(); } - diff --git a/CppSamples/Scenes/BasicSceneView/BasicSceneView.h b/CppSamples/Scenes/BasicSceneView/BasicSceneView.h index 164340b6ea..e8830102ec 100644 --- a/CppSamples/Scenes/BasicSceneView/BasicSceneView.h +++ b/CppSamples/Scenes/BasicSceneView/BasicSceneView.h @@ -1,12 +1,12 @@ // [WriteFile Name=BasicSceneView, Category=Scenes] // [Legal] // Copyright 2022 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. @@ -17,14 +17,15 @@ #ifndef BASICSCENEVIEW_H #define BASICSCENEVIEW_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h"); class BasicSceneView : public QObject diff --git a/CppSamples/Scenes/BasicSceneView/BasicSceneView.pro b/CppSamples/Scenes/BasicSceneView/BasicSceneView.pro index bc01a85304..2baff1293e 100644 --- a/CppSamples/Scenes/BasicSceneView/BasicSceneView.pro +++ b/CppSamples/Scenes/BasicSceneView/BasicSceneView.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = BasicSceneView -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/BasicSceneView/BasicSceneView.qml b/CppSamples/Scenes/BasicSceneView/BasicSceneView.qml index dfa61fefa3..3efd122438 100644 --- a/CppSamples/Scenes/BasicSceneView/BasicSceneView.qml +++ b/CppSamples/Scenes/BasicSceneView/BasicSceneView.qml @@ -1,12 +1,12 @@ // [WriteFile Name=BasicSceneView, Category=Scenes] // [Legal] // Copyright 2022 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. diff --git a/CppSamples/Scenes/BasicSceneView/main.cpp b/CppSamples/Scenes/BasicSceneView/main.cpp index 7e7fe68f2e..41880b0c01 100644 --- a/CppSamples/Scenes/BasicSceneView/main.cpp +++ b/CppSamples/Scenes/BasicSceneView/main.cpp @@ -1,26 +1,32 @@ +// [Legal] // Copyright 2022 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 "BasicSceneView.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.cpp b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.cpp index e232b1c332..2dfb86d3e0 100644 --- a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.cpp +++ b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeAtmosphereEffect, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -18,16 +18,19 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ChangeAtmosphereEffect.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "Camera.h" +#include "ElevationSourceListModel.h" +#include "MapTypes.h" #include "Scene.h" #include "SceneQuickView.h" -#include "MapTypes.h" #include "Surface.h" -#include "Camera.h" -#include "ElevationSourceListModel.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; @@ -90,5 +93,3 @@ ChangeAtmosphereEffect::AtmosphereEnum ChangeAtmosphereEffect::atmosphereEffect( return static_cast(m_sceneView->atmosphereEffect()); return static_cast(AtmosphereEffect::None); } - - diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h index d555c609bc..d2b3e673d8 100644 --- a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h +++ b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeAtmosphereEffect, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -17,16 +17,18 @@ #ifndef CHANGEATMOSPHEREEFFECT_H #define CHANGEATMOSPHEREEFFECT_H +// ArcGIS Maps SDK headers #include "SceneViewTypes.h" +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class ChangeAtmosphereEffect : public QObject diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.pro b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.pro index e76935c561..cae38b0e68 100644 --- a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.pro +++ b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ChangeAtmosphereEffect -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.qml b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.qml index 25dea718f8..39d53e8f38 100644 --- a/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.qml +++ b/CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ChangeAtmosphereEffect, Category=Scenes] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Scenes/ChangeAtmosphereEffect/main.cpp b/CppSamples/Scenes/ChangeAtmosphereEffect/main.cpp index 7518fbd287..8748a490fb 100644 --- a/CppSamples/Scenes/ChangeAtmosphereEffect/main.cpp +++ b/CppSamples/Scenes/ChangeAtmosphereEffect/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 2018 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 "ChangeAtmosphereEffect.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.cpp b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.cpp index d7f3575d7b..b4ab4b8086 100644 --- a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.cpp +++ b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ChooseCameraController, Category=Scenes] // [Legal] // Copyright 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. @@ -18,31 +18,34 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ChooseCameraController.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "Camera.h" +#include "ElevationSourceListModel.h" #include "GlobeCameraController.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerSceneProperties.h" +#include "MapTypes.h" #include "ModelSceneSymbol.h" -#include "OrbitLocationCameraController.h" #include "OrbitGeoElementCameraController.h" +#include "OrbitLocationCameraController.h" +#include "Point.h" #include "Scene.h" #include "SceneQuickView.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Camera.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" #include "SceneViewTypes.h" -#include "LayerSceneProperties.h" #include "SpatialReference.h" -#include "GraphicsOverlay.h" -#include "Point.h" -#include "Graphic.h" +#include "Surface.h" +// Qt headers #include -#include #include +#include namespace { @@ -147,4 +150,3 @@ void ChooseCameraController::setSceneView(SceneQuickView* sceneView) emit sceneViewChanged(); } - diff --git a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h index 496c308e05..6d48e9290b 100644 --- a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h +++ b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h @@ -1,12 +1,12 @@ // [WriteFile Name=ChooseCameraController, Category=Scenes] // [Legal] // Copyright 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. @@ -30,8 +30,6 @@ class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class ChooseCameraController : public QObject diff --git a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.pro b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.pro index 5b0bdf7b33..7e782584df 100644 --- a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.pro +++ b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ChooseCameraController -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.qml b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.qml index a668003c54..01ba7659a0 100644 --- a/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.qml +++ b/CppSamples/Scenes/ChooseCameraController/ChooseCameraController.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ChooseCameraController, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/ChooseCameraController/main.cpp b/CppSamples/Scenes/ChooseCameraController/main.cpp index ec7758c1ef..41953cb9fb 100644 --- a/CppSamples/Scenes/ChooseCameraController/main.cpp +++ b/CppSamples/Scenes/ChooseCameraController/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "ChooseCameraController.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.cpp b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.cpp index 0ee73c7ade..3e9428efa4 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.cpp +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateTerrainSurfaceFromLocalRaster, Category=Scenes] // [Legal] // Copyright 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. @@ -18,20 +18,23 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CreateTerrainSurfaceFromLocalRaster.h" +// ArcGIS Maps SDK headers +#include "Camera.h" +#include "ElevationSourceListModel.h" +#include "Error.h" +#include "MapTypes.h" #include "RasterElevationSource.h" #include "Scene.h" #include "SceneQuickView.h" -#include "MapTypes.h" -#include "Error.h" #include "Surface.h" -#include "ElevationSourceListModel.h" -#include "Camera.h" -#include +// Qt headers #include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h index e45068ce44..de6587f7e8 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateTerrainSurfaceFromLocalRaster, Category=Scenes] // [Legal] // Copyright 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. @@ -17,16 +17,18 @@ #ifndef CREATETERRAINSURFACEFROMLOCALRASTER_H #define CREATETERRAINSURFACEFROMLOCALRASTER_H +// ArcGIS Maps SDK headers #include "Error.h" +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class CreateTerrainSurfaceFromLocalRaster : public QObject diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.pro b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.pro index d6d86fbbf9..653f778691 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.pro +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateTerrainSurfaceFromLocalRaster -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.qml b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.qml index ecf765172f..f6d90a1e19 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.qml +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateTerrainSurfaceFromLocalRaster, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/main.cpp b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/main.cpp index 58603c07bd..d1bb6ea488 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/main.cpp +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "CreateTerrainSurfaceFromLocalRaster.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.cpp b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.cpp index aae83c93a1..c265755f10 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.cpp +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateTerrainSurfaceFromLocalTilePackage, Category=Scenes] // [Legal] // Copyright 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. @@ -18,20 +18,23 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CreateTerrainSurfaceFromLocalTilePackage.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "Camera.h" +#include "ElevationSourceListModel.h" +#include "Error.h" +#include "MapTypes.h" #include "Scene.h" #include "SceneQuickView.h" -#include "MapTypes.h" -#include "Error.h" #include "Surface.h" -#include "ElevationSourceListModel.h" -#include "Camera.h" -#include +// Qt headers #include #include +#include using namespace Esri::ArcGISRuntime; @@ -135,4 +138,3 @@ void CreateTerrainSurfaceFromLocalTilePackage::setSceneView(SceneQuickView* scen emit sceneViewChanged(); } - diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h index bafbfeada7..6740187533 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateTerrainSurfaceFromLocalTilePackage, Category=Scenes] // [Legal] // Copyright 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. @@ -17,16 +17,18 @@ #ifndef CreateTerrainSurfaceFromLocalTilePackage_H #define CreateTerrainSurfaceFromLocalTilePackage_H +// ArcGIS Maps SDK headers #include "Error.h" +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class CreateTerrainSurfaceFromLocalTilePackage : public QObject diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.pro b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.pro index 02a0bcd878..a5d6d58dbb 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.pro +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateTerrainSurfaceFromLocalTilePackage -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.qml b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.qml index d46c76f447..6c85089fcc 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.qml +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateTerrainSurfaceFromLocalTilePackage, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/main.cpp b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/main.cpp index fec16de280..15f2966fd9 100644 --- a/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/main.cpp +++ b/CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "CreateTerrainSurfaceFromLocalTilePackage.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.cpp b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.cpp index e2a5b57339..f360e4ae31 100644 --- a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.cpp +++ b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Display3DLabelsInScene, Category=Scenes] // [Legal] // Copyright 2021 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. @@ -18,19 +18,21 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Display3DLabelsInScene.h" +// ArcGIS Maps SDK headers #include "ArcadeLabelExpression.h" +#include "Error.h" #include "FeatureLayer.h" +#include "GroupLayer.h" #include "LabelDefinition.h" +#include "LabelDefinitionListModel.h" +#include "LayerListModel.h" #include "Scene.h" #include "SceneQuickView.h" -#include "TextSymbol.h" -#include "Error.h" -#include "LayerListModel.h" -#include "GroupLayer.h" #include "ServiceTypes.h" -#include "LabelDefinitionListModel.h" +#include "TextSymbol.h" using namespace Esri::ArcGISRuntime; @@ -103,4 +105,3 @@ void Display3DLabelsInScene::setSceneView(SceneQuickView* sceneView) emit sceneViewChanged(); } - diff --git a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h index 21719b1fea..5469d5bc60 100644 --- a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h +++ b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h @@ -1,12 +1,12 @@ // [WriteFile Name=Display3DLabelsInScene, Category=Scenes] // [Legal] // Copyright 2021 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. @@ -17,6 +17,9 @@ #ifndef DISPLAY3DLABELSINSCENE_H #define DISPLAY3DLABELSINSCENE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -24,8 +27,6 @@ class SceneQuickView; class FeatureLayer; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class Display3DLabelsInScene : public QObject diff --git a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.pro b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.pro index f3a1cb5e57..f9b58411d7 100644 --- a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.pro +++ b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = Display3DLabelsInScene -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.qml b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.qml index 7e84b90c6a..000a54b6dc 100644 --- a/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.qml +++ b/CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Display3DLabelsInScene, Category=Scenes] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/Scenes/Display3DLabelsInScene/main.cpp b/CppSamples/Scenes/Display3DLabelsInScene/main.cpp index aba15c22a4..3abf0c15c2 100644 --- a/CppSamples/Scenes/Display3DLabelsInScene/main.cpp +++ b/CppSamples/Scenes/Display3DLabelsInScene/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 2021 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 "Display3DLabelsInScene.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.cpp b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.cpp index c50e139875..27b0587a3a 100644 --- a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.cpp +++ b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplaySceneLayer, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -18,21 +18,23 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplaySceneLayer.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "Basemap.h" -#include "ArcGISTiledElevationSource.h" +// ArcGIS Maps SDK headers #include "ArcGISSceneLayer.h" -#include "Point.h" -#include "Viewpoint.h" +#include "ArcGISTiledElevationSource.h" +#include "Basemap.h" #include "Camera.h" -#include "MapTypes.h" -#include "Surface.h" #include "ElevationSourceListModel.h" #include "LayerListModel.h" +#include "MapTypes.h" +#include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SpatialReference.h" +#include "Surface.h" +#include "Viewpoint.h" using namespace Esri::ArcGISRuntime; @@ -78,4 +80,3 @@ void DisplaySceneLayer::componentComplete() // set scene on the scene view m_sceneView->setArcGISScene(m_scene); } - diff --git a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h index 2b1d4765fe..e0285b6d45 100644 --- a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h +++ b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplaySceneLayer, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -17,6 +17,9 @@ #ifndef DISPLAYSCENELAYER_H #define DISPLAYSCENELAYER_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -24,8 +27,6 @@ namespace Esri::ArcGISRuntime class ArcGISSceneLayer; } -#include - class DisplaySceneLayer : public QQuickItem { Q_OBJECT @@ -44,4 +45,3 @@ class DisplaySceneLayer : public QQuickItem }; #endif // DISPLAYSCENELAYER_H - diff --git a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.pro b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.pro index 8c3f46ff4d..ebf6a3c27d 100644 --- a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.pro +++ b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.qml b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.qml index 030eaba947..2320c9713e 100644 --- a/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.qml +++ b/CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplaySceneLayer, Category=Scenes] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Scenes/DisplaySceneLayer/main.cpp b/CppSamples/Scenes/DisplaySceneLayer/main.cpp index 4830dbe8a3..332c2371a8 100644 --- a/CppSamples/Scenes/DisplaySceneLayer/main.cpp +++ b/CppSamples/Scenes/DisplaySceneLayer/main.cpp @@ -1,31 +1,38 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "DisplaySceneLayer.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "DisplaySceneLayer.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.cpp b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.cpp index f07d3f87b2..df1f5cf35f 100644 --- a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.cpp +++ b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DistanceCompositeSymbol, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -18,32 +18,35 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DistanceCompositeSymbol.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "Basemap.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "Basemap.h" #include "DistanceCompositeSceneSymbol.h" -#include "SimpleMarkerSymbol.h" -#include "SimpleMarkerSceneSymbol.h" +#include "ElevationSourceListModel.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerSceneProperties.h" +#include "MapTypes.h" #include "ModelSceneSymbol.h" #include "OrbitGeoElementCameraController.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" +#include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SceneViewTypes.h" -#include "LayerSceneProperties.h" +#include "SimpleMarkerSceneSymbol.h" +#include "SimpleMarkerSymbol.h" #include "SpatialReference.h" -#include "GraphicsOverlay.h" -#include "Point.h" -#include "Graphic.h" +#include "Surface.h" +#include "SymbolTypes.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h index 6f546b1eb8..2ffc2d428c 100644 --- a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h +++ b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h @@ -1,12 +1,12 @@ // [WriteFile Name=DistanceCompositeSymbol, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef DISTANCE_COMPOSITE_SYMBOL_H #define DISTANCE_COMPOSITE_SYMBOL_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - class DistanceCompositeSymbol : public QQuickItem { Q_OBJECT @@ -42,4 +43,3 @@ class DistanceCompositeSymbol : public QQuickItem }; #endif // DISTANCE_COMPOSITE_SYMBOL_H - diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.pro b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.pro index 04892c0475..b05c890782 100644 --- a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.pro +++ b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.qml b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.qml index 199da1be45..8cadab7ea3 100644 --- a/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.qml +++ b/CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DistanceCompositeSymbol, Category=Scenes] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Scenes/DistanceCompositeSymbol/main.cpp b/CppSamples/Scenes/DistanceCompositeSymbol/main.cpp index 076d4bc7b2..384f780b97 100644 --- a/CppSamples/Scenes/DistanceCompositeSymbol/main.cpp +++ b/CppSamples/Scenes/DistanceCompositeSymbol/main.cpp @@ -1,31 +1,38 @@ +// [Legal] // Copyright 2016 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 -#include -#include +// sample headers +#include "DistanceCompositeSymbol.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "DistanceCompositeSymbol.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.cpp b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.cpp index 593194c5a8..e5ac94edec 100644 --- a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.cpp +++ b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ExtrudeGraphics, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -18,31 +18,34 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ExtrudeGraphics.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "Basemap.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" -#include "SimpleRenderer.h" -#include "Point.h" -#include "PolygonBuilder.h" -#include "Polygon.h" -#include "SimpleFillSymbol.h" +#include "AttributeListModel.h" +#include "Basemap.h" #include "Camera.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Surface.h" #include "ElevationSourceListModel.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "MapTypes.h" +#include "Point.h" +#include "Polygon.h" +#include "PolygonBuilder.h" #include "RendererSceneProperties.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SceneViewTypes.h" -#include "GraphicsOverlay.h" +#include "SimpleFillSymbol.h" +#include "SimpleRenderer.h" #include "SpatialReference.h" -#include "Graphic.h" -#include "AttributeListModel.h" +#include "Surface.h" +#include "SymbolTypes.h" +// STL headers #include #include diff --git a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h index 76e86c9073..76f5da2c5e 100644 --- a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h +++ b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h @@ -1,12 +1,12 @@ // [WriteFile Name=ExtrudeGraphics, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -17,6 +17,10 @@ #ifndef EXTRUDE_GRAPHICS_H #define EXTRUDE_GRAPHICS_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -25,9 +29,6 @@ namespace Esri::ArcGISRuntime class Polygon; } -#include -#include - class ExtrudeGraphics : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.pro b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.pro index 64a8ecef20..a52557dcb8 100644 --- a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.pro +++ b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.qml b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.qml index 955c0000fd..0f65181ba0 100644 --- a/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.qml +++ b/CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ExtrudeGraphics, Category=Scenes] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Scenes/ExtrudeGraphics/main.cpp b/CppSamples/Scenes/ExtrudeGraphics/main.cpp index 8047cf1817..71d0550ac3 100644 --- a/CppSamples/Scenes/ExtrudeGraphics/main.cpp +++ b/CppSamples/Scenes/ExtrudeGraphics/main.cpp @@ -1,31 +1,38 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "ExtrudeGraphics.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "ExtrudeGraphics.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.cpp b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.cpp index 730c1de207..c9f1faadf2 100644 --- a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.cpp +++ b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerExtrusion, Category=Scenes] // [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. @@ -18,27 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FeatureLayerExtrusion.h" -#include "FeatureLayer.h" -#include "ServiceFeatureTable.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "Point.h" -#include "SimpleLineSymbol.h" -#include "SimpleFillSymbol.h" -#include "SimpleRenderer.h" -#include "RendererSceneProperties.h" #include "Camera.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "Surface.h" #include "ElevationSourceListModel.h" -#include "RendererSceneProperties.h" +#include "FeatureLayer.h" #include "LayerListModel.h" +#include "MapTypes.h" +#include "Point.h" +#include "RendererSceneProperties.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SceneViewTypes.h" +#include "ServiceFeatureTable.h" +#include "SimpleFillSymbol.h" +#include "SimpleLineSymbol.h" +#include "SimpleRenderer.h" #include "SpatialReference.h" +#include "Surface.h" +#include "SymbolTypes.h" #include "Viewpoint.h" using namespace Esri::ArcGISRuntime; @@ -119,6 +120,3 @@ void FeatureLayerExtrusion::totalPopulation() props.setExtrusionExpression("[POP2007] / 10"); m_renderer->setSceneProperties(props); } - - - diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h index 58994b742a..9986e49b37 100644 --- a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h +++ b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerExtrusion, Category=Scenes] // [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. @@ -17,6 +17,13 @@ #ifndef FEATURELAYEREXTRUSION_H #define FEATURELAYEREXTRUSION_H +// ArcGIS Maps SDK headers +#include "Camera.h" +#include "Point.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class FeatureLayer; @@ -29,10 +36,6 @@ class SimpleRenderer; enum class FeatureRenderingMode; } -#include -#include "Point.h" -#include "Camera.h" - class FeatureLayerExtrusion : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.pro b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.pro index 919148ddcd..feb425c1f7 100644 --- a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.pro +++ b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FeatureLayerExtrusion -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.qml b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.qml index 60ea2031a8..3cf6e975c7 100644 --- a/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.qml +++ b/CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FeatureLayerExtrusion, Category=Scenes] // [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. diff --git a/CppSamples/Scenes/FeatureLayerExtrusion/main.cpp b/CppSamples/Scenes/FeatureLayerExtrusion/main.cpp index 6312810bee..0f5b6271a3 100644 --- a/CppSamples/Scenes/FeatureLayerExtrusion/main.cpp +++ b/CppSamples/Scenes/FeatureLayerExtrusion/main.cpp @@ -1,30 +1,37 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "FeatureLayerExtrusion.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FeatureLayerExtrusion.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.cpp b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.cpp index 7a09dafc04..1929070aee 100644 --- a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.cpp +++ b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FilterFeaturesInScene, Category=Scenes] // [Legal] // Copyright 2023 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. @@ -18,8 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FilterFeaturesInScene.h" +// ArcGIS Maps SDK headers #include "ArcGISSceneLayer.h" #include "ArcGISTiledElevationSource.h" #include "ArcGISVectorTiledLayer.h" @@ -47,6 +49,7 @@ #include "Surface.h" #include "SymbolTypes.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h index 9edfc2706b..30ce659352 100644 --- a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h +++ b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h @@ -1,12 +1,12 @@ // [WriteFile Name=FilterFeaturesInScene, Category=Scenes] // [Legal] // Copyright 2023 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. @@ -17,6 +17,12 @@ #ifndef FILTERFEATURESINSCENE_H #define FILTERFEATURESINSCENE_H +// ArcGIS Maps SDK headers +#include "Polygon.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class ArcGISSceneLayer; @@ -26,10 +32,6 @@ class SceneLayerPolygonFilter; class SceneQuickView; } -#include "Polygon.h" - -#include - Q_MOC_INCLUDE("SceneQuickView.h"); class FilterFeaturesInScene : public QObject diff --git a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.pro b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.pro index 963c85fb1b..ca5c1b633a 100644 --- a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.pro +++ b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FilterFeaturesInScene -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.qml b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.qml index 3db231a77e..0aeefd513a 100644 --- a/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.qml +++ b/CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FilterFeaturesInScene, Category=Scenes] // [Legal] // Copyright 2023 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. diff --git a/CppSamples/Scenes/FilterFeaturesInScene/main.cpp b/CppSamples/Scenes/FilterFeaturesInScene/main.cpp index c2ed3ce7f1..944e143ceb 100644 --- a/CppSamples/Scenes/FilterFeaturesInScene/main.cpp +++ b/CppSamples/Scenes/FilterFeaturesInScene/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2023 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 "FilterFeaturesInScene.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.cpp b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.cpp index acd10ce880..4ccadad43c 100644 --- a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.cpp +++ b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=GetElevationAtPoint, Category=Scenes] // [Legal] // Copyright 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. @@ -18,24 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "GetElevationAtPoint.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "Camera.h" +#include "ElevationSourceListModel.h" +#include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "MapTypes.h" +#include "Point.h" #include "Scene.h" #include "SceneQuickView.h" #include "SimpleMarkerSymbol.h" #include "Surface.h" -#include "Camera.h" -#include "MapTypes.h" #include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" -#include "Graphic.h" -#include "Point.h" +// Qt headers #include #include diff --git a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h index 8d28d7e238..401bbbe85a 100644 --- a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h +++ b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h @@ -1,12 +1,12 @@ // [WriteFile Name=GetElevationAtPoint, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.pro b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.pro index f94f16c275..a58a41ed43 100644 --- a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.pro +++ b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = GetElevationAtPoint -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.qml b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.qml index beabdbc15c..3f9a1ee20c 100644 --- a/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.qml +++ b/CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.qml @@ -1,12 +1,12 @@ // [WriteFile Name=GetElevationAtPoint, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/GetElevationAtPoint/main.cpp b/CppSamples/Scenes/GetElevationAtPoint/main.cpp index 8f453cfd4c..9686470450 100644 --- a/CppSamples/Scenes/GetElevationAtPoint/main.cpp +++ b/CppSamples/Scenes/GetElevationAtPoint/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "GetElevationAtPoint.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.cpp b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.cpp index a06998ce74..bc95aadead 100644 --- a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.cpp +++ b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=OpenMobileScenePackage, Category=Scenes] // [Legal] // Copyright 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. @@ -18,15 +18,18 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "OpenMobileScenePackage.h" +// ArcGIS Maps SDK headers #include "Error.h" #include "MobileScenePackage.h" #include "Scene.h" #include "SceneQuickView.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h index 0b87ece07b..28b31c8b91 100644 --- a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h +++ b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h @@ -1,12 +1,12 @@ // [WriteFile Name=OpenMobileScenePackage, Category=Scenes] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef OPENMOBILESCENEPACKAGE_H #define OPENMOBILESCENEPACKAGE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Error; @@ -25,8 +28,6 @@ class SceneQuickView; class MobileScenePackage; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class OpenMobileScenePackage : public QObject diff --git a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.pro b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.pro index 1768499a74..f3b5a5d28b 100644 --- a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.pro +++ b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = OpenMobileScenePackage -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.qml b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.qml index 2d5cccb0ac..6864a46623 100644 --- a/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.qml +++ b/CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.qml @@ -1,12 +1,12 @@ // [WriteFile Name=OpenMobileScenePackage, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/OpenMobileScenePackage/main.cpp b/CppSamples/Scenes/OpenMobileScenePackage/main.cpp index 5f290cfa76..00642f832b 100644 --- a/CppSamples/Scenes/OpenMobileScenePackage/main.cpp +++ b/CppSamples/Scenes/OpenMobileScenePackage/main.cpp @@ -1,25 +1,32 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "OpenMobileScenePackage.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/OpenScene/OpenScene.cpp b/CppSamples/Scenes/OpenScene/OpenScene.cpp index 9e8df9c68a..4720bef4d6 100644 --- a/CppSamples/Scenes/OpenScene/OpenScene.cpp +++ b/CppSamples/Scenes/OpenScene/OpenScene.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=OpenScene, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -18,11 +18,13 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "OpenScene.h" +// ArcGIS Maps SDK headers +#include "PortalItem.h" #include "Scene.h" #include "SceneQuickView.h" -#include "PortalItem.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/OpenScene/OpenScene.h b/CppSamples/Scenes/OpenScene/OpenScene.h index 0eba25745a..ca5042dc73 100644 --- a/CppSamples/Scenes/OpenScene/OpenScene.h +++ b/CppSamples/Scenes/OpenScene/OpenScene.h @@ -1,12 +1,12 @@ // [WriteFile Name=OpenScene, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -17,13 +17,14 @@ #ifndef OPENSCENE_H #define OPENSCENE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; } -#include - class OpenScene : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Scenes/OpenScene/OpenScene.pro b/CppSamples/Scenes/OpenScene/OpenScene.pro index 24e47c7b8e..4d493c61c1 100644 --- a/CppSamples/Scenes/OpenScene/OpenScene.pro +++ b/CppSamples/Scenes/OpenScene/OpenScene.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = OpenScene -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/OpenScene/OpenScene.qml b/CppSamples/Scenes/OpenScene/OpenScene.qml index d55875cc71..b496f80e72 100644 --- a/CppSamples/Scenes/OpenScene/OpenScene.qml +++ b/CppSamples/Scenes/OpenScene/OpenScene.qml @@ -1,12 +1,12 @@ // [WriteFile Name=OpenScene, Category=Scenes] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Scenes/OpenScene/main.cpp b/CppSamples/Scenes/OpenScene/main.cpp index e13de3762a..b3a4da7cc9 100644 --- a/CppSamples/Scenes/OpenScene/main.cpp +++ b/CppSamples/Scenes/OpenScene/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "OpenScene.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "OpenScene.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.cpp b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.cpp index 10a7fb1123..b5cc280962 100644 --- a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.cpp +++ b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=OrbitCameraAroundObject, Category=Scenes] // [Legal] // Copyright 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. @@ -18,31 +18,34 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "OrbitCameraAroundObject.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "AttributeListModel.h" +#include "ElevationSourceListModel.h" #include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerSceneProperties.h" +#include "MapTypes.h" #include "ModelSceneSymbol.h" #include "OrbitGeoElementCameraController.h" +#include "Point.h" +#include "RendererSceneProperties.h" #include "Scene.h" #include "SceneQuickView.h" -#include "SimpleRenderer.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" -#include "LayerSceneProperties.h" -#include "RendererSceneProperties.h" -#include "AttributeListModel.h" #include "SceneViewTypes.h" -#include "GraphicsOverlay.h" +#include "SimpleRenderer.h" #include "SpatialReference.h" -#include "Point.h" +#include "Surface.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h index 0dab851523..f0a06dd4cf 100644 --- a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h +++ b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h @@ -1,12 +1,12 @@ // [WriteFile Name=OrbitCameraAroundObject, Category=Scenes] // [Legal] // Copyright 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. @@ -17,6 +17,10 @@ #ifndef ORBITCAMERAAROUNDOBJECT_H #define ORBITCAMERAAROUNDOBJECT_H +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class Graphic; @@ -26,9 +30,6 @@ namespace Esri::ArcGISRuntime class SceneQuickView; } -#include -#include - Q_MOC_INCLUDE("SceneQuickView.h") class OrbitCameraAroundObject : public QObject diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.pro b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.pro index cfe9f9d04d..cd26dea2c9 100644 --- a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.pro +++ b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = OrbitCameraAroundObject -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.qml b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.qml index 844612609e..700b0ad786 100644 --- a/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.qml +++ b/CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.qml @@ -1,12 +1,12 @@ // [WriteFile Name=OrbitCameraAroundObject, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/OrbitCameraAroundObject/main.cpp b/CppSamples/Scenes/OrbitCameraAroundObject/main.cpp index a778edf716..3070acca39 100644 --- a/CppSamples/Scenes/OrbitCameraAroundObject/main.cpp +++ b/CppSamples/Scenes/OrbitCameraAroundObject/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "OrbitCameraAroundObject.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.cpp b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.cpp index de964b9e83..cfb567ae00 100644 --- a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.cpp +++ b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=RealisticLightingAndShadows, Category=Scenes] // [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. @@ -18,26 +18,30 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "RealisticLightingAndShadows.h" -#include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" +// ArcGIS Maps SDK headers #include "ArcGISSceneLayer.h" +#include "ArcGISTiledElevationSource.h" #include "Camera.h" -#include "MapTypes.h" -#include "Surface.h" #include "ElevationSourceListModel.h" #include "LayerListModel.h" +#include "MapTypes.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SceneViewTypes.h" +#include "Surface.h" -#include +// Qt headers #include +#include #include #include #include #include +// STL headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h index 7ffc1d1eec..0c33e3d859 100644 --- a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h +++ b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h @@ -1,12 +1,12 @@ // [WriteFile Name=RealisticLightingAndShadows, Category=Scenes] // [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. @@ -17,14 +17,15 @@ #ifndef REALISTICLIGHTINGANDSHADOWS_H #define REALISTICLIGHTINGANDSHADOWS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class RealisticLightingAndShadows : public QObject diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.pro b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.pro index 159ea66fa8..b669c8e8fd 100644 --- a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.pro +++ b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = RealisticLightingAndShadows -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.qml b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.qml index aeba5506d8..efa967e323 100644 --- a/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.qml +++ b/CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.qml @@ -1,12 +1,12 @@ // [WriteFile Name=RealisticLightingAndShadows, Category=Scenes] // [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. diff --git a/CppSamples/Scenes/RealisticLightingAndShadows/main.cpp b/CppSamples/Scenes/RealisticLightingAndShadows/main.cpp index da2a868673..4b8e8197a0 100644 --- a/CppSamples/Scenes/RealisticLightingAndShadows/main.cpp +++ b/CppSamples/Scenes/RealisticLightingAndShadows/main.cpp @@ -1,24 +1,31 @@ +// [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 "RealisticLightingAndShadows.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.cpp b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.cpp index 3aec633496..b9d11332c1 100644 --- a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.cpp +++ b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SceneLayerSelection, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -18,26 +18,27 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SceneLayerSelection.h" +// ArcGIS Maps SDK headers +#include "ArcGISSceneLayer.h" #include "ArcGISTiledElevationSource.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "Surface.h" #include "Basemap.h" -#include "ArcGISSceneLayer.h" -#include "Point.h" -#include "Camera.h" -#include "SpatialReference.h" -#include "Viewpoint.h" #include "Camera.h" -#include "MapTypes.h" -#include "Surface.h" #include "ElevationSourceListModel.h" -#include "LayerListModel.h" -#include "IdentifyLayerResult.h" #include "Feature.h" +#include "IdentifyLayerResult.h" +#include "LayerListModel.h" +#include "MapTypes.h" +#include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" +#include "SpatialReference.h" +#include "Surface.h" +#include "Viewpoint.h" +// Qt headers #include #include diff --git a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h index 296d3a89ee..f1c86b761b 100644 --- a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h +++ b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h @@ -1,12 +1,12 @@ // [WriteFile Name=SceneLayerSelection, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -17,14 +17,15 @@ #ifndef SCENELAYERSELECTION_H #define SCENELAYERSELECTION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; class ArcGISSceneLayer; } -#include - class SceneLayerSelection : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.pro b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.pro index 23a42c350e..ef01febb89 100644 --- a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.pro +++ b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = SceneLayerSelection -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.qml b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.qml index 5d99973ba3..ffb43fc936 100644 --- a/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.qml +++ b/CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SceneLayerSelection, Category=Scenes] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Scenes/SceneLayerSelection/main.cpp b/CppSamples/Scenes/SceneLayerSelection/main.cpp index 18bb54ec90..84524b0e4f 100644 --- a/CppSamples/Scenes/SceneLayerSelection/main.cpp +++ b/CppSamples/Scenes/SceneLayerSelection/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "SceneLayerSelection.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "SceneLayerSelection.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.cpp b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.cpp index c2300420a4..d5620496cb 100644 --- a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.cpp +++ b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ScenePropertiesExpressions, Category=Scenes] // [Legal] // Copyright 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. @@ -18,29 +18,31 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ScenePropertiesExpressions.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "AttributeListModel.h" #include "Basemap.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "SimpleMarkerSceneSymbol.h" -#include "SimpleRenderer.h" #include "Camera.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Graphic.h" -#include "Surface.h" #include "ElevationSourceListModel.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "LayerSceneProperties.h" +#include "MapTypes.h" +#include "Point.h" #include "RendererSceneProperties.h" -#include "AttributeListModel.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SceneViewTypes.h" -#include "GraphicsOverlay.h" +#include "SimpleMarkerSceneSymbol.h" +#include "SimpleRenderer.h" #include "SpatialReference.h" -#include "Point.h" +#include "Surface.h" +#include "SymbolTypes.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h index 514993189e..d7a1cb3512 100644 --- a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h +++ b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h @@ -1,12 +1,12 @@ // [WriteFile Name=ScenePropertiesExpressions, Category=Scenes] // [Legal] // Copyright 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. @@ -17,6 +17,9 @@ #ifndef SCENEPROPERTIESEXPRESSIONS_H #define SCENEPROPERTIESEXPRESSIONS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Graphic; @@ -25,8 +28,6 @@ class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class ScenePropertiesExpressions : public QObject diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.pro b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.pro index 260972cfff..17ff3bf599 100644 --- a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.pro +++ b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ScenePropertiesExpressions -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.qml b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.qml index 8b87ac3383..736ebd818a 100644 --- a/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.qml +++ b/CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ScenePropertiesExpressions, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/ScenePropertiesExpressions/main.cpp b/CppSamples/Scenes/ScenePropertiesExpressions/main.cpp index deea91fc06..f9bb648319 100644 --- a/CppSamples/Scenes/ScenePropertiesExpressions/main.cpp +++ b/CppSamples/Scenes/ScenePropertiesExpressions/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "ScenePropertiesExpressions.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.cpp b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.cpp index 452c801b56..8461c73910 100644 --- a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.cpp +++ b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SetSurfacePlacementMode, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -18,29 +18,31 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SetSurfacePlacementMode.h" +// ArcGIS Maps SDK headers #include "ArcGISSceneLayer.h" #include "ArcGISTiledElevationSource.h" #include "Camera.h" +#include "ElevationSourceListModel.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerListModel.h" +#include "LayerSceneProperties.h" +#include "MapTypes.h" #include "Point.h" #include "Scene.h" #include "SceneQuickView.h" +#include "SceneViewTypes.h" #include "SimpleMarkerSymbol.h" #include "SpatialReference.h" +#include "Surface.h" +#include "SymbolTypes.h" #include "TextSymbol.h" #include "Viewpoint.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" -#include "LayerSceneProperties.h" -#include "LayerListModel.h" -#include "SceneViewTypes.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h index fa9760a16d..bb2d35ade6 100644 --- a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h +++ b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h @@ -1,12 +1,12 @@ // [WriteFile Name=SetSurfacePlacementMode, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef SETSURFACEPLACEMENTMODE_H #define SETSURFACEPLACEMENTMODE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; class GraphicsOverlay; } -#include - class SetSurfacePlacementMode : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.pro b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.pro index 94bb14ce49..4cbc5dd7a4 100644 --- a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.pro +++ b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.qml b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.qml index e0c8749e0d..eeb3ac0479 100644 --- a/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.qml +++ b/CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SetSurfacePlacementMode, Category=Scenes] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Scenes/SetSurfacePlacementMode/main.cpp b/CppSamples/Scenes/SetSurfacePlacementMode/main.cpp index a7c67b4854..41e8f7d255 100644 --- a/CppSamples/Scenes/SetSurfacePlacementMode/main.cpp +++ b/CppSamples/Scenes/SetSurfacePlacementMode/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "SetSurfacePlacementMode.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "SetSurfacePlacementMode.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/Symbols/Symbols.cpp b/CppSamples/Scenes/Symbols/Symbols.cpp index 262d04cf21..08e7584dc6 100644 --- a/CppSamples/Scenes/Symbols/Symbols.cpp +++ b/CppSamples/Scenes/Symbols/Symbols.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=Symbols, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -18,26 +18,28 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "Symbols.h" -#include "Scene.h" -#include "SceneQuickView.h" -#include "Basemap.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" -#include "SimpleMarkerSceneSymbol.h" +#include "Basemap.h" #include "Camera.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicsOverlay.h" -#include "GraphicListModel.h" -#include "Graphic.h" -#include "Point.h" -#include "Surface.h" #include "ElevationSourceListModel.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "LayerSceneProperties.h" +#include "MapTypes.h" +#include "Point.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "SceneViewTypes.h" +#include "SimpleMarkerSceneSymbol.h" #include "SpatialReference.h" +#include "Surface.h" +#include "SymbolTypes.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/Symbols/Symbols.h b/CppSamples/Scenes/Symbols/Symbols.h index e3a1c2c06b..cbfd08f4be 100644 --- a/CppSamples/Scenes/Symbols/Symbols.h +++ b/CppSamples/Scenes/Symbols/Symbols.h @@ -1,12 +1,12 @@ // [WriteFile Name=Symbols, Category=Scenes] // [Legal] // Copyright 2016 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. @@ -17,14 +17,15 @@ #ifndef SYMBOLS_H #define SYMBOLS_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - class Symbols : public QQuickItem { Q_OBJECT @@ -42,4 +43,3 @@ class Symbols : public QQuickItem }; #endif // SYMBOLS_H - diff --git a/CppSamples/Scenes/Symbols/Symbols.pro b/CppSamples/Scenes/Symbols/Symbols.pro index 9899253424..d3399e5de2 100644 --- a/CppSamples/Scenes/Symbols/Symbols.pro +++ b/CppSamples/Scenes/Symbols/Symbols.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Scenes/Symbols/Symbols.qml b/CppSamples/Scenes/Symbols/Symbols.qml index c5621e816b..f8a2b599e1 100644 --- a/CppSamples/Scenes/Symbols/Symbols.qml +++ b/CppSamples/Scenes/Symbols/Symbols.qml @@ -1,12 +1,12 @@ // [WriteFile Name=Symbols, Category=Scenes] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Scenes/Symbols/main.cpp b/CppSamples/Scenes/Symbols/main.cpp index a5ac1e03ce..211a8899e0 100644 --- a/CppSamples/Scenes/Symbols/main.cpp +++ b/CppSamples/Scenes/Symbols/main.cpp @@ -1,31 +1,38 @@ +// [Legal] // Copyright 2016 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 -#include -#include +// sample headers +#include "Symbols.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Symbols.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.cpp b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.cpp index ce6cbd8d7d..0f57216dad 100644 --- a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.cpp +++ b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SyncMapViewSceneView, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -18,15 +18,18 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SyncMapViewSceneView.h" -#include "Scene.h" -#include "SceneQuickView.h" +// ArcGIS Maps SDK headers #include "Map.h" #include "MapQuickView.h" #include "MapTypes.h" +#include "Scene.h" +#include "SceneQuickView.h" #include "Viewpoint.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h index 1a54cffbdd..92386e73a3 100644 --- a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h +++ b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h @@ -1,12 +1,12 @@ // [WriteFile Name=SyncMapViewSceneView, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -17,6 +17,9 @@ #ifndef SYNCMAPVIEWSCENEVIEW_H #define SYNCMAPVIEWSCENEVIEW_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; @@ -26,8 +29,6 @@ class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("SceneQuickView.h") diff --git a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.pro b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.pro index 5b1da19652..f79baff846 100644 --- a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.pro +++ b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = SyncMapViewSceneView -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.qml b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.qml index 15520a7a66..abf18abdfc 100644 --- a/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.qml +++ b/CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SyncMapViewSceneView, Category=Scenes] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Scenes/SyncMapViewSceneView/main.cpp b/CppSamples/Scenes/SyncMapViewSceneView/main.cpp index d0f214cf16..efc8e89152 100644 --- a/CppSamples/Scenes/SyncMapViewSceneView/main.cpp +++ b/CppSamples/Scenes/SyncMapViewSceneView/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 2018 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 "SyncMapViewSceneView.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.cpp b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.cpp index 542c93f78f..61b4f2953e 100644 --- a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.cpp +++ b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=TerrainExaggeration, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -18,18 +18,21 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "TerrainExaggeration.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" -#include "Scene.h" #include "Camera.h" +#include "ElevationSourceListModel.h" +#include "MapTypes.h" #include "Point.h" +#include "Scene.h" #include "SceneQuickView.h" -#include "MapTypes.h" -#include "Surface.h" -#include "ElevationSourceListModel.h" #include "SpatialReference.h" +#include "Surface.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h index b1532d9981..c90c7b7157 100644 --- a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h +++ b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h @@ -1,12 +1,12 @@ // [WriteFile Name=TerrainExaggeration, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -17,14 +17,15 @@ #ifndef TERRAINEXAGGERATION_H #define TERRAINEXAGGERATION_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class SceneQuickView; class Surface; } -#include - class TerrainExaggeration : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.pro b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.pro index 883a24d9cd..ba962ae6ad 100644 --- a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.pro +++ b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = TerrainExaggeration -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.qml b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.qml index 82adaccfe8..f7d9300284 100644 --- a/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.qml +++ b/CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.qml @@ -1,12 +1,12 @@ // [WriteFile Name=TerrainExaggeration, Category=Scenes] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Scenes/TerrainExaggeration/main.cpp b/CppSamples/Scenes/TerrainExaggeration/main.cpp index 5cd98871b4..c9ac344e64 100644 --- a/CppSamples/Scenes/TerrainExaggeration/main.cpp +++ b/CppSamples/Scenes/TerrainExaggeration/main.cpp @@ -1,30 +1,37 @@ +// [Legal] // Copyright 2018 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 -#include +// sample headers +#include "TerrainExaggeration.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "TerrainExaggeration.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.cpp b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.cpp index 085a34192c..6a86d77785 100644 --- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.cpp +++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ViewContentBeneathTerrainSurface, Category=Scenes] // [Legal] // Copyright 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. @@ -18,13 +18,15 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ViewContentBeneathTerrainSurface.h" +// ArcGIS Maps SDK headers +#include "Error.h" #include "Scene.h" #include "SceneQuickView.h" -#include "Error.h" -#include "Surface.h" #include "SceneViewTypes.h" +#include "Surface.h" using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h index f163a05772..2ec3540712 100644 --- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h +++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h @@ -1,12 +1,12 @@ // [WriteFile Name=ViewContentBeneathTerrainSurface, Category=Scenes] // [Legal] // Copyright 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. @@ -17,14 +17,15 @@ #ifndef VIEWCONTENTBENEATHTERRAINSURFACE_H #define VIEWCONTENTBENEATHTERRAINSURFACE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class ViewContentBeneathTerrainSurface : public QObject diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.pro b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.pro index 33901cbb7b..4db2314430 100644 --- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.pro +++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ViewContentBeneathTerrainSurface -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.qml b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.qml index 3eb44714e2..ec6d7d7cde 100644 --- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.qml +++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ViewContentBeneathTerrainSurface, Category=Scenes] // [Legal] // Copyright 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. diff --git a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/main.cpp b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/main.cpp index 3318be915c..1a1a7b16ac 100644 --- a/CppSamples/Scenes/ViewContentBeneathTerrainSurface/main.cpp +++ b/CppSamples/Scenes/ViewContentBeneathTerrainSurface/main.cpp @@ -1,24 +1,31 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "ViewContentBeneathTerrainSurface.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.cpp b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.cpp index 7e05440611..24077a1fe5 100644 --- a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.cpp +++ b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ViewPointCloudDataOffline, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -18,23 +18,26 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ViewPointCloudDataOffline.h" +// ArcGIS Maps SDK headers #include "ArcGISTiledElevationSource.h" +#include "ElevationSourceListModel.h" +#include "Envelope.h" +#include "Error.h" +#include "LayerListModel.h" +#include "MapTypes.h" +#include "PointCloudLayer.h" #include "Scene.h" #include "SceneQuickView.h" -#include "PointCloudLayer.h" -#include "MapTypes.h" -#include "Error.h" #include "Surface.h" -#include "ElevationSourceListModel.h" -#include "LayerListModel.h" #include "Viewpoint.h" -#include "Envelope.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; @@ -109,5 +112,3 @@ void ViewPointCloudDataOffline::setSceneView(SceneQuickView* sceneView) emit sceneViewChanged(); } - - diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h index 2af180ac94..36dbe9529f 100644 --- a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h +++ b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h @@ -1,12 +1,12 @@ // [WriteFile Name=ViewPointCloudDataOffline, Category=Scenes] // [Legal] // Copyright 2018 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. @@ -17,14 +17,15 @@ #ifndef VIEWPOINTCLOUDDATAOFFLINE_H #define VIEWPOINTCLOUDDATAOFFLINE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Scene; class SceneQuickView; } -#include - Q_MOC_INCLUDE("SceneQuickView.h") class ViewPointCloudDataOffline : public QObject diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.pro b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.pro index 06db86d6a3..23a1cb45af 100644 --- a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.pro +++ b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ViewPointCloudDataOffline -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.qml b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.qml index 33259faf9f..56d276013a 100644 --- a/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.qml +++ b/CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ViewPointCloudDataOffline, Category=Scenes] // [Legal] // Copyright 2018 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. diff --git a/CppSamples/Scenes/ViewPointCloudDataOffline/main.cpp b/CppSamples/Scenes/ViewPointCloudDataOffline/main.cpp index 6fd34e81ce..dc7b3a47ec 100644 --- a/CppSamples/Scenes/ViewPointCloudDataOffline/main.cpp +++ b/CppSamples/Scenes/ViewPointCloudDataOffline/main.cpp @@ -1,25 +1,32 @@ +// [Legal] // Copyright 2018 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 "ViewPointCloudDataOffline.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/Search/FindAddress/FindAddress.cpp b/CppSamples/Search/FindAddress/FindAddress.cpp index 309eba4fdc..13a6a9bb9d 100644 --- a/CppSamples/Search/FindAddress/FindAddress.cpp +++ b/CppSamples/Search/FindAddress/FindAddress.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FindAddress, Category=Search] // [Legal] // Copyright 2016 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. @@ -18,32 +18,37 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FindAddress.h" -#include "Map.h" -#include "MapQuickView.h" +// ArcGIS Maps SDK headers +#include "AttributeListModel.h" #include "Basemap.h" -#include "GraphicsOverlay.h" -#include "PictureMarkerSymbol.h" -#include "SimpleRenderer.h" -#include "LocatorTask.h" +#include "CalloutData.h" +#include "Envelope.h" #include "GeocodeParameters.h" +#include "GeocodeResult.h" #include "Graphic.h" -#include "MapTypes.h" -#include "GraphicsOverlayListModel.h" #include "GraphicListModel.h" -#include "AttributeListModel.h" -#include "GeocodeResult.h" -#include "CalloutData.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "IdentifyGraphicsOverlayResult.h" +#include "LocatorTask.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapTypes.h" +#include "PictureMarkerSymbol.h" #include "Point.h" -#include "Envelope.h" +#include "SimpleRenderer.h" +// Qt headers #include #include -#include #include +// STL headers +#include + using namespace Esri::ArcGISRuntime; FindAddress::FindAddress(QQuickItem* parent) : diff --git a/CppSamples/Search/FindAddress/FindAddress.h b/CppSamples/Search/FindAddress/FindAddress.h index aec33ffaf7..30555cac06 100644 --- a/CppSamples/Search/FindAddress/FindAddress.h +++ b/CppSamples/Search/FindAddress/FindAddress.h @@ -1,12 +1,12 @@ // [WriteFile Name=FindAddress, Category=Search] // [Legal] // Copyright 2016 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. @@ -17,6 +17,12 @@ #ifndef FIND_ADDRESS_H #define FIND_ADDRESS_H +// ArcGIS Maps SDK headers +#include "GeocodeParameters.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class Map; @@ -26,9 +32,6 @@ namespace Esri::ArcGISRuntime class LocatorTask; } -#include "GeocodeParameters.h" -#include - class FindAddress : public QQuickItem { Q_OBJECT @@ -59,4 +62,3 @@ class FindAddress : public QQuickItem }; #endif // FIND_ADDRESS_H - diff --git a/CppSamples/Search/FindAddress/FindAddress.pro b/CppSamples/Search/FindAddress/FindAddress.pro index 3d508dd371..362a76088e 100644 --- a/CppSamples/Search/FindAddress/FindAddress.pro +++ b/CppSamples/Search/FindAddress/FindAddress.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Search/FindAddress/FindAddress.qml b/CppSamples/Search/FindAddress/FindAddress.qml index e0b54125f3..913738e4a8 100644 --- a/CppSamples/Search/FindAddress/FindAddress.qml +++ b/CppSamples/Search/FindAddress/FindAddress.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FindAddress, Category=Search] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Search/FindAddress/main.cpp b/CppSamples/Search/FindAddress/main.cpp index 458be35c56..636dc2fb0f 100644 --- a/CppSamples/Search/FindAddress/main.cpp +++ b/CppSamples/Search/FindAddress/main.cpp @@ -1,32 +1,40 @@ +// [Legal] // Copyright 2015 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 -#include -#include +// sample headers +#include "FindAddress.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Other headers #include "Esri/ArcGISRuntime/Toolkit/register.h" -#include "ArcGISRuntimeEnvironment.h" +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FindAddress.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Search/FindPlace/FindPlace.cpp b/CppSamples/Search/FindPlace/FindPlace.cpp index 8d18d4b449..e015be46ac 100644 --- a/CppSamples/Search/FindPlace/FindPlace.cpp +++ b/CppSamples/Search/FindPlace/FindPlace.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=FindPlace, Category=Search] // [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. @@ -18,38 +18,45 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "FindPlace.h" +// ArcGIS Maps SDK headers +#include "AttributeListModel.h" #include "CalloutData.h" -#include "Map.h" -#include "MapQuickView.h" -#include "GraphicsOverlay.h" -#include "GeocodeResult.h" #include "GeoElement.h" +#include "GeocodeResult.h" #include "GeometryEngine.h" -#include "PictureMarkerSymbol.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "IdentifyGraphicsOverlayResult.h" -#include "Point.h" -#include "SimpleRenderer.h" -#include "LocatorTask.h" +#include "Location.h" #include "LocationDisplay.h" -#include "SuggestListModel.h" +#include "LocatorTask.h" +#include "Map.h" +#include "MapQuickView.h" #include "MapTypes.h" #include "MapViewTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "AttributeListModel.h" +#include "PictureMarkerSymbol.h" +#include "Point.h" +#include "SimpleRenderer.h" +#include "SpatialReference.h" +#include "SuggestListModel.h" #include "SuggestParameters.h" -#include "Location.h" -#include "Graphic.h" #include "Viewpoint.h" -#include "SpatialReference.h" -#include "GeocodeResult.h" +// Qt headers #include #include #include +#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)) || defined(Q_OS_IOS) || defined(Q_OS_MACOS) || defined(Q_OS_ANDROID) +#define PERMISSIONS_PLATFORM +#include +#endif + using namespace Esri::ArcGISRuntime; FindPlace::FindPlace(QQuickItem* parent /* = nullptr */): @@ -94,22 +101,13 @@ void FindPlace::componentComplete() m_mapView->calloutData()->setVisible(false); m_calloutData = m_mapView->calloutData(); - // connect mapview signals connectSignals(); + + initiateLocation(); } void FindPlace::connectSignals() { - connect(m_mapView, &MapQuickView::drawStatusChanged, this, [this](DrawStatus drawStatus) - { - if (drawStatus != DrawStatus::Completed || m_mapView->locationDisplay()->isStarted()) - return; - - // turn on the location display - m_mapView->locationDisplay()->setAutoPanMode(LocationDisplayAutoPanMode::Recenter); - m_mapView->locationDisplay()->start(); - }); - connect(m_mapView, &MapQuickView::mousePressed, this, [this](QMouseEvent& /*event*/) { emit hideSuggestionView(); @@ -141,6 +139,32 @@ void FindPlace::connectSignals() }); } +void FindPlace::initiateLocation() +{ +#ifdef PERMISSIONS_PLATFORM + QLocationPermission locationPermission{}; + locationPermission.setAccuracy(QLocationPermission::Accuracy::Precise); + locationPermission.setAvailability(QLocationPermission::Availability::WhenInUse); + + switch (qApp->checkPermission(locationPermission)) + { + case Qt::PermissionStatus::Undetermined: + qApp->requestPermission(locationPermission, this, &FindPlace::initiateLocation); + return; + case Qt::PermissionStatus::Denied: + emit locationPermissionDenied(); + return; + case Qt::PermissionStatus::Granted: + m_mapView->locationDisplay()->setAutoPanMode(LocationDisplayAutoPanMode::Recenter); + m_mapView->locationDisplay()->start(); + return; + } +#else + m_mapView->locationDisplay()->setAutoPanMode(LocationDisplayAutoPanMode::Recenter); + m_mapView->locationDisplay()->start(); +#endif +} + void FindPlace::addGraphicsOverlay() { // add a graphics overlay to the mapview diff --git a/CppSamples/Search/FindPlace/FindPlace.h b/CppSamples/Search/FindPlace/FindPlace.h index 1602a27a59..9cafa1c662 100644 --- a/CppSamples/Search/FindPlace/FindPlace.h +++ b/CppSamples/Search/FindPlace/FindPlace.h @@ -1,12 +1,12 @@ // [WriteFile Name=FindPlace, Category=Search] // [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. @@ -17,6 +17,15 @@ #ifndef FINDPLACE_H #define FINDPLACE_H +// ArcGIS Maps SDK headers +#include "Envelope.h" +#include "GeocodeParameters.h" +#include "Point.h" + +// Qt headers +#include +#include + namespace Esri::ArcGISRuntime { class CalloutData; @@ -27,13 +36,6 @@ namespace Esri::ArcGISRuntime class GeocodeResult; } -#include "Point.h" -#include "Envelope.h" -#include "GeocodeParameters.h" - -#include -#include - class FindPlace : public QQuickItem { Q_OBJECT @@ -67,6 +69,7 @@ class FindPlace : public QQuickItem void hideCallout(); void showCallout(); void showExtentButton(); + void locationPermissionDenied(); private: void addGraphicsOverlay(); @@ -76,6 +79,7 @@ class FindPlace : public QQuickItem void setPoiTextHasFocus(bool hasFocus); Esri::ArcGISRuntime::GeocodeParameters createParameters(); void onGeocodingCompleted_(const QList& results); + void initiateLocation(); private: Esri::ArcGISRuntime::Map* m_map = nullptr; diff --git a/CppSamples/Search/FindPlace/FindPlace.pro b/CppSamples/Search/FindPlace/FindPlace.pro index fd9349a73c..f223da44d5 100644 --- a/CppSamples/Search/FindPlace/FindPlace.pro +++ b/CppSamples/Search/FindPlace/FindPlace.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = FindPlace -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample @@ -64,7 +64,11 @@ ios { OTHER_FILES += \ $$PWD/Info.plist - QMAKE_INFO_PLIST = $$PWD/Info.plist + QMAKE_INFO_PLIST = $$PWD/ios/Info.plist +} + +macx { + QMAKE_INFO_PLIST = $$PWD/mac/Info.plist } android { diff --git a/CppSamples/Search/FindPlace/FindPlace.qml b/CppSamples/Search/FindPlace/FindPlace.qml index cf483e7b3a..41de14df84 100644 --- a/CppSamples/Search/FindPlace/FindPlace.qml +++ b/CppSamples/Search/FindPlace/FindPlace.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FindPlace, Category=Search] // [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. @@ -19,6 +19,7 @@ import QtQuick.Controls import QtPositioning import Esri.ArcGISRuntime.Toolkit import Esri.Samples +import QtQuick.Dialogs FindPlaceSample { id: findPlaceSample @@ -151,4 +152,25 @@ FindPlaceSample { callout.dismiss(); } } + + Connections { + target: findPlaceSample + function onLocationPermissionDenied() { + permissionDeniedDialog.open() + } + } + + Dialog { + id: permissionDeniedDialog + title: "Location Permission Denied" + modal: true + standardButtons: Dialog.Ok + x: (parent.width - width) / 2 + y: (parent.height - height) / 2 + + Text { + text: "This application requires location permissions." + color: "white" + } + } } diff --git a/CppSamples/Search/FindPlace/SearchBox.qml b/CppSamples/Search/FindPlace/SearchBox.qml index 75beb39266..bed87ab34c 100644 --- a/CppSamples/Search/FindPlace/SearchBox.qml +++ b/CppSamples/Search/FindPlace/SearchBox.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FindPlace, Category=Search] // [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. diff --git a/CppSamples/Search/FindPlace/SearchButton.qml b/CppSamples/Search/FindPlace/SearchButton.qml index d895ff1330..abffa961fd 100644 --- a/CppSamples/Search/FindPlace/SearchButton.qml +++ b/CppSamples/Search/FindPlace/SearchButton.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FindPlace, Category=Search] // [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. diff --git a/CppSamples/Search/FindPlace/SuggestionView.qml b/CppSamples/Search/FindPlace/SuggestionView.qml index c97cb6994c..c890932d9a 100644 --- a/CppSamples/Search/FindPlace/SuggestionView.qml +++ b/CppSamples/Search/FindPlace/SuggestionView.qml @@ -1,12 +1,12 @@ // [WriteFile Name=FindPlace, Category=Search] // [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. diff --git a/CppSamples/Search/FindPlace/ios/Info.plist b/CppSamples/Search/FindPlace/ios/Info.plist new file mode 100644 index 0000000000..15cffaed6e --- /dev/null +++ b/CppSamples/Search/FindPlace/ios/Info.plist @@ -0,0 +1,55 @@ + + + + + CFBundleDisplayName + FindPlace + CFBundleExecutable + FindPlace + CFBundleGetInfoString + ArcGIS + CFBundleIcons~ipad + + CFBundleIdentifier + com.esri.${PRODUCT_NAME:rfc1034identifier} + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + NOTE + This app is cool + UIFileSharingEnabled + FALSE + UIRequiresPersistentWiFi + NO + LSRequiresIPhoneOS + + NSLocationWhenInUseUsageDescription + Location required for application + NSLocationAlwaysAndWhenInUseUsageDescription + Location required for application + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UILaunchStoryboardName + LaunchScreen + + + diff --git a/CppSamples/Search/FindPlace/mac/Info.plist b/CppSamples/Search/FindPlace/mac/Info.plist new file mode 100644 index 0000000000..d3fa3cacd9 --- /dev/null +++ b/CppSamples/Search/FindPlace/mac/Info.plist @@ -0,0 +1,31 @@ + + + + + CFBundleDisplayName + FindPlace + CFBundleExecutable + FindPlace + CFBundleGetInfoString + ArcGIS + CFBundleIdentifier + com.esri.FindPlace + CFBundleName + FindPlace + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + NSLocationUsageDescription + Location required for application + NSLocationWhenInUseUsageDescription + Location required for application + NSLocationAlwaysAndWhenInUseUsageDescription + Location required for application + + + diff --git a/CppSamples/Search/FindPlace/main.cpp b/CppSamples/Search/FindPlace/main.cpp index c49cbe9d37..a948fad94b 100644 --- a/CppSamples/Search/FindPlace/main.cpp +++ b/CppSamples/Search/FindPlace/main.cpp @@ -1,31 +1,39 @@ +// [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. // See the License for the specific language governing permissions and // limitations under the License. +// [Legal] -#include -#include +// sample headers +#include "FindPlace.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Other headers #include "Esri/ArcGISRuntime/Toolkit/register.h" -#include "ArcGISRuntimeEnvironment.h" +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "FindPlace.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Search/OfflineGeocode/OfflineGeocode.cpp b/CppSamples/Search/OfflineGeocode/OfflineGeocode.cpp index e65fc698d1..f91588ad06 100644 --- a/CppSamples/Search/OfflineGeocode/OfflineGeocode.cpp +++ b/CppSamples/Search/OfflineGeocode/OfflineGeocode.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=OfflineGeocode, Category=Search] // [Legal] // Copyright 2016 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. @@ -18,38 +18,43 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "OfflineGeocode.h" -#include "Map.h" -#include "Point.h" -#include "Graphic.h" +// ArcGIS Maps SDK headers +#include "ArcGISTiledLayer.h" +#include "Basemap.h" #include "CalloutData.h" -#include "LocatorTask.h" -#include "MapQuickView.h" +#include "Error.h" +#include "ErrorException.h" +#include "GeocodeParameters.h" #include "GeocodeResult.h" +#include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" -#include "SuggestListModel.h" -#include "ArcGISTiledLayer.h" -#include "GeocodeParameters.h" -#include "PictureMarkerSymbol.h" -#include "IdentifyGraphicsOverlayResult.h" -#include "MapViewTypes.h" -#include "Error.h" #include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" +#include "IdentifyGraphicsOverlayResult.h" #include "LayerListModel.h" -#include "TileCache.h" -#include "Basemap.h" +#include "LocatorTask.h" +#include "Map.h" +#include "MapQuickView.h" +#include "MapViewTypes.h" +#include "PictureMarkerSymbol.h" +#include "Point.h" #include "SpatialReference.h" +#include "SuggestListModel.h" +#include "TileCache.h" #include "Viewpoint.h" -#include "ErrorException.h" +// Qt headers #include #include +#include +#include #include + +// STL headers #include -#include -#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Search/OfflineGeocode/OfflineGeocode.h b/CppSamples/Search/OfflineGeocode/OfflineGeocode.h index 3dcfc392df..fce9b7c9ec 100644 --- a/CppSamples/Search/OfflineGeocode/OfflineGeocode.h +++ b/CppSamples/Search/OfflineGeocode/OfflineGeocode.h @@ -1,12 +1,12 @@ // [WriteFile Name=OfflineGeocode, Category=Search] // [Legal] // Copyright 2016 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. @@ -17,6 +17,16 @@ #ifndef OFFLINEGEOCODE_H #define OFFLINEGEOCODE_H +// ArcGIS Maps SDK headers +#include "Error.h" +#include "GeocodeParameters.h" +#include "Point.h" +#include "ReverseGeocodeParameters.h" +#include "SuggestResult.h" + +// Qt headers +#include + namespace Esri::ArcGISRuntime { class ErrorException; @@ -31,14 +41,6 @@ namespace Esri::ArcGISRuntime class SuggestListModel; } -#include "Point.h" -#include "Error.h" -#include "SuggestResult.h" -#include "GeocodeParameters.h" -#include "ReverseGeocodeParameters.h" - -#include - Q_MOC_INCLUDE("SuggestListModel.h") class OfflineGeocode : public QQuickItem diff --git a/CppSamples/Search/OfflineGeocode/OfflineGeocode.pro b/CppSamples/Search/OfflineGeocode/OfflineGeocode.pro index 4dce6f382f..281c74e07f 100644 --- a/CppSamples/Search/OfflineGeocode/OfflineGeocode.pro +++ b/CppSamples/Search/OfflineGeocode/OfflineGeocode.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Search/OfflineGeocode/OfflineGeocode.qml b/CppSamples/Search/OfflineGeocode/OfflineGeocode.qml index 5b7d24ae11..c6f5419deb 100644 --- a/CppSamples/Search/OfflineGeocode/OfflineGeocode.qml +++ b/CppSamples/Search/OfflineGeocode/OfflineGeocode.qml @@ -1,12 +1,12 @@ // [WriteFile Name=OfflineGeocode, Category=Search] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Search/OfflineGeocode/main.cpp b/CppSamples/Search/OfflineGeocode/main.cpp index b283d1dc48..46e503a212 100644 --- a/CppSamples/Search/OfflineGeocode/main.cpp +++ b/CppSamples/Search/OfflineGeocode/main.cpp @@ -1,31 +1,39 @@ +// [Legal] // Copyright 2015 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 -#include +// sample headers +#include "OfflineGeocode.h" + +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +// Other headers #include "Esri/ArcGISRuntime/Toolkit/register.h" -#include "ArcGISRuntimeEnvironment.h" +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "OfflineGeocode.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.cpp b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.cpp index bfd55fed6a..80ee6d3eb9 100644 --- a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.cpp +++ b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ReverseGeocodeOnline, Category=Search] // [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. @@ -18,28 +18,31 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ReverseGeocodeOnline.h" +// ArcGIS Maps SDK headers +#include "AttributeListModel.h" #include "CalloutData.h" +#include "Envelope.h" +#include "GeocodeResult.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" #include "LocatorTask.h" #include "Map.h" #include "MapQuickView.h" -#include "PictureMarkerSymbol.h" -#include "SimpleRenderer.h" #include "MapTypes.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "AttributeListModel.h" -#include "ReverseGeocodeParameters.h" -#include "GeocodeResult.h" +#include "PictureMarkerSymbol.h" #include "Point.h" +#include "ReverseGeocodeParameters.h" +#include "SimpleRenderer.h" #include "SpatialReference.h" -#include "Envelope.h" -#include +// Qt headers #include +#include #include #include diff --git a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h index af2bf24ec5..49ae6591e8 100644 --- a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h +++ b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h @@ -1,12 +1,12 @@ // [WriteFile Name=ReverseGeocodeOnline, Category=Search] // [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. @@ -17,6 +17,9 @@ #ifndef REVERSEGEOCODEONLINE_H #define REVERSEGEOCODEONLINE_H +// Qt headers +#include + namespace Esri::ArcGISRuntime { class CalloutData; @@ -27,8 +30,6 @@ class Map; class MapQuickView; } -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("CalloutData.h") diff --git a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.pro b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.pro index ca1223f193..b45b9df301 100644 --- a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.pro +++ b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ReverseGeocodeOnline -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) # path of the toolkit relative to the sample diff --git a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.qml b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.qml index fef26c10bc..719b7a0534 100644 --- a/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.qml +++ b/CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ReverseGeocodeOnline, Category=Search] // [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. diff --git a/CppSamples/Search/ReverseGeocodeOnline/main.cpp b/CppSamples/Search/ReverseGeocodeOnline/main.cpp index 999c33ce96..1a5d60bdda 100644 --- a/CppSamples/Search/ReverseGeocodeOnline/main.cpp +++ b/CppSamples/Search/ReverseGeocodeOnline/main.cpp @@ -1,29 +1,37 @@ +// [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 "ReverseGeocodeOnline.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Other headers +#include "Esri/ArcGISRuntime/Toolkit/register.h" + +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "Esri/ArcGISRuntime/Toolkit/register.h" - int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.cpp b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.cpp index b75089bc33..7769261a74 100644 --- a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.cpp +++ b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=SearchDictionarySymbolStyle, Category=Search] // [Legal] // Copyright 2016 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. @@ -18,14 +18,18 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "SearchDictionarySymbolStyle.h" + +// ArcGIS Maps SDK headers #include "DictionarySymbolStyle.h" -#include "SymbolStyleSearchResultListModel.h" #include "SymbolStyleSearchParameters.h" +#include "SymbolStyleSearchResultListModel.h" +// Qt headers #include -#include #include +#include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h index 8a8deb1e81..cd1018a5ef 100644 --- a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h +++ b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h @@ -1,12 +1,12 @@ // [WriteFile Name=SearchDictionarySymbolStyle, Category=Search] // [Legal] // Copyright 2016 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. @@ -17,15 +17,16 @@ #ifndef SEARCHDICTIONARYSYMBOLSTYLE_H #define SEARCHDICTIONARYSYMBOLSTYLE_H +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class DictionarySymbolStyle; } -#include -#include -#include - class SearchDictionarySymbolStyle : public QQuickItem { Q_OBJECT diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.pro b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.pro index b9efa3b38d..3bcfd13e7b 100644 --- a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.pro +++ b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.pro @@ -24,7 +24,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl qml quick -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) TEMPLATE = app diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.qml b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.qml index ca5a07a1af..c04051bdaa 100644 --- a/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.qml +++ b/CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.qml @@ -1,12 +1,12 @@ // [WriteFile Name=SearchDictionarySymbolStyle, Category=Search] // [Legal] // Copyright 2016 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. diff --git a/CppSamples/Search/SearchDictionarySymbolStyle/main.cpp b/CppSamples/Search/SearchDictionarySymbolStyle/main.cpp index b11f7ec0ea..e654cc5673 100644 --- a/CppSamples/Search/SearchDictionarySymbolStyle/main.cpp +++ b/CppSamples/Search/SearchDictionarySymbolStyle/main.cpp @@ -1,29 +1,37 @@ -// Copyright 2016 ESRI +// [Legal] +// Copyright 2016 Esri. // -// All rights reserved under the copyright laws of the United States -// and applicable international laws, treaties, and conventions. -// -// You may freely redistribute and use this sample code, with or -// without modification, provided you include the original copyright -// notice and use restrictions. -// -// See the Sample code usage restrictions document for further information. +// 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 "SearchDictionarySymbolStyle.h" -#include -#include -#include +// ArcGIS Maps SDK headers +#include "ArcGISRuntimeEnvironment.h" + +// Qt headers #include #include +#include #include +#include +#include +// Platform specific headers #ifdef Q_OS_WIN #include #endif -#include "SearchDictionarySymbolStyle.h" -#include "ArcGISRuntimeEnvironment.h" - #define STRINGIZE(x) #x #define QUOTE(x) STRINGIZE(x) diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.cpp b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.cpp index 2a29cf5591..fff2a9e0af 100644 --- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.cpp +++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ConfigureSubnetworkTrace, Category=UtilityNetwork] // [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. @@ -18,9 +18,13 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "ConfigureSubnetworkTrace.h" +// ArcGIS Maps SDK headers #include "CodedValueDomain.h" +#include "Credential.h" +#include "Error.h" #include "UtilityAssetGroup.h" #include "UtilityAssetType.h" #include "UtilityCategory.h" @@ -41,11 +45,12 @@ #include "UtilityTraceParameters.h" #include "UtilityTraceResultListModel.h" #include "UtilityTraversability.h" -#include "Error.h" -#include "Credential.h" +// Qt headers #include #include + +// STL headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h index 709ff21667..7337ca8cac 100644 --- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h +++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h @@ -1,12 +1,12 @@ // [WriteFile Name=ConfigureSubnetworkTrace, Category=UtilityNetwork] // [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. @@ -17,6 +17,15 @@ #ifndef CONFIGURESUBNETWORKTRACE_H #define CONFIGURESUBNETWORKTRACE_H +// ArcGIS Maps SDK headers +#include "UtilityNetworkAttribute.h" +#include "UtilityNetworkAttributeComparison.h" + +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class Credential; @@ -32,13 +41,6 @@ class UtilityTraceConfiguration; class UtilityTraceParameters; } -#include -#include -#include - -#include "UtilityNetworkAttributeComparison.h" -#include "UtilityNetworkAttribute.h" - class ConfigureSubnetworkTrace : public QObject { Q_OBJECT diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.pro b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.pro index 6cdf4aaf7d..401023baf3 100644 --- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.pro +++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ConfigureSubnetworkTrace -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.qml b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.qml index 5e4b511971..56413b9c16 100644 --- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.qml +++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ConfigureSubnetworkTrace, Category=UtilityNetwork] // [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. diff --git a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/main.cpp b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/main.cpp index d4a5fd8123..88d2e3a590 100644 --- a/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/main.cpp +++ b/CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/main.cpp @@ -1,23 +1,30 @@ +// [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 "ConfigureSubnetworkTrace.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.cpp b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.cpp index 72bbb71792..35357f587b 100644 --- a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.cpp +++ b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=CreateLoadReport, Category=UtilityNetwork] // [Legal] // Copyright 2021 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. @@ -18,11 +18,14 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "CreateLoadReport.h" -#include "MapQuickView.h" - +// ArcGIS Maps SDK headers #include "CodedValueDomain.h" +#include "Credential.h" +#include "MapQuickView.h" +#include "MapTypes.h" #include "UtilityAssetGroup.h" #include "UtilityAssetType.h" #include "UtilityCategory.h" @@ -40,16 +43,15 @@ #include "UtilityTerminalConfiguration.h" #include "UtilityTier.h" #include "UtilityTraceConfiguration.h" +#include "UtilityTraceFunction.h" #include "UtilityTraceFunctionListModel.h" #include "UtilityTraceFunctionOutput.h" #include "UtilityTraceOrCondition.h" #include "UtilityTraceParameters.h" #include "UtilityTraceResultListModel.h" #include "UtilityTraversability.h" -#include "Credential.h" -#include "MapTypes.h" -#include "UtilityTraceFunction.h" +// Qt headers #include using namespace Esri::ArcGISRuntime; diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h index 8363134353..db2d9a466d 100644 --- a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h +++ b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h @@ -1,12 +1,12 @@ // [WriteFile Name=CreateLoadReport, Category=UtilityNetwork] // [Legal] // Copyright 2021 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. @@ -17,6 +17,11 @@ #ifndef CREATELOADREPORT_H #define CREATELOADREPORT_H +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class Credential; @@ -32,10 +37,6 @@ class UtilityTraceConfiguration; class UtilityTraceParameters; } -#include -#include -#include - class CreateLoadReport : public QObject { Q_OBJECT diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.pro b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.pro index ae0f95f6dc..1cf6f82761 100644 --- a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.pro +++ b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = CreateLoadReport -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.qml b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.qml index 597d63d953..51fcf2457c 100644 --- a/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.qml +++ b/CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.qml @@ -1,12 +1,12 @@ // [WriteFile Name=CreateLoadReport, Category=UtilityNetwork] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/UtilityNetwork/CreateLoadReport/main.cpp b/CppSamples/UtilityNetwork/CreateLoadReport/main.cpp index 0f6df1c286..85a8801f3d 100644 --- a/CppSamples/UtilityNetwork/CreateLoadReport/main.cpp +++ b/CppSamples/UtilityNetwork/CreateLoadReport/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 2021 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 "CreateLoadReport.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.cpp b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.cpp index f91e889138..5538920110 100644 --- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.cpp +++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayContentOfUtilityNetworkContainer, Category=UtilityNetwork] // [Legal] // Copyright 2021 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. @@ -18,46 +18,47 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayContentOfUtilityNetworkContainer.h" #include "SymbolImageProvider.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" +#include "ArcGISFeatureLayerInfo.h" #include "ArcGISFeatureListModel.h" #include "ArcGISFeatureTable.h" +#include "AuthenticationChallenge.h" #include "AuthenticationManager.h" +#include "Credential.h" +#include "DrawingInfo.h" +#include "Envelope.h" +#include "Error.h" +#include "ErrorException.h" #include "GeometryEngine.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "IdentifyLayerResult.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "Point.h" +#include "Polygon.h" +#include "Renderer.h" +#include "SimpleLineSymbol.h" +#include "SpatialReference.h" #include "SubtypeFeatureLayer.h" +#include "Symbol.h" +#include "SymbolTypes.h" #include "UtilityAssetType.h" #include "UtilityAssociation.h" #include "UtilityElement.h" #include "UtilityNetwork.h" #include "UtilityNetworkTypes.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "LayerListModel.h" -#include "Credential.h" -#include "AuthenticationChallenge.h" -#include "IdentifyLayerResult.h" -#include "ArcGISFeature.h" -#include "ArcGISFeatureTable.h" -#include "ArcGISFeatureLayerInfo.h" -#include "DrawingInfo.h" -#include "GraphicsOverlay.h" -#include "Graphic.h" -#include "ErrorException.h" -#include "Envelope.h" -#include "ArcGISFeatureTable.h" -#include "SpatialReference.h" -#include "Renderer.h" -#include "Point.h" -#include "Polygon.h" -#include "Symbol.h" -#include "SimpleLineSymbol.h" +// Qt headers #include #include #include diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h index 1edff06011..70bc2a7a61 100644 --- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h +++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayContentOfUtilityNetworkContainer, Category=UtilityNetwork] // [Legal] // Copyright 2021 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. @@ -17,6 +17,15 @@ #ifndef DISPLAYCONTENTOFUTILITYNETWORKCONTAINER_H #define DISPLAYCONTENTOFUTILITYNETWORKCONTAINER_H +// ArcGIS Maps SDK headers +#include "Geometry.h" +#include "Viewpoint.h" + +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class ArcGISFeature; @@ -35,13 +44,6 @@ namespace Esri::ArcGISRuntime class SymbolImageProvider; -#include -#include -#include - -#include "Viewpoint.h" -#include "Geometry.h" - Q_MOC_INCLUDE("MapQuickView.h") class DisplayContentOfUtilityNetworkContainer : public QObject diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.pro b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.pro index 517b0c267a..0bdf0d4837 100644 --- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.pro +++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayContentOfUtilityNetworkContainer -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.qml b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.qml index 2f960bfdf6..5ab7ba0313 100644 --- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.qml +++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayContentOfUtilityNetworkContainer, Category=UtilityNetwork] // [Legal] // Copyright 2021 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. diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.cpp b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.cpp index 8c822a0774..cb45ee97e4 100644 --- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.cpp +++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.cpp @@ -1,18 +1,22 @@ +// [Legal] // Copyright 2021 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 "SymbolImageProvider.h" +// Qt headers #include SymbolImageProvider::SymbolImageProvider() : diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.h b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.h index 894d1da7d8..b0db357700 100644 --- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.h +++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/SymbolImageProvider.h @@ -1,4 +1,17 @@ +// [Legal] // Copyright 2021 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] // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/main.cpp b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/main.cpp index 3d8df37f25..e964830dff 100644 --- a/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/main.cpp +++ b/CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/main.cpp @@ -1,25 +1,31 @@ +// [Legal] // Copyright 2021 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 "DisplayContentOfUtilityNetworkContainer.h" +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.cpp b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.cpp index 75a4da306c..3857a8e7be 100644 --- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.cpp +++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayUtilityAssociations, Category=UtilityNetwork] // [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. @@ -18,17 +18,30 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "DisplayUtilityAssociations.h" #include "SymbolImageProvider.h" +// ArcGIS Maps SDK headers #include "ArcGISFeatureTable.h" #include "AttributeListModel.h" +#include "Credential.h" +#include "Envelope.h" +#include "Error.h" #include "FeatureLayer.h" -#include "GraphicsOverlay.h" #include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "Point.h" #include "SimpleLineSymbol.h" +#include "SpatialReference.h" +#include "SymbolTypes.h" +#include "UniqueValue.h" #include "UniqueValueRenderer.h" #include "UtilityAssociation.h" #include "UtilityNetwork.h" @@ -36,23 +49,12 @@ #include "UtilityNetworkListModel.h" #include "UtilityNetworkSource.h" #include "UtilityNetworkTypes.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "AttributeListModel.h" -#include "LayerListModel.h" -#include "Credential.h" -#include "UniqueValue.h" #include "Viewpoint.h" -#include "Envelope.h" -#include "SpatialReference.h" -#include "Point.h" +// Qt headers #include -#include #include +#include #include #include diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h index 9f115c620b..a6ca84c318 100644 --- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h +++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayUtilityAssociations, Category=UtilityNetwork] // [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. @@ -17,7 +17,10 @@ #ifndef DISPLAYUTILITYASSOCIATIONS_H #define DISPLAYUTILITYASSOCIATIONS_H +// ArcGIS Maps SDK headers #include "UtilityNetworkTypes.h" + +// Qt headers #include namespace Esri::ArcGISRuntime @@ -32,8 +35,6 @@ class UtilityNetwork; class SymbolImageProvider; -#include - Q_MOC_INCLUDE("MapQuickView.h") class DisplayUtilityAssociations : public QObject diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.pro b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.pro index 3c6688f469..8090f4860c 100644 --- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.pro +++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = DisplayUtilityAssociations -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.qml b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.qml index 59b0ff2b2e..f08d937c79 100644 --- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.qml +++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.qml @@ -1,12 +1,12 @@ // [WriteFile Name=DisplayUtilityAssociations, Category=UtilityNetwork] // [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. diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.cpp b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.cpp index 4f2713b399..883558464e 100644 --- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.cpp +++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.cpp @@ -1,18 +1,22 @@ +// [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 "SymbolImageProvider.h" +// Qt headers #include SymbolImageProvider::SymbolImageProvider() : diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.h b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.h index 621d4d557f..0c92d0b464 100644 --- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.h +++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/SymbolImageProvider.h @@ -1,4 +1,17 @@ +// [Legal] // Copyright 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. +// [Legal] // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/main.cpp b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/main.cpp index 46fd069241..b7aedc5f51 100644 --- a/CppSamples/UtilityNetwork/DisplayUtilityAssociations/main.cpp +++ b/CppSamples/UtilityNetwork/DisplayUtilityAssociations/main.cpp @@ -1,23 +1,30 @@ +// [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 "DisplayUtilityAssociations.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.cpp b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.cpp index e3d704f4bd..0a3b47fbb2 100644 --- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.cpp +++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=PerformValveIsolationTrace, Category=UtilityNetwork] // [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. @@ -18,21 +18,33 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "PerformValveIsolationTrace.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" #include "ArcGISFeatureListModel.h" +#include "Credential.h" +#include "Error.h" #include "FeatureLayer.h" +#include "GeometryEngine.h" #include "Graphic.h" +#include "GraphicListModel.h" #include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "IdentifyLayerResult.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" #include "Point.h" +#include "Polyline.h" #include "QueryParameters.h" #include "ServiceFeatureTable.h" #include "ServiceGeodatabase.h" #include "SimpleMarkerSymbol.h" #include "SimpleRenderer.h" -#include "UtilityTraceResultListModel.h" +#include "SymbolTypes.h" #include "UtilityAssetGroup.h" #include "UtilityAssetType.h" #include "UtilityCategory.h" @@ -51,21 +63,15 @@ #include "UtilityTraceConfiguration.h" #include "UtilityTraceFilter.h" #include "UtilityTraceParameters.h" -#include "GeometryEngine.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicListModel.h" -#include "LayerListModel.h" -#include "Credential.h" -#include "IdentifyLayerResult.h" -#include "ArcGISFeature.h" -#include "Polyline.h" +#include "UtilityTraceResultListModel.h" +// Qt headers #include #include +// Other headers +#include "TaskCanceler.h" + using namespace Esri::ArcGISRuntime; namespace @@ -100,7 +106,8 @@ PerformValveIsolationTrace::PerformValveIsolationTrace(QObject* parent /* = null m_startingLocationOverlay(new GraphicsOverlay(this)), m_filterBarriersOverlay(new GraphicsOverlay(this)), m_serviceGeodatabase(new ServiceGeodatabase(featureServiceUrl, m_cred, this)), - m_graphicParent(new QObject()) + m_graphicParent(new QObject()), + m_taskCanceler(std::make_unique()) { // disable UI while loading service geodatabase and utility network m_tasksRunning = true; @@ -171,11 +178,11 @@ void PerformValveIsolationTrace::setMapView(MapQuickView* mapView) constexpr double tolerance = 10.0; constexpr bool returnPopups = false; m_clickPoint = m_mapView->screenToLocation(mouseEvent.position().x(), mouseEvent.position().y()); - m_mapView->identifyLayersAsync(mouseEvent.position(), tolerance, returnPopups).then(this, [this](const QList& results) + m_taskCanceler->addTask(m_mapView->identifyLayersAsync(mouseEvent.position(), tolerance, returnPopups).then(this, [this](const QList& results) { // handle the identify results onIdentifyLayersCompleted_(results); - }); + })); }); // apply renderers @@ -249,10 +256,11 @@ void PerformValveIsolationTrace::performTrace() UtilityCategoryComparison* categoryComparison = new UtilityCategoryComparison(selectedCategory, UtilityCategoryComparisonOperator::Exists, this); traceParameters->traceConfiguration()->filter()->setBarriers(categoryComparison); } - m_utilityNetwork->traceAsync(traceParameters).then(this, [this](QList) + + m_taskCanceler->addTask(m_utilityNetwork->traceAsync(traceParameters).then(this, [this](QList) { onTraceCompleted_(); - }); + })); } } @@ -309,8 +317,7 @@ void PerformValveIsolationTrace::onTraceCompleted_() objectIds.append(utilityElement->objectId()); } queryParameters.setObjectIds(objectIds); - auto future = featureLayer->selectFeaturesAsync(queryParameters, SelectionMode::New); - Q_UNUSED(future) + m_taskCanceler->addTask(featureLayer->selectFeaturesAsync(queryParameters, SelectionMode::New)); } } } @@ -385,7 +392,7 @@ void PerformValveIsolationTrace::connectSignals() return; // display starting location - m_utilityNetwork->featuresForElementsAsync(QList {m_startingLocation}).then(this, [this](QList) + m_taskCanceler->addTask(m_utilityNetwork->featuresForElementsAsync(QList {m_startingLocation}).then(this, [this](QList) { // display starting location ArcGISFeatureListModel* elementFeaturesList = m_utilityNetwork->featuresForElementsResult(); @@ -394,10 +401,10 @@ void PerformValveIsolationTrace::connectSignals() m_startingLocationOverlay->graphics()->append(graphic); constexpr double scale = 3000.0; - m_mapView->setViewpointCenterAsync(startingLocationGeometry, scale); + m_taskCanceler->addTask(m_mapView->setViewpointCenterAsync(startingLocationGeometry, scale)); m_tasksRunning = false; emit tasksRunningChanged(); - }); + })); // populate the combo box choices m_categoriesList = categoriesList(); diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h index 4ccc6e0234..a0cb31e5d8 100644 --- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h +++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h @@ -1,12 +1,12 @@ // [WriteFile Name=PerformValveIsolationTrace, Category=UtilityNetwork] // [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. @@ -17,6 +17,13 @@ #ifndef PERFORMVALVEISOLATIONTRACE_H #define PERFORMVALVEISOLATIONTRACE_H +// Qt headers +#include +#include + +// STL headers +#include + namespace Esri::ArcGISRuntime { class ArcGISFeature; @@ -34,13 +41,11 @@ class IdentifyLayerResult; class ServiceGeodatabase; } -#include -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("IdentifyLayerResult.h") +class TaskCanceler; + class PerformValveIsolationTrace : public QObject { Q_OBJECT @@ -96,6 +101,7 @@ class PerformValveIsolationTrace : public QObject QStringList m_terminals; QScopedPointer m_graphicParent; QStringList m_categoriesList; + std::unique_ptr m_taskCanceler; int m_selectedIndex = -1; bool m_isolateFeatures = false; bool m_tasksRunning = false; diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.pro b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.pro index 7231afa838..0452b9a168 100644 --- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.pro +++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.pro @@ -27,13 +27,16 @@ QT += opengl qml quick TEMPLATE = app TARGET = PerformValveIsolationTrace -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- +INCLUDEPATH += $${PWD}/../../../SampleViewer + HEADERS += \ - PerformValveIsolationTrace.h + PerformValveIsolationTrace.h \ + $${PWD}/../../../SampleViewer/TaskCanceler.h SOURCES += \ main.cpp \ diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.qml b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.qml index 56b60dfb3a..732ac48b90 100644 --- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.qml +++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.qml @@ -1,12 +1,12 @@ // [WriteFile Name=PerformValveIsolationTrace, Category=UtilityNetwork] // [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. diff --git a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/main.cpp b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/main.cpp index c602c90371..064257cb82 100644 --- a/CppSamples/UtilityNetwork/PerformValveIsolationTrace/main.cpp +++ b/CppSamples/UtilityNetwork/PerformValveIsolationTrace/main.cpp @@ -1,23 +1,30 @@ +// [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 "PerformValveIsolationTrace.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif @@ -65,7 +72,6 @@ int main(int argc, char *argv[]) engine.addImportPath(ARCGIS_RUNTIME_IMPORT_PATH_2); #endif - // Set the source engine.load(QUrl("qrc:/Samples/UtilityNetwork/PerformValveIsolationTrace/main.qml")); diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.cpp b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.cpp index 52013b8262..95b9426846 100644 --- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.cpp +++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=TraceUtilityNetwork, Category=UtilityNetwork] // [Legal] // Copyright 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. @@ -18,16 +18,38 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers #include "TraceUtilityNetwork.h" +// ArcGIS Maps SDK headers +#include "ArcGISFeature.h" +#include "AttributeListModel.h" +#include "Credential.h" +#include "Envelope.h" +#include "Error.h" #include "ErrorException.h" #include "FeatureLayer.h" +#include "FeatureQueryResult.h" #include "GeometryEngine.h" +#include "Graphic.h" +#include "GraphicListModel.h" +#include "GraphicsOverlay.h" +#include "GraphicsOverlayListModel.h" +#include "IdentifyLayerResult.h" +#include "LayerListModel.h" #include "Map.h" #include "MapQuickView.h" +#include "MapTypes.h" +#include "Polyline.h" +#include "QueryParameters.h" #include "ServiceFeatureTable.h" #include "ServiceGeodatabase.h" +#include "SimpleLineSymbol.h" #include "SimpleMarkerSymbol.h" +#include "SpatialReference.h" +#include "SymbolTypes.h" +#include "UniqueValue.h" +#include "UniqueValueListModel.h" #include "UniqueValueRenderer.h" #include "UtilityAssetGroup.h" #include "UtilityAssetType.h" @@ -43,31 +65,14 @@ #include "UtilityTier.h" #include "UtilityTraceParameters.h" #include "UtilityTraceResultListModel.h" -#include "MapTypes.h" -#include "SymbolTypes.h" -#include "Error.h" -#include "GraphicsOverlayListModel.h" -#include "GraphicsOverlay.h" -#include "GraphicListModel.h" -#include "Graphic.h" -#include "AttributeListModel.h" -#include "LayerListModel.h" -#include "Credential.h" -#include "UniqueValueListModel.h" -#include "IdentifyLayerResult.h" -#include "ArcGISFeature.h" -#include "QueryParameters.h" -#include "UniqueValue.h" -#include "FeatureQueryResult.h" -#include "SimpleLineSymbol.h" -#include "SpatialReference.h" -#include "Envelope.h" #include "Viewpoint.h" -#include "Polyline.h" -#include "ErrorException.h" +// Qt headers #include +// Other headers +#include "TaskCanceler.h" + using namespace Esri::ArcGISRuntime; TraceUtilityNetwork::TraceUtilityNetwork(QObject* parent /* = nullptr */): @@ -79,7 +84,8 @@ TraceUtilityNetwork::TraceUtilityNetwork(QObject* parent /* = nullptr */): m_mediumVoltageSymbol(new SimpleLineSymbol(SimpleLineSymbolStyle::Solid, QColor(Qt::darkCyan), 3, this)), m_lowVoltageSymbol(new SimpleLineSymbol(SimpleLineSymbolStyle::Dash, QColor(Qt::darkCyan), 3, this)), m_serviceGeodatabase(new ServiceGeodatabase(m_serviceUrl, m_cred, this)), - m_graphicParent(new QObject()) + m_graphicParent(new QObject()), + m_taskCanceler(std::make_unique()) { m_map->setInitialViewpoint(Viewpoint(Envelope(-9813547.35557238, 5129980.36635111, -9813185.0602376, 5130215.41254146, SpatialReference::webMercator()))); @@ -184,10 +190,10 @@ void TraceUtilityNetwork::connectSignals() constexpr double tolerance = 10.0; constexpr bool returnPopups = false; m_clickPoint = m_mapView->screenToLocation(mouseEvent.position().x(), mouseEvent.position().y()); - m_mapView->identifyLayersAsync(mouseEvent.position(), tolerance, returnPopups).then(this, [this](const QList& results) + m_taskCanceler->addTask(m_mapView->identifyLayersAsync(mouseEvent.position(), tolerance, returnPopups).then(this, [this](const QList& results) { onIdentifyLayersCompleted_(results); - }); + })); }); } @@ -275,13 +281,13 @@ void TraceUtilityNetwork::trace(int index) m_traceParams->setStartingLocations(m_startingLocations); m_traceParams->setBarriers(m_barriers); // Perform a connected trace on the utility network - m_utilityNetwork->traceAsync(m_traceParams).then(this, [this](QList) + m_taskCanceler->addTask(m_utilityNetwork->traceAsync(m_traceParams).then(this, [this](QList) { onTraceCompleted_(); }).onFailed([this](const ErrorException& exception) { onTaskFailed_(exception); - }); + })); } void TraceUtilityNetwork::reset() @@ -396,7 +402,9 @@ void TraceUtilityNetwork::onIdentifyLayersCompleted_(const QListselectFeaturesAsync(deviceParams, SelectionMode::Add).then(this, [this](FeatureQueryResult*) + m_taskCanceler->addTask(m_deviceLayer->selectFeaturesAsync(deviceParams, SelectionMode::Add).then(this, [this](FeatureQueryResult*) { setBusyIndicator(false); - }); + })); - m_lineLayer->selectFeaturesAsync(lineParams, SelectionMode::Add).then(this, [this](FeatureQueryResult*) + m_taskCanceler->addTask(m_lineLayer->selectFeaturesAsync(lineParams, SelectionMode::Add).then(this, [this](FeatureQueryResult*) { setBusyIndicator(false); - }); + })); } UniqueValue* TraceUtilityNetwork::createUniqueValue(const QString& label, Esri::ArcGISRuntime::Symbol* fillSymbol, int value) diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h index a8a7f817fd..7473ca3e21 100644 --- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h +++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h @@ -1,12 +1,12 @@ // [WriteFile Name=TraceUtilityNetwork, Category=UtilityNetwork] // [Legal] // Copyright 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. @@ -17,8 +17,14 @@ #ifndef TraceUtilityNetwork_H #define TraceUtilityNetwork_H +// ArcGIS Maps SDK headers #include "Point.h" +// Qt headers +#include +#include +#include + namespace Esri::ArcGISRuntime { class ArcGISFeature; @@ -45,13 +51,11 @@ class UtilityTier; class UtilityTraceParameters; } -#include -#include -#include - Q_MOC_INCLUDE("MapQuickView.h") Q_MOC_INCLUDE("IdentifyLayerResult.h") +class TaskCanceler; + class TraceUtilityNetwork : public QObject { Q_OBJECT @@ -133,7 +137,7 @@ class TraceUtilityNetwork : public QObject QList m_barriers; QList m_terminals; QScopedPointer m_graphicParent; - + std::unique_ptr m_taskCanceler; }; #endif // TraceUtilityNetwork_H diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.pro b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.pro index cc5c452cec..fb44f879c7 100644 --- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.pro +++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.pro @@ -27,13 +27,16 @@ QT += opengl qml quick TEMPLATE = app TARGET = TraceUtilityNetwork -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- +INCLUDEPATH += $${PWD}/../../../SampleViewer + HEADERS += \ - TraceUtilityNetwork.h + TraceUtilityNetwork.h \ + $${PWD}/../../../SampleViewer/TaskCanceler.h SOURCES += \ main.cpp \ diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qml b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qml index e3b759373d..959bf8a378 100644 --- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qml +++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qml @@ -1,12 +1,12 @@ // [WriteFile Name=TraceUtilityNetwork, Category=UtilityNetwork] // [Legal] // Copyright 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. diff --git a/CppSamples/UtilityNetwork/TraceUtilityNetwork/main.cpp b/CppSamples/UtilityNetwork/TraceUtilityNetwork/main.cpp index 9a117e4f33..6e9f370402 100644 --- a/CppSamples/UtilityNetwork/TraceUtilityNetwork/main.cpp +++ b/CppSamples/UtilityNetwork/TraceUtilityNetwork/main.cpp @@ -1,23 +1,30 @@ +// [Legal] // Copyright 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. +// [Legal] +// sample headers #include "TraceUtilityNetwork.h" + +// ArcGIS Maps SDK headers #include "ArcGISRuntimeEnvironment.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.cpp b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.cpp index 3ed3fab9a5..bdb3e65605 100644 --- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.cpp +++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.cpp @@ -1,12 +1,12 @@ // [WriteFile Name=ValidateUtilityNetworkTopology, Category=UtilityNetwork] // [Legal] // Copyright 2024 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. @@ -18,6 +18,10 @@ #include "pch.hpp" #endif // PCH_BUILD +// sample headers +#include "ValidateUtilityNetworkTopology.h" + +// ArcGIS Maps SDK headers #include "ArcGISFeature.h" #include "ArcGISFeatureListModel.h" #include "AttributeListModel.h" @@ -26,8 +30,8 @@ #include "Error.h" #include "FeatureEditResult.h" #include "FeatureLayer.h" -#include "FeatureTableEditResult.h" #include "FeatureQueryResult.h" +#include "FeatureTableEditResult.h" #include "Field.h" #include "Graphic.h" #include "GraphicListModel.h" @@ -73,15 +77,14 @@ #include "UtilityTraceParameters.h" #include "UtilityTraceResultListModel.h" #include "UtilityValidationResult.h" -#include "ValidateUtilityNetworkTopology.h" #include "Viewpoint.h" -#include +// Qt headers #include +#include using namespace Esri::ArcGISRuntime; - ValidateUtilityNetworkTopology::ValidateUtilityNetworkTopology(QObject* parent /* = nullptr */) : QObject(parent) { diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h index 50bf9ba40d..808dc6da41 100644 --- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h +++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h @@ -1,12 +1,12 @@ // [WriteFile Name=ValidateUtilityNetworkTopology, Category=UtilityNetwork] // [Legal] // Copyright 2024 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. @@ -17,9 +17,13 @@ #ifndef VALIDATEUTILITYNETWORKTOPOLOGY_H #define VALIDATEUTILITYNETWORKTOPOLOGY_H +// ArcGIS Maps SDK headers #include "CodedValueDomain.h" #include "IdentifyLayerResult.h" +// Qt headers +#include + namespace Esri::ArcGISRuntime { class ArcGISFeature; class FeatureLayer; @@ -35,8 +39,6 @@ namespace Esri::ArcGISRuntime { class UtilityTraceParameters; } -#include - Q_MOC_INCLUDE("MapQuickView.h"); class ValidateUtilityNetworkTopology : public QObject diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.pro b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.pro index f37df3e928..51ae289752 100644 --- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.pro +++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.pro @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = ValidateUtilityNetworkTopology -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qml b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qml index 6a7fe9afd3..84239b3c55 100644 --- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qml +++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qml @@ -1,12 +1,12 @@ // [WriteFile Name=ValidateUtilityNetworkTopology, Category=UtilityNetwork] // [Legal] // Copyright 2024 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. diff --git a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/main.cpp b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/main.cpp index c8dc675e8c..6ed71a10d0 100644 --- a/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/main.cpp +++ b/CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/main.cpp @@ -1,22 +1,27 @@ +// [Legal] // Copyright 2024 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 "ValidateUtilityNetworkTopology.h" +// Qt headers #include #include #include +// Platform specific headers #ifdef Q_OS_WIN #include #endif diff --git a/CppWidgetsSamples/DisplayInformation/BuildLegend/BuildLegend.pro b/CppWidgetsSamples/DisplayInformation/BuildLegend/BuildLegend.pro index 76bd3de6e1..6272bb3159 100644 --- a/CppWidgetsSamples/DisplayInformation/BuildLegend/BuildLegend.pro +++ b/CppWidgetsSamples/DisplayInformation/BuildLegend/BuildLegend.pro @@ -27,7 +27,7 @@ QT += opengl widgets TEMPLATE = app TARGET = BuildLegend -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/DisplayInformation/GORenderers/GORenderers.pro b/CppWidgetsSamples/DisplayInformation/GORenderers/GORenderers.pro index 8da83aa70b..81a5585e5c 100644 --- a/CppWidgetsSamples/DisplayInformation/GORenderers/GORenderers.pro +++ b/CppWidgetsSamples/DisplayInformation/GORenderers/GORenderers.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/DisplayInformation/GOSymbols/GOSymbols.pro b/CppWidgetsSamples/DisplayInformation/GOSymbols/GOSymbols.pro index a5bd09bd53..698dd6c43c 100644 --- a/CppWidgetsSamples/DisplayInformation/GOSymbols/GOSymbols.pro +++ b/CppWidgetsSamples/DisplayInformation/GOSymbols/GOSymbols.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro b/CppWidgetsSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro index bddcb4f85a..6b457da5a1 100644 --- a/CppWidgetsSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro +++ b/CppWidgetsSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/ChangeBasemap/ChangeBasemap.pro b/CppWidgetsSamples/Maps/ChangeBasemap/ChangeBasemap.pro index c03b05428f..994a90ebdf 100644 --- a/CppWidgetsSamples/Maps/ChangeBasemap/ChangeBasemap.pro +++ b/CppWidgetsSamples/Maps/ChangeBasemap/ChangeBasemap.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro b/CppWidgetsSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro index 26e479a908..325283993d 100644 --- a/CppWidgetsSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro +++ b/CppWidgetsSamples/Maps/ChangeViewpoint/ChangeViewpoint.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/DisplayMap/DisplayMap.pro b/CppWidgetsSamples/Maps/DisplayMap/DisplayMap.pro index ad16768c43..5f6eba8dc9 100644 --- a/CppWidgetsSamples/Maps/DisplayMap/DisplayMap.pro +++ b/CppWidgetsSamples/Maps/DisplayMap/DisplayMap.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/ManageBookmarks/ManageBookmarks.pro b/CppWidgetsSamples/Maps/ManageBookmarks/ManageBookmarks.pro index 8de7328e95..c43b5e6f25 100644 --- a/CppWidgetsSamples/Maps/ManageBookmarks/ManageBookmarks.pro +++ b/CppWidgetsSamples/Maps/ManageBookmarks/ManageBookmarks.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/MapLoaded/MapLoaded.pro b/CppWidgetsSamples/Maps/MapLoaded/MapLoaded.pro index bf109fff1e..2edbecfc48 100644 --- a/CppWidgetsSamples/Maps/MapLoaded/MapLoaded.pro +++ b/CppWidgetsSamples/Maps/MapLoaded/MapLoaded.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/MapRotation/MapRotation.pro b/CppWidgetsSamples/Maps/MapRotation/MapRotation.pro index 80e9297729..57ab9a2e77 100644 --- a/CppWidgetsSamples/Maps/MapRotation/MapRotation.pro +++ b/CppWidgetsSamples/Maps/MapRotation/MapRotation.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/OpenExistingMap/OpenExistingMap.pro b/CppWidgetsSamples/Maps/OpenExistingMap/OpenExistingMap.pro index dcca7b1cf6..b33d583d1d 100644 --- a/CppWidgetsSamples/Maps/OpenExistingMap/OpenExistingMap.pro +++ b/CppWidgetsSamples/Maps/OpenExistingMap/OpenExistingMap.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro b/CppWidgetsSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro index 5dde41ac5c..c92447cc7b 100644 --- a/CppWidgetsSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro +++ b/CppWidgetsSamples/Maps/SetInitialMapArea/SetInitialMapArea.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro b/CppWidgetsSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro index d78a1d91fc..218f2eff4b 100644 --- a/CppWidgetsSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro +++ b/CppWidgetsSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro b/CppWidgetsSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro index c0f4360fa8..70a5abf82c 100644 --- a/CppWidgetsSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro +++ b/CppWidgetsSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/CppWidgetsSamples/Scenes/BasicSceneView/BasicSceneView.pro b/CppWidgetsSamples/Scenes/BasicSceneView/BasicSceneView.pro index 72f05319be..6595b7e052 100644 --- a/CppWidgetsSamples/Scenes/BasicSceneView/BasicSceneView.pro +++ b/CppWidgetsSamples/Scenes/BasicSceneView/BasicSceneView.pro @@ -22,7 +22,7 @@ CONFIG += c++17 # additional modules are pulled in via arcgisruntime.pri QT += opengl widgets -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \ diff --git a/SampleViewer/SampleViewer.pro b/SampleViewer/SampleViewer.pro index 4e6713242a..fb8079d8a7 100644 --- a/SampleViewer/SampleViewer.pro +++ b/SampleViewer/SampleViewer.pro @@ -20,12 +20,13 @@ TEMPLATE = app QT += core gui xml network qml quick positioning sensors multimedia QT += widgets quickcontrols2 opengl webview core5compat websockets texttospeech +android|ios: QT += bluetooth TARGET = ArcGISQt_Samples DEFINES += Qt_Version=\"$$QT_VERSION\" SAMPLEPATHCPP = $$PWD/../CppSamples COMMONVIEWER = $$PWD PCH_HEADER = $$COMMONVIEWER/pch.hpp -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 DEFINES += ArcGIS_Runtime_Version=$$ARCGIS_RUNTIME_VERSION # This block determines whether to build against the installed SDK or the local dev build area @@ -149,8 +150,8 @@ android { HEADERS += \ $$PCH_HEADER \ - $$COMMONVIEWER/SyntaxHighlighter/syntax_highlighter.h \ - $$COMMONVIEWER/SyntaxHighlighter/QMLHighlighter.h \ + $$COMMONVIEWER/SyntaxHighlighter/SyntaxHighlighter.h \ + $$COMMONVIEWER/SyntaxHighlighter/QmlHighlighter.h \ $$COMMONVIEWER/CategoryListModel.h \ $$COMMONVIEWER/DataItem.h \ $$COMMONVIEWER/DataItemListModel.h \ @@ -164,11 +165,12 @@ HEADERS += \ $$COMMONVIEWER/SearchFilterSimpleKeywordCriteria.h \ $$COMMONVIEWER/SourceCode.h \ $$COMMONVIEWER/SourceCodeListModel.h \ - $$COMMONVIEWER/ZipHelper.h + $$COMMONVIEWER/ZipHelper.h \ + $$COMMONVIEWER/TaskCanceler.h SOURCES += \ - $$COMMONVIEWER/SyntaxHighlighter/syntax_highlighter.cpp \ - $$COMMONVIEWER/SyntaxHighlighter/QMLHighlighter.cpp \ + $$COMMONVIEWER/SyntaxHighlighter/SyntaxHighlighter.cpp \ + $$COMMONVIEWER/SyntaxHighlighter/QmlHighlighter.cpp \ $$COMMONVIEWER/CategoryListModel.cpp \ $$COMMONVIEWER/DataItem.cpp \ $$COMMONVIEWER/DataItemListModel.cpp \ diff --git a/SampleViewer/SyntaxHighlighter/QMLHighlighter.cpp b/SampleViewer/SyntaxHighlighter/QmlHighlighter.cpp similarity index 69% rename from SampleViewer/SyntaxHighlighter/QMLHighlighter.cpp rename to SampleViewer/SyntaxHighlighter/QmlHighlighter.cpp index d542daf36f..d76204ea79 100644 --- a/SampleViewer/SyntaxHighlighter/QMLHighlighter.cpp +++ b/SampleViewer/SyntaxHighlighter/QmlHighlighter.cpp @@ -16,11 +16,11 @@ #include "pch.hpp" #include -#include +#include -#include "QMLHighlighter.h" +#include "QmlHighlighter.h" -QMLHighlighter::QMLHighlighter(QTextDocument* parent) : +QmlHighlighter::QmlHighlighter(QTextDocument* parent) : QSyntaxHighlighter(parent) { HighlightingRule rule; @@ -35,43 +35,43 @@ QMLHighlighter::QMLHighlighter(QTextDocument* parent) : << "\\bendif\\b" << "\\bQ_DECL_OVERRIDE\\b"; foreach (const QString& pattern, keywordPatterns) { - rule.pattern = QRegExp(pattern); + rule.pattern = QRegularExpression(pattern); rule.format = m_keywordFormat; m_highlightingRules.append(rule); } m_classFormat.setForeground(Qt::darkMagenta); - rule.pattern = QRegExp("\\b[A-Z][A-Za-z]+\\b"); + rule.pattern = QRegularExpression(QStringLiteral("\\b[A-Z][A-Za-z]+\\b")); rule.format = m_classFormat; m_highlightingRules.append(rule); m_classFormat_2.setForeground(Qt::darkMagenta); - rule.pattern = QRegExp("\\bQ_PROPERTY\\b"); + rule.pattern = QRegularExpression(QStringLiteral("\\bQ_PROPERTY\\b")); rule.format = m_classFormat_2; m_highlightingRules.append(rule); m_classFormat_3.setForeground(Qt::darkMagenta); - rule.pattern = QRegExp("\\bQ_INVOKABLE\\b"); + rule.pattern = QRegularExpression(QStringLiteral("\\bQ_INVOKABLE\\b")); rule.format = m_classFormat_3; m_highlightingRules.append(rule); m_memberVarName_1.setForeground(Qt::darkRed); - rule.pattern = QRegExp("\\b[a-z][A-Za-z]+(?=:)\\b"); + rule.pattern = QRegularExpression(QStringLiteral("\\b[a-z][A-Za-z]+(?=:)\\b")); rule.format = m_memberVarName_1; m_highlightingRules.append(rule); m_memberVarName_2.setForeground(Qt::darkRed); - rule.pattern = QRegExp("\\b[a-z]+(?=:)\\b"); + rule.pattern = QRegularExpression(QStringLiteral("\\b[a-z]+(?=:)\\b")); rule.format = m_memberVarName_2; m_highlightingRules.append(rule); m_memberVarName_3.setForeground(Qt::darkRed); - rule.pattern = QRegExp("\\banchors.\\b"); + rule.pattern = QRegularExpression(QStringLiteral("\\banchors.\\b")); rule.format = m_memberVarName_3; m_highlightingRules.append(rule); m_memberVarName_4.setForeground(Qt::darkRed); - rule.pattern = QRegExp("\\banchors\\b"); + rule.pattern = QRegularExpression(QStringLiteral("\\banchors\\b")); rule.format = m_memberVarName_4; m_highlightingRules.append(rule); @@ -91,49 +91,50 @@ QMLHighlighter::QMLHighlighter(QTextDocument* parent) : foreach (const QString& pattern, keywordPatternsOther) { - rule.pattern = QRegExp(pattern); + rule.pattern = QRegularExpression(pattern); rule.format = m_keywordOtherFormat; m_highlightingRules.append(rule); } m_singleLineCommentFormat.setForeground(Qt::darkGreen); - rule.pattern = QRegExp("^(?!\"([^\"']*)\")\\s*//[^\n]*"); + rule.pattern = QRegularExpression(QStringLiteral("^(?!\"([^\"']*)\")\\s*//[^\n]*")); rule.format = m_singleLineCommentFormat; m_highlightingRules.append(rule); m_multiLineCommentFormat.setForeground(Qt::darkGreen); m_quotationFormat.setForeground(Qt::darkGreen); - rule.pattern = QRegExp("(\"[^\"]+\"|'[^\']+')"); + rule.pattern = QRegularExpression(QStringLiteral("(\"[^\"]+\"|'[^\']+')")); rule.format = m_quotationFormat; m_highlightingRules.append(rule); - m_commentStartExpression = QRegExp("/\\*"); - m_commentEndExpression = QRegExp("\\*/"); + m_commentStartExpression = QRegularExpression(QStringLiteral("/\\*")); + m_commentEndExpression = QRegularExpression(QStringLiteral("\\*/")); } -void QMLHighlighter::highlightBlock(const QString& text) +void QmlHighlighter::highlightBlock(const QString& text) { foreach (const HighlightingRule& rule, m_highlightingRules) { - QRegExp expression(rule.pattern); - int index = expression.indexIn(text); - while (index >= 0) + QRegularExpression expression(rule.pattern); + QRegularExpressionMatchIterator matchIterator = expression.globalMatch(text); + while (matchIterator.hasNext()) { - int length = expression.matchedLength(); + QRegularExpressionMatch match = matchIterator.next(); + int index = match.capturedStart(); + int length = match.capturedLength(); setFormat(index, length, rule.format); - index = expression.indexIn(text, index + length); } } setCurrentBlockState(0); int startIndex = 0; if (previousBlockState() != 1) - startIndex = m_commentStartExpression.indexIn(text); + startIndex = m_commentStartExpression.match(text).capturedStart(); while (startIndex >= 0) { - int endIndex = m_commentEndExpression.indexIn(text, startIndex); + int endIndex = m_commentEndExpression.match(text, startIndex).capturedStart(); int commentLength; if (endIndex == -1) { @@ -142,10 +143,10 @@ void QMLHighlighter::highlightBlock(const QString& text) } else { - commentLength = endIndex - startIndex + m_commentEndExpression.matchedLength(); + commentLength = endIndex - startIndex + m_commentEndExpression.match(text, startIndex).capturedLength(); } setFormat(startIndex, commentLength, m_multiLineCommentFormat); - startIndex = m_commentStartExpression.indexIn(text, startIndex + commentLength); + startIndex = m_commentStartExpression.match(text, startIndex + commentLength).capturedStart(); } } diff --git a/SampleViewer/SyntaxHighlighter/QMLHighlighter.h b/SampleViewer/SyntaxHighlighter/QmlHighlighter.h similarity index 84% rename from SampleViewer/SyntaxHighlighter/QMLHighlighter.h rename to SampleViewer/SyntaxHighlighter/QmlHighlighter.h index 16cf3680b1..1174ce4a09 100644 --- a/SampleViewer/SyntaxHighlighter/QMLHighlighter.h +++ b/SampleViewer/SyntaxHighlighter/QmlHighlighter.h @@ -20,12 +20,12 @@ #include #include #include -#include +#include -class QMLHighlighter : public QSyntaxHighlighter { +class QmlHighlighter : public QSyntaxHighlighter { public: - explicit QMLHighlighter(QTextDocument* parent = nullptr); + explicit QmlHighlighter(QTextDocument* parent = nullptr); protected: void highlightBlock(const QString& text); @@ -33,14 +33,14 @@ class QMLHighlighter : public QSyntaxHighlighter { private: struct HighlightingRule { - QRegExp pattern; + QRegularExpression pattern; QTextCharFormat format; }; QList m_highlightingRules; - QRegExp m_commentStartExpression; - QRegExp m_commentEndExpression; + QRegularExpression m_commentStartExpression; + QRegularExpression m_commentEndExpression; QTextCharFormat m_keywordFormat; QTextCharFormat m_keywordOtherFormat; diff --git a/SampleViewer/SyntaxHighlighter/syntax_highlighter.cpp b/SampleViewer/SyntaxHighlighter/SyntaxHighlighter.cpp similarity index 89% rename from SampleViewer/SyntaxHighlighter/syntax_highlighter.cpp rename to SampleViewer/SyntaxHighlighter/SyntaxHighlighter.cpp index 0ea9537398..753d43af77 100644 --- a/SampleViewer/SyntaxHighlighter/syntax_highlighter.cpp +++ b/SampleViewer/SyntaxHighlighter/SyntaxHighlighter.cpp @@ -18,9 +18,9 @@ #include #include -#include "QMLHighlighter.h" +#include "QmlHighlighter.h" -#include "syntax_highlighter.h" +#include "SyntaxHighlighter.h" SyntaxHighlighter::SyntaxHighlighter(QObject* parent) : QObject(parent) @@ -30,6 +30,6 @@ SyntaxHighlighter::SyntaxHighlighter(QObject* parent) : void SyntaxHighlighter::setHighlighter(QObject* textArea) { QQuickTextDocument* quickTextDocument = qvariant_cast(textArea->property("textDocument")); QTextDocument* document = quickTextDocument->textDocument(); - QMLHighlighter* highlighter = new QMLHighlighter(document); + QmlHighlighter* highlighter = new QmlHighlighter(document); highlighter->rehighlight(); } diff --git a/SampleViewer/SyntaxHighlighter/syntax_highlighter.h b/SampleViewer/SyntaxHighlighter/SyntaxHighlighter.h similarity index 100% rename from SampleViewer/SyntaxHighlighter/syntax_highlighter.h rename to SampleViewer/SyntaxHighlighter/SyntaxHighlighter.h diff --git a/SampleViewer/TaskCanceler.h b/SampleViewer/TaskCanceler.h new file mode 100644 index 0000000000..1d9cb12cf2 --- /dev/null +++ b/SampleViewer/TaskCanceler.h @@ -0,0 +1,74 @@ +// [Legal] +// Copyright 2024 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] + +#ifndef TaskCanceler_H +#define TaskCanceler_H + +// Qt headers +#include + +#include +#include +#include + +// This class is a helper to ensure any QFuture-based async tasks are +// canceled upon destruction. This is useful to ensure QFuture +// continuations aren't being executed at the same time as samples are being +// destructed + +class TaskCanceler +{ +public: + TaskCanceler() = default; + ~TaskCanceler() + { + cancelAllTasks_(); + } + + template + void addTask(const QFuture& future) + { + auto watcher = std::make_shared>(); + + QObject::connect(watcher.get(), &QFutureWatcher::finished, &m_connectionContext, [this, watcher]() + { + std::lock_guard lock(m_mutex); + m_watchers.erase(watcher); + }); + watcher->setFuture(future); + + std::lock_guard lock(m_mutex); + m_watchers.insert(watcher); + } + +private: + void cancelAllTasks_() + { + std::lock_guard lock(m_mutex); + for (auto& watcher : m_watchers) + { + if (watcher->isRunning()) + { + watcher->cancel(); + } + } + } + + std::unordered_set> m_watchers; + std::mutex m_mutex; + QObject m_connectionContext; +}; + +#endif // TaskCanceler_H diff --git a/SampleViewer/mainSample.cpp b/SampleViewer/mainSample.cpp index 0b19979d29..12d33131d3 100644 --- a/SampleViewer/mainSample.cpp +++ b/SampleViewer/mainSample.cpp @@ -13,7 +13,7 @@ // limitations under the License. // [Legal] -#include "pch.hpp" +#include "pch.hpp" // IWYU pragma: keep // Qt headers #include @@ -30,8 +30,9 @@ # include #endif // QT_WEBVIEW_WEBENGINE_BACKEND +#include "ArcGISQt_global.h" // IWYU pragma: keep - for LOCALSERVER_SUPPORTED + #include "SampleManager.h" -#include "ArcGISRuntimeEnvironment.h" #include "CategoryListModel.h" #include "DataItem.h" @@ -44,253 +45,245 @@ #include "SearchFilterCriteria.h" #include "SourceCode.h" #include "SourceCodeListModel.h" -#include "SyntaxHighlighter/syntax_highlighter.h" -#include "DrawOrderLayerListModel.h" +#include "SyntaxHighlighter/SyntaxHighlighter.h" +#include "../CppSamples/Layers/ManageOperationalLayers/DrawOrderLayerListModel.h" #ifdef ESRI_BUILD #include "buildnum.h" #endif // All Samples -#include "Add3DTilesLayer.h" -#include "AddAPointSceneLayer.h" -#include "AddCustomDynamicEntityDataSource.h" -#include "AddDynamicEntityLayer.h" -#include "AddEncExchangeSet.h" -#include "AddFeaturesFeatureService.h" -#include "AddGraphicsWithRenderer.h" -#include "AddIntegratedMeshLayer.h" -#include "AddItemsToPortal.h" -#include "AnalyzeHotspots.h" -#include "AnalyzeViewshed.h" -#include "Animate3DSymbols.h" -#include "AnimateImagesWithImageOverlay.h" -#include "ApplyMosaicRuleToRasters.h" -#include "ApplyScheduledMapUpdates.h" -#include "ApplyUniqueValuesWithAlternateSymbols.h" -#include "ArcGISMapImageLayerUrl.h" -#include "ArcGISQt_global.h" // for LOCALSERVER_SUPPORTED -#include "ArcGISTiledLayerUrl.h" -#include "BasicSceneView.h" -#include "BlendRasterLayer.h" -#include "BookmarkListModel.h" -#include "BrowseBuildingFloors.h" -#include "BrowseOGCAPIFeatureService.h" -#include "BrowseWfsLayers.h" -#include "Buffer.h" -#include "BuildLegend.h" -#include "ChangeAtmosphereEffect.h" -#include "ChangeBasemap.h" -#include "ChangeSublayerRenderer.h" -#include "ChangeSublayerVisibility.h" -#include "ChangeViewpoint.h" -#include "ChooseCameraController.h" -#include "ClipGeometry.h" -#include "ClosestFacility.h" -#include "ConfigureBasemapStyleLanguage.h" -#include "ConfigureClusters.h" -#include "ConfigureSubnetworkTrace.h" -#include "ContingentValues.h" -#include "ControlAnnotationSublayerVisibility.h" -#include "ControlTimeExtentTimeSlider.h" -#include "ConvexHull.h" -#include "CreateAndSaveKmlFile.h" -#include "CreateAndSaveMap.h" -#include "CreateAndEditGeometries.h" -#include "CreateDynamicBasemapGallery.h" -#include "CreateGeometries.h" -#include "CreateLoadReport.h" -#include "CreateMobileGeodatabase.h" -#include "CreateSymbolStylesFromWebStyles.h" -#include "CreateTerrainSurfaceFromLocalRaster.h" -#include "CreateTerrainSurfaceFromLocalTilePackage.h" -#include "Credential.h" -#include "CustomDictionaryStyle.h" -#include "CutGeometry.h" -#include "DeleteFeaturesFeatureService.h" -#include "DensifyAndGeneralize.h" -#include "Display3DLabelsInScene.h" -#include "DisplayAnnotation.h" -#include "DisplayContentOfUtilityNetworkContainer.h" -#include "DisplayDimensions.h" -#include "DisplayDeviceLocation.h" -#include "DisplayDeviceLocationWithNmeaDataSources.h" -#include "DisplayDrawingStatus.h" -#include "DisplayFeatureLayers.h" -#include "DisplayGrid.h" -#include "DisplayKml.h" -#include "DisplayKmlNetworkLinks.h" -#include "DisplayLayerViewDrawState.h" -#include "DisplayMap.h" -#include "DisplayOgcApiFeatureCollection.h" -#include "DisplayOverviewMap.h" -#include "DisplayClusters.h" -#include "DisplayRouteLayer.h" -#include "DisplaySceneLayer.h" -#include "DisplaySubtypeFeatureLayer.h" -#include "DisplayUtilityAssociations.h" -#include "DisplayWfsLayer.h" -#include "DistanceCompositeSymbol.h" -#include "DistanceMeasurementAnalysis.h" -#include "DownloadPreplannedMap.h" -#include "EditAndSyncFeatures.h" -#include "EditFeatureAttachments.h" -#include "EditFeaturesWithFeatureLinkedAnnotation.h" -#include "EditKmlGroundOverlay.h" -#include "EditWithBranchVersioning.h" -#include "ExportTiles.h" -#include "ExportVectorTiles.h" -#include "ExtrudeGraphics.h" -#include "Feature_Collection_Layer.h" -#include "FeatureCollectionLayerFromPortal.h" -#include "FeatureCollectionLayerQuery.h" -#include "FeatureLayerChangeRenderer.h" -#include "FeatureLayerDictionaryRenderer.h" -#include "FeatureLayerExtrusion.h" -#include "FilterFeaturesInScene.h" -#include "FeatureLayerQuery.h" -#include "FeatureLayerRenderingModeMap.h" -#include "FeatureLayerRenderingModeScene.h" -#include "FeatureLayerSelection.h" -#include "FilterByDefinitionExpressionOrDisplayFilter.h" -#include "FindAddress.h" -#include "FindClosestFacilityToMultipleIncidentsService.h" -#include "FindPlace.h" -#include "FindRoute.h" -#include "FindServiceAreasForMultipleFacilities.h" -#include "FormatCoordinates.h" -#include "GenerateGeodatabaseReplicaFromFeatureService.h" -#include "GenerateOfflineMap_Overrides.h" -#include "GenerateOfflineMap.h" -#include "GenerateOfflineMapLocalBasemap.h" -#include "GeodesicOperations.h" -#include "Geotriggers.h" -#include "GetElevationAtPoint.h" -#include "GODictionaryRenderer_3D.h" -#include "GODictionaryRenderer.h" -#include "GOSymbols.h" -#include "GroupLayers.h" -#include "Hillshade_Renderer.h" -#include "HonorMobileMapPackageExpiration.h" -#include "IdentifyGraphics.h" -#include "IdentifyKmlFeatures.h" -#include "IdentifyLayers.h" -#include "IdentifyRasterCell.h" -#include "IntegratedWindowsAuthentication.h" -#include "LineOfSightGeoElement.h" -#include "LineOfSightLocation.h" -#include "ListKmlContents.h" -#include "ListRelatedFeatures.h" -#include "ListTransformations.h" -#include "LoadWfsXmlQuery.h" -#include "ManageBookmarks.h" -#include "ManageOperationalLayers.h" -#include "MapImageProvider.h" -#include "MapLoaded.h" -#include "MapReferenceScale.h" -#include "MapRotation.h" -#include "MinMaxScale.h" -#include "MobileMap_SearchAndRoute.h" -#include "NavigateRoute.h" -#include "NavigateARouteWithRerouting.h" -#include "NearestVertex.h" -#include "OfflineGeocode.h" -#include "OfflineRouting.h" -#include "OpenMapUrl.h" -#include "OpenMobileMap_MapPackage.h" -#include "OpenMobileScenePackage.h" -#include "OpenScene.h" -#include "OrbitCameraAroundObject.h" -#include "OSM_Layer.h" -#include "PerformValveIsolationTrace.h" -#include "Picture_Marker_Symbol.h" -#include "PlayAKmlTour.h" -#include "PortalUserInfo.h" -#include "ProjectGeometry.h" -#include "QueryFeaturesWithArcadeExpression.h" -#include "QueryMapImageSublayer.h" -#include "QueryOGCAPICQLFilters.h" -#include "RasterColormapRenderer.h" -#include "RasterFunctionService.h" -#include "RasterLayerFile.h" -#include "RasterLayerGeoPackage.h" -#include "RasterLayerService.h" -#include "RasterRenderingRule.h" -#include "RasterRgbRenderer.h" -#include "RasterStretchRenderer.h" -#include "ReadGeoPackage.h" -#include "ReadSymbolsFromMobileStyle.h" -#include "RealisticLightingAndShadows.h" -#include "ReverseGeocodeOnline.h" -#include "RouteAroundBarriers.h" -#include "SceneLayerSelection.h" -#include "ScenePropertiesExpressions.h" -#include "SearchDictionarySymbolStyle.h" -#include "SearchForWebmap.h" -#include "ServiceArea.h" -#include "ServiceFeatureTableCache.h" -#include "ServiceFeatureTableManualCache.h" -#include "ServiceFeatureTableNoCache.h" -#include "SetInitialMapArea.h" -#include "SetInitialMapLocation.h" -#include "SetMapSpatialReference.h" -#include "SetMaxExtent.h" -#include "ShowCallout.h" -#include "ShowDeviceLocationUsingIndoorPositioning.h" -#include "ShowLabelsOnLayers.h" -#include "ShowLocationHistory.h" -#include "ShowMagnifier.h" -#include "ShowOrgBasemaps.h" -#include "ShowPopup.h" -#include "Simple_Marker_Symbol.h" -#include "Simple_Renderer.h" -#include "SketchOnMap.h" -#include "SnapGeometryEdits.h" -#include "SpatialOperations.h" -#include "SpatialRelationships.h" -#include "StatisticalQuery.h" -#include "StatisticalQueryGroupSort.h" -#include "StyleWmsLayer.h" -#include "SuggestListModel.h" -#include "SetSurfacePlacementMode.h" -#include "SymbolizeShapefile.h" -#include "Symbols.h" -#include "SyncMapViewSceneView.h" -#include "TakeScreenshot.h" -#include "TerrainExaggeration.h" -#include "TileCacheLayer.h" -#include "TokenAuthentication.h" -#include "TraceUtilityNetwork.h" -#include "Unique_Value_Renderer.h" -#include "UpdateAttributesFeatureService.h" -#include "UpdateGeometryFeatureService.h" -#include "ValidateUtilityNetworkTopology.h" -#include "VectorTiledLayerUrl.h" -#include "ViewContentBeneathTerrainSurface.h" -#include "ViewPointCloudDataOffline.h" -#include "ViewshedCamera.h" -#include "ViewshedGeoElement.h" -#include "ViewshedLocation.h" -#include "Web_Tiled_Layer.h" -#include "WmsLayerUrl.h" -#include "WMTS_Layer.h" +#include "../CppSamples/Analysis/AnalyzeHotspots/AnalyzeHotspots.h" +#include "../CppSamples/Analysis/AnalyzeViewshed/AnalyzeViewshed.h" +#include "../CppSamples/Analysis/DistanceMeasurementAnalysis/DistanceMeasurementAnalysis.h" +#include "../CppSamples/Analysis/Geotriggers/Geotriggers.h" +#include "../CppSamples/Analysis/LineOfSightGeoElement/LineOfSightGeoElement.h" +#include "../CppSamples/Analysis/LineOfSightLocation/LineOfSightLocation.h" +#include "../CppSamples/Analysis/StatisticalQuery/StatisticalQuery.h" +#include "../CppSamples/Analysis/StatisticalQueryGroupSort/StatisticalQueryGroupSort.h" +#include "../CppSamples/Analysis/ViewshedCamera/ViewshedCamera.h" +#include "../CppSamples/Analysis/ViewshedGeoElement/ViewshedGeoElement.h" +#include "../CppSamples/Analysis/ViewshedLocation/ViewshedLocation.h" +#include "../CppSamples/CloudAndPortal/IntegratedWindowsAuthentication/IntegratedWindowsAuthentication.h" +#include "../CppSamples/CloudAndPortal/TokenAuthentication/TokenAuthentication.h" +#include "../CppSamples/DisplayInformation/AddGraphicsWithRenderer/AddGraphicsWithRenderer.h" +#include "../CppSamples/DisplayInformation/BuildLegend/BuildLegend.h" +#include "../CppSamples/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h" +#include "../CppSamples/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h" +#include "../CppSamples/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h" +#include "../CppSamples/DisplayInformation/DisplayClusters/DisplayClusters.h" +#include "../CppSamples/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h" +#include "../CppSamples/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h" +#include "../CppSamples/DisplayInformation/GOSymbols/GOSymbols.h" +#include "../CppSamples/DisplayInformation/IdentifyGraphics/IdentifyGraphics.h" +#include "../CppSamples/DisplayInformation/Picture_Marker_Symbol/Picture_Marker_Symbol.h" +#include "../CppSamples/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.h" +#include "../CppSamples/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h" +#include "../CppSamples/DisplayInformation/ShowCallout/ShowCallout.h" +#include "../CppSamples/DisplayInformation/ShowGrid/ShowGrid.h" +#include "../CppSamples/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h" +#include "../CppSamples/DisplayInformation/ShowPopup/ShowPopup.h" +#include "../CppSamples/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h" +#include "../CppSamples/DisplayInformation/Simple_Renderer/Simple_Renderer.h" +#include "../CppSamples/DisplayInformation/SketchOnMap/SketchOnMap.h" +#include "../CppSamples/DisplayInformation/SymbolizeShapefile/SymbolizeShapefile.h" +#include "../CppSamples/DisplayInformation/Unique_Value_Renderer/Unique_Value_Renderer.h" +#include "../CppSamples/EditData/AddFeaturesFeatureService/AddFeaturesFeatureService.h" +#include "../CppSamples/EditData/ContingentValues/ContingentValues.h" +#include "../CppSamples/EditData/DeleteFeaturesFeatureService/DeleteFeaturesFeatureService.h" +#include "../CppSamples/EditData/EditAndSyncFeatures/EditAndSyncFeatures.h" +#include "../CppSamples/EditData/EditFeatureAttachments/EditFeatureAttachments.h" +#include "../CppSamples/EditData/EditFeaturesWithFeatureLinkedAnnotation/EditFeaturesWithFeatureLinkedAnnotation.h" +#include "../CppSamples/EditData/EditKmlGroundOverlay/EditKmlGroundOverlay.h" +#include "../CppSamples/EditData/EditWithBranchVersioning/EditWithBranchVersioning.h" +#include "../CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.h" +#include "../CppSamples/EditData/UpdateAttributesFeatureService/UpdateAttributesFeatureService.h" +#include "../CppSamples/EditData/UpdateGeometryFeatureService/UpdateGeometryFeatureService.h" +#include "../CppSamples/Features/ControlTimeExtentTimeSlider/ControlTimeExtentTimeSlider.h" +#include "../CppSamples/Features/CreateMobileGeodatabase/CreateMobileGeodatabase.h" +#include "../CppSamples/Features/FeatureLayerChangeRenderer/FeatureLayerChangeRenderer.h" +#include "../CppSamples/Features/FeatureLayerDictionaryRenderer/FeatureLayerDictionaryRenderer.h" +#include "../CppSamples/Features/FeatureLayerQuery/FeatureLayerQuery.h" +#include "../CppSamples/Features/FeatureLayerSelection/FeatureLayerSelection.h" +#include "../CppSamples/Features/FilterByDefinitionExpressionOrDisplayFilter/FilterByDefinitionExpressionOrDisplayFilter.h" +#include "../CppSamples/Features/GenerateGeodatabaseReplicaFromFeatureService/GenerateGeodatabaseReplicaFromFeatureService.h" +#include "../CppSamples/Features/ListRelatedFeatures/ListRelatedFeatures.h" +#include "../CppSamples/Features/ServiceFeatureTableCache/ServiceFeatureTableCache.h" +#include "../CppSamples/Features/ServiceFeatureTableManualCache/ServiceFeatureTableManualCache.h" +#include "../CppSamples/Features/ServiceFeatureTableNoCache/ServiceFeatureTableNoCache.h" +#include "../CppSamples/Geometry/Buffer/Buffer.h" +#include "../CppSamples/Geometry/ClipGeometry/ClipGeometry.h" +#include "../CppSamples/Geometry/ConvexHull/ConvexHull.h" +#include "../CppSamples/Geometry/CreateAndEditGeometries/CreateAndEditGeometries.h" +#include "../CppSamples/Geometry/CreateGeometries/CreateGeometries.h" +#include "../CppSamples/Geometry/CutGeometry/CutGeometry.h" +#include "../CppSamples/Geometry/DensifyAndGeneralize/DensifyAndGeneralize.h" +#include "../CppSamples/Geometry/FormatCoordinates/FormatCoordinates.h" +#include "../CppSamples/Geometry/GeodesicOperations/GeodesicOperations.h" +#include "../CppSamples/Geometry/ListTransformations/ListTransformations.h" +#include "../CppSamples/Geometry/NearestVertex/NearestVertex.h" +#include "../CppSamples/Geometry/ProjectGeometry/ProjectGeometry.h" +#include "../CppSamples/Geometry/SpatialOperations/SpatialOperations.h" +#include "../CppSamples/Geometry/SpatialRelationships/SpatialRelationships.h" +#include "../CppSamples/Layers/AddCustomDynamicEntityDataSource/AddCustomDynamicEntityDataSource.h" +#include "../CppSamples/Layers/AddDynamicEntityLayer/AddDynamicEntityLayer.h" +#include "../CppSamples/Layers/AddEncExchangeSet/AddEncExchangeSet.h" +#include "../CppSamples/Layers/ApplyMosaicRuleToRasters/ApplyMosaicRuleToRasters.h" +#include "../CppSamples/Layers/ApplyUniqueValuesWithAlternateSymbols/ApplyUniqueValuesWithAlternateSymbols.h" +#include "../CppSamples/Layers/ArcGISMapImageLayerUrl/ArcGISMapImageLayerUrl.h" +#include "../CppSamples/Layers/ArcGISTiledLayerUrl/ArcGISTiledLayerUrl.h" +#include "../CppSamples/Layers/BlendRasterLayer/BlendRasterLayer.h" +#include "../CppSamples/Layers/BrowseOGCAPIFeatureService/BrowseOGCAPIFeatureService.h" +#include "../CppSamples/Layers/BrowseWfsLayers/BrowseWfsLayers.h" +#include "../CppSamples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.h" +#include "../CppSamples/Layers/ChangeSublayerVisibility/ChangeSublayerVisibility.h" +#include "../CppSamples/Layers/ConfigureClusters/ConfigureClusters.h" +#include "../CppSamples/Layers/CreateAndSaveKmlFile/CreateAndSaveKmlFile.h" +#include "../CppSamples/Layers/DisplayAnnotation/DisplayAnnotation.h" +#include "../CppSamples/Layers/DisplayDimensions/DisplayDimensions.h" +#include "../CppSamples/Layers/DisplayFeatureLayers/DisplayFeatureLayers.h" +#include "../CppSamples/Layers/DisplayKml/DisplayKml.h" +#include "../CppSamples/Layers/DisplayKmlNetworkLinks/DisplayKmlNetworkLinks.h" +#include "../CppSamples/Layers/DisplayOgcApiFeatureCollection/DisplayOgcApiFeatureCollection.h" +#include "../CppSamples/Layers/DisplaySubtypeFeatureLayer/DisplaySubtypeFeatureLayer.h" +#include "../CppSamples/Layers/DisplayWfsLayer/DisplayWfsLayer.h" +#include "../CppSamples/Layers/ExportTiles/ExportTiles.h" +#include "../CppSamples/Layers/ExportVectorTiles/ExportVectorTiles.h" +#include "../CppSamples/Layers/FeatureCollectionLayerFromPortal/FeatureCollectionLayerFromPortal.h" +#include "../CppSamples/Layers/FeatureCollectionLayerQuery/FeatureCollectionLayerQuery.h" +#include "../CppSamples/Layers/FeatureLayerRenderingModeMap/FeatureLayerRenderingModeMap.h" +#include "../CppSamples/Layers/FeatureLayerRenderingModeScene/FeatureLayerRenderingModeScene.h" +#include "../CppSamples/Layers/Feature_Collection_Layer/Feature_Collection_Layer.h" +#include "../CppSamples/Layers/GroupLayers/GroupLayers.h" +#include "../CppSamples/Layers/Hillshade_Renderer/Hillshade_Renderer.h" +#include "../CppSamples/Layers/IdentifyKmlFeatures/IdentifyKmlFeatures.h" +#include "../CppSamples/Layers/IdentifyRasterCell/IdentifyRasterCell.h" +#include "../CppSamples/Layers/ListKmlContents/ListKmlContents.h" +#include "../CppSamples/Layers/LoadWfsXmlQuery/LoadWfsXmlQuery.h" +#include "../CppSamples/Layers/ManageOperationalLayers/ManageOperationalLayers.h" +#include "../CppSamples/Layers/OSM_Layer/OSM_Layer.h" +#include "../CppSamples/Layers/PlayAKmlTour/PlayAKmlTour.h" +#include "../CppSamples/Layers/QueryMapImageSublayer/QueryMapImageSublayer.h" +#include "../CppSamples/Layers/QueryOGCAPICQLFilters/QueryOGCAPICQLFilters.h" +#include "../CppSamples/Layers/RasterColormapRenderer/RasterColormapRenderer.h" +#include "../CppSamples/Layers/RasterFunctionService/RasterFunctionService.h" +#include "../CppSamples/Layers/RasterLayerFile/RasterLayerFile.h" +#include "../CppSamples/Layers/RasterLayerGeoPackage/RasterLayerGeoPackage.h" +#include "../CppSamples/Layers/RasterLayerService/RasterLayerService.h" +#include "../CppSamples/Layers/RasterRenderingRule/RasterRenderingRule.h" +#include "../CppSamples/Layers/RasterRgbRenderer/RasterRgbRenderer.h" +#include "../CppSamples/Layers/RasterStretchRenderer/RasterStretchRenderer.h" +#include "../CppSamples/Layers/StyleWmsLayer/StyleWmsLayer.h" +#include "../CppSamples/Layers/TileCacheLayer/TileCacheLayer.h" +#include "../CppSamples/Layers/VectorTiledLayerUrl/VectorTiledLayerUrl.h" +#include "../CppSamples/Layers/WMTS_Layer/WMTS_Layer.h" +#include "../CppSamples/Layers/Web_Tiled_Layer/Web_Tiled_Layer.h" +#include "../CppSamples/Layers/WmsLayerUrl/WmsLayerUrl.h" +#include "../CppSamples/Maps/ApplyScheduledMapUpdates/ApplyScheduledMapUpdates.h" +#include "../CppSamples/Maps/BrowseBuildingFloors/BrowseBuildingFloors.h" +#include "../CppSamples/Maps/ChangeBasemap/ChangeBasemap.h" +#include "../CppSamples/Maps/ChangeViewpoint/ChangeViewpoint.h" +#include "../CppSamples/Maps/ConfigureBasemapStyleLanguage/ConfigureBasemapStyleLanguage.h" +#include "../CppSamples/Maps/CreateAndSaveMap/CreateAndSaveMap.h" +#include "../CppSamples/Maps/CreateDynamicBasemapGallery/CreateDynamicBasemapGallery.h" +#include "../CppSamples/Maps/DisplayDeviceLocation/DisplayDeviceLocation.h" +#include "../CppSamples/Maps/DisplayDeviceLocationWithNmeaDataSources/DisplayDeviceLocationWithNmeaDataSources.h" +#include "../CppSamples/Maps/DisplayDrawingStatus/DisplayDrawingStatus.h" +#include "../CppSamples/Maps/DisplayLayerViewDrawState/DisplayLayerViewDrawState.h" +#include "../CppSamples/Maps/DisplayMap/DisplayMap.h" +#include "../CppSamples/Maps/DisplayOverviewMap/DisplayOverviewMap.h" +#include "../CppSamples/Maps/DownloadPreplannedMap/DownloadPreplannedMap.h" +#include "../CppSamples/Maps/GenerateOfflineMap/GenerateOfflineMap.h" +#include "../CppSamples/Maps/GenerateOfflineMapLocalBasemap/GenerateOfflineMapLocalBasemap.h" +#include "../CppSamples/Maps/GenerateOfflineMap_Overrides/GenerateOfflineMap_Overrides.h" +#include "../CppSamples/Maps/HonorMobileMapPackageExpiration/HonorMobileMapPackageExpiration.h" +#include "../CppSamples/Maps/IdentifyLayers/IdentifyLayers.h" +#include "../CppSamples/Maps/ManageBookmarks/ManageBookmarks.h" +#include "../CppSamples/Maps/MapLoaded/MapLoaded.h" +#include "../CppSamples/Maps/MapReferenceScale/MapReferenceScale.h" +#include "../CppSamples/Maps/MapRotation/MapRotation.h" +#include "../CppSamples/Maps/MinMaxScale/MinMaxScale.h" +#include "../CppSamples/Maps/MobileMap_SearchAndRoute/MobileMap_SearchAndRoute.h" +#include "../CppSamples/Maps/OpenMapUrl/OpenMapUrl.h" +#include "../CppSamples/Maps/OpenMobileMap_MapPackage/OpenMobileMap_MapPackage.h" +#include "../CppSamples/Maps/ReadGeoPackage/ReadGeoPackage.h" +#include "../CppSamples/Maps/SetInitialMapArea/SetInitialMapArea.h" +#include "../CppSamples/Maps/SetInitialMapLocation/SetInitialMapLocation.h" +#include "../CppSamples/Maps/SetMapSpatialReference/SetMapSpatialReference.h" +#include "../CppSamples/Maps/SetMaxExtent/SetMaxExtent.h" +#include "../CppSamples/Maps/ShowDeviceLocationUsingIndoorPositioning/ShowDeviceLocationUsingIndoorPositioning.h" +#include "../CppSamples/Maps/ShowLocationHistory/ShowLocationHistory.h" +#include "../CppSamples/Maps/ShowMagnifier/ShowMagnifier.h" +#include "../CppSamples/Maps/TakeScreenshot/MapImageProvider.h" +#include "../CppSamples/Maps/TakeScreenshot/TakeScreenshot.h" +#include "../CppSamples/Routing/ClosestFacility/ClosestFacility.h" +#include "../CppSamples/Routing/DisplayRouteLayer/DisplayRouteLayer.h" +#include "../CppSamples/Routing/FindClosestFacilityToMultipleIncidentsService/FindClosestFacilityToMultipleIncidentsService.h" +#include "../CppSamples/Routing/FindRoute/FindRoute.h" +#include "../CppSamples/Routing/FindServiceAreasForMultipleFacilities/FindServiceAreasForMultipleFacilities.h" +#include "../CppSamples/Routing/NavigateARouteWithRerouting/NavigateARouteWithRerouting.h" +#include "../CppSamples/Routing/NavigateRoute/NavigateRoute.h" +#include "../CppSamples/Routing/OfflineRouting/OfflineRouting.h" +#include "../CppSamples/Routing/RouteAroundBarriers/RouteAroundBarriers.h" +#include "../CppSamples/Routing/ServiceArea/ServiceArea.h" +#include "../CppSamples/Scenes/Add3DTilesLayer/Add3DTilesLayer.h" +#include "../CppSamples/Scenes/AddAPointSceneLayer/AddAPointSceneLayer.h" +#include "../CppSamples/Scenes/AddIntegratedMeshLayer/AddIntegratedMeshLayer.h" +#include "../CppSamples/Scenes/Animate3DSymbols/Animate3DSymbols.h" +#include "../CppSamples/Scenes/AnimateImagesWithImageOverlay/AnimateImagesWithImageOverlay.h" +#include "../CppSamples/Scenes/BasicSceneView/BasicSceneView.h" +#include "../CppSamples/Scenes/ChangeAtmosphereEffect/ChangeAtmosphereEffect.h" +#include "../CppSamples/Scenes/ChooseCameraController/ChooseCameraController.h" +#include "../CppSamples/Scenes/CreateTerrainSurfaceFromLocalRaster/CreateTerrainSurfaceFromLocalRaster.h" +#include "../CppSamples/Scenes/CreateTerrainSurfaceFromLocalTilePackage/CreateTerrainSurfaceFromLocalTilePackage.h" +#include "../CppSamples/Scenes/Display3DLabelsInScene/Display3DLabelsInScene.h" +#include "../CppSamples/Scenes/DisplaySceneLayer/DisplaySceneLayer.h" +#include "../CppSamples/Scenes/DistanceCompositeSymbol/DistanceCompositeSymbol.h" +#include "../CppSamples/Scenes/ExtrudeGraphics/ExtrudeGraphics.h" +#include "../CppSamples/Scenes/FeatureLayerExtrusion/FeatureLayerExtrusion.h" +#include "../CppSamples/Scenes/FilterFeaturesInScene/FilterFeaturesInScene.h" +#include "../CppSamples/Scenes/GetElevationAtPoint/GetElevationAtPoint.h" +#include "../CppSamples/Scenes/OpenMobileScenePackage/OpenMobileScenePackage.h" +#include "../CppSamples/Scenes/OpenScene/OpenScene.h" +#include "../CppSamples/Scenes/OrbitCameraAroundObject/OrbitCameraAroundObject.h" +#include "../CppSamples/Scenes/RealisticLightingAndShadows/RealisticLightingAndShadows.h" +#include "../CppSamples/Scenes/SceneLayerSelection/SceneLayerSelection.h" +#include "../CppSamples/Scenes/ScenePropertiesExpressions/ScenePropertiesExpressions.h" +#include "../CppSamples/Scenes/SetSurfacePlacementMode/SetSurfacePlacementMode.h" +#include "../CppSamples/Scenes/Symbols/Symbols.h" +#include "../CppSamples/Scenes/SyncMapViewSceneView/SyncMapViewSceneView.h" +#include "../CppSamples/Scenes/TerrainExaggeration/TerrainExaggeration.h" +#include "../CppSamples/Scenes/ViewContentBeneathTerrainSurface/ViewContentBeneathTerrainSurface.h" +#include "../CppSamples/Scenes/ViewPointCloudDataOffline/ViewPointCloudDataOffline.h" +#include "../CppSamples/Search/FindAddress/FindAddress.h" +#include "../CppSamples/Search/FindPlace/FindPlace.h" +#include "../CppSamples/Search/OfflineGeocode/OfflineGeocode.h" +#include "../CppSamples/Search/ReverseGeocodeOnline/ReverseGeocodeOnline.h" +#include "../CppSamples/Search/SearchDictionarySymbolStyle/SearchDictionarySymbolStyle.h" +#include "../CppSamples/UtilityNetwork/ConfigureSubnetworkTrace/ConfigureSubnetworkTrace.h" +#include "../CppSamples/UtilityNetwork/CreateLoadReport/CreateLoadReport.h" +#include "../CppSamples/UtilityNetwork/DisplayContentOfUtilityNetworkContainer/DisplayContentOfUtilityNetworkContainer.h" +#include "../CppSamples/UtilityNetwork/DisplayUtilityAssociations/DisplayUtilityAssociations.h" +#include "../CppSamples/UtilityNetwork/PerformValveIsolationTrace/PerformValveIsolationTrace.h" +#include "../CppSamples/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.h" +#include "../CppSamples/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.h" #ifdef LOCALSERVER_SUPPORTED -#include "LocalServerFeatureLayer.h" -#include "LocalServerGeoprocessing.h" -#include "LocalServerMapImageLayer.h" -#include "LocalServerServices.h" +#include "../CppSamples/LocalServer/LocalServerGeoprocessing/LocalServerGeoprocessing.h" +#include "../CppSamples/LocalServer/LocalServerFeatureLayer/LocalServerFeatureLayer.h" +#include "../CppSamples/LocalServer/LocalServerMapImageLayer/LocalServerMapImageLayer.h" +#include "../CppSamples/LocalServer/LocalServerServices/LocalServerServices.h" #endif // LOCALSERVER_SUPPORTED #ifdef SHOW_PORTAL_SAMPLES -#include "AddItemsToPortal.h" -#include "PortalUserInfo.h" -#include "SearchForWebmap.h" -#include "ShowOrgBasemaps.h" +#include "../CppSamples/CloudAndPortal/SearchForWebmap/SearchForWebmap.h" +#include "../CppSamples/CloudAndPortal/AddItemsToPortal/AddItemsToPortal.h" +#include "../CppSamples/CloudAndPortal/PortalUserInfo/PortalUserInfo.h" +#include "../CppSamples/CloudAndPortal/ShowOrgBasemaps/ShowOrgBasemaps.h" #endif // HIDE_PORTAL_SAMPLES #ifdef SHOW_RASTER_FUNCTION_SAMPLE -#include "RasterFunctionFile.h" +#include "../CppSamples/Layers/RasterFunctionFile/RasterFunctionFile.h" #endif // SHOW_RASTER_FUNCTION_SAMPLE @@ -403,9 +396,9 @@ void registerCppSampleClasses() ControlAnnotationSublayerVisibility::init(); ControlTimeExtentTimeSlider::init(); ConvexHull::init(); + CreateAndEditGeometries::init(); CreateAndSaveKmlFile::init(); CreateAndSaveMap::init(); - CreateAndEditGeometries::init(); CreateDynamicBasemapGallery::init(); CreateGeometries::init(); CreateLoadReport::init(); @@ -419,20 +412,19 @@ void registerCppSampleClasses() DensifyAndGeneralize::init(); Display3DLabelsInScene::init(); DisplayAnnotation::init(); - DisplayDimensions::init(); + DisplayClusters::init(); DisplayContentOfUtilityNetworkContainer::init(); DisplayDeviceLocation::init(); DisplayDeviceLocationWithNmeaDataSources::init(); + DisplayDimensions::init(); DisplayDrawingStatus::init(); DisplayFeatureLayers::init(); - DisplayGrid::init(); DisplayKml::init(); DisplayKmlNetworkLinks::init(); DisplayLayerViewDrawState::init(); DisplayMap::init(); DisplayOgcApiFeatureCollection::init(); DisplayOverviewMap::init(); - DisplayClusters::init(); DisplayRouteLayer::init(); DisplaySceneLayer::init(); DisplaySubtypeFeatureLayer::init(); @@ -449,34 +441,34 @@ void registerCppSampleClasses() ExportTiles::init(); ExportVectorTiles::init(); ExtrudeGraphics::init(); - Feature_Collection_Layer::init(); FeatureCollectionLayerFromPortal::init(); FeatureCollectionLayerQuery::init(); FeatureLayerChangeRenderer::init(); FeatureLayerDictionaryRenderer::init(); FeatureLayerExtrusion::init(); - FilterFeaturesInScene::init(); FeatureLayerQuery::init(); FeatureLayerRenderingModeMap::init(); FeatureLayerRenderingModeScene::init(); FeatureLayerSelection::init(); + Feature_Collection_Layer::init(); FilterByDefinitionExpressionOrDisplayFilter::init(); + FilterFeaturesInScene::init(); FindAddress::init(); FindClosestFacilityToMultipleIncidentsService::init(); FindPlace::init(); FindRoute::init(); FindServiceAreasForMultipleFacilities::init(); FormatCoordinates::init(); + GODictionaryRenderer::init(); + GODictionaryRenderer_3D::init(); + GOSymbols::init(); GenerateGeodatabaseReplicaFromFeatureService::init(); - GenerateOfflineMap_Overrides::init(); GenerateOfflineMap::init(); GenerateOfflineMapLocalBasemap::init(); + GenerateOfflineMap_Overrides::init(); GeodesicOperations::init(); Geotriggers::init(); GetElevationAtPoint::init(); - GODictionaryRenderer_3D::init(); - GODictionaryRenderer::init(); - GOSymbols::init(); GroupLayers::init(); Hillshade_Renderer::init(); HonorMobileMapPackageExpiration::init(); @@ -498,9 +490,10 @@ void registerCppSampleClasses() MapRotation::init(); MinMaxScale::init(); MobileMap_SearchAndRoute::init(); - NavigateRoute::init(); NavigateARouteWithRerouting::init(); + NavigateRoute::init(); NearestVertex::init(); + OSM_Layer::init(); OfflineGeocode::init(); OfflineRouting::init(); OpenMapUrl::init(); @@ -508,7 +501,6 @@ void registerCppSampleClasses() OpenMobileScenePackage::init(); OpenScene::init(); OrbitCameraAroundObject::init(); - OSM_Layer::init(); PerformValveIsolationTrace::init(); Picture_Marker_Symbol::init(); PlayAKmlTour::init(); @@ -540,8 +532,10 @@ void registerCppSampleClasses() SetInitialMapLocation::init(); SetMapSpatialReference::init(); SetMaxExtent::init(); + SetSurfacePlacementMode::init(); ShowCallout::init(); ShowDeviceLocationUsingIndoorPositioning::init(); + ShowGrid::init(); ShowLabelsOnLayers::init(); ShowLocationHistory::init(); ShowMagnifier::init(); @@ -549,13 +543,12 @@ void registerCppSampleClasses() Simple_Marker_Symbol::init(); Simple_Renderer::init(); SketchOnMap::init(); + SnapGeometryEdits::init(); SpatialOperations::init(); SpatialRelationships::init(); - SnapGeometryEdits::init(); StatisticalQuery::init(); StatisticalQueryGroupSort::init(); StyleWmsLayer::init(); - SetSurfacePlacementMode::init(); SymbolizeShapefile::init(); Symbols::init(); SyncMapViewSceneView::init(); @@ -574,9 +567,9 @@ void registerCppSampleClasses() ViewshedCamera::init(); ViewshedGeoElement::init(); ViewshedLocation::init(); + WMTS_Layer::init(); Web_Tiled_Layer::init(); WmsLayerUrl::init(); - WMTS_Layer::init(); #ifdef SHOW_PORTAL_SAMPLES PortalUserInfo::init(); diff --git a/SampleViewer/samples.pri b/SampleViewer/samples.pri index a0ff9c712d..da2ac83060 100644 --- a/SampleViewer/samples.pri +++ b/SampleViewer/samples.pri @@ -17,225 +17,6 @@ #------------------------------------------------- -INCLUDEPATH += \ - "$$SAMPLEPATHCPP/Analysis/AnalyzeHotspots" \ - "$$SAMPLEPATHCPP/Analysis/AnalyzeViewshed" \ - "$$SAMPLEPATHCPP/Analysis/DistanceMeasurementAnalysis" \ - "$$SAMPLEPATHCPP/Analysis/Geotriggers" \ - "$$SAMPLEPATHCPP/Analysis/LineOfSightGeoElement" \ - "$$SAMPLEPATHCPP/Analysis/LineOfSightLocation" \ - "$$SAMPLEPATHCPP/Analysis/StatisticalQuery" \ - "$$SAMPLEPATHCPP/Analysis/StatisticalQueryGroupSort" \ - "$$SAMPLEPATHCPP/Analysis/ViewshedCamera" \ - "$$SAMPLEPATHCPP/Analysis/ViewshedGeoElement" \ - "$$SAMPLEPATHCPP/Analysis/ViewshedLocation" \ - "$$SAMPLEPATHCPP/CloudAndPortal/AddItemsToPortal" \ - "$$SAMPLEPATHCPP/CloudAndPortal/IntegratedWindowsAuthentication" \ - "$$SAMPLEPATHCPP/CloudAndPortal/PortalUserInfo" \ - "$$SAMPLEPATHCPP/CloudAndPortal/SearchForWebmap" \ - "$$SAMPLEPATHCPP/CloudAndPortal/ShowOrgBasemaps" \ - "$$SAMPLEPATHCPP/CloudAndPortal/TokenAuthentication" \ - "$$SAMPLEPATHCPP/DisplayInformation/AddGraphicsWithRenderer" \ - "$$SAMPLEPATHCPP/DisplayInformation/BuildLegend" \ - "$$SAMPLEPATHCPP/DisplayInformation/ControlAnnotationSublayerVisibility" \ - "$$SAMPLEPATHCPP/DisplayInformation/CreateSymbolStylesFromWebStyles" \ - "$$SAMPLEPATHCPP/DisplayInformation/CustomDictionaryStyle" \ - "$$SAMPLEPATHCPP/DisplayInformation/DisplayGrid" \ - "$$SAMPLEPATHCPP/DisplayInformation/DisplayClusters" \ - "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer_3D" \ - "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer" \ - "$$SAMPLEPATHCPP/DisplayInformation/GOSymbols" \ - "$$SAMPLEPATHCPP/DisplayInformation/IdentifyGraphics" \ - "$$SAMPLEPATHCPP/DisplayInformation/Picture_Marker_Symbol" \ - "$$SAMPLEPATHCPP/DisplayInformation/QueryFeaturesWithArcadeExpression" \ - "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle" \ - "$$SAMPLEPATHCPP/DisplayInformation/ShowCallout" \ - "$$SAMPLEPATHCPP/DisplayInformation/ShowLabelsOnLayers" \ - "$$SAMPLEPATHCPP/DisplayInformation/ShowPopup" \ - "$$SAMPLEPATHCPP/DisplayInformation/Simple_Marker_Symbol" \ - "$$SAMPLEPATHCPP/DisplayInformation/Simple_Renderer" \ - "$$SAMPLEPATHCPP/DisplayInformation/SketchOnMap" \ - "$$SAMPLEPATHCPP/DisplayInformation/SymbolizeShapefile" \ - "$$SAMPLEPATHCPP/DisplayInformation/Unique_Value_Renderer" \ - "$$SAMPLEPATHCPP/EditData/AddFeaturesFeatureService" \ - "$$SAMPLEPATHCPP/EditData/ContingentValues" \ - "$$SAMPLEPATHCPP/EditData/DeleteFeaturesFeatureService" \ - "$$SAMPLEPATHCPP/EditData/EditAndSyncFeatures" \ - "$$SAMPLEPATHCPP/EditData/EditFeatureAttachments" \ - "$$SAMPLEPATHCPP/EditData/EditFeaturesWithFeatureLinkedAnnotation" \ - "$$SAMPLEPATHCPP/EditData/EditKmlGroundOverlay" \ - "$$SAMPLEPATHCPP/EditData/EditWithBranchVersioning" \ - "$$SAMPLEPATHCPP/EditData/SnapGeometryEdits" \ - "$$SAMPLEPATHCPP/EditData/UpdateAttributesFeatureService" \ - "$$SAMPLEPATHCPP/EditData/UpdateGeometryFeatureService" \ - "$$SAMPLEPATHCPP/Features/ControlTimeExtentTimeSlider" \ - "$$SAMPLEPATHCPP/Features/CreateMobileGeodatabase" \ - "$$SAMPLEPATHCPP/Features/FeatureLayerChangeRenderer" \ - "$$SAMPLEPATHCPP/Features/FeatureLayerDictionaryRenderer" \ - "$$SAMPLEPATHCPP/Features/FeatureLayerQuery" \ - "$$SAMPLEPATHCPP/Features/FeatureLayerSelection" \ - "$$SAMPLEPATHCPP/Features/FilterByDefinitionExpressionOrDisplayFilter" \ - "$$SAMPLEPATHCPP/Features/GenerateGeodatabaseReplicaFromFeatureService" \ - "$$SAMPLEPATHCPP/Features/ListRelatedFeatures" \ - "$$SAMPLEPATHCPP/Features/ServiceFeatureTableCache" \ - "$$SAMPLEPATHCPP/Features/ServiceFeatureTableManualCache" \ - "$$SAMPLEPATHCPP/Features/ServiceFeatureTableNoCache" \ - "$$SAMPLEPATHCPP/Geometry/Buffer" \ - "$$SAMPLEPATHCPP/Geometry/ClipGeometry" \ - "$$SAMPLEPATHCPP/Geometry/ConvexHull" \ - "$$SAMPLEPATHCPP/Geometry/CreateAndEditGeometries" \ - "$$SAMPLEPATHCPP/Geometry/CreateGeometries" \ - "$$SAMPLEPATHCPP/Geometry/CutGeometry" \ - "$$SAMPLEPATHCPP/Geometry/DensifyAndGeneralize" \ - "$$SAMPLEPATHCPP/Geometry/FormatCoordinates" \ - "$$SAMPLEPATHCPP/Geometry/GeodesicOperations" \ - "$$SAMPLEPATHCPP/Geometry/ListTransformations" \ - "$$SAMPLEPATHCPP/Geometry/NearestVertex" \ - "$$SAMPLEPATHCPP/Geometry/ProjectGeometry" \ - "$$SAMPLEPATHCPP/Geometry/SpatialOperations" \ - "$$SAMPLEPATHCPP/Geometry/SpatialRelationships" \ - "$$SAMPLEPATHCPP/Layers/ConfigureClusters" \ - "$$SAMPLEPATHCPP/Layers/AddCustomDynamicEntityDataSource" \ - "$$SAMPLEPATHCPP/Layers/AddDynamicEntityLayer" \ - "$$SAMPLEPATHCPP/Layers/AddEncExchangeSet" \ - "$$SAMPLEPATHCPP/Layers/ApplyMosaicRuleToRasters" \ - "$$SAMPLEPATHCPP/Layers/ApplyUniqueValuesWithAlternateSymbols" \ - "$$SAMPLEPATHCPP/Layers/ArcGISMapImageLayerUrl" \ - "$$SAMPLEPATHCPP/Layers/ArcGISTiledLayerUrl" \ - "$$SAMPLEPATHCPP/Layers/BlendRasterLayer" \ - "$$SAMPLEPATHCPP/Layers/BrowseOGCAPIFeatureService" \ - "$$SAMPLEPATHCPP/Layers/BrowseWfsLayers" \ - "$$SAMPLEPATHCPP/Layers/ChangeSublayerRenderer" \ - "$$SAMPLEPATHCPP/Layers/ChangeSublayerVisibility" \ - "$$SAMPLEPATHCPP/Layers/CreateAndSaveKmlFile" \ - "$$SAMPLEPATHCPP/Layers/DisplayAnnotation" \ - "$$SAMPLEPATHCPP/Layers/DisplayDimensions" \ - "$$SAMPLEPATHCPP/Layers/DisplayFeatureLayers" \ - "$$SAMPLEPATHCPP/Layers/DisplayKml" \ - "$$SAMPLEPATHCPP/Layers/DisplayKmlNetworkLinks" \ - "$$SAMPLEPATHCPP/Layers/DisplayOgcApiFeatureCollection" \ - "$$SAMPLEPATHCPP/Layers/DisplaySubtypeFeatureLayer" \ - "$$SAMPLEPATHCPP/Layers/DisplayWfsLayer" \ - "$$SAMPLEPATHCPP/Layers/ExportTiles" \ - "$$SAMPLEPATHCPP/Layers/ExportVectorTiles" \ - "$$SAMPLEPATHCPP/Layers/Feature_Collection_Layer" \ - "$$SAMPLEPATHCPP/Layers/FeatureCollectionLayerFromPortal" \ - "$$SAMPLEPATHCPP/Layers/FeatureCollectionLayerQuery" \ - "$$SAMPLEPATHCPP/Layers/FeatureLayerRenderingModeMap" \ - "$$SAMPLEPATHCPP/Layers/FeatureLayerRenderingModeScene" \ - "$$SAMPLEPATHCPP/Layers/GroupLayers" \ - "$$SAMPLEPATHCPP/Layers/Hillshade_Renderer" \ - "$$SAMPLEPATHCPP/Layers/IdentifyKmlFeatures" \ - "$$SAMPLEPATHCPP/Layers/IdentifyRasterCell" \ - "$$SAMPLEPATHCPP/Layers/ListKmlContents" \ - "$$SAMPLEPATHCPP/Layers/LoadWfsXmlQuery" \ - "$$SAMPLEPATHCPP/Layers/ManageOperationalLayers" \ - "$$SAMPLEPATHCPP/Layers/OSM_Layer" \ - "$$SAMPLEPATHCPP/Layers/PlayAKmlTour" \ - "$$SAMPLEPATHCPP/Layers/QueryMapImageSublayer" \ - "$$SAMPLEPATHCPP/Layers/QueryOGCAPICQLFilters" \ - "$$SAMPLEPATHCPP/Layers/RasterColormapRenderer" \ - "$$SAMPLEPATHCPP/Layers/RasterFunctionService" \ - "$$SAMPLEPATHCPP/Layers/RasterLayerFile" \ - "$$SAMPLEPATHCPP/Layers/RasterLayerGeoPackage" \ - "$$SAMPLEPATHCPP/Layers/RasterLayerService"\ - "$$SAMPLEPATHCPP/Layers/RasterRenderingRule" \ - "$$SAMPLEPATHCPP/Layers/RasterRgbRenderer" \ - "$$SAMPLEPATHCPP/Layers/RasterStretchRenderer" \ - "$$SAMPLEPATHCPP/Layers/StyleWmsLayer" \ - "$$SAMPLEPATHCPP/Layers/TileCacheLayer" \ - "$$SAMPLEPATHCPP/Layers/VectorTiledLayerUrl" \ - "$$SAMPLEPATHCPP/Layers/Web_Tiled_Layer" \ - "$$SAMPLEPATHCPP/Layers/WmsLayerUrl" \ - "$$SAMPLEPATHCPP/Layers/WMTS_Layer" \ - "$$SAMPLEPATHCPP/Maps/ApplyScheduledMapUpdates" \ - "$$SAMPLEPATHCPP/Maps/BrowseBuildingFloors" \ - "$$SAMPLEPATHCPP/Maps/ChangeBasemap" \ - "$$SAMPLEPATHCPP/Maps/ChangeViewpoint" \ - "$$SAMPLEPATHCPP/Maps/ConfigureBasemapStyleLanguage" \ - "$$SAMPLEPATHCPP/Maps/CreateAndSaveMap" \ - "$$SAMPLEPATHCPP/Maps/CreateDynamicBasemapGallery" \ - "$$SAMPLEPATHCPP/Maps/DisplayDeviceLocation" \ - "$$SAMPLEPATHCPP/Maps/DisplayDeviceLocationWithNmeaDataSources" \ - "$$SAMPLEPATHCPP/Maps/DisplayDrawingStatus" \ - "$$SAMPLEPATHCPP/Maps/DisplayLayerViewDrawState" \ - "$$SAMPLEPATHCPP/Maps/DisplayMap" \ - "$$SAMPLEPATHCPP/Maps/DisplayOverviewMap" \ - "$$SAMPLEPATHCPP/Maps/DownloadPreplannedMap" \ - "$$SAMPLEPATHCPP/Maps/GenerateOfflineMap_Overrides" \ - "$$SAMPLEPATHCPP/Maps/GenerateOfflineMap" \ - "$$SAMPLEPATHCPP/Maps/GenerateOfflineMapLocalBasemap" \ - "$$SAMPLEPATHCPP/Maps/HonorMobileMapPackageExpiration" \ - "$$SAMPLEPATHCPP/Maps/IdentifyLayers" \ - "$$SAMPLEPATHCPP/Maps/ManageBookmarks" \ - "$$SAMPLEPATHCPP/Maps/MapLoaded" \ - "$$SAMPLEPATHCPP/Maps/MapReferenceScale" \ - "$$SAMPLEPATHCPP/Maps/MapRotation" \ - "$$SAMPLEPATHCPP/Maps/MinMaxScale" \ - "$$SAMPLEPATHCPP/Maps/MobileMap_SearchAndRoute" \ - "$$SAMPLEPATHCPP/Maps/OpenMapUrl" \ - "$$SAMPLEPATHCPP/Maps/OpenMobileMap_MapPackage" \ - "$$SAMPLEPATHCPP/Maps/ReadGeoPackage" \ - "$$SAMPLEPATHCPP/Maps/SetInitialMapArea" \ - "$$SAMPLEPATHCPP/Maps/SetInitialMapLocation" \ - "$$SAMPLEPATHCPP/Maps/SetMapSpatialReference" \ - "$$SAMPLEPATHCPP/Maps/SetMaxExtent" \ - "$$SAMPLEPATHCPP/Maps/ShowDeviceLocationUsingIndoorPositioning" \ - "$$SAMPLEPATHCPP/Maps/ShowLocationHistory" \ - "$$SAMPLEPATHCPP/Maps/ShowMagnifier" \ - "$$SAMPLEPATHCPP/Maps/TakeScreenshot" \ - "$$SAMPLEPATHCPP/Routing/ClosestFacility" \ - "$$SAMPLEPATHCPP/Routing/DisplayRouteLayer" \ - "$$SAMPLEPATHCPP/Routing/FindClosestFacilityToMultipleIncidentsService" \ - "$$SAMPLEPATHCPP/Routing/FindRoute" \ - "$$SAMPLEPATHCPP/Routing/FindServiceAreasForMultipleFacilities" \ - "$$SAMPLEPATHCPP/Routing/NavigateRoute" \ - "$$SAMPLEPATHCPP/Routing/NavigateARouteWithRerouting" \ - "$$SAMPLEPATHCPP/Routing/OfflineRouting" \ - "$$SAMPLEPATHCPP/Routing/RouteAroundBarriers" \ - "$$SAMPLEPATHCPP/Routing/ServiceArea" \ - "$$SAMPLEPATHCPP/Scenes/Add3DTilesLayer" \ - "$$SAMPLEPATHCPP/Scenes/AddAPointSceneLayer" \ - "$$SAMPLEPATHCPP/Scenes/AddIntegratedMeshLayer" \ - "$$SAMPLEPATHCPP/Scenes/Animate3DSymbols" \ - "$$SAMPLEPATHCPP/Scenes/AnimateImagesWithImageOverlay" \ - "$$SAMPLEPATHCPP/Scenes/BasicSceneView" \ - "$$SAMPLEPATHCPP/Scenes/ChangeAtmosphereEffect" \ - "$$SAMPLEPATHCPP/Scenes/ChooseCameraController" \ - "$$SAMPLEPATHCPP/Scenes/CreateTerrainSurfaceFromLocalRaster" \ - "$$SAMPLEPATHCPP/Scenes/CreateTerrainSurfaceFromLocalTilePackage" \ - "$$SAMPLEPATHCPP/Scenes/Display3DLabelsInScene" \ - "$$SAMPLEPATHCPP/Scenes/DisplaySceneLayer" \ - "$$SAMPLEPATHCPP/Scenes/DistanceCompositeSymbol" \ - "$$SAMPLEPATHCPP/Scenes/ExtrudeGraphics" \ - "$$SAMPLEPATHCPP/Scenes/FeatureLayerExtrusion" \ - "$$SAMPLEPATHCPP/Scenes/FilterFeaturesInScene" \ - "$$SAMPLEPATHCPP/Scenes/GetElevationAtPoint" \ - "$$SAMPLEPATHCPP/Scenes/OpenMobileScenePackage" \ - "$$SAMPLEPATHCPP/Scenes/OpenScene" \ - "$$SAMPLEPATHCPP/Scenes/OrbitCameraAroundObject" \ - "$$SAMPLEPATHCPP/Scenes/RealisticLightingAndShadows" \ - "$$SAMPLEPATHCPP/Scenes/SceneLayerSelection" \ - "$$SAMPLEPATHCPP/Scenes/ScenePropertiesExpressions" \ - "$$SAMPLEPATHCPP/Scenes/SetSurfacePlacementMode" \ - "$$SAMPLEPATHCPP/Scenes/Symbols" \ - "$$SAMPLEPATHCPP/Scenes/SyncMapViewSceneView" \ - "$$SAMPLEPATHCPP/Scenes/TerrainExaggeration" \ - "$$SAMPLEPATHCPP/Scenes/ViewContentBeneathTerrainSurface" \ - "$$SAMPLEPATHCPP/Scenes/ViewPointCloudDataOffline" \ - "$$SAMPLEPATHCPP/Search/FindAddress" \ - "$$SAMPLEPATHCPP/Search/FindPlace" \ - "$$SAMPLEPATHCPP/Search/OfflineGeocode" \ - "$$SAMPLEPATHCPP/Search/ReverseGeocodeOnline" \ - "$$SAMPLEPATHCPP/Search/SearchDictionarySymbolStyle" \ - "$$SAMPLEPATHCPP/UtilityNetwork/ConfigureSubnetworkTrace" \ - "$$SAMPLEPATHCPP/UtilityNetwork/CreateLoadReport" \ - "$$SAMPLEPATHCPP/UtilityNetwork/DisplayContentOfUtilityNetworkContainer" \ - "$$SAMPLEPATHCPP/UtilityNetwork/DisplayUtilityAssociations" \ - "$$SAMPLEPATHCPP/UtilityNetwork/PerformValveIsolationTrace" \ - "$$SAMPLEPATHCPP/UtilityNetwork/TraceUtilityNetwork" \ - "$$SAMPLEPATHCPP/UtilityNetwork/ValidateUtilityNetworkTopology" - HEADERS += \ "$$SAMPLEPATHCPP/Analysis/AnalyzeHotspots/AnalyzeHotspots.h" \ "$$SAMPLEPATHCPP/Analysis/AnalyzeViewshed/AnalyzeViewshed.h" \ @@ -256,7 +37,6 @@ HEADERS += \ "$$SAMPLEPATHCPP/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.h" \ "$$SAMPLEPATHCPP/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.h" \ "$$SAMPLEPATHCPP/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.h" \ - "$$SAMPLEPATHCPP/DisplayInformation/DisplayGrid/DisplayGrid.h" \ "$$SAMPLEPATHCPP/DisplayInformation/DisplayClusters/DisplayClusters.h" \ "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.h" \ "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.h" \ @@ -267,6 +47,7 @@ HEADERS += \ "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.h" \ "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.h" \ "$$SAMPLEPATHCPP/DisplayInformation/ShowCallout/ShowCallout.h" \ + "$$SAMPLEPATHCPP/DisplayInformation/ShowGrid/ShowGrid.h" \ "$$SAMPLEPATHCPP/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.h" \ "$$SAMPLEPATHCPP/DisplayInformation/ShowPopup/ShowPopup.h" \ "$$SAMPLEPATHCPP/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.h" \ @@ -483,7 +264,6 @@ SOURCES += \ "$$SAMPLEPATHCPP/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.cpp" \ - "$$SAMPLEPATHCPP/DisplayInformation/DisplayGrid/DisplayGrid.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/DisplayClusters/DisplayClusters.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.cpp" \ @@ -494,6 +274,7 @@ SOURCES += \ "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/SymbolImageProvider.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/ShowCallout/ShowCallout.cpp" \ + "$$SAMPLEPATHCPP/DisplayInformation/ShowGrid/ShowGrid.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/ShowPopup/ShowPopup.cpp" \ "$$SAMPLEPATHCPP/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.cpp" \ @@ -709,7 +490,6 @@ RESOURCES += \ "$$SAMPLEPATHCPP/DisplayInformation/ControlAnnotationSublayerVisibility/ControlAnnotationSublayerVisibility.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/CreateSymbolStylesFromWebStyles/CreateSymbolStylesFromWebStyles.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/CustomDictionaryStyle/CustomDictionaryStyle.qrc" \ - "$$SAMPLEPATHCPP/DisplayInformation/DisplayGrid/DisplayGrid.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/DisplayClusters/DisplayClusters.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer_3D/GODictionaryRenderer_3D.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/GODictionaryRenderer/GODictionaryRenderer.qrc" \ @@ -719,6 +499,7 @@ RESOURCES += \ "$$SAMPLEPATHCPP/DisplayInformation/QueryFeaturesWithArcadeExpression/QueryFeaturesWithArcadeExpression.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/ReadSymbolsFromMobileStyle/ReadSymbolsFromMobileStyle.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/ShowCallout/ShowCallout.qrc" \ + "$$SAMPLEPATHCPP/DisplayInformation/ShowGrid/ShowGrid.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/ShowLabelsOnLayers/ShowLabelsOnLayers.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/ShowPopup/ShowPopup.qrc" \ "$$SAMPLEPATHCPP/DisplayInformation/Simple_Marker_Symbol/Simple_Marker_Symbol.qrc" \ @@ -905,8 +686,8 @@ RESOURCES += \ "$$SAMPLEPATHCPP/UtilityNetwork/TraceUtilityNetwork/TraceUtilityNetwork.qrc" \ "$$SAMPLEPATHCPP/UtilityNetwork/ValidateUtilityNetworkTopology/ValidateUtilityNetworkTopology.qrc" -# Local Server Only (Linux and Windows) -!android:!ios:!macx { +# Local Server Only (Linux x86_64 and Windows x86_64) +win32:contains(QMAKE_TARGET.arch, x86_64)|unix:contains(QMAKE_TARGET.arch, x86_64) { INCLUDEPATH += \ "$$SAMPLEPATHCPP/LocalServer/LocalServerFeatureLayer" \ "$$SAMPLEPATHCPP/LocalServer/LocalServerGeoprocessing" \ diff --git a/Templates/CppSampleTemplate/main.cpp.tmpl b/Templates/CppSampleTemplate/main.cpp.tmpl index 191e60f848..2ebfb786ee 100644 --- a/Templates/CppSampleTemplate/main.cpp.tmpl +++ b/Templates/CppSampleTemplate/main.cpp.tmpl @@ -1,10 +1,10 @@ // Copyright %{CurrentYear} 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. diff --git a/Templates/CppSampleTemplate/main.qml.tmpl b/Templates/CppSampleTemplate/main.qml.tmpl index 359de8b4d2..c323079bf2 100644 --- a/Templates/CppSampleTemplate/main.qml.tmpl +++ b/Templates/CppSampleTemplate/main.qml.tmpl @@ -1,10 +1,10 @@ // Copyright %{CurrentYear} 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. diff --git a/Templates/CppSampleTemplate/sample.cpp.tmpl b/Templates/CppSampleTemplate/sample.cpp.tmpl index 6e0dda42a8..14f7f570eb 100644 --- a/Templates/CppSampleTemplate/sample.cpp.tmpl +++ b/Templates/CppSampleTemplate/sample.cpp.tmpl @@ -1,12 +1,12 @@ // [WriteFile Name=%{SampleName}, Category=%{SampleCategory}] // [Legal] // Copyright %{CurrentYear} 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. diff --git a/Templates/CppSampleTemplate/sample.h.tmpl b/Templates/CppSampleTemplate/sample.h.tmpl index bb669921a6..3a6215c541 100644 --- a/Templates/CppSampleTemplate/sample.h.tmpl +++ b/Templates/CppSampleTemplate/sample.h.tmpl @@ -1,12 +1,12 @@ // [WriteFile Name=%{SampleName}, Category=%{SampleCategory}] // [Legal] // Copyright %{CurrentYear} 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. @@ -17,6 +17,8 @@ #ifndef %{IncludeGuard} #define %{IncludeGuard} +#include + namespace Esri::ArcGISRuntime { @if %{UseFeatureLayer} @@ -31,8 +33,6 @@ namespace Esri::ArcGISRuntime @endif } -#include - @if %{ThreeDSample} Q_MOC_INCLUDE("SceneQuickView.h"); @else diff --git a/Templates/CppSampleTemplate/sample.pro.tmpl b/Templates/CppSampleTemplate/sample.pro.tmpl index 3270d7b996..d489710d5b 100644 --- a/Templates/CppSampleTemplate/sample.pro.tmpl +++ b/Templates/CppSampleTemplate/sample.pro.tmpl @@ -27,7 +27,7 @@ QT += opengl qml quick TEMPLATE = app TARGET = %{SampleName} -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) #------------------------------------------------------------------------------- diff --git a/Templates/CppSampleTemplate/wizard.json b/Templates/CppSampleTemplate/wizard.json index c709225779..b6ee345718 100644 --- a/Templates/CppSampleTemplate/wizard.json +++ b/Templates/CppSampleTemplate/wizard.json @@ -2,10 +2,10 @@ "version": 1, "kind": "project", "supportedProjectTypes": [ "Qt4ProjectManager.Qt4Project" ], - "id": "A.Sample_ArcGISQt_CPP_200_5_0", + "id": "A.Sample_ArcGISQt_CPP_200_6_0", "category": "B.CustomProjects", - "trDescription": "Creates a Sample ArcGIS Maps 200.5.0 Qt Quick C++ application.", - "trDisplayName": "Sample ArcGIS Maps 200.5.0 C++ Qt Quick App", + "trDescription": "Creates a Sample ArcGIS Maps 200.6.0 Qt Quick C++ application.", + "trDisplayName": "Sample ArcGIS Maps 200.6.0 C++ Qt Quick App", "trDisplayCategory": "ArcGIS", "icon": "wizard.png", "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ], diff --git a/Templates/CppWidgetsSampleTemplate/main.cpp.tmpl b/Templates/CppWidgetsSampleTemplate/main.cpp.tmpl index dd5b3f3409..0aabc65b83 100644 --- a/Templates/CppWidgetsSampleTemplate/main.cpp.tmpl +++ b/Templates/CppWidgetsSampleTemplate/main.cpp.tmpl @@ -1,10 +1,10 @@ // Copyright %{CurrentYear} 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. diff --git a/Templates/CppWidgetsSampleTemplate/sample.cpp.tmpl b/Templates/CppWidgetsSampleTemplate/sample.cpp.tmpl index c82518bb39..40b15d5c12 100644 --- a/Templates/CppWidgetsSampleTemplate/sample.cpp.tmpl +++ b/Templates/CppWidgetsSampleTemplate/sample.cpp.tmpl @@ -1,12 +1,12 @@ // [WriteFile Name=%{SampleName}, Category=%{SampleCategory}] // [Legal] // Copyright %{CurrentYear} 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. diff --git a/Templates/CppWidgetsSampleTemplate/sample.h.tmpl b/Templates/CppWidgetsSampleTemplate/sample.h.tmpl index 0de1f35f50..8e30abf38d 100644 --- a/Templates/CppWidgetsSampleTemplate/sample.h.tmpl +++ b/Templates/CppWidgetsSampleTemplate/sample.h.tmpl @@ -1,12 +1,12 @@ // [WriteFile Name=GORenderers, Category=DisplayInformation] // [Legal] // Copyright %{CurrentYear} 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. @@ -17,6 +17,8 @@ #ifndef %{IncludeGuard} #define %{IncludeGuard} +#include + namespace Esri::ArcGISRuntime { @if %{UseFeatureLayer} @@ -31,8 +33,6 @@ namespace Esri::ArcGISRuntime @endif } -#include - class %{SampleName} : public QWidget { Q_OBJECT diff --git a/Templates/CppWidgetsSampleTemplate/sample.pro.tmpl b/Templates/CppWidgetsSampleTemplate/sample.pro.tmpl index 9a9cffb40f..66367b0503 100644 --- a/Templates/CppWidgetsSampleTemplate/sample.pro.tmpl +++ b/Templates/CppWidgetsSampleTemplate/sample.pro.tmpl @@ -27,7 +27,7 @@ QT += widgets TEMPLATE = app TARGET = %{SampleName} -ARCGIS_RUNTIME_VERSION = 200.5.0 +ARCGIS_RUNTIME_VERSION = 200.6.0 include($$PWD/arcgisruntime.pri) win32:CONFIG += \\ diff --git a/Templates/CppWidgetsSampleTemplate/wizard.json b/Templates/CppWidgetsSampleTemplate/wizard.json index 670bd54609..f81997d97b 100644 --- a/Templates/CppWidgetsSampleTemplate/wizard.json +++ b/Templates/CppWidgetsSampleTemplate/wizard.json @@ -1,199 +1,199 @@ { - "version": 1, - "kind": "project", - "supportedProjectTypes": [ "Qt4ProjectManager.Qt4Project" ], - "id": "A.Sample_ArcGISQt_CPP__Widgets_200_5_0", - "category": "B.CustomProjects", - "trDescription": "Creates a Sample ArcGIS Maps 200.5.0 Qt C++ Widgets application.", - "trDisplayName": "Sample ArcGIS Maps 200.5.0 Qt C++ Widgets App", - "trDisplayCategory": "ArcGIS", - "icon": "wizard.png", - "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureQWidgets", "QtSupport.Wizards.FeatureDesktop" ], - "platformIndependent": "false", - "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Plugins} ].indexOf('CppEditor') >= 0}", + "version": 1, + "kind": "project", + "supportedProjectTypes": [ "Qt4ProjectManager.Qt4Project" ], + "id": "A.Sample_ArcGISQt_CPP__Widgets_200_6_0", + "category": "B.CustomProjects", + "trDescription": "Creates a Sample ArcGIS Maps 200.6.0 Qt C++ Widgets application.", + "trDisplayName": "Sample ArcGIS Maps 200.6.0 Qt C++ Widgets App", + "trDisplayCategory": "ArcGIS", + "icon": "wizard.png", + "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureQWidgets", "QtSupport.Wizards.FeatureDesktop" ], + "platformIndependent": "false", + "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Plugins} ].indexOf('CppEditor') >= 0}", - "options": - [ - { "key": "ProFileName", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'pro')}" }, - { "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" }, - { "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" }, - { "key": "QtQuickWindowVersion", "value": "%{JS: %{QtVersion}.qtQuickWindowVersion}" }, - { "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" }, - { "key": "DisplayName", "value": "%{JS: Cpp.className('%{DispName}')}" }, - { "key": "SampleName", "value": "%{JS: '%{Class}'.charAt(0).toUpperCase() + '%{Class}'.substring(1)}" }, - { "key": "SampleDescription", "value": "%{SampleDesc}" }, - { "key": "SampleCategory", "value": "%{SampleCat}" }, - { "key": "IncludeGuard", "value": "%{JS: Cpp.classToHeaderGuard('%{Class}', '%{JS: Util.preferredSuffix('text/x-c++hdr')}')}" }, - { "key": "ThreeDSample", "value": "%{threeD}" }, - { "key": "UseFeatureLayer", "value": "%{JS: ( '%{FeatureLayerURL}'.length === 0 ) ? 'false' : 'true'}" }, - { "key": "UseAPIKey", "value": "%{apiKey}" }, - { "key": "CurrentYear", "value": "%{JS: new Date().getFullYear()}" } - ], + "options": + [ + { "key": "ProFileName", "value": "%{JS: Util.fileName('%{ProjectDirectory}/%{ProjectName}', 'pro')}" }, + { "key": "MainCppFileName", "value": "%{JS: 'main.' + Util.preferredSuffix('text/x-c++src')}" }, + { "key": "QtQuickVersion", "value": "%{JS: %{QtVersion}.qtQuickVersion}" }, + { "key": "QtQuickWindowVersion", "value": "%{JS: %{QtVersion}.qtQuickWindowVersion}" }, + { "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" }, + { "key": "DisplayName", "value": "%{JS: Cpp.className('%{DispName}')}" }, + { "key": "SampleName", "value": "%{JS: '%{Class}'.charAt(0).toUpperCase() + '%{Class}'.substring(1)}" }, + { "key": "SampleDescription", "value": "%{SampleDesc}" }, + { "key": "SampleCategory", "value": "%{SampleCat}" }, + { "key": "IncludeGuard", "value": "%{JS: Cpp.classToHeaderGuard('%{Class}', '%{JS: Util.preferredSuffix('text/x-c++hdr')}')}" }, + { "key": "ThreeDSample", "value": "%{threeD}" }, + { "key": "UseFeatureLayer", "value": "%{JS: ( '%{FeatureLayerURL}'.length === 0 ) ? 'false' : 'true'}" }, + { "key": "UseAPIKey", "value": "%{apiKey}" }, + { "key": "CurrentYear", "value": "%{JS: new Date().getFullYear()}" } + ], - "pages": - [ + "pages": + [ + { + "trDisplayName": "Project Location", + "trShortTitle": "Location", + "typeId": "Project" + }, + { + "trDisplayName": "Define Project Details", + "trShortTitle": "Details", + "typeId": "Fields", + "data": + [ { - "trDisplayName": "Project Location", - "trShortTitle": "Location", - "typeId": "Project" - }, - { - "trDisplayName": "Define Project Details", - "trShortTitle": "Details", - "typeId": "Fields", - "data": + "name": "SampleCat", + "trDisplayName": "ArcGIS SDK Samples Category:", + "type": "ComboBox", + "data": + { + "index": 0, + "items": [ - { - "name": "SampleCat", - "trDisplayName": "ArcGIS SDK Samples Category:", - "type": "ComboBox", - "data": - { - "index": 0, - "items": - [ - { - "trKey": "Analysis", - "value": "Analysis" - }, - { - "trKey": "CloudAndPortal", - "value": "CloudAndPortal" - }, - { - "trKey": "DisplayInformation", - "value": "DisplayInformation" - }, - { - "trKey": "EditData", - "value": "EditData" - }, - { - "trKey": "Features", - "value": "Features" - }, - { - "trKey": "Layers", - "value": "Layers" - }, - { - "trKey": "Maps", - "value": "Maps" - }, - { - "trKey": "Routing", - "value": "Routing" - }, - { - "trKey": "Scenes", - "value": "Scenes" - }, - { - "trKey": "Search", - "value": "Search" - } - ] - } - }, - { - "name": "DispName", - "trDisplayName": "Display Name:", - "mandatory": true, - "type": "LineEdit", - "data": { "trPlaceholder" : "This will be the name we display to the user etc." } - }, - { - "name": "Class", - "trDisplayName": "Sample Name:", - "mandatory": true, - "type": "LineEdit", - "data": { "validator": "(?:[a-zA-Z_0-9]*)", "trPlaceholder" : "This will be the name of files/classes etc." } - }, - { - "name": "SampleDesc", - "trDisplayName": "Sample Description:", - "mandatory": false, - "type": "LineEdit", - "data": - { - "trText": "This sample demonstrates how to XXXXX." - } - }, - { - "name": "threeD", - "trDisplayName": "3-D sample", - "type": "CheckBox", - "data":{"checked": false} - }, - { - "name": "FeatureLayerURL", - "trDisplayName": "Feature Layer URL:", - "mandatory": false, - "type": "LineEdit", - "data": - { - "trPlaceholder" : "Optionally add the URL for a FeatureLayer" - } - }, - { - "name": "apiKey", - "trDisplayName": "Use API Key", - "type": "CheckBox", - "data":{"checked": true} - } + { + "trKey": "Analysis", + "value": "Analysis" + }, + { + "trKey": "CloudAndPortal", + "value": "CloudAndPortal" + }, + { + "trKey": "DisplayInformation", + "value": "DisplayInformation" + }, + { + "trKey": "EditData", + "value": "EditData" + }, + { + "trKey": "Features", + "value": "Features" + }, + { + "trKey": "Layers", + "value": "Layers" + }, + { + "trKey": "Maps", + "value": "Maps" + }, + { + "trKey": "Routing", + "value": "Routing" + }, + { + "trKey": "Scenes", + "value": "Scenes" + }, + { + "trKey": "Search", + "value": "Search" + } ] + } + }, + { + "name": "DispName", + "trDisplayName": "Display Name:", + "mandatory": true, + "type": "LineEdit", + "data": { "trPlaceholder" : "This will be the name we display to the user etc." } + }, + { + "name": "Class", + "trDisplayName": "Sample Name:", + "mandatory": true, + "type": "LineEdit", + "data": { "validator": "(?:[a-zA-Z_0-9]*)", "trPlaceholder" : "This will be the name of files/classes etc." } }, { - "trDisplayName": "Kit Selection", - "trShortTitle": "Kits", - "typeId": "Kits", - "data": { - "projectFilePath": "%{ProFileName}" - } + "name": "SampleDesc", + "trDisplayName": "Sample Description:", + "mandatory": false, + "type": "LineEdit", + "data": + { + "trText": "This sample demonstrates how to XXXXX." + } }, { - "trDisplayName": "Project Management", - "trShortTitle": "Summary", - "typeId": "Summary" + "name": "threeD", + "trDisplayName": "3-D sample", + "type": "CheckBox", + "data":{"checked": false} + }, + { + "name": "FeatureLayerURL", + "trDisplayName": "Feature Layer URL:", + "mandatory": false, + "type": "LineEdit", + "data": + { + "trPlaceholder" : "Optionally add the URL for a FeatureLayer" + } + }, + { + "name": "apiKey", + "trDisplayName": "Use API Key", + "type": "CheckBox", + "data":{"checked": true} } - ], - "generators": - [ + ] + }, + { + "trDisplayName": "Kit Selection", + "trShortTitle": "Kits", + "typeId": "Kits", + "data": { + "projectFilePath": "%{ProFileName}" + } + }, + { + "trDisplayName": "Project Management", + "trShortTitle": "Summary", + "typeId": "Summary" + } + ], + "generators": + [ + { + "typeId": "File", + "data": + [ { - "typeId": "File", - "data": - [ - { - "source": "main.cpp.tmpl", - "target": "%{MainCppFileName}" - }, - { - "source": "sample.cpp.tmpl", - "target": "%{SampleName}.cpp", - "openInEditor": true - }, - { - "source": "sample.h.tmpl", - "target": "%{SampleName}.h" - }, - { - "source": "sample.pro.tmpl", - "target": "%{ProFileName}", - "openAsProject": true - }, - { - "source": "screenshot.png", - "isBinary": true - }, - { - "source": "README.md.tmpl", - "target": "README.md" - }, - { - "source": "arcgisruntime.pri", - "target": "arcgisruntime.pri" - } - ] + "source": "main.cpp.tmpl", + "target": "%{MainCppFileName}" + }, + { + "source": "sample.cpp.tmpl", + "target": "%{SampleName}.cpp", + "openInEditor": true + }, + { + "source": "sample.h.tmpl", + "target": "%{SampleName}.h" + }, + { + "source": "sample.pro.tmpl", + "target": "%{ProFileName}", + "openAsProject": true + }, + { + "source": "screenshot.png", + "isBinary": true + }, + { + "source": "README.md.tmpl", + "target": "README.md" + }, + { + "source": "arcgisruntime.pri", + "target": "arcgisruntime.pri" } - ] + ] + } + ] }