Skip to content

merge master #4

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.

Sign up for GitHub

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

Jump to bottom
Merged
JMit-dev merged 108 commits into from
Jan 28, 2026
Merged

merge master #4

JMit-dev merged 108 commits into from
Jan 28, 2026

Conversation

@JMit-dev
Copy link
Owner

@JMit-dev JMit-dev commented Jan 28, 2026

Checklist

  • Testing:

    • The feature has automated tests
    • Tests were run
    • If not, explain how you tested your changes

  • Documentation:

    • The feature is documented
    • The documentation is up to date
    • Release notes:
      • Added an entry if the change is breaking or significant
      • Added an entry when adding a new feature

wmliuanl and others added 30 commits November 7, 2025 13:44
@wmliuanl
Modified the behavior of spinner widget to react differently with dif…
e8fb55f 
…ferent key combinations

arrow up/down: change by 1 increment
page up/down: change by 10 increment
Alt + arrow up/down change by 5 increment
Alt + page up/down change by 50 increment
@wmliuanl
Merge pull request #1 from ControlSystemStudio/master
12a6040 
merge upstream
@minijackson
docs: fix warnings
b465ebc
@minijackson
databrowser-timescale: add index.rst
200ea9d 
Else, the app documentation wouldn't be included in Phoebus'
documentation
@minijackson
display/editor: add missing documents to the doc toctree
357ddde
@wmliuanl
Merge branch 'ControlSystemStudio:master' into master
d556b27
@shroffk
preserve the selection for the alarm tree
2d18a93
@shroffk
remove the flag since it is inconsistent
4356591
generates swagger documentation during the maven build process
ace4905 
Swagger documentation is then included and used in the Phoebus documentation using a safe directive
show in red incorrect properties in settings.ini
00edc45
add validation when loosing focus
aeb1205
add parameters to generate the file from the source files. generation…
29297a8 
… from jar still working
remove CI : swagger.json is now generated during maven build
e08d6f1
@georgweiss
Setup base APIs to show dialog comparing stored array and live array
35093e4
@georgweiss
Merge pull request ControlSystemStudio#3659 from lcaouen/create_setti…
ed9fce4 
…ngs_template_locally

add parameters to generate the file from the source files. generation…
@abrahamwolk
CSSTUDIO-3597 Create a new instance of macros in EmbeddedDisplayWidge…
f5c5bf0 
…t.getEffectiveMacros().
@georgweiss
Merge pull request ControlSystemStudio#3660 from lcaouen/new_swagger_…
770f350 
…generation

New swagger generation
@georgweiss
Add pv name to dialog layout
2f5314b
@DKastelic
Port AlarmTreePath unit test from old cs studio
a557455
@DKastelic
Fix bug where moving tree item to unchanged path would delete it
a677402
@DKastelic
Update makePath to throw exception
9a11ac7
@DKastelic
Update UI actions to handle AlarmTreePath exception
0313967
@DKastelic
Update XmlModelReader to handle AlarmTreePathException
ac18402
@DKastelic
Document AlarmTreePathException
11a5bd1
@georgweiss
Update comparison table when PV is connected
ab385da
@georgweiss
Render delta value in comparison dialog
c9bacba
@georgweiss
Add styling of diff column
4838f2b
@georgweiss
Adding comparison dialog title
78385ca
load properties from manifest + escape html tags + monospace font
54083d7
@georgweiss
Additional string resources
85b257d
shroffk and others added 29 commits December 31, 2025 14:26
@shroffk
The "add pvs to alarm tree" supports multiple configuration
95c2b75
@shroffk
move the add PV action to the dialog instead of the action
9d1c23d
@shroffk
More clear name for the context menu action to add PVs to the alarm s…
eb15e54 
…ystem
@shroffk
Merge pull request ControlSystemStudio#3624 from wmliuanl/master
2727d71 
Modified the behavior of spinner widget to react differently with dif…
@shroffk
Merge pull request ControlSystemStudio#3667 from ControlSystemStudio/…
794bd81 
…alarm_apps

Fix alarm tree selection preservations
@shroffk
Merge pull request ControlSystemStudio#3664 from DKastelic/master
db2ce5f 
Fix alarm service PV handling for PVs with leading slashes
@shroffk
Merge remote-tracking branch 'origin/master' into alarm_apps
0eadadd
@georgweiss
Merge pull request ControlSystemStudio#3661 from lcaouen/check_settings
1fc5aaa 
show in red incorrect properties in settings.ini
NavigationTabs : fix minor typo issues
400445a
NavigationTabs : indentation is consistent in using 4 spaces
e404138
NavigationTabs : using a single setTabs method to update Tabs
f425702
NavigatonTabs : fix minor typo issues
6e6247c
remove Messages import
272a540
NavigatonTabs : fix minor typo issues
7f4f726
NavigationTabs : fix NavigationTabsDemo.java
666a19e
@abrahamwolk
CSSTUDIO-3605 Report error for unsupported number formats when conver…
010be78 
…ting to HEX representation.
@abrahamwolk
CSSTUDIO-3605 Improve typing and limit scope of 'buf'.
4fdae91
@shroffk
Handle the new AlarmTreePathException
b51cd18
@georgweiss
Fix open save&restore action when UI is not yet open
0e767e7
NavigationTabs: fix build of tests
fae59a9
@shroffk
Create a preference to enable/disable add PVs to alarm configuration …
1ccd11e 
…context menu action
@georgweiss
Merge pull request ControlSystemStudio#3683 from ControlSystemStudio/…
e4ec9ce 
…CSSTUDIO-3622

Fix open save&restore action when UI is not yet open
@abrahamwolk
Merge pull request ControlSystemStudio#3674 from ControlSystemStudio/…
ed38995 
…CSSTUDIO-3605

CSSTUDIO-3605 Always use the type "long" when converting to hexadecimal notation
@shroffk
Merge pull request ControlSystemStudio#3680 from lcaouen/individual-c…
4334fbd 
…olors-on-navtabs

Individual colors on navtabs
Fix ControlSystemStudio#3685
72630a2
@shroffk
Merge pull request ControlSystemStudio#3682 from ControlSystemStudio/…
8e402d8 
…alarm_apps

Expand Alarm Configuration Actions
@shroffk
Merge pull request ControlSystemStudio#3686 from lcaouen/check_settings
f3967da 
Fix ControlSystemStudio#3685
@abrahamwolk
CSSTUDIO-3620 Bugfix: When no range is specified, the default range […
75b01dd 
…0.0, 100.0] should only be set if there are no observed values to base the range on.
@abrahamwolk
Merge pull request ControlSystemStudio#3689 from ControlSystemStudio/…
1ea9747 
…CSSTUDIO-3620

CSSTUDIO-3620 Linear Meter Bugfix: Fix setting of range when no range has been specified
@JMit-dev JMit-dev merged commit d2b87f9 into ui-improvements Jan 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@JMit-dev @wmliuanl @minijackson @shroffk @georgweiss @abrahamwolk @DKastelic @agaget @kasemir