Skip to content

Osiris dae hack #1749

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

Closed
Tom-Willemsen wants to merge 2 commits into from
Closed

Osiris dae hack #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81f3908
Update version to 15.0.0.
ISISBuilder Aug 9, 2024
51765f0
ON ERROR RESUME NEXT
Tom-Willemsen Nov 13, 2024
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 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Eclipse-BundleShape: dir
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.e4.client;singleton:=true
Bundle-Name: IBEX
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 15.0.0
Require-Bundle: uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.dashboard;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.beamstatus;bundle-version="1.0.0",
Expand Down
1 change: 1 addition & 0 deletions base/uk.ac.stfc.isis.ibex.e4.client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
<relativePath>../uk.ac.stfc.isis.ibex.client.tycho.parent</relativePath>
<artifactId>uk.ac.stfc.isis.ibex.client.tycho.parent</artifactId>
</parent>
<version>15.0.0</version>
</project>
7 changes: 6 additions & 1 deletion ...ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/DaeExperimentSetupTableViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,12 @@ private void tryToChangeBackgroundWhenTextChanged() {
* The index for the cell.
*/
private void ifCellValueDifferentFromCachedValueThenChangeLabel(ViewerCell cell, int rowIndexCoefficient) {
String cachedValue = cachedValues.get(cell.getVisualIndex() + rowIndexCoefficient);
String cachedValue;
try {
cachedValue = cachedValues.get(cell.getVisualIndex() + rowIndexCoefficient);
} catch (IndexOutOfBoundsException e) {
cachedValue = "";
}

if (cachedValue.equals(cell.getText())) {
cell.setBackground(panelViewModel.getColour("white"));
Expand Down
3 changes: 2 additions & 1 deletion ...tfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import uk.ac.stfc.isis.ibex.epics.adapters.UpdatedObservableAdapter;
import uk.ac.stfc.isis.ibex.instrument.Instrument;
import uk.ac.stfc.isis.ibex.logger.IsisLog;
import uk.ac.stfc.isis.ibex.logger.LoggerUtils;
import uk.ac.stfc.isis.ibex.ui.UIUtils;
import uk.ac.stfc.isis.ibex.ui.dae.DaeUI;
import uk.ac.stfc.isis.ibex.ui.dae.DaeViewModel;
Expand Down Expand Up @@ -124,7 +125,7 @@ public void widgetSelected(SelectionEvent e) {
applyChangesToUI();
} catch (Exception err) {
// Top level error handler. Catch anything and log it, and bring up an error dialog informing the user of the error.
IsisLog.getLogger(this.getClass()).error(err);
LoggerUtils.logErrorWithStackTrace(IsisLog.getLogger(this.getClass()), err.getMessage(), err);
MessageDialog.openError(parent.getShell(), "Internal IBEX Error",
"Please report this error to the IBEX team.\n\nException was: " + err.getMessage());
}
Expand Down