processing in SpectraVisualizerWindow disabled by default

- now activated in showNewSpectrumWindow
mzmine · Jun 2, 2019 · fd31dbc · fd31dbc
1 parent 29cf0e1
commit fd31dbc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/net/sf/mzmine/modules/visualization/spectra/simplespectra/SpectraToolBar.java b/src/main/java/net/sf/mzmine/modules/visualization/spectra/simplespectra/SpectraToolBar.java
@@ -26,7 +26,6 @@
 import javax.swing.JButton;
 import javax.swing.JToolBar;
 import net.sf.mzmine.datamodel.MassSpectrumType;
-import net.sf.mzmine.modules.visualization.spectra.simplespectra.datapointprocessing.DataPointProcessingManager;
 import net.sf.mzmine.util.GUIUtils;
 
 /**
@@ -48,7 +47,6 @@ public class SpectraToolBar extends JToolBar {
   static final Icon dbLipidsIcon = new ImageIcon("icons/DBLipidsIcon.png");
   static final Icon dbSpectraIcon = new ImageIcon("icons/DBSpectraIcon.png");
   static final Icon sumFormulaIcon = new ImageIcon("icons/search.png");
-  static final Icon processingIcon = new ImageIcon("icons/btnspectraprocessing.png");
 
   private JButton centroidContinuousButton, dataPointsButton;
 

diff --git a/...va/net/sf/mzmine/modules/visualization/spectra/simplespectra/SpectraVisualizerModule.java b/...va/net/sf/mzmine/modules/visualization/spectra/simplespectra/SpectraVisualizerModule.java
@@ -99,7 +99,7 @@ public static SpectraVisualizerWindow showNewSpectrumWindow(RawDataFile dataFile
       return null;
     }
 
-    SpectraVisualizerWindow newWindow = new SpectraVisualizerWindow(dataFile);
+    SpectraVisualizerWindow newWindow = new SpectraVisualizerWindow(dataFile, true);
     newWindow.loadRawData(scan);
 
     if (peak != null)

diff --git a/...va/net/sf/mzmine/modules/visualization/spectra/simplespectra/SpectraVisualizerWindow.java b/...va/net/sf/mzmine/modules/visualization/spectra/simplespectra/SpectraVisualizerWindow.java
@@ -104,15 +104,15 @@ public class SpectraVisualizerWindow extends JFrame implements ActionListener {
 
   private static final double zoomCoefficient = 1.2f;
 
-  public SpectraVisualizerWindow(RawDataFile dataFile) {
+  public SpectraVisualizerWindow(RawDataFile dataFile, boolean enableProcessing) {
 
     super("Spectrum loading...");
     this.dataFile = dataFile;
 
     setDefaultCloseOperation(DISPOSE_ON_CLOSE);
     setBackground(Color.white);
 
-    spectrumPlot = new SpectraPlot(this, true);
+    spectrumPlot = new SpectraPlot(this, enableProcessing);
     add(spectrumPlot, BorderLayout.CENTER);
 
     toolBar = new SpectraToolBar(this);
@@ -143,6 +143,12 @@ public SpectraVisualizerWindow(RawDataFile dataFile) {
     this.addComponentListener(settings);
 
   }
+
+  public SpectraVisualizerWindow(RawDataFile dataFile) {
+    this(dataFile, false);
+  }
+
+
 
   @Override
   public void dispose() {