Skip to content

Commit

Permalink
Merge pull request #849 from Mailaender/quick-access-default-icons
Browse files Browse the repository at this point in the history 
Added default icons to the quick access toolbar
  • Loading branch information
@eselmeister
eselmeister authored Dec 16, 2021
2 parents a69ba42 + 248c950 commit 7b4ca73
Show file tree
Hide file tree
Showing 7 changed files with 152 additions and 19 deletions.
Binary file added chemclipse/plugins/org.eclipse.chemclipse.rcp.ui.icons/icons/16x16/xmldoc.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions ...emclipse.rcp.ui.icons/src/org/eclipse/chemclipse/rcp/ui/icons/core/IApplicationImage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ public static String getLocation(String fileName, String size) {
String IMAGE_SCAN_FID = PATH_PREFIX + "scan-fid.png";
//
String IMAGE_SAMPLE = PATH_PREFIX + "sample.gif";
String IMAGE_SAMPLE_CALIBRATION = PATH_PREFIX + "sample-calibration.gif";
String IMAGE_SAMPLE_CALIBRATION_QUALIFIER = PATH_PREFIX + "sample-calibration-qualifier.gif";
String IMAGE_SAMPLE_QUALIFIER = PATH_PREFIX + "sample-qualifier.gif";
String IMAGE_SAMPLE_ISTD = PATH_PREFIX + "sample-istd.gif";
String IMAGE_SAMPLE_ISTD_QUALIFIER = PATH_PREFIX + "sample-istd-qualifier.gif";
Expand Down Expand Up @@ -156,6 +158,7 @@ public static String getLocation(String fileName, String size) {
String IMAGE_PEAK_INTEGRATOR = PATH_PREFIX + "peakIntegrator.gif";
String IMAGE_CHROMATOGRAM_INTEGRATOR = PATH_PREFIX + "chromatogramIntegrator.gif";
String IMAGE_DELETE_PEAK_INTEGRATIONS = PATH_PREFIX + "deletePeakIntegrations.gif";
String IMAGE_DELETE_PEAK_IDENTIFICATIONS = PATH_PREFIX + "delete_all_identifications.gif";
String IMAGE_DELETE_CHROMATOGRAM_INTEGRATIONS = PATH_PREFIX + "deleteChromatogramIntegrations.gif";
String IMAGE_COMBINED_INTEGRATOR = PATH_PREFIX + "combinedIntegrator.gif";
//
Expand Down Expand Up @@ -444,6 +447,7 @@ public static String getLocation(String fileName, String size) {
String IMAGE_REVIEW_DETAILS_SHOW = PATH_PREFIX + "reviewDetailsShow.gif";
String IMAGE_REVIEW_DETAILS_HIDE = PATH_PREFIX + "reviewDetailsHide.gif";
String IMAGE_PLUGINS = PATH_PREFIX + "plugins.png";
String IMAGE_XML_FILE = PATH_PREFIX + "xmldoc.gif";
String IMAGE_ZIP_FILE = PATH_PREFIX + "zip_file.png";
String IMAGE_TRANSFER = PATH_PREFIX + "transfer.png";
//
Expand All @@ -459,6 +463,8 @@ public static String getLocation(String fileName, String size) {
String IMAGE_CLEAR = PATH_PREFIX + "clear.gif";
String IMAGE_RULER = PATH_PREFIX + "ruler.gif";
String IMAGE_SKIP_QUANTIFIED_PEAK = PATH_PREFIX + "skipQuantifiedPeak.gif";
String IMAGE_DELETE_PEAK = PATH_PREFIX + "delete_peak.gif";
String IMAGE_DELETE_PEAKS = PATH_PREFIX + "delete_peaks.gif";
String IMAGE_CROSS_ZERO = PATH_PREFIX + "crossZero.gif";
String IMAGE_INCLUDE_INTERCEPT = PATH_PREFIX + "includeIntercept.gif";
String IMAGE_LOWER_MIN_AREA = PATH_PREFIX + "lowerMinArea.gif";
Expand Down
144 changes: 141 additions & 3 deletions ...pse.chemclipse.support.ui/src/org/eclipse/chemclipse/support/ui/processors/Processor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*
* Contributors:
* Philip Wenig - initial API and implementation
* Matthias Mailänder - add default icons
*******************************************************************************/
package org.eclipse.chemclipse.support.ui.processors;

Expand All @@ -23,6 +24,145 @@ public class Processor {
public Processor(IProcessSupplier<?> processSupplier) {

this.processSupplier = processSupplier;
// Quick-Access Toolbar default icons:
if(processSupplier.getCategory().equals("Baseline Detector")) {
imageFileName = IApplicationImage.IMAGE_BASELINE;
if(processSupplier.getName().contains("SNIP")) {
imageFileName = IApplicationImage.IMAGE_BASELINE_SNIP;
} else if(processSupplier.getName().contains("Delete")) {
imageFileName = IApplicationImage.IMAGE_BASELINE_DELETE;
}
} else if(processSupplier.getCategory().equals("Chromatogram Calculator")) {
imageFileName = IApplicationImage.IMAGE_CALCULATE;
if(processSupplier.getName().contains("Retention Index Calculator")) {
imageFileName = IApplicationImage.IMAGE_RETENION_INDEX;
} else if(processSupplier.getName().contains("Reset")) {
imageFileName = IApplicationImage.IMAGE_RESET;
}
} else if(processSupplier.getCategory().equals("Chromatogram Classifier")) {
imageFileName = IApplicationImage.IMAGE_CLASSIFIER;
if(processSupplier.getName().contains("WNC")) {
imageFileName = IApplicationImage.IMAGE_CLASSIFIER_WNC;
} else if(processSupplier.getName().contains("Durbin-Watson")) {
imageFileName = IApplicationImage.IMAGE_CLASSIFIER_DW;
}
} else if(processSupplier.getCategory().equals("Chromatogram Export")) {
imageFileName = IApplicationImage.IMAGE_SAVE;
if(processSupplier.getName().contains("*.CAL")) {
imageFileName = IApplicationImage.IMAGE_SAMPLE_CALIBRATION;
} else if(processSupplier.getName().contains("Excel")) {
imageFileName = IApplicationImage.IMAGE_EXCEL_DOCUMENT;
} else if(processSupplier.getName().contains("ZIP")) {
imageFileName = IApplicationImage.IMAGE_ZIP_FILE;
} else if(processSupplier.getName().contains("mzML") || processSupplier.getName().contains("mzXML") || processSupplier.getName().contains("mzData") || processSupplier.getName().contains("AnIML") || processSupplier.getName().contains("GAML")) {
imageFileName = IApplicationImage.IMAGE_XML_FILE;
}
} else if(processSupplier.getCategory().equals("Chromatogram Filter")) {
imageFileName = IApplicationImage.IMAGE_CHROMATOGRAM;
if(processSupplier.getName().contains("(1:1)")) {
imageFileName = IApplicationImage.IMAGE_RESET_EQUAL;
} else if(processSupplier.getName().contains("CODA")) {
imageFileName = IApplicationImage.IMAGE_FILTER_CODA;
} else if(processSupplier.getName().contains("Backfolding")) {
imageFileName = IApplicationImage.IMAGE_FILTER_BACKFOLDING;
} else if(processSupplier.getName().contains("Denoising")) {
imageFileName = IApplicationImage.IMAGE_FILTER_DENOISING;
} else if(processSupplier.getName().contains("Mean Normalizer")) {
imageFileName = IApplicationImage.IMAGE_FILTER_MEAN_NORMALIZER;
} else if(processSupplier.getName().contains("Median Normalizer")) {
imageFileName = IApplicationImage.IMAGE_FILTER_MEDIAN_NORMALIZER;
} else if(processSupplier.getName().equals("Normalizer")) {
imageFileName = IApplicationImage.IMAGE_FILTER_NORMALIZER;
} else if(processSupplier.getName().contains("Savitzky-Golay")) {
imageFileName = IApplicationImage.IMAGE_FILTER_SAVITZKY_GOLAY;
} else if(processSupplier.getName().contains("Scan Remover")) {
imageFileName = IApplicationImage.IMAGE_FILTER_SCANREMOVER;
} else if(processSupplier.getName().contains("Subtract")) {
imageFileName = IApplicationImage.IMAGE_SUBTRACT_SCAN_DEFAULT;
}
} else if(processSupplier.getCategory().equals("Chromatogram Integrator")) {
imageFileName = IApplicationImage.IMAGE_CHROMATOGRAM_INTEGRATOR;
if(processSupplier.getName().contains("Sumarea")) {
imageFileName = IApplicationImage.IMAGE_INTEGRATOR_SUMAREA;
}
} else if(processSupplier.getCategory().equals("Chromatogram Reports")) {
imageFileName = IApplicationImage.IMAGE_CHROMATOGRAM_REPORT;
} else if(processSupplier.getCategory().equals("External Programs")) {
if(processSupplier.getName().contains("NIST")) {
imageFileName = IApplicationImage.IMAGE_NIST;
}
} else if(processSupplier.getCategory().equals("Combined Chromatogram and Peak Integrator")) {
imageFileName = IApplicationImage.IMAGE_COMBINED_INTEGRATOR;
} else if(processSupplier.getCategory().equals("Peak Detector")) {
imageFileName = IApplicationImage.IMAGE_PEAK_DETECTOR;
if(processSupplier.getName().contains("AMDIS") || processSupplier.getName().contains("MCR-AR")) {
imageFileName = IApplicationImage.IMAGE_DECONVOLUTION;
}
} else if(processSupplier.getCategory().equals("Peak Export")) {
imageFileName = IApplicationImage.IMAGE_EXPORT;
} else if(processSupplier.getCategory().equals("Peak Filter")) {
imageFileName = IApplicationImage.IMAGE_PEAKS;
if(processSupplier.getName().contains("Add")) {
imageFileName = IApplicationImage.IMAGE_ADD;
} else if(processSupplier.getName().contains("Remove")) {
imageFileName = IApplicationImage.IMAGE_REMOVE;
} else if(processSupplier.getName().contains("Delete")) {
imageFileName = IApplicationImage.IMAGE_DELETE;
}
if(processSupplier.getName().contains("Delete Peak")) {
imageFileName = IApplicationImage.IMAGE_DELETE_PEAKS;
} else if(processSupplier.getName().contains("Delete Integration")) {
imageFileName = IApplicationImage.IMAGE_DELETE_PEAK_INTEGRATIONS;
} else if(processSupplier.getName().contains("Delete Target")) {
imageFileName = IApplicationImage.IMAGE_DELETE_PEAK_IDENTIFICATIONS;
} else if(processSupplier.getName().contains("SNIP")) {
imageFileName = IApplicationImage.IMAGE_FILTER_SNIP_ALL_PEAKS;
}
} else if(processSupplier.getCategory().equals("Peak Identifier")) {
imageFileName = IApplicationImage.IMAGE_IDENTIFY_PEAKS;
if(processSupplier.getName().equals("Library File (MS)")) {
imageFileName = IApplicationImage.IMAGE_MASS_SPECTRUM_LIBRARY;
} else if(processSupplier.getName().equals("Unknown Marker")) {
imageFileName = IApplicationImage.IMAGE_UNKNOWN;
} else if(processSupplier.getName().contains("NIST")) {
imageFileName = IApplicationImage.IMAGE_NIST_PEAKS;
}
} else if(processSupplier.getCategory().equals("Peak Integrator")) {
imageFileName = IApplicationImage.IMAGE_PEAK_INTEGRATOR;
if(processSupplier.getName().contains("Peak Max")) {
imageFileName = IApplicationImage.IMAGE_PEAK_INTEGRATOR_MAX;
}
} else if(processSupplier.getCategory().equals("Peak Quantifier")) {
imageFileName = IApplicationImage.IMAGE_QUANTIFY_ALL_PEAKS;
if(processSupplier.getName().contains("ISTD")) {
imageFileName = IApplicationImage.IMAGE_INTERNAL_STANDARDS_DEFAULT;
} else if(processSupplier.getName().contains("ESTD")) {
imageFileName = IApplicationImage.IMAGE_EXTERNAL_STANDARDS_DEFAULT;
}
if(processSupplier.getName().contains("Add Peaks to DB")) {
imageFileName = IApplicationImage.IMAGE_ADD_PEAKS_TO_QUANTITATION_TABLE;
}
} else if(processSupplier.getCategory().equals("Peak Massspectrum Filter") || processSupplier.getCategory().equals("Scan Massspectrum Filter")) {
imageFileName = IApplicationImage.IMAGE_MASS_SPECTRUM;
if(processSupplier.getName().contains("Savitzky-Golay")) {
imageFileName = IApplicationImage.IMAGE_FILTER_SAVITZKY_GOLAY;
} else if(processSupplier.getName().contains("SNIP")) {
imageFileName = IApplicationImage.IMAGE_FILTER_SNIP_ALL_PEAKS;
} else if(processSupplier.getName().contains("Subtract")) {
imageFileName = IApplicationImage.IMAGE_SUBTRACT_SCAN_DEFAULT;
}
} else if(processSupplier.getCategory().equals("Scan Identifier")) {
imageFileName = IApplicationImage.IMAGE_IDENTIFY_MASS_SPECTRUM;
if(processSupplier.getName().equals("Library File (MS)")) {
imageFileName = IApplicationImage.IMAGE_MASS_SPECTRUM_LIBRARY;
} else if(processSupplier.getName().equals("Unknown Marker")) {
imageFileName = IApplicationImage.IMAGE_UNKNOWN;
} else if(processSupplier.getName().contains("NIST")) {
imageFileName = IApplicationImage.IMAGE_NIST_MASS_SPECTRUM;
}
} else if(processSupplier.getCategory().equals("System")) {
imageFileName = IApplicationImage.IMAGE_PREFERENCES;
}
}

public boolean isActive() {
Expand All @@ -42,9 +182,7 @@ public String getImageFileName() {

public void setImageFileName(String imageFileName) {

if(imageFileName == null || imageFileName.isEmpty()) {
this.imageFileName = IApplicationImage.IMAGE_EXECUTE_EXTENSION;
} else {
if(imageFileName != null && !imageFileName.isEmpty()) {
this.imageFileName = imageFileName;
}
}
Expand Down
11 changes: 0 additions & 11 deletions ...clipse.support.ui/src/org/eclipse/chemclipse/support/ui/provider/ListContentProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.Set;

import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;

public class ListContentProvider implements IStructuredContentProvider {

Expand Down Expand Up @@ -47,14 +46,4 @@ public Object[] getElements(Object inputElement) {
}
return new Object[0];
}

@Override
public void dispose() {

}

@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {

}
}
2 changes: 1 addition & 1 deletion ...clipse.xxd.model/src/org/eclipse/chemclipse/xxd/model/filter/peaks/DeletePeaksFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public <X extends IPeak> void filterIPeaks(CRUDListener<X, IPeakModel> listener,
SubMonitor subMonitor = SubMonitor.convert(monitor, peaks.size());
for(X peak : peaks) {
if(configuration.isDeleteUnidentifiedOnly()) {
if(peak.getTargets().size() == 0) {
if(peak.getTargets().isEmpty()) {
listener.delete(peak);
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions ....fragment.test/src/org/eclipse/chemclipse/msd/converter/core/DefaultConverterSupport.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2019 Lablicate GmbH.
* Copyright (c) 2011, 2021 Lablicate GmbH.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand All @@ -18,7 +18,7 @@
/**
* THIS IS A TESTCLASS. DO NOT USE IN PRODUCTION!
*
* @author wenigmedia
* @author Philip Wenig
*
*/
public class DefaultConverterSupport extends AbstractConverterSupport {
Expand Down
4 changes: 2 additions & 2 deletions ...onverter.fragment.test/src/org/eclipse/chemclipse/msd/converter/core/DefaultSupplier.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2018 Lablicate GmbH.
* Copyright (c) 2011, 2021 Lablicate GmbH.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
Expand All @@ -16,7 +16,7 @@
/**
* THIS IS A TESTCLASS. DO NOT USE IN PRODUCTION!
*
* @author wenigmedia
* @author Philip Wenig
*
*/
public class DefaultSupplier extends AbstractSupplier {
Expand Down

0 comments on commit 7b4ca73

Please sign in to comment.