Fix #72 and #71, Upgrades to PyQt 5 and sequence count fix#85
Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom May 20, 2020
Merged
Conversation
skliper
changed the title
skliper
added
the
CCB:Ignore
Contributor
lbleier-GSFC
force-pushed
the
fix72-upgradepyqt
branch
2 times, most recently
from
9e95db1 to
9555ec8
Compare
astrogeco
added
CCB:Ready
astrogeco
changed the title
astrogeco
reviewed
May 13, 2020
Contributor
|
CCB 20200513 - Approved with cleanup needed |
skliper
removed
the
CCB:Ready
dmknutsen
approved these changes
May 13, 2020
This was
linked to
issues
May 15, 2020
Closed
Contributor
|
@lbleier-GSFC can you take a look at resolving the comments and conflicts? |
Contributor
Author
Should be ok now |
Contributor
|
@lbleier-GSFC Thanks! Can you rebase and squash commits |
lbleier-GSFC
force-pushed
the
fix72-upgradepyqt
branch
from
12de114 to
57f549d
Compare
Contributor
Author
Please verify this looks ok |
Contributor
|
@lbleier-GSFC still needs a rebase. Don't merge ic into your work, rebase your work on ic. |
Also includes general fixes/refactoring/cleanup. Also fixes nasa#71
lbleier-GSFC
force-pushed
the
fix72-upgradepyqt
branch
from
f3ef354 to
5ae4d32
Compare
Contributor
|
@astrogeco fixed! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Describe the contribution
This is a major change, upgrading PyQt4 to PyQt5 and includes a lot of cleanup/refactoring, and changes to the GUI itself
Fix #71
Fix #72
Testing performed
Steps taken to test the contribution:
Additional context
PLEASE NOTE: All
.uifiles as well as any.pyfiles auto-generated bypyuic5should be ignored during review, as these are related to the GUI itselfContributor Info - All information REQUIRED for consideration of pull request
Leor Bleier, NASA GSFC\Code 582