2.5D Occlusion and Testing Update #3757
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
acpaquette
commented
Mar 13, 2020
Comment on lines
+329
to
+334
| int patchSize = ui.GetInteger("PATCHSIZE"); | ||
| int minPatchSize = 4; | ||
| if (patchSize < minPatchSize) { | ||
| patchSize = minPatchSize; | ||
| } | ||
| p.SetTiling(patchSize, patchSize); |
There was a problem hiding this comment.
Originally:
int minPatchSize = 4;
if (patchSize < minPatchSize) {
minPatchSize = patchSize;
}
p.SetTiling(patchSize, minPatchSize);
Comment on lines
+34
to
+37
| void cam2map(Cube *icube, Pvl &userMap, PvlGroup &userGrp, UserInterface &ui, Pvl *log) { | ||
| ProcessRubberSheet p; | ||
| cam2map(icube, userMap, userGrp, p, ui, log); | ||
| } |
There was a problem hiding this comment.
New method so a mocked process object can be injected into the test.
acpaquette
commented
Mar 13, 2020
Comment on lines
+545
to
+549
| if (p_occlusion){ | ||
| if (abs(lat - p_incam->UniversalLatitude()) > 0.00001 || abs(lon - p_incam->UniversalLongitude()) > 0.00001) { | ||
| return false; | ||
| } | ||
| } |
There was a problem hiding this comment.
Also the actual occlusion handling in the cam2mapReverse Xform
scsides
approved these changes
Mar 16, 2020
11 tasks
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.
Allows cam2map to account for occlusion when projecting images. Also updates cam2map with the application changes and test, and the application change for map2cam.
Description
Allows cam2map to account for occluded portions of images when they are map projected. This option can only be used with the reverse patch algorithm and is turned off by default to keep any currently used pipelines for generating map projected products to remain the same.
This PR also updates cam2map and map2cam to be callable as functions. The tests for cam2map where also updated with additional fixtures as well as a few new mocks.
Related Issue
This is related to a larger occlusion project with no specific issues on the ISIS repo.
Motivation and Context
This allows ISIS to more accurately project highly oblique images, so long as the image is accurately coregistered to its associated DEM.
How Has This Been Tested?
This has been tested with the current ISIS tests along with a new set of gtests.
Screenshots (if appropriate):
Types of changes
Checklist:
Licensing
This project is mostly composed of free and unencumbered software released into the public domain, and we are unlikely to accept contributions that are not also released into the public domain. Somewhere near the top of each file should have these words: