-
Notifications
You must be signed in to change notification settings - Fork 26
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
ENH: layout changes for compact complex screens + row positioner widget #563
Merged
Merged
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
9533338
WIP/POC: positioner which uses horizontal space
klauer 7549719
CLN: remove prototype collapsible widget
klauer 47ea46a
MNT: rename 'one line positioner' -> 'positioner row'
klauer 76c8c74
REF: always suggest tree for top-level screens
klauer 3ca4ad5
MNT: move device name label to top
klauer ac43191
MNT: add back title in positioner
klauer 4f102df
TMP: patch over issue 565 temporarily
klauer a00bba4
FIX: patch over issue 565
klauer a75ac10
WIP: tweaks for positioner row after discussion
klauer 06c3966
ENH: 'expand panel' option for positioner row
klauer 5a42a84
MNT: add type hints + fix expand button
klauer ccb8f40
FIX: clear error daemon thread
klauer c0709d4
MNT: more alignment fixes
klauer b82f263
MNT: clear out status label text
klauer b0ac7cf
MNT: placeholder for size policy fixing
klauer df39abf
Merge branch 'master' into enh_oneline_positioner
klauer 751c08a
MNT: basic layout nitpicking
ZLLentz 2c7dc7f
WIP: try bigger readback and moving up the name
ZLLentz 9b9aaf4
ENH: layout adjustments for resizing and error handling
ZLLentz e919aae
ENH: increase bounding boxes and fill out the placeholder templates
ZLLentz 284375b
Merge branch 'enh_oneline_positioner' into mnt_layout_nitpick
ZLLentz d5dcd3d
REF: make TyphosNotesEdit designable
klauer 27d5c0c
MNT: fix up typhos imports to be relative
klauer 9138889
ENH: add notes to row positioner widget
klauer 6e1afa5
FIX: call notes_edit add_device
klauer 5d6f402
Merge remote-tracking branch 'origin/master' into wip_oneline_notes
klauer 923e021
FIX: designability + stylesheets for notes line edit
klauer b4524d9
REF/API: clean up loading priority + document
klauer 1ec1846
DOC: add upcoming changes to docs
klauer d207920
MNT: do not require {} for keyword arg-less devices
klauer e62c574
TST: do not assume the loaded template name
klauer 402b747
TST: ensure old detailed screen is loaded
klauer f0cd1ab
TST: fix test suite after switch to relative imports
klauer 3190483
MNT: hide user_setpoint in row widget
klauer c7322a2
FIX: size hint depending on mode
klauer 45c6e5c
FIX: more reasonable minimum width for row widget
ZLLentz 4b616c5
MNT: remove development device templates
klauer aaf937d
MNT: remove unintentional change
klauer 8da1096
Merge branch 'master' into enh_oneline_positioner
klauer f7ba0db
FIX: widgets may be gc'd before screenshot; ignore them
klauer 60763fc
FIX: cherry-pick fixup
klauer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
563 row-positioner | ||
################## | ||
|
||
API Changes | ||
----------- | ||
- ``TyphosNoteEdit`` now supports ``.add_device()`` like other typhos widgets. | ||
This is alongside its original ``setup_data`` API. | ||
- ``TyphosDeviceDisplay`` composite heuristics have been removed in favor of | ||
simpler methods, described in the features section. | ||
|
||
Features | ||
-------- | ||
- ``TyphosNoteEdit`` is now a ``TyphosBase`` object and is accessible in the Qt | ||
designer. | ||
- Added new designable widget ``TyphosPositionerRowWidget``. This compact | ||
positioner widget makes dense motor-heavy screens much more space efficient. | ||
- The layout method for ``TyphosDeviceDisplay`` has changed. For large device trees, | ||
it now favors showing the compact "embedded" screens over detailed screens. The order | ||
of priority is now as follows: | ||
- For top-level devices (e.g., ``at2l0``), the template load priority is as follows: | ||
|
||
* Happi-defined values (``"detailed_screen"``, ``embedded_screen"``, ``"engineering_screen"``) | ||
* Device-specific screens, if available (named as ``ClassNameHere.detailed.ui``) | ||
* The detailed tree, if the device has sub-devices | ||
* The default templates | ||
|
||
- For nested displays in a device tree, sub-device (e.g., ``at2l0.blade_01``) | ||
template load priority is as follows: | ||
|
||
* Device-specific screens, if available (named as ``ClassNameHere.embedded.ui``) | ||
* The detailed tree, if the device has sub-devices | ||
* The default templates (``embedded_screen.ui``) | ||
|
||
Bugfixes | ||
-------- | ||
- For devices which do not require keyword arguments to instantiate, the typhos | ||
CLI will no longer require an empty dictionary. That is, ``$ typhos | ||
ophyd.sim.SynAxis[]`` is equivalent to ``$ typhos ophyd.sim.SynAxis[{}]``. | ||
As before, ophyd's required "name" keyword argument is filled in by typhos by | ||
default. | ||
|
||
|
||
Maintenance | ||
----------- | ||
- N/A | ||
|
||
Contributors | ||
------------ | ||
- klauer | ||
- ZLLentz |
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an interesting choice. It's useful but has added to my confusion about template names. Why do we do this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So it's like:
It's all confusing, for sure. Does that touch on your confusion on this aspect or is it something else?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's more that
detailed_tree.ui
shows up in each of the embedded/detailed/engineering dropdowns.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that may have been unintentional
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
aaah ok the comment made it seem intentional, but that's not really a proper reading of the comment. Gotcha