Fix for issue #318

mzmine · Jun 21, 2017 · 91d622d · 91d622d
1 parent 8f9f4cd
commit 91d622d
Show file tree

Hide file tree

Showing 4 changed files with 145 additions and 137 deletions.
diff --git a/src/main/java/net/sf/mzmine/modules/visualization/twod/BaseXYPlot.java b/src/main/java/net/sf/mzmine/modules/visualization/twod/BaseXYPlot.java
@@ -19,24 +19,18 @@
 
 package net.sf.mzmine.modules.visualization.twod;
 
-import com.google.common.collect.Range;
-import net.sf.mzmine.datamodel.DataPoint;
+import java.awt.Graphics2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.util.logging.Logger;
+
 import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.plot.CrosshairState;
 import org.jfree.chart.plot.PlotRenderingInfo;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.data.general.DatasetChangeEvent;
 
-import java.awt.*;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.logging.Logger;
+import com.google.common.collect.Range;
 
 /**
  * Created by owen myers (oweenm@gmail.com) on 4/5/17.
@@ -74,7 +68,7 @@ public class BaseXYPlot extends XYPlot{
 
     public boolean render(final Graphics2D g2, final Rectangle2D dataArea,
                           int index, PlotRenderingInfo info, CrosshairState crosshairState) {
-        return true;
+        return super.render(g2, dataArea, index, info, crosshairState);
 
     }
 

diff --git a/src/main/java/net/sf/mzmine/modules/visualization/twod/TwoDBottomPanel.java b/src/main/java/net/sf/mzmine/modules/visualization/twod/TwoDBottomPanel.java
@@ -113,7 +113,7 @@ class TwoDBottomPanel extends JPanel implements TreeModelListener,
 	peakListSelector = new JComboBox<PeakList>();
 	peakListSelector.setBackground(Color.white);
 	peakListSelector.setFont(smallFont);
-	peakListSelector.addActionListener(masterFrame);
+	peakListSelector.addActionListener(this);
 	peakListSelector.setActionCommand("PEAKLIST_CHANGE");
 	add(peakListSelector);
 
@@ -303,7 +303,6 @@ public void actionPerformed(ActionEvent e) {
 	PeakList selectedPeakList = getPeaksInThreshold();
 	if (selectedPeakList != null)
 	    masterFrame.getPlot().loadPeakList(selectedPeakList);
-
     }
 
     @Override

diff --git a/src/main/java/net/sf/mzmine/modules/visualization/twod/TwoDPlot.java b/src/main/java/net/sf/mzmine/modules/visualization/twod/TwoDPlot.java
@@ -27,6 +27,7 @@
 import java.awt.event.MouseEvent;
 import java.awt.geom.Rectangle2D;
 import java.text.NumberFormat;
+import java.util.logging.Logger;
 
 import javax.swing.JFileChooser;
 import javax.swing.JMenuItem;
@@ -44,6 +45,8 @@
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.plot.DatasetRenderingOrder;
+import org.jfree.chart.renderer.category.LineAndShapeRenderer;
+import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
 import org.jfree.chart.title.TextTitle;
 import org.jfree.ui.RectangleEdge;
 
@@ -54,6 +57,8 @@
  */
 class TwoDPlot extends ChartPanel {
 
+  private Logger logger = Logger.getLogger(this.getClass().getName());
+
     private static final long serialVersionUID = 1L;
 
     // crosshair (selection) color
@@ -84,8 +89,6 @@ class TwoDPlot extends ChartPanel {
     private NumberFormat rtFormat = MZmineCore.getConfiguration().getRTFormat();
     private NumberFormat mzFormat = MZmineCore.getConfiguration().getMZFormat();
 
-    // private TwoDItemRenderer renderer;
-
     TwoDPlot(RawDataFile rawDataFile, TwoDVisualizerWindow visualizer,
 	    TwoDDataSet dataset, Range<Double> rtRange, Range<Double> mzRange,String whichPlotTypeStr) {
 
@@ -253,6 +256,8 @@ void setPlotMode(PlotMode plotMode) {
     }
 
     void loadPeakList(PeakList peakList) {
+
+      logger.finest("Loading peaklist " + peakList);
 
 	PeakDataSet peaksDataSet = new PeakDataSet(rawDataFile, peakList,
 		rtRange, mzRange);