merging dev into CSM branch in preparation for PR #4192
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
* Convert ckwriter to new app format * Updated ckwriter tests to gtest and fixed angular velocities in the ThreeImageNetwork fixture * Removed old/unnecessary includes * Removed old ckwriter test makefiles
* jigsaw to app conversion and remove unnecessary tests * Updated based on comments * Updated spacing * Adds apollo fixture for jigsaw tests * Updated to use pvl control network * Switch to using function to compare whole csv lines * Updated to add more individual line comparisons * Updated based on comments * Remove accidentally re-added line * removed ISISROOT path * Remove incorrect comparison part of test * Adds jigsaw BundleXYZ test * Update qview MeasureTool to add an option to calculate distances using RA/DEC and update qview to show DEC/RA rather than LAT/LON in lower-right corner * Add changelog
…S#4107) * Added text to description by Dave Humm. Closes DOI-USGS#3860 * Forgot to add to the change log file * Update after review * Updated after review
* added socetlinescankeywords tests * removed prints * added no blob test * removed prints * addressed comments * removed prefix
* Added text to description by Dave Humm. Closes DOI-USGS#3860 * Forgot to add to the change log file * Update after review * Updated after review * Fixed broken xmls * Update lronaccal.xml
* Add dn populated dem fixture * Convert the shapow app into the new app format * Translate the base and multiplier from a label * Add dem cube and updated tests * Removed old shadow tests * Fixed demCube fixed label loading * Updated shadow tests and demCube fixture
* Converted lronac2pds to new application format * Updated tests for lronac2pds to gtests * Removed old lronac2pds test makefiles * Removed local path * Addressed PR comments
* Initial hidtmgen conversion + gtests * Initial hidtmgen tests
* Fixed small bug in spk writer * Converted spkwriter app * Converted tests to Gtests * Removed old tests make files
* Removed old spiceinit makefiles and fixed test * Updated spiceinit ck config to use regex for fk * Fixed comment typo
* converted hicolormos * added colormost things idk * added test * finished tests * removed old tests * mislabeled fixture * missed a spot * more missed sport * removed include * uuuuuuuuuggggh * smaller cube * removed blobs
* Removed duplicate inclusion for mappt * Removed exclusion too
* Fixed changelog and added DOI-USGS#4150 * More changelog clean-up
* added new files * added lronac2isis tests * added data (important) * static funcs
* Updated himos to new application format * Added new gtests for himos * Removed old himos tests * Addressed excess white spaceing * Added static declaration on app helper functions * Removed unnecessary static declaration
* added ring automos tests * uuuugh * comments * fixed typo * messing up your branchm not even once
* write tests with cropped data * add cropped data * test DN's and remove accidental paths * remove accidental prints * fix build failure * remove local path
* Updated lo_reimported notebooke * Updated kaguya notebook * Updated chan notebook * Changed path * Updated marci notebook * Updated lo notebook * Updated lo notebooks * Added mimap notebook
* Updated apollopanstitcher app format * Fixed typo * Updated setoutputcube for ProcessMosaic * Initial stab at the apollopanstitcher gtest * Updated test name * Updated file name * Updated test and removed redundant ui access * Removed old test makefiles
* added tests * changed include guards to all lower
* inital reduce conversion and gtests * removed comment per PR feedback * Removed log variables in tests.
* App conversion for automos * Updated tests for automos * Removed old automos tests * Tested applog output in default test and removed other applog variables
* Added north/south pole tests for demprep * Added missing data files for n/s pole tests.
* added std2isis tests * removed old tests * added unittests * removed image importer unittest * addressed comments
kberryUSGS
approved these changes
Dec 10, 2020
jessemapel
added a commit
that referenced
this pull request
Dec 10, 2020
This reverts commit 68bd30b.
|
Manually reverted by force pushing from last commit to CSM branch. I need to do a regular merge and not a squash and merge. |
Closed
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.
update branch from dev