Jared/re org no qml sample app #1712
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Haven't reviewed in detail yet, but I recommend simplifying the root sample viewer folder from |
|
Also, I recommend changing The extra |
ldanzinger
reviewed
May 30, 2024
|
Not to pile too much extra in here, but it would be nice if the sample-templates was just called Templates, and if all the folders were consistently CamelCase (or whatever standard we want to use). We can split off stuff for later if it adds extra complexity, but it would be nice to make everything a bit more tidy if it's reasonable to do so |
@ldanzinger So changing the folder, |
|
I am not sure how all of the inner workings of the GuideDoc builds (which include generating the samples pages for localhost and Jenkins) work. The renaming of CPP samples and folder structure could be have an impact. I supposed that we will find out after this PR gets merged and we adjust if needed. I am cc'ing @ThadT to make sure we all know there could be down-stream ramifications. |
There was a problem hiding this comment.
Looks like this is on the right track. I skimmed over the changes. I agree with Lucas' suggestions and I suspect that is a lot more we can do internally to refactor the code where abstractions are no longer needed, but that would be a more invasive and lengthy process.
| @@ -139,7 +139,7 @@ QMAKE_TARGET_COPYRIGHT = Copyright 2017 Esri Inc. | |||
| include(samples.pri) | |||
|
|
|||
| # contains source files for zlib-ng and minizip-ng | |||
| include($$PWD/../../3rdparty/zlib_minizip_ng.pri) | |||
| include($$PWD/../3rdparty/zlib_minizip_ng.pri) | |||
There was a problem hiding this comment.
This alone could bring back the path-too-long problems on Windows. The build is very touchy.
We should still try to do what makes sense.
There was a problem hiding this comment.
We just moved the project down a directory so all the relative paths need updating. I would of thought reducing a level would help alleviate the problem rather than add too it.
There was a problem hiding this comment.
I'd have thought the same thing but the build machine was generating really long relative paths, so this could actually add to the ../../../ depending on where it sits in the path. We'll see what happens when we go to merge it. If we hit problems again, we can consider the workaround I mentioned in our internal issue.
jared-2016
commented
May 31, 2024
Yeah, we'll need to tweak some of the config settings for the site that read the samples repo to generate the doc. It's straightforward to test it before you merge the PR. Just let me know when you have all the pathnames updated and I can give it a look. |
…e and to ahead to CamelCase like we do everywhere else in the repo.
It's still there. |
@JamesMBallard Sorry for the confusion. There were two, one in the sample viewer folder and one that holds all the samples source. I just removed the sampleviewer portion. Removing the QML samples was not included in the scope of this work. |
|
@jared-2016 - I was confused about this too. The folder in the samples source is the one that affects the samples doc. The changes in this PR shouldn't impact the doc at all 👍 |
|
This is too many file changes to review in github. I pulled the branch down, tried and build and got hit with lots of warnings like this: The build fails as well (it's not just configure warnings). |
JamesMBallard
approved these changes
Jun 3, 2024
|
Here goes nothing! |
JamesMBallard
added a commit
that referenced
this pull request
Aug 1, 2024
* 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 <[email protected]> * review comment fixed * Review comment fixed. * self review * review comment fixed * review comment fixed --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Revert "Jared/remove extras dependency (#1707)" (#1709) This reverts commit a254a04. * Jared/lets try to merge (#1710) * Revert "Revert "Jared/remove extras dependency (#1707)" (#1709)" This reverts commit e155a75. * 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 e155a75. * Switch paths to bypass path issues on Windows. * removing duplicates. * duplicates. * Removing comments. * review comment --------- Co-authored-by: James Ballard <[email protected]> * 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 207849a. * 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 461cefd. * 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 <[email protected]> * Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp Co-authored-by: James Ballard <[email protected]> * Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp Co-authored-by: James Ballard <[email protected]> * Update BasemapStyleListModel.cpp removed const. --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> --------- Co-authored-by: James Ballard <[email protected]> * 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 --------- Co-authored-by: Jared Caccamo <[email protected]> Co-authored-by: James Ballard <[email protected]> Co-authored-by: Ajith Challiyil Pulakkatuthodi <[email protected]> Co-authored-by: Brian Noble <[email protected]> Co-authored-by: James Ballard <[email protected]> Co-authored-by: Tanner Yould <[email protected]> Co-authored-by: Andrew Bladon <[email protected]> Co-authored-by: Harini Chaganti <[email protected]> Co-authored-by: Guillaume Belz <[email protected]>
bri12415
added a commit
that referenced
this pull request
Nov 13, 2024
* 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 <[email protected]> * review comment fixed * Review comment fixed. * self review * review comment fixed * review comment fixed --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Revert "Jared/remove extras dependency (#1707)" (#1709) This reverts commit a254a04. * Jared/lets try to merge (#1710) * Revert "Revert "Jared/remove extras dependency (#1707)" (#1709)" This reverts commit e155a75. * 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 e155a75. * Switch paths to bypass path issues on Windows. * removing duplicates. * duplicates. * Removing comments. * review comment --------- Co-authored-by: James Ballard <[email protected]> * 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 207849a. * 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 461cefd. * 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 <[email protected]> * Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp Co-authored-by: James Ballard <[email protected]> * Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp Co-authored-by: James Ballard <[email protected]> * Update BasemapStyleListModel.cpp removed const. --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> --------- Co-authored-by: Brian Noble <[email protected]> * 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 <[email protected]> --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> Co-authored-by: James Ballard <[email protected]> Co-authored-by: Ajith Challiyil Pulakkatuthodi <[email protected]> Co-authored-by: James Ballard <[email protected]> Co-authored-by: Tanner Yould <[email protected]> Co-authored-by: Andrew Bladon <[email protected]> Co-authored-by: Lucas Danzinger <[email protected]> Co-authored-by: Harini Chaganti <[email protected]> Co-authored-by: Guillaume Belz <[email protected]>
ldanzinger
added a commit
that referenced
this pull request
Nov 25, 2024
* 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 <[email protected]> * review comment fixed * Review comment fixed. * self review * review comment fixed * review comment fixed --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * Revert "Jared/remove extras dependency (#1707)" (#1709) This reverts commit a254a04. * Jared/lets try to merge (#1710) * Revert "Revert "Jared/remove extras dependency (#1707)" (#1709)" This reverts commit e155a75. * 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 e155a75. * Switch paths to bypass path issues on Windows. * removing duplicates. * duplicates. * Removing comments. * review comment --------- Co-authored-by: James Ballard <[email protected]> * 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 207849a. * 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 461cefd. * 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 <[email protected]> * Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp Co-authored-by: James Ballard <[email protected]> * Update CppSamples/Maps/CreateDynamicBasemapGallery/BasemapStyleListModel.cpp Co-authored-by: James Ballard <[email protected]> * Update BasemapStyleListModel.cpp removed const. --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> --------- Co-authored-by: Brian Noble <[email protected]> * 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 <[email protected]> --------- Co-authored-by: James Ballard <[email protected]> * 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 <[email protected]> Co-authored-by: James Ballard <[email protected]> Co-authored-by: Ajith Challiyil Pulakkatuthodi <[email protected]> Co-authored-by: James Ballard <[email protected]> Co-authored-by: Tanner Yould <[email protected]> Co-authored-by: Andrew Bladon <[email protected]> Co-authored-by: Lucas Danzinger <[email protected]> Co-authored-by: Harini Chaganti <[email protected]> Co-authored-by: Guillaume Belz <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Opening a draft PR to get some eyes on this and to discuss the name change of the sample viewer itself.
ArcGISRuntimeSDKQt_QMLSamplesfolder and project removed.ArcGISRuntimeSDKQt_SampleViewerfolder.ArcGISRuntimeSDKQt_CppSamplesrenamed toArcGISRuntimeSDKQt_SamplesDid a local dev build and setup build on macos without issue as far as I can tell. App icon works etc.
Type of change
Platforms tested on:
Checklist