Skip to content

Ticket25 ds new perspective #1852

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

Merged
Tom-Willemsen merged 6 commits into from
Jun 25, 2026
Merged

Ticket25 ds new perspective #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddfdcb6
Changes for DS Perspective
Jun 17, 2026
0b1319a
Merge remote-tracking branch 'origin/master' into Ticket25_DS_New_Per…
Jun 17, 2026
5a30a5e
Took latest from ds_71
Jun 18, 2026
63dfb8f
Added support for hot keys
Jun 18, 2026
dd03be4
Remove older OPI
Tom-Willemsen Jun 25, 2026
64a37e0
Remove unrequired dependencies
Tom-Willemsen Jun 25, 2026
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 base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@
<module>../uk.ac.stfc.isis.ibex.ui.alerts</module>
<module>../uk.ac.stfc.isis.ibex.alerts.tests</module>
<module>../uk.ac.stfc.isis.ibex.ui.alerts.tests</module>
<module>../uk.ac.stfc.isis.ibex.ui.streamingdae</module>
</modules>
</project>

29 changes: 29 additions & 0 deletions base/uk.ac.stfc.isis.ibex.e4.client/Application.e4xmi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,12 @@
<tags>type:user</tags>
</parameters>
</bindings>
<bindings xmi:id="_s_S0QIQ0Eeizju06Crxm-g" elementId="uk.ac.stfc.isis.ibex.e4.client.keybindings" keySequence="M2+M3+K" command="_UJcx8IOSEeizju06Crxm-g">
<tags>type:user</tags>
<parameters xmi:id="_s_S0QYQ0Eeizju06Crxm-g" elementId="uk.ac.stfc.isis.ibex.e4.client.parameter.0" name="uk.ac.stfc.isis.ibex.e4.client.switchperspectives.perspectiveid" value="uk.ac.stfc.isis.ibex.client.e4.product.perspective.streamingdae">
<tags>type:user</tags>
</parameters>
</bindings>
<bindings xmi:id="_fq1XQJZmEeilnu5vNzjU3w" elementId="uk.ac.stfc.isis.ibex.e4.client.keybindings" keySequence="M2+M3+Z" command="_NufGcJZmEeilnu5vNzjU3w">
<tags>type:user</tags>
</bindings>
Expand Down Expand Up @@ -612,6 +618,29 @@
</children>
</children>
</snippets>
<snippets xsi:type="advanced:Perspective" xmi:id="_iX2kcJIBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.client.e4.product.perspective.streamingdae" accessibilityPhrase="Streaming DAE" selectedElement="_iX2kcZIBEe-V38_cTZ3ImZ" label="Streaming DAE" iconURI="platform:/plugin/uk.ac.stfc.isis.ibex.ui.streamingdae/icons/server16_24x24.png" tooltip="The front panel for Streaming DAE">
<children xsi:type="basic:PartSashContainer" xmi:id="_iX2kcZIBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.e4.client.partsashcontainer.127" selectedElement="_iX2kd5IBEe-V38_cTZ3ImZ">
<children xsi:type="basic:PartSashContainer" xmi:id="_iX2kcpIBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.e4.client.partsashcontainer.128" containerData="30" horizontal="true">
<children xsi:type="basic:PartStack" xmi:id="_iX2kc5IBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.e4.client.partstack.130" containerData="35">
<children xsi:type="advanced:Placeholder" xmi:id="_iX2kdJIBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.e4.client.placeholder.6" ref="_RgW1RIjKEee8_tONW2Z5Qw">
<tags>NoClose</tags>
</children>
</children>
<children xsi:type="basic:PartStack" xmi:id="_iX2kdZIBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.e4.client.partstack.31" containerData="65">
<children xsi:type="advanced:Placeholder" xmi:id="_iX2kdpIBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.e4.client.placeholder.12" ref="_RgW1RojKEee8_tONW2Z5Qw">
<tags>NoClose</tags>
</children>
</children>
</children>
<children xsi:type="basic:PartSashContainer" xmi:id="_iX2kd5IBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.e4.client.partsashcontainer.29" containerData="70" horizontal="true">
<children xsi:type="basic:PartStack" xmi:id="_iX2keZIBEe-V38_cTZ3InZ" elementId="uk.ac.stfc.isis.ibex.e4.client.partstack.37" containerData="64">
<children xsi:type="basic:Part" xmi:id="_iXnT6JIBFe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.ui.streamingdae.StreamingDaeRunInfoOpiTargetView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Run Information"/>
<children xsi:type="basic:Part" xmi:id="_iX2kfZIBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.ui.streamingdae.StreamingDaeSpectraPlotsOpiTargetView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Spectra Plots"/>
<children xsi:type="basic:Part" xmi:id="_iX2kgpIBEe-V38_cTZ3ImZ" elementId="uk.ac.stfc.isis.ibex.ui.streamingdae.StreamingDaeVetoDiagnosticsOpiTargetView" contributionURI="bundleclass://org.eclipse.ui.workbench/org.eclipse.ui.internal.e4.compatibility.CompatibilityView" label="Veto Diagnostics"/>
</children>
</children>
</children>
</snippets>
<snippets xsi:type="advanced:Perspective" xmi:id="_iX4ZoJIBEe-V38_cTZ3ImQ" elementId="uk.ac.stfc.isis.ibex.client.e4.product.perspective.moxas" accessibilityPhrase="Moxa Ports" label="Moxa Ports" iconURI="platform:/plugin/uk.ac.stfc.isis.ibex.ui.moxas/icons/moxa_24x24.png" tooltip="The front panel for viewing Moxa mappings">
<children xsi:type="basic:PartSashContainer" xmi:id="_iX4ZoZIBEe-V38_cTZ3ImQ" elementId="uk.ac.stfc.isis.ibex.e4.client.partsashcontainer.30">
<children xsi:type="basic:PartSashContainer" xmi:id="_iX4ZopIBEe-V38_cTZ3ImQ" elementId="uk.ac.stfc.isis.ibex.e4.client.partsashcontainer.19" containerData="30" horizontal="true">
Expand Down
3 changes: 2 additions & 1 deletion base/uk.ac.stfc.isis.ibex.e4.client/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ Require-Bundle: uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher;bundle-version="1
uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.reflectometry;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.moxas;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.alerts;bundle-version="1.0.0"
uk.ac.stfc.isis.ibex.ui.alerts;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.streamingdae;bundle-version="1.0.0"
Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-Vendor: ISIS
Expand Down
2 changes: 1 addition & 1 deletion base/uk.ac.stfc.isis.ibex.e4.client/plugin_customization.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[DEFAULT]
uk.ac.stfc.isis.ibex.preferences/perspectives_not_shown=uk.ac.stfc.isis.ibex.client.e4.product.perspective.scriptGenerator,uk.ac.stfc.isis.ibex.client.e4.product.perspective.reflectometry
uk.ac.stfc.isis.ibex.preferences/perspectives_not_shown=uk.ac.stfc.isis.ibex.client.e4.product.perspective.scriptGenerator,uk.ac.stfc.isis.ibex.client.e4.product.perspective.reflectometry,uk.ac.stfc.isis.ibex.client.e4.product.perspective.streamingdae
uk.ac.stfc.isis.ibex.preferences/show_values_of_invalid_blocks=false

# Script generator preferences
Expand Down
3 changes: 3 additions & 0 deletions base/uk.ac.stfc.isis.ibex.feature.base/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,4 +852,7 @@
id="wrapped.org.glassfish.tyrus.bundles.tyrus-standalone-client"
version="0.0.0"/>

<plugin
id="uk.ac.stfc.isis.ibex.ui.streamingdae"
version="0.0.0"/>
</feature>
Loading
Loading