Skip to content
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 @@ -60,6 +60,7 @@ public enum MZmineModuleCategory {
VISUALIZATIONRAWDATA("Visualization"), //
VISUALIZATIONFEATURELIST("Visualization feature list"), //
VISUALIZATION_RAW_AND_FEATURE("Visualization data"), //
VISUALIZATION_OTHER_DATA("Visualization of data from other detectors"), //
DATAANALYSIS("Data analysis"), //
HELPSYSTEM("Help"), //
TOOLS("Tools"), OTHER_DATA_PROCESSING("Processing other data"); //
Expand Down Expand Up @@ -90,7 +91,7 @@ public MainCategory getMainCategory() {
// no main category
case HELPSYSTEM, TOOLS -> MainCategory.OTHER;
// no default so that the compiler marks missing cases
case OTHER_DATA_PROCESSING -> MainCategory.OTHER_DATA;
case OTHER_DATA_PROCESSING, VISUALIZATION_OTHER_DATA -> MainCategory.OTHER_DATA;
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,20 @@ public void updateChart(@NotNull List<DatasetAndRenderer> datasets,
final List<DatasetAndRenderer> data = new ArrayList<>();

data.addAll(List.of(new DatasetAndRenderer(new ColoredXYDataset(
new IonTimeSeriesToXYProvider(corrected, feature.toString() + " corrected",
feature.getRawDataFile().getColor()), RunOption.THIS_THREAD),
new ColoredAreaShapeRenderer()),
new DatasetAndRenderer(new ColoredXYDataset(
new IonTimeSeriesToXYProvider(full, feature.toString(),
feature.getRawDataFile().getColor()), RunOption.THIS_THREAD),
new ColoredXYLineRenderer())));
new IonTimeSeriesToXYProvider(corrected, feature.toString() + " corrected",
feature.getRawDataFile().getColor()), RunOption.THIS_THREAD),
new ColoredAreaShapeRenderer()), new DatasetAndRenderer(new ColoredXYDataset(
new IonTimeSeriesToXYProvider(full, feature.toString(),
feature.getRawDataFile().getColor()), RunOption.THIS_THREAD),
new ColoredXYLineRenderer())));

additionalPreviewData.forEach(a -> {
if ("samples".equals(a.getSeriesKey())) {
data.add(new DatasetAndRenderer(new ColoredXYDataset(a), new ColoredXYShapeRenderer()));
data.add(new DatasetAndRenderer(new ColoredXYDataset(a, RunOption.THIS_THREAD),
new ColoredXYShapeRenderer()));
} else {
data.add(new DatasetAndRenderer(new ColoredXYDataset(a), new ColoredXYLineRenderer()));
data.add(new DatasetAndRenderer(new ColoredXYDataset(a, RunOption.THIS_THREAD),
new ColoredXYLineRenderer()));
}
});

Expand Down
Loading