Skip to content
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.

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

Display converter processing errors in the Feedback tab #1866

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ private void createErrorMessagePage(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new FillLayout());
Label label = new Label(composite, SWT.NONE);
label.setText("The mass spectrum couldn't be loaded.");
label.setText("The database mass spectrum couldn't be loaded.");
}

private void importMassSpectra(File file, boolean batch) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2008, 2023 Lablicate GmbH.
* Copyright (c) 2008, 2024 Lablicate GmbH.
*
* All rights reserved.
* This program and the accompanying materials are made available under the
Expand All @@ -19,6 +19,7 @@
import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD;
import org.eclipse.chemclipse.processing.converter.ISupplier;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;

Expand Down Expand Up @@ -49,6 +50,7 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException

try {
IProcessingInfo<File> processingInfo = ChromatogramConverterMSD.getInstance().convert(file, chromatogram, supplier.getId(), monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
data = processingInfo.getProcessingResult();
} finally {
monitor.done();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2023 Lablicate GmbH.
* Copyright (c) 2018, 2024 Lablicate GmbH.
*
* All rights reserved.
* This program and the accompanying materials are made available under the
Expand All @@ -19,6 +19,7 @@
import org.eclipse.chemclipse.msd.converter.database.DatabaseConverter;
import org.eclipse.chemclipse.msd.model.core.IMassSpectra;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;

Expand All @@ -44,13 +45,12 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
try {
monitor.beginTask("Import Database", IProgressMonitor.UNKNOWN);
IProcessingInfo<IMassSpectra> processingInfo = DatabaseConverter.convert(file, monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
massSpectra = processingInfo.getProcessingResult();
} catch(Exception e) {
/*
* Exceptions: FileNotFoundException
* NoChromatogramConverterAvailableException
* FileIsNotReadableException FileIsEmptyException
* ChromatogramIsNullException
*/
logger.error(e);
} finally {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2013, 2020 Lablicate GmbH.
* Copyright (c) 2013, 2024 Lablicate GmbH.
*
* All rights reserved.
* This program and the accompanying materials are made available under the
Expand All @@ -19,6 +19,7 @@
import org.eclipse.chemclipse.msd.converter.massspectrum.MassSpectrumConverter;
import org.eclipse.chemclipse.msd.model.core.IMassSpectra;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;

Expand All @@ -44,13 +45,12 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
try {
monitor.beginTask("Import Mass Spectrum", IProgressMonitor.UNKNOWN);
IProcessingInfo<IMassSpectra> processingInfo = MassSpectrumConverter.convert(file, monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
massSpectra = processingInfo.getProcessingResult();
} catch(Exception e) {
/*
* Exceptions: FileNotFoundException
* NoChromatogramConverterAvailableException
* FileIsNotReadableException FileIsEmptyException
* ChromatogramIsNullException
*/
logger.warn(e);
} finally {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2023 Lablicate GmbH.
* Copyright (c) 2018, 2024 Lablicate GmbH.
*
* All rights reserved.
* This program and the accompanying materials are made available under the
Expand All @@ -19,6 +19,7 @@
import org.eclipse.chemclipse.logging.core.Logger;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.methods.IProcessMethod;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.chemclipse.ux.extension.xxd.ui.l10n.ExtensionMessages;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
Expand Down Expand Up @@ -46,6 +47,7 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
try {
monitor.beginTask(ExtensionMessages.importProcessMethod, IProgressMonitor.UNKNOWN);
IProcessingInfo<IProcessMethod> processingInfo = MethodConverter.convert(file, monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
processMethod = processingInfo.getProcessingResult();
} catch(Exception e) {
logger.error(e);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2023 Lablicate GmbH.
* Copyright (c) 2018, 2024 Lablicate GmbH.
*
* All rights reserved.
* This program and the accompanying materials are made available under the
Expand All @@ -19,6 +19,7 @@
import org.eclipse.chemclipse.pcr.model.core.IPlate;
import org.eclipse.chemclipse.processing.converter.ISupplier;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.chemclipse.ux.extension.xxd.ui.l10n.ExtensionMessages;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
Expand Down Expand Up @@ -50,6 +51,7 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
try {
monitor.beginTask(ExtensionMessages.exportPlate, IProgressMonitor.UNKNOWN);
IProcessingInfo<File> processingInfo = PlateConverterPCR.convert(file, plate, supplier.getId(), monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
data = processingInfo.getProcessingResult();
} catch(Exception e) {
logger.error(e);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2023 Lablicate GmbH.
* Copyright (c) 2018, 2024 Lablicate GmbH.
*
* All rights reserved.
* This program and the accompanying materials are made available under the
Expand All @@ -18,6 +18,7 @@
import org.eclipse.chemclipse.pcr.converter.core.PlateConverterPCR;
import org.eclipse.chemclipse.pcr.model.core.IPlate;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.chemclipse.ux.extension.xxd.ui.l10n.ExtensionMessages;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
Expand Down Expand Up @@ -45,6 +46,7 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
try {
monitor.beginTask(ExtensionMessages.importPlate, IProgressMonitor.UNKNOWN);
IProcessingInfo<?> processingInfo = PlateConverterPCR.convert(file, monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
plate = (IPlate)processingInfo.getProcessingResult();
} catch(Exception e) {
logger.error(e);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2023 Lablicate GmbH.
* Copyright (c) 2018, 2024 Lablicate GmbH.
*
* All rights reserved.
* This program and the accompanying materials are made available under the
Expand All @@ -19,6 +19,7 @@
import org.eclipse.chemclipse.logging.core.Logger;
import org.eclipse.chemclipse.model.quantitation.IQuantitationDatabase;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.chemclipse.ux.extension.xxd.ui.l10n.ExtensionMessages;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
Expand Down Expand Up @@ -46,6 +47,7 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
try {
monitor.beginTask(ExtensionMessages.importQuantitationDatabase, IProgressMonitor.UNKNOWN);
IProcessingInfo<IQuantitationDatabase> processingInfo = QuantDBConverter.convert(file, monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
quantitationDatabase = processingInfo.getProcessingResult();
} catch(Exception e) {
logger.error(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import org.eclipse.chemclipse.logging.core.Logger;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.chemclipse.ux.extension.xxd.ui.l10n.ExtensionMessages;
import org.eclipse.chemclipse.vsd.converter.core.ScanConverterVSD;
import org.eclipse.chemclipse.vsd.model.core.ISpectrumVSD;
Expand Down Expand Up @@ -45,6 +46,7 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
try {
monitor.beginTask(ExtensionMessages.importScan, IProgressMonitor.UNKNOWN);
IProcessingInfo<?> processingInfo = ScanConverterVSD.convert(file, monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
spectrumVSD = (ISpectrumVSD)processingInfo.getProcessingResult();
} catch(Exception e) {
logger.error(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import org.eclipse.chemclipse.logging.core.Logger;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.chemclipse.ux.extension.xxd.ui.l10n.ExtensionMessages;
import org.eclipse.chemclipse.wsd.converter.core.ScanConverterWSD;
import org.eclipse.chemclipse.wsd.model.core.ISpectrumWSD;
Expand Down Expand Up @@ -46,11 +47,12 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
try {
monitor.beginTask(ExtensionMessages.importScan, IProgressMonitor.UNKNOWN);
IProcessingInfo<?> processingInfo = ScanConverterWSD.convert(file, monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
spectrumWSD = (ISpectrumWSD)processingInfo.getProcessingResult();
} catch(Exception e) {
logger.error(e);
} finally {
monitor.done();
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018, 2023 Lablicate GmbH.
* Copyright (c) 2018, 2024 Lablicate GmbH.
*
* All rights reserved.
* This program and the accompanying materials are made available under the
Expand All @@ -20,6 +20,7 @@
import org.eclipse.chemclipse.converter.sequence.SequenceConverter;
import org.eclipse.chemclipse.logging.core.Logger;
import org.eclipse.chemclipse.processing.core.IProcessingInfo;
import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport;
import org.eclipse.chemclipse.ux.extension.xxd.ui.l10n.ExtensionMessages;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
Expand Down Expand Up @@ -49,6 +50,7 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException
try {
subMonitor.worked(1);
IProcessingInfo<ISequence<? extends ISequenceRecord>> processingInfo = SequenceConverter.convert(file, monitor);
ProcessingInfoPartSupport.getInstance().update(processingInfo);
sequence = processingInfo.getProcessingResult();
subMonitor.worked(2);
} catch(Exception e) {
Expand Down
Loading