Skip to content
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
89a58f9
Added old matcher GUI
JoschD Jun 30, 2023
1e344a2
fixes for python 3
JoschD Jul 3, 2023
96d442f
a layout
JoschD Nov 13, 2023
c1ab766
some logging adaptions
JoschD Nov 14, 2023
25ffd27
pretend to load measurements, parse info, color and tooltips
JoschD Nov 14, 2023
32020a6
editable dataclass dialogs
JoschD Nov 16, 2023
d716aa3
doc doc doc
JoschD Nov 17, 2023
018339c
path selection button
JoschD Nov 17, 2023
f4d3dc5
choices
JoschD Nov 17, 2023
8b29b49
segment handling
JoschD Dec 4, 2023
d88f774
button-philosophy changes, remove button implemented
JoschD Dec 5, 2023
d1016af
moved to lists
JoschD Dec 5, 2023
f62b07d
buttons and selections working as expected
JoschD Dec 5, 2023
0d6c59c
can start tasks
JoschD Dec 6, 2023
369c2da
define uniqueness by output-folder
JoschD Dec 7, 2023
0de50c1
segment dialog
JoschD Dec 7, 2023
e9f9dc9
button box
JoschD Dec 7, 2023
4c8a5e4
Happy with structure, now ready to load data!
JoschD Dec 8, 2023
2bc03a0
better tab handling, copy function updated
JoschD Dec 14, 2023
2604d86
updated docstrings, fixed deprecation warnings
JoschD Jan 23, 2025
cfcbe11
updated to pyproject, updated typing, fixed validation
JoschD Feb 4, 2025
32bb854
type hinting
JoschD Feb 5, 2025
16e376d
some notes, not sure about corrected
JoschD Feb 6, 2025
9961b3c
plotting attempts
JoschD Feb 6, 2025
ea1bfd4
first data plotting
JoschD Feb 7, 2025
40a7bb9
modifing models
JoschD Feb 10, 2025
ccf7ae9
some more GUI and settings
JoschD Feb 10, 2025
755d621
more plotting
JoschD Feb 11, 2025
118945e
Edit Corrections
JoschD Feb 14, 2025
6a663ba
better menus
JoschD Feb 14, 2025
066754c
settings view
JoschD Feb 17, 2025
8947c59
split dataclass ui, path inheritance
JoschD Feb 18, 2025
abea391
bugfixes and plot settings quick access
JoschD Feb 19, 2025
c0f9bc1
autoload and such
JoschD Feb 21, 2025
41b9665
better plotting and others
JoschD Feb 24, 2025
19304b8
Fixing some bugs, check segment start
JoschD Mar 4, 2025
fcee8f1
fixing ruff complaints
JoschD Mar 4, 2025
7db951c
update data correctly
JoschD Mar 4, 2025
66ad7c4
argparse
JoschD Mar 11, 2025
e6610ee
copy measurement
JoschD Mar 13, 2025
b1f1b0a
alpha beta plots
JoschD Mar 17, 2025
369d5fc
plotting rdts
JoschD Mar 20, 2025
9cefe38
running with coupling
JoschD Mar 21, 2025
9d8a72f
measurement loading, coupling working
JoschD Mar 27, 2025
f5e5f75
better undo
JoschD Apr 2, 2025
6307577
element lines and help
JoschD Apr 2, 2025
d15fd3d
help update
JoschD Apr 2, 2025
b7a6f7c
run task in thread again
JoschD Apr 3, 2025
e77db56
towards release
JoschD Apr 4, 2025
acdc08f
docs
JoschD Apr 4, 2025
a01f3b2
zenodo
JoschD Apr 4, 2025
d23ed36
pyqtgraph docmock
JoschD Apr 4, 2025
b254b11
pyside docmock
JoschD Apr 4, 2025
2e9d3a2
shiboken docmock
JoschD Apr 4, 2025
e9abd9c
docmock?
JoschD Apr 4, 2025
24346ab
should not depend on omc3 optional
JoschD Apr 4, 2025
0f4197e
typo
JoschD Apr 4, 2025
423ca4d
clearer comment
JoschD Apr 4, 2025
6b28fc9
rotate model labels
JoschD Apr 7, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on: # Runs on all push events to master branch and any push related to a pull r

jobs:
coverage:
if: false # disabled for now
uses: pylhc/.github/.github/workflows/coverage.yml@master
with:
src-dir: omc3_gui
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ on:

jobs:
tests:
if: false # disabled for now
uses: pylhc/.github/.github/workflows/cron.yml@master
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ on: # Runs on any push event to any branch except master (the coverage workflow

jobs:
tests:
if: false # disabled for now
uses: pylhc/.github/.github/workflows/tests.yml@master
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -248,3 +248,6 @@ pyproject.toml*~
.cache
/doc/_build/*
*pycache*

# testers
tst_*
23 changes: 0 additions & 23 deletions .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,10 @@
"affiliation": "CERN",
"orcid": "0000-0001-7864-5448"
},
{
"name": "Felix Soubelet",
"affiliation": "University of Liverpool & CERN",
"orcid": "0000-0001-8012-1440"
},
{
"name": "Andreas Wegscheider",
"affiliation": "CERN"
},
{
"name": "Jaime Maria Coello De Portugal - Martinez Vazquez",
"affiliation": "CERN",
"orcid": "0000-0002-6899-3809"
},
{
"name": "Maël Le Garrec",
"affiliation": "CERN",
"orcid": "0000-0002-8146-2340"
},
{
"name": "Tobias Persson",
"affiliation": "CERN"
},
{
"name": "Rogelio Tomas Garcia",
"affiliation": "CERN",
"orcid": "0000-0002-9857-1703"
}
],
"title": "OMC3-GUI",
Expand Down
36 changes: 30 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,35 @@
# OMC3-GUI Changelog

#### 2025-04-04 - v1.0.0 - Segment-by-Segment GUI

- Maintenance:
- `pyproject.toml` used instead of `setup.py`.
- Deactivated testing workflows as there are no tests.
- Documentation

- Initial release of the Segment-by-Segment GUI:
- Implements plotting for the Segment-by-Segment propagation of the
omc3 backend. Requires `omc3 >= 0.24.0`.
- Plotting for the SegmentDiffs of `AlphaPhase`, `BetaPhase`, `Dispersion`
and `Coupling`.
- Saving and loading of the optics measurements from `.json` files.
- Create virtual `copy` of the measurements.

- General plotting functionality with `pyqtgraph`:
- `PlotWidget` to replicate the look-and-feel of the Java-GUI plots.
- `DualPlotWidget` to handle two plots in one widget (as often the case in our GUIs for two planes).
- Plotting for pandas Dataframes.
- Plotting for model elements as vertical lines.

- General reusable Tools:
- Dataclass UI: Widgets to display and edit dataclasses in UI.
- Widgets, threads, item models, file dialogs

#### 2023-06-20 - v0.0.0 - Inital commit

- `setup.py` and packaging functionality
- Automated CI
- Multiple versions of python
- Accuracy tests
- Unit tests
- Release automation
- `setup.py` and packaging functionality
- Automated CI:
- Multiple versions of python
- Accuracy tests
- Unit tests
- Release automation
Loading