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

Qt UI Layout #5

Open
wants to merge 1 commit into
base: connect-ui
Choose a base branch
from
Open

Qt UI Layout #5

wants to merge 1 commit into from

Conversation

rflmota
Copy link
Collaborator

@rflmota rflmota commented Jan 20, 2021

Hi @dennisolien

I've retouched Qt UI layout to be concordant to MercuryGS requirements document. I guess I haven't broken any functionality regarding your previous commits, but I ask you to test and review.

  • Telecommanding tab

Screenshot 2021-01-20 at 15 44 57

  • Telemetry tab

Screenshot 2021-01-20 at 15 46 31

  • File Transfer tab

Screenshot 2021-01-20 at 15 46 56

  • Config tab

Screenshot 2021-01-20 at 15 47 31

  • Test tab

Screenshot 2021-01-20 at 15 50 52

Qt UI Layout - (style): Re-layout of Qt UI to match specs mockups.
@dennisolien
Copy link
Collaborator

dennisolien commented Jan 22, 2021

are you sure that the Telemetry tab is right? did you remove the changes i did? Im looking at spec KS-DOC-01104: 5.3 Telemetry PLAT_COMMS_00105

@rflmota
Copy link
Collaborator Author

rflmota commented Jan 22, 2021

Hi @dennisolien ,

I just checked the document KS-DOC-01104 OSSAT Mercury GS Specification_03 and I guess you're right, maybe I was referring to a older version of specs, but I didn't noticed that a new subsection Last Failure was added to the form.

image

Also I didn't include the TLM CH1..3 as in the example provided, because my reasoning is that information is dynamic and several channels may be added more than 1..3 (maybe we should place a scrollable text area for this?

I can have a look and try to fix this later or you can go ahead and replace with your own, tell me what you think

@rflmota
Copy link
Collaborator Author

rflmota commented Jan 22, 2021

@dennisolien , regarding your changes, I didn't removed, but I also didn't merged with mine, I had previously designed the form and when I noticed your #4, I just decided to push my version upstream since already included tabs LOGand TESTfrom your todo list. But in case it just gives you more trouble merging the branch, just drop my changes.

@dennisolien
Copy link
Collaborator

@rflmota this is really helpful, im just reimplementing it in my main branch. In your version there is some problems with the names of ui elements, so i'm just going over one tab at the time, copying in your work with the right name on the elements.

and i agree on the TLM CH1..3 stuff.

@dennisolien
Copy link
Collaborator

I think all of this is added in #4, can you @rflmota check if master and this branch have feature parity.

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.

2 participants