diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.converter.ui/plugin.xml b/chemclipse/plugins/org.eclipse.chemclipse.pcr.converter.ui/plugin.xml index e77c3ed292..7dbbf9bbe6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.converter.ui/plugin.xml +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.converter.ui/plugin.xml @@ -4,7 +4,7 @@ diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/plugin.xml b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/plugin.xml index 981a85040e..7ba28a1c8b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/plugin.xml +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/plugin.xml @@ -9,6 +9,24 @@ id="org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui.preferences.converterPreferencePage" name="CSV PCR Export Converter"> + + + + + + diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/ChannelMappingPreferencePage.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/ChannelMappingPreferencePage.java new file mode 100644 index 0000000000..290209e501 --- /dev/null +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/ChannelMappingPreferencePage.java @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2022, 2023 Lablicate GmbH. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * Contributors: + * + * Matthias Mailänder - initial API and implementation + *******************************************************************************/ +package org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui.preferences; + +import org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui.Activator; +import org.eclipse.chemclipse.pcr.report.supplier.tabular.ui.editors.ChannelMappingFieldEditor; +import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; + +public class ChannelMappingPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { + + public ChannelMappingPreferencePage() { + + super(GRID); + setPreferenceStore(Activator.getDefault().getPreferenceStore()); + setDescription("Labels the headers according to these rules."); + } + + /** + * Creates the field editors. Field editors are abstractions of the common + * GUI blocks needed to manipulate various types of preferences. Each field + * editor knows how to save and restore itself. + */ + @Override + public void createFieldEditors() { + + addField(new ChannelMappingFieldEditor(PreferenceSupplier.P_CHANNEL_MAPPING, "", getFieldEditorParent())); + } + + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + @Override + public void init(IWorkbench workbench) { + + } +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/PreferencePage.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/PreferencePage.java index b0294eadb8..fefe8d64ac 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/PreferencePage.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/PreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Lablicate GmbH. + * Copyright (c) 2022, 2023 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -15,10 +15,6 @@ import org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.preferences.PreferenceSupplier; import org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui.Activator; import org.eclipse.chemclipse.pcr.report.supplier.tabular.model.DecimalSeparator; -import org.eclipse.chemclipse.pcr.report.supplier.tabular.ui.editors.ChannelMappingFieldEditor; -import org.eclipse.chemclipse.pcr.report.supplier.tabular.ui.editors.VirtualChannelFieldEditor; -import org.eclipse.chemclipse.pcr.report.supplier.tabular.ui.editors.WellMappingFieldEditor; -import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.LabelFieldEditor; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.ui.IWorkbench; @@ -30,7 +26,7 @@ public PreferencePage() { super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setDescription("Exports plates into *.csv reports according to these rules."); + setDescription("Exports plates into *.csv reports."); } /** @@ -41,10 +37,6 @@ public PreferencePage() { @Override public void createFieldEditors() { - addField(new ChannelMappingFieldEditor(PreferenceSupplier.P_CHANNEL_MAPPING, "Channel Mappings:", getFieldEditorParent())); - addField(new WellMappingFieldEditor(PreferenceSupplier.P_WELL_MAPPING, "Well Mappings:", getFieldEditorParent())); - addField(new VirtualChannelFieldEditor(PreferenceSupplier.P_VIRTUAL_CHANNELS, "Virtual Channels:", getFieldEditorParent())); - addField(new LabelFieldEditor("*.csv Options", getFieldEditorParent())); addField(new ComboFieldEditor(PreferenceSupplier.P_DELIMITER, "Delimiter Character: ", Delimiter.getOptions(), getFieldEditorParent())); addField(new ComboFieldEditor(PreferenceSupplier.P_DECIMAL_SEPARATOR, "Decimal Separator: ", DecimalSeparator.getOptions(), getFieldEditorParent())); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/VirtualChannelsPreferencePage.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/VirtualChannelsPreferencePage.java new file mode 100644 index 0000000000..3be96b0545 --- /dev/null +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/VirtualChannelsPreferencePage.java @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2022, 2023 Lablicate GmbH. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * Contributors: + * + * Matthias Mailänder - initial API and implementation + *******************************************************************************/ +package org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui.preferences; + +import org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui.Activator; +import org.eclipse.chemclipse.pcr.report.supplier.tabular.ui.editors.VirtualChannelFieldEditor; +import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; + +public class VirtualChannelsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { + + public VirtualChannelsPreferencePage() { + + super(GRID); + setPreferenceStore(Activator.getDefault().getPreferenceStore()); + setDescription("Adds extra channels by combining existing ones according to these rules."); + } + + /** + * Creates the field editors. Field editors are abstractions of the common + * GUI blocks needed to manipulate various types of preferences. Each field + * editor knows how to save and restore itself. + */ + @Override + public void createFieldEditors() { + + addField(new VirtualChannelFieldEditor(PreferenceSupplier.P_VIRTUAL_CHANNELS, "", getFieldEditorParent())); + } + + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + @Override + public void init(IWorkbench workbench) { + + } +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/WellMappingPreferencePage.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/WellMappingPreferencePage.java new file mode 100644 index 0000000000..e05f245952 --- /dev/null +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/csv/ui/preferences/WellMappingPreferencePage.java @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2022, 2023 Lablicate GmbH. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * Contributors: + * + * Matthias Mailänder - initial API and implementation + *******************************************************************************/ +package org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui.preferences; + +import org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.pcr.report.supplier.tabular.csv.ui.Activator; +import org.eclipse.chemclipse.pcr.report.supplier.tabular.ui.editors.WellMappingFieldEditor; +import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; + +public class WellMappingPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { + + public WellMappingPreferencePage() { + + super(GRID); + setPreferenceStore(Activator.getDefault().getPreferenceStore()); + setDescription("Decides how the end result is reported based on Ct values."); + } + + /** + * Creates the field editors. Field editors are abstractions of the common + * GUI blocks needed to manipulate various types of preferences. Each field + * editor knows how to save and restore itself. + */ + @Override + public void createFieldEditors() { + + addField(new WellMappingFieldEditor(PreferenceSupplier.P_WELL_MAPPING, "", getFieldEditorParent())); + } + + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + @Override + public void init(IWorkbench workbench) { + + } +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/plugin.xml b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/plugin.xml index daf40cc603..87854ca637 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/plugin.xml +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/plugin.xml @@ -9,6 +9,18 @@ id="org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui.preferences.converterPreferencePage" name="Excel PCR Export Converter"> + + + + diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/ChannelMappingPreferencePage.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/ChannelMappingPreferencePage.java new file mode 100644 index 0000000000..025e494263 --- /dev/null +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/ChannelMappingPreferencePage.java @@ -0,0 +1,50 @@ +/******************************************************************************* + * Copyright (c) 2023 Lablicate GmbH. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * Contributors: + * + * Matthias Mailänder - initial API and implementation + *******************************************************************************/ +package org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui.preferences; + +import org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui.Activator; +import org.eclipse.chemclipse.pcr.report.supplier.tabular.ui.editors.ChannelMappingFieldEditor; +import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; + +public class ChannelMappingPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { + + public ChannelMappingPreferencePage() { + + super(GRID); + setPreferenceStore(Activator.getDefault().getPreferenceStore()); + setDescription("Exports plates into *.xlsx reports according to these rules."); + } + + /** + * Creates the field editors. Field editors are abstractions of the common + * GUI blocks needed to manipulate various types of preferences. Each field + * editor knows how to save and restore itself. + */ + @Override + public void createFieldEditors() { + + addField(new ChannelMappingFieldEditor(PreferenceSupplier.P_CHANNEL_MAPPING, "", getFieldEditorParent())); + } + + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + @Override + public void init(IWorkbench workbench) { + + } +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/IgnoredSubsetPreferencePage.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/IgnoredSubsetPreferencePage.java new file mode 100644 index 0000000000..332c054ba2 --- /dev/null +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/IgnoredSubsetPreferencePage.java @@ -0,0 +1,49 @@ +/******************************************************************************* + * Copyright (c) 2022, 2023 Lablicate GmbH. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * Contributors: + * + * Matthias Mailänder - initial API and implementation + *******************************************************************************/ +package org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui.preferences; + +import org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.preferences.PreferenceSupplier; +import org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui.Activator; +import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPreferencePage; + +public class IgnoredSubsetPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { + + public IgnoredSubsetPreferencePage() { + + super(GRID); + setPreferenceStore(Activator.getDefault().getPreferenceStore()); + setDescription("These subsets will never get reported."); + } + + /** + * Creates the field editors. Field editors are abstractions of the common + * GUI blocks needed to manipulate various types of preferences. Each field + * editor knows how to save and restore itself. + */ + @Override + public void createFieldEditors() { + + addField(new StringListFieldEditor(PreferenceSupplier.P_IGNORE_SUBSETS, "", getFieldEditorParent())); + } + + /* + * (non-Javadoc) + * @see + * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) + */ + @Override + public void init(IWorkbench workbench) { + + } +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/PreferencePage.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/PreferencePage.java index 62e1bf75aa..07b2c11215 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/PreferencePage.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/ui/preferences/PreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Lablicate GmbH. + * Copyright (c) 2022, 2023 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -13,8 +13,6 @@ import org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.preferences.PreferenceSupplier; import org.eclipse.chemclipse.pcr.report.supplier.tabular.excel.ui.Activator; -import org.eclipse.chemclipse.pcr.report.supplier.tabular.ui.editors.ChannelMappingFieldEditor; -import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpacerFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.ui.IWorkbench; @@ -26,7 +24,7 @@ public PreferencePage() { super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setDescription("Exports plates into *.xlsx reports according to these rules."); + setDescription("Exports plates into *.xlsx reports."); } /** @@ -37,9 +35,6 @@ public PreferencePage() { @Override public void createFieldEditors() { - addField(new StringListFieldEditor(PreferenceSupplier.P_IGNORE_SUBSETS, "Ignored Subsets:", getFieldEditorParent())); - addField(new SpacerFieldEditor(getFieldEditorParent())); - addField(new ChannelMappingFieldEditor(PreferenceSupplier.P_CHANNEL_MAPPING, "Channel Mappings:", getFieldEditorParent())); addField(new StringFieldEditor(PreferenceSupplier.P_ANALYSIS_SEPARATOR, "Sample Analysis Separator:", getFieldEditorParent())); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/preferences/PreferenceSupplier.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/preferences/PreferenceSupplier.java index 6f5dac24b9..04cc41caa1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/preferences/PreferenceSupplier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.excel/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/excel/preferences/PreferenceSupplier.java @@ -90,9 +90,9 @@ public static ChannelMappings getChannelMappings() { public static Set getIgnoredSubsets() { IEclipsePreferences preferences = INSTANCE().getPreferences(); - Set subsets = new HashSet(); + Set subsets = new HashSet<>(); String preferenceEntry = preferences.get(P_IGNORE_SUBSETS, DEF_IGNORE_SUBSETS); - if(preferenceEntry != "") { + if(!"".equals(preferenceEntry)) { String[] items = StringUtils.parseString(preferenceEntry); if(items.length > 0) { for(String item : items) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/ChannelMappingFieldEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/ChannelMappingFieldEditor.java index c78b37a4af..35ba59c9b3 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/ChannelMappingFieldEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/ChannelMappingFieldEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Lablicate GmbH. + * Copyright (c) 2022, 2023 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -55,6 +55,7 @@ protected void doFillIntoGrid(Composite parent, int numColumns) { editor = new ChannelMappingTable(parent, SWT.NONE); GridData gridData = new GridData(GridData.FILL_BOTH); gridData.minimumHeight = 150; + gridData.widthHint = 500; editor.setLayoutData(gridData); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/VirtualChannelFieldEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/VirtualChannelFieldEditor.java index 7207a9ac18..9d8663e4ef 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/VirtualChannelFieldEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/VirtualChannelFieldEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Lablicate GmbH. + * Copyright (c) 2022, 2023 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -55,6 +55,7 @@ protected void doFillIntoGrid(Composite parent, int numColumns) { editor = new VirtualChannelTable(parent, SWT.NONE); GridData gridData = new GridData(GridData.FILL_BOTH); gridData.minimumHeight = 150; + gridData.widthHint = 600; editor.setLayoutData(gridData); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/WellMappingFieldEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/WellMappingFieldEditor.java index 36b60c27b8..c45067ab95 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/WellMappingFieldEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/editors/WellMappingFieldEditor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Lablicate GmbH. + * Copyright (c) 2022, 2023 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -55,6 +55,7 @@ protected void doFillIntoGrid(Composite parent, int numColumns) { editor = new WellMappingTable(parent, SWT.NONE); GridData gridData = new GridData(GridData.FILL_BOTH); gridData.minimumHeight = 150; + gridData.widthHint = 1000; editor.setLayoutData(gridData); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/ChannelMappingLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/ChannelMappingLabelProvider.java index 54cdabbd1e..504053d916 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/ChannelMappingLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/ChannelMappingLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Lablicate GmbH. + * Copyright (c) 2022, 2023 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -45,8 +45,7 @@ public Image getColumnImage(Object element, int columnIndex) { public String getColumnText(Object element, int columnIndex) { String text = ""; - if(element instanceof ChannelMapping) { - ChannelMapping channelMapping = (ChannelMapping)element; + if(element instanceof ChannelMapping channelMapping) { switch(columnIndex) { case 0: text = channelMapping.getSubset(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/VirtualChannelLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/VirtualChannelLabelProvider.java index ccfea16fa7..b76a60ebc3 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/VirtualChannelLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/VirtualChannelLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Lablicate GmbH. + * Copyright (c) 2022, 2023 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -47,8 +47,7 @@ public Image getColumnImage(Object element, int columnIndex) { public String getColumnText(Object element, int columnIndex) { String text = ""; - if(element instanceof VirtualChannel) { - VirtualChannel virtualChannel = (VirtualChannel)element; + if(element instanceof VirtualChannel virtualChannel) { switch(columnIndex) { case 0: text = virtualChannel.getSubset(); @@ -74,4 +73,4 @@ public Image getImage(Object element) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_COPY, IApplicationImageProvider.SIZE_16x16); } -} \ No newline at end of file +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/WellMappingLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/WellMappingLabelProvider.java index 0a6bdbe066..d6983d9faf 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/WellMappingLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.pcr.report.supplier.tabular.ui/src/org/eclipse/chemclipse/pcr/report/supplier/tabular/ui/internal/provider/WellMappingLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022 Lablicate GmbH. + * Copyright (c) 2022, 2023 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -51,8 +51,7 @@ public Image getColumnImage(Object element, int columnIndex) { public String getColumnText(Object element, int columnIndex) { String text = ""; - if(element instanceof WellMapping) { - WellMapping wellMapping = (WellMapping)element; + if(element instanceof WellMapping wellMapping) { switch(columnIndex) { case 0: text = wellMapping.getSubset(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.rcp.app.ui/plugin.xml b/chemclipse/plugins/org.eclipse.chemclipse.rcp.app.ui/plugin.xml index a9e95c4e17..4557490792 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.rcp.app.ui/plugin.xml +++ b/chemclipse/plugins/org.eclipse.chemclipse.rcp.app.ui/plugin.xml @@ -21,7 +21,12 @@ class="org.eclipse.chemclipse.rcp.app.ui.preferences.PreferencePage" id="org.eclipse.chemclipse.rcp.app.ui.preferences.preferencePage" name="Chromatography/Spectrometry"> - + + +