Load the current chromatogram when peak/scan list becomes visible.

eclipse-chemclipse · Feb 22, 2022 · 42e866e · 42e866e
1 parent 2b81d52
commit 42e866e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/...tension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakScanListPart.java b/...tension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakScanListPart.java
@@ -56,6 +56,15 @@ void execute(MPart part, MDirectToolItem toolItem) {
 		}
 	}
 
+	@Override
+	public void setFocus() {
+
+		ExtendedPeakScanListUI control = getControl();
+		if(control != null) {
+			getControl().setFocus();
+		}
+	}
+
 	@Inject
 	@Optional
 	public void updatePeakSelection(@UIEventTopic(IChemClipseEvents.TOPIC_PEAK_XXD_UPDATE_SELECTION) IPeak peak) {

diff --git a/...ion.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/ExtendedPeakScanListUI.java b/...ion.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/ExtendedPeakScanListUI.java
@@ -62,6 +62,7 @@
 import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.support.TableConfigSupport;
 import org.eclipse.chemclipse.ux.extension.xxd.ui.operations.DeletePeaksOperation;
 import org.eclipse.chemclipse.ux.extension.xxd.ui.operations.DeleteScansOperation;
+import org.eclipse.chemclipse.ux.extension.xxd.ui.part.support.DataUpdateSupport;
 import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceConstants;
 import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferencePageLists;
 import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferencePageMergePeaks;
@@ -111,6 +112,7 @@ public class ExtendedPeakScanListUI extends Composite implements IExtendedPartUI
 	private ScanIdentifierUI scanIdentifierUI;
 	private Button buttonTableEdit;
 	private AtomicReference<PeakScanListUI> tableViewer = new AtomicReference<>();
+	//
 	private IChromatogramSelection chromatogramSelection;
 	//
 	private boolean showScans;
@@ -142,6 +144,14 @@ private void updateFromPreferences() {
 	@Override
 	public boolean setFocus() {
 
+		DataUpdateSupport dataUpdateSupport = Activator.getDefault().getDataUpdateSupport();
+		List<Object> objects = dataUpdateSupport.getUpdates(IChemClipseEvents.TOPIC_CHROMATOGRAM_XXD_UPDATE_SELECTION);
+		if(!objects.isEmpty()) {
+			Object first = objects.get(0);
+			if(first instanceof IChromatogramSelection) {
+				chromatogramSelection = (IChromatogramSelection)first;
+			}
+		}
 		updateChromatogramSelection();
 		return true;
 	}