Fixed FeatureOverview
@@ -90,11 +90,11 @@ public class FeatureOverviewWindow extends Stage {
splitPaneCenter.getItems().add(splitPaneRight);
// add spectra MS1
- // splitPaneRight.getItems().add(addSpectraMS1());
+ splitPaneRight.getItems().add(addSpectraMS1());
// add Spectra MS2
if (feature.getMostIntenseFragmentScanNumber() > 0) {
- // splitPaneRight.getItems().add(addSpectraMS2());
+ splitPaneRight.getItems().add(addSpectraMS2());
} else {
FlowPane noMSMSPanel = new FlowPane();
Label noMSMSScansFound = new Label("Sorry, no MS/MS scans found!");
@@ -140,11 +140,7 @@ public class FeatureOverviewWindow extends Stage {
featureSelection, // selected features
labelsMap); // labels
- pane.getItems().add(window.getTICPlot());
- pane.getItems().add(window.getToolBar());
- // pane.setResizeWeight(1);
- // pane.setDividerSize(1);
- // pane.setBorder(BorderFactory.createLineBorder(Color.black));
+ pane.getItems().add(window.getScene().getRoot());
return pane;
}
@@ -180,12 +176,7 @@ public class FeatureOverviewWindow extends Stage {
pane.setOrientation(Orientation.HORIZONTAL);
SpectraVisualizerWindow spectraWindowMS1 = new SpectraVisualizerWindow(rawFiles[0]);
spectraWindowMS1.loadRawData(rawFiles[0].getScan(feature.getRepresentativeScanNumber()));
-
- // pane.add(spectraWindowMS1.getSpectrumPlot());
- pane.getItems().add(spectraWindowMS1.getToolBar());
- // pane.setResizeWeight(1);
- pane.setDisable(true);
- // pane.setDividerSize(0);
+ pane.getItems().add(spectraWindowMS1.getScene().getRoot());
return pane;
}
@@ -194,12 +185,7 @@ public class FeatureOverviewWindow extends Stage {
pane.setOrientation(Orientation.HORIZONTAL);
SpectraVisualizerWindow spectraWindowMS2 = new SpectraVisualizerWindow(rawFiles[0]);
spectraWindowMS2.loadRawData(rawFiles[0].getScan(feature.getMostIntenseFragmentScanNumber()));
-
- // pane.add(spectraWindowMS2.getSpectrumPlot());
- pane.getItems().add(spectraWindowMS2.getToolBar());
- // pane.setResizeWeight(1);
- pane.setDisable(true);
- // pane.setDividerSize(0);
+ pane.getItems().add(spectraWindowMS2.getScene().getRoot());
return pane;
}
}
