Bri12415/v.next merged with main #1769
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
* version upgrade * few stragglers
* 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]>
* 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 "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]>
* 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.
Goodbeye QML Samples, we will miss you.
* 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]>
* minor samples repo doc update. * I remember my confusion from before. I still don't know why or how this ever worked before.
* minor samples repo doc update. * no need to specify c++. * duplicate text
* 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 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 * Update FindAddress.cpp * Update FindPlace.cpp * Update README.md * Update ReverseGeocodeOnline.cpp * Update FindAddress.cpp
* 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
* 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.
* updating samples with reticle * Update CppSamples/EditData/SnapGeometryEdits/SnapGeometryEdits.cpp Co-authored-by: James Ballard <[email protected]> --------- Co-authored-by: James Ballard <[email protected]>
* Restore the local server samples. * There is no more base class. Remove virtual. * Const correctness. Don't shadow vars.
* 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
* 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
* 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.
* Changes for 200.6. * Reformat this file. Remove tabs, let Qt Creator auto-format the rest.
* 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.
* 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]>
* 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` * Alphabetize
* 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]>
JamesMBallard
approved these changes
Nov 13, 2024
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
There are some issues with our usual workflow for merging v.next into main that im facing.
So here is what I did:
v.nextwithbri12415/v.next_merged_with_mainmaininto that branchbri12415/v.next_merged_with_mainintomainUsed SampleViewer to verify branch (with toolkit using samples)