Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added mappt coordlist functionality #3905

Merged
merged 10 commits into from
Jun 12, 2020
Merged

Conversation

Kelvinrr
Copy link
Collaborator

@Kelvinrr Kelvinrr commented Jun 9, 2020

Description

Mappt now has a coordlist option like campt.

Related Issue

#3872

Motivation and Context

This makes mappt more in line with campt and allows users to avoid multiple mappt runs on the same projected image.

How Has This Been Tested?

Tests added and are passing

Screenshots (if appropriate):

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation change (update to the documentation; no code change)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • I have read and agree to abide by the Code of Conduct
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

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:

This work is free and unencumbered software released into the public domain. In jurisdictions that recognize copyright laws, the author or authors of this software dedicate any and all copyright interest in the software to the public domain.

  • I dedicate any and all copyright interest in this software to the public domain. I make this dedication for the benefit of the public at large and to the detriment of my heirs and successors. I intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this software under copyright law.

@acpaquette
Copy link
Collaborator

This is somewhat tangential but the include guard in mappt.h has campt_h as the defining variable. Could we get that change in this PR to mappt_h?

@Kelvinrr
Copy link
Collaborator Author

Kelvinrr commented Jun 9, 2020

@acpaquette good catch. Should be fixed now.

@kaitlyndlee
Copy link
Contributor

It looks like in campt.xml, all instances of campt got changed to mappt.

@Kelvinrr
Copy link
Collaborator Author

Kelvinrr commented Jun 9, 2020

uuuuuuugh this is the most spaghetti PR

@Kelvinrr
Copy link
Collaborator Author

Kelvinrr commented Jun 9, 2020

@kaitlyndlee you seem to commenting changes my last commit fixed

@Kelvinrr Kelvinrr requested review from krlberry and kaitlyndlee June 9, 2020 20:20
Copy link
Contributor

@jessemapel jessemapel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change looks good, but it looks like the flatfile output got removed.

isis/src/base/apps/mappt/mappt.cpp Show resolved Hide resolved
Copy link
Contributor

@krlberry krlberry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry one more mappt->campt thing. Besides that and Jesse's comment about the missing flatfile output option this looks good to me!

isis/src/base/apps/mappt/mappt.xml Outdated Show resolved Hide resolved
Copy link
Contributor

@krlberry krlberry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me aside from some debug cout statements that were left in!

isis/tests/FunctionalTestsMappt.cpp Outdated Show resolved Hide resolved
isis/src/base/apps/mappt/mappt.cpp Outdated Show resolved Hide resolved
isis/src/base/apps/mappt/mappt.cpp Outdated Show resolved Hide resolved
Copy link
Contributor

@krlberry krlberry left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Looks good!

@Kelvinrr Kelvinrr merged commit 0bc9a43 into DOI-USGS:dev Jun 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants