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

ENH: add sortable/filterable table inspired by pmps-ui #67

Merged
merged 34 commits into from
Nov 15, 2021
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3014b16
ENH: add start of filter/sort table
ZLLentz Jul 20, 2021
dc4e555
MNT: fix issues with setting up channels and connection of non-channels
ZLLentz Jul 20, 2021
8deb30c
MNT: typo
ZLLentz Jul 20, 2021
b799d00
MNT: finish filtering, start sorting, small cleanup
ZLLentz Jul 20, 2021
21f665d
DOC: add docstrings
ZLLentz Jul 20, 2021
43168d6
ENH: add a way to rearrange table rows
ZLLentz Jul 22, 2021
b323764
MNT: restore missing header hide call
ZLLentz Jul 22, 2021
478f59d
MNT: fix issue where manual sort would break auto sort
ZLLentz Jul 23, 2021
4f7452f
MNT: sorting tweaks, add context menu
ZLLentz Jul 23, 2021
b363265
ENH: add sorting to right-click menu
ZLLentz Jul 23, 2021
590b8f4
ENH: refactor filters for gui adjustment of filters
ZLLentz Jul 23, 2021
c2f4755
DOC: add comments
ZLLentz Jul 23, 2021
c619af3
HACK: allow an initial sorting
ZLLentz Jul 23, 2021
0272ef0
ENH: allow user to hide headers from sort menu
ZLLentz Jul 23, 2021
d73cfde
BUG: fix bad imports that snuck their way into the filter tables
ZLLentz Nov 10, 2021
2a4ecfe
CI: pip build segfaults... let's check the other builds.
ZLLentz Nov 10, 2021
fa01a73
ENH: add an example usage for the table widget
ZLLentz Nov 13, 2021
36d1ed9
ENH: examples for adding filters to a table
ZLLentz Nov 13, 2021
50ddd57
DOC: add missing type annotations
ZLLentz Nov 13, 2021
b90c607
MNT: Add log text for failed file load
ZLLentz Nov 13, 2021
b6141e3
MNT: return early when reload_ui_file fails
ZLLentz Nov 13, 2021
202b97f
MNT: remove redundant comment
ZLLentz Nov 13, 2021
d6441b8
MNT: handle case where user gives an empty list
ZLLentz Nov 13, 2021
c787160
MNT: reset _channels outside of loop for proper cleanup
ZLLentz Nov 13, 2021
e673d43
BUG: issues with missing pydm_channel attr, non-Nones
ZLLentz Nov 13, 2021
8898311
Merge branch 'table' of github.com:ZLLentz/pcdswidgets into table
ZLLentz Nov 13, 2021
60b109f
ENH: error handling for user filter functions
ZLLentz Nov 13, 2021
8d41ffc
MNT: simplify the sorting method
ZLLentz Nov 13, 2021
56fbbdd
REF: bring the row adder into its own method.
ZLLentz Nov 13, 2021
1bf99c7
DOC: document why this hacky solution is used
ZLLentz Nov 13, 2021
a73ee0f
MNT: this annotation is not allowed on py37/py38
ZLLentz Nov 15, 2021
83361cd
DOC: make function signature a literal
ZLLentz Nov 15, 2021
f8d7347
MNT: argument order consistency
ZLLentz Nov 15, 2021
f52f096
STY: flake8
ZLLentz Nov 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# This makes the PIP based Python 3.6 optional for passing.
# Remove this block if passing tests with PIP is mandatory for your
# package
- name: "Python 3.6 - PIP"
- name: "Python - PIP"

import:
# If your project requires X11 leave the following import
Expand Down
5 changes: 5 additions & 0 deletions pcdswidgets/designer.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from pydm.widgets.qtplugin_base import qtplugin_factory

from .table import FilterSortWidgetTable
from .vacuum.gauges import RoughGauge, HotCathodeGauge, ColdCathodeGauge
from .vacuum.others import RGA
from .vacuum.pumps import IonPump, TurboPump, ScrollPump, GetterPump
Expand All @@ -12,6 +13,10 @@

BasePlugin = qtplugin_factory(PCDSSymbolBase, group="PCDS Symbols")

# Table
FilterSortWidgetTablePlugin = qtplugin_factory(FilterSortWidgetTable,
group="PCDS Utilities")

# Valves
PCDSPneumaticValvePlugin = qtplugin_factory(PneumaticValve,
group="PCDS Valves")
Expand Down
Loading