Skip to content

Uncouple the unknown marker number of traces from copy traces to clipboard #2740

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
eselmeister merged 1 commit into from
Feb 26, 2026
+37 −19
Merged

Uncouple the unknown marker number of traces from copy traces to clipboard #2740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions ....extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/model/TracesSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2022, 2025 Lablicate GmbH.
* Copyright (c) 2022, 2026 Lablicate GmbH.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -48,10 +48,9 @@ public static void setTracesExportOption(TracesExportOption tracesExportOption)
preferenceStore.setValue(PreferenceSupplier.P_TRACES_EXPORT_OPTION, tracesExportOption.name());
}

public static String getTraces(Object scan) {
public static String getTraces(IScan scan, int maxCopyTraces) {

String traces;
int maxCopyTraces = getNumberOfTraces();
boolean sortTraces = isSortTraces();

if(scan instanceof IScanMSD scanMSD) {
Expand All @@ -67,9 +66,9 @@ public static String getTraces(Object scan) {
return traces;
}

public static void copyTracesToClipboard(Display display, TracesExportOption tracesExportOption, Object scan) {
public static void copyTracesToClipboard(Display display, TracesExportOption tracesExportOption, IScan scan, int maxCopyTraces) {

String traces = getTraces(scan);
String traces = getTraces(scan, maxCopyTraces);
if(!traces.isEmpty()) {
switch(tracesExportOption) {
case NAMED_TRACE:
Expand Down Expand Up @@ -117,11 +116,6 @@ private static IScan getScanInstance(Object scan) {
return scanInstance;
}

private static int getNumberOfTraces() {

return preferenceStore.getInt(PreferenceSupplier.P_MAX_COPY_SCAN_TRACES);
}

private static boolean isSortTraces() {

return preferenceStore.getBoolean(PreferenceSupplier.P_SORT_COPY_TRACES);
Expand Down
4 changes: 3 additions & 1 deletion ....ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePageTargets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017, 2025 Lablicate GmbH.
* Copyright (c) 2017, 2026 Lablicate GmbH.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand All @@ -15,6 +15,7 @@
import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.ExtendedIntegerFieldEditor;
import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.FloatFieldEditor;
import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpacerFieldEditor;
import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor;
import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator;
import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.ScanWebIdentifierUI;
import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.TargetWebIdentifierUI;
Expand Down Expand Up @@ -66,6 +67,7 @@ public void createFieldEditors() {
addField(new FloatFieldEditor(PreferenceSupplier.P_MATCH_QUALITY_UNKNOWN_TARGET, "Match Quality (Unknown Target)", PreferenceSupplier.MIN_MATCH_QUALITY, PreferenceSupplier.MAX_MATCH_QUALITY, getFieldEditorParent()));
addField(new BooleanFieldEditor(PreferenceSupplier.P_UNKNOWN_TARGET_ADD_RETENTION_INDEX, "Add Retention Index (Unknown Target)", getFieldEditorParent()));
addField(new BooleanFieldEditor(PreferenceSupplier.P_VERIFY_UNKNOWN_TARGET, "Verify (Unknown Target)", getFieldEditorParent()));
addField(new SpinnerFieldEditor(PreferenceSupplier.P_MAX_UNKNOWN_TRACES, "Show Traces", PreferenceSupplier.MIN_TRACES, PreferenceSupplier.MAX_TRACES, getFieldEditorParent()));
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions ...xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferenceSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ public class PreferenceSupplier extends AbstractPreferenceSupplier implements IP
public static final boolean DEF_SCAN_CHART_ENABLE_COMPRESS = false;
public static final String P_MAX_COPY_SCAN_TRACES = "maxCopyScanTraces";
public static final int DEF_MAX_COPY_SCAN_TRACES = DEF_SCAN_TRACES;
public static final String P_MAX_UNKNOWN_TRACES = "maxUnknownTraces";
public static final int DEF_MAX_UNKNOWN_TRACES = DEF_SCAN_TRACES;
public static final String P_SORT_COPY_TRACES = "sortCopyTraces";
public static final boolean DEF_SORT_COPY_TRACES = true;
public static final String P_TRACES_EXPORT_OPTION = "tracesExportOption";
Expand Down Expand Up @@ -1024,6 +1026,7 @@ public void initializeDefaults() {
putDefault(P_RETENTION_INDEX_DEVIATION_ABS_OK, DEF_RETENTION_INDEX_DEVIATION_ABS_OK);
putDefault(P_RETENTION_INDEX_DEVIATION_ABS_WARN, DEF_RETENTION_INDEX_DEVIATION_ABS_WARN);
putDefault(P_ADD_UNKNOWN_AFTER_DELETE_TARGETS_ALL, DEF_ADD_UNKNOWN_AFTER_DELETE_TARGETS_ALL);
putDefault(P_MAX_UNKNOWN_TRACES, DEF_MAX_UNKNOWN_TRACES);
putDefault(P_MATCH_QUALITY_UNKNOWN_TARGET, DEF_MATCH_QUALITY_UNKNOWN_TARGET);
putDefault(P_UNKNOWN_TARGET_ADD_RETENTION_INDEX, DEF_UNKNOWN_TARGET_ADD_RETENTION_INDEX);
putDefault(P_VERIFY_UNKNOWN_TARGET, DEF_VERIFY_UNKNOWN_TARGET);
Expand Down
12 changes: 10 additions & 2 deletions ...i/src/org/eclipse/chemclipse/ux/extension/xxd/ui/support/IdentificationTargetSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2023, 2025 Lablicate GmbH.
* Copyright (c) 2023, 2026 Lablicate GmbH.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand All @@ -24,6 +24,8 @@ public class IdentificationTargetSupport {

private static final String IDENTIFIER_UNKNOWN = "Manual Identification";

private static final IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();

public static IIdentificationTarget getTargetUnknown(IScan scan) {

IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
Expand All @@ -38,7 +40,8 @@ public static IIdentificationTarget getTargetUnknown(IScan scan) {
public static String getUnknownTargetName(IScan scan, boolean addRetentionIndex) {

StringBuilder builder = new StringBuilder();
String traces = TracesSupport.getTraces(scan);
int maxCopyTraces = getNumberOfTraces();
String traces = TracesSupport.getTraces(scan, maxCopyTraces);

builder.append("Unknown");
if(!traces.isEmpty()) {
Expand All @@ -59,4 +62,9 @@ public static String getUnknownTargetName(IScan scan, boolean addRetentionIndex)

return builder.toString();
}

private static int getNumberOfTraces() {

return preferenceStore.getInt(PreferenceSupplier.P_MAX_UNKNOWN_TRACES);
}
}
8 changes: 4 additions & 4 deletions ...ion.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/ExtendedPeakScanListUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ private void addKeyEventProcessors(Display display, ITableSettings tableSettings
} else if(matchesKeyPress("DeleteTargets", e)) {
deleteTargetsAll(e.display);
} else if(matchesKeyPress("Unknown", e)) {
addTargetsUnknown(e.display);
addTargetsUnknown();
} else if(matchesKeyPress("Query", e)) {
scanIdentifierControl.get().runIdentification();
tableViewer.get().refresh();
Expand Down Expand Up @@ -669,7 +669,7 @@ private IScan getScan(Object object) {
return null;
}

private void addTargetsUnknown(Display display) {
private void addTargetsUnknown() {

for(Object object : tableViewer.get().getStructuredSelection().toList()) {
IScan scan = getScan(object);
Expand All @@ -685,10 +685,10 @@ private void addTargetsUnknown(Display display) {
* Send update.
*/
tableViewer.get().refresh();
UpdateNotifierUI.update(display, chromatogramSelection);
UpdateNotifierUI.update(getDisplay(), chromatogramSelection);

chromatogramSelection.getChromatogram().setDirty(true);
UpdateNotifierUI.update(display, IChemClipseEvents.TOPIC_EDITOR_CHROMATOGRAM_UPDATE, "Peaks/Scans unknown targets have been set.");
UpdateNotifierUI.update(getDisplay(), IChemClipseEvents.TOPIC_EDITOR_CHROMATOGRAM_UPDATE, "Peaks/Scans unknown targets have been set.");
}

private void propagateSelection(Display display) {
Expand Down
15 changes: 13 additions & 2 deletions ...xtension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/swt/TracesClipboardUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2025 Lablicate GmbH.
* Copyright (c) 2025, 2026 Lablicate GmbH.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand All @@ -18,8 +18,11 @@
import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory;
import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage;
import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider;
import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator;
import org.eclipse.chemclipse.ux.extension.xxd.ui.model.TracesExportOption;
import org.eclipse.chemclipse.ux.extension.xxd.ui.model.TracesSupport;
import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceSupplier;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
Expand All @@ -33,6 +36,8 @@

public class TracesClipboardUI extends Composite {

private static final IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();

private AtomicReference<Button> buttonClipboard = new AtomicReference<>();
private IScan scan = null;

Expand Down Expand Up @@ -119,7 +124,13 @@ private void copyToClipboard(Display display) {

if(scan != null) {
TracesExportOption tracesExportOption = TracesSupport.getTracesExportOption();
TracesSupport.copyTracesToClipboard(display, tracesExportOption, scan);
int maxCopyTraces = getNumberOfTraces();
TracesSupport.copyTracesToClipboard(display, tracesExportOption, scan, maxCopyTraces);
}
}

private static int getNumberOfTraces() {

return preferenceStore.getInt(PreferenceSupplier.P_MAX_COPY_SCAN_TRACES);
}
}