Added mouse zoom. Added drag-to-scroll. Version 1.1.

erikjber · erikjber · commit 255b4df923ff · 2017-10-23T21:36:14.000+02:00
diff --git a/OpenGammaTool/src/com/gammascout/AboutDialog.java b/OpenGammaTool/src/com/gammascout/AboutDialog.java
@@ -50,7 +50,7 @@ public AboutDialog()
 		dtrpnOpenGammaTool.setBackground(UIManager
 				.getColor("Button.background"));
 		dtrpnOpenGammaTool
-				.setText("<html><body>\nOpen Gamma Tool<br/>\nVersion 1.0<br/>\n&#169; 2014, 2015 Erik Berglund<br/>\n<br/>\nSpecial thanks to <a href=\"http://johannes-bauer.com/linux/gammascout/\">Johannes Bauer</a><br/>\nfor reverse engineering and documenting <br/>\nthe GammaScout&#8482; protocol<br/>\n</body></html>");
+				.setText("<html><body>\nOpen Gamma Tool<br/>\nVersion 1.1<br/>\n&#169; 2014-2017 Erik Berglund<br/>\n<br/>\nSpecial thanks to <a href=\"http://johannes-bauer.com/linux/gammascout/\">Johannes Bauer</a><br/>\nfor reverse engineering and documenting <br/>\nthe GammaScout&#8482; protocol<br/>\n</body></html>");
 		GroupLayout gl_contentPanel = new GroupLayout(contentPanel);
 		gl_contentPanel.setHorizontalGroup(gl_contentPanel.createParallelGroup(
 				Alignment.TRAILING).addGroup(
diff --git a/OpenGammaTool/src/com/gammascout/MainWindow.java b/OpenGammaTool/src/com/gammascout/MainWindow.java
@@ -38,6 +38,7 @@
 import org.jfree.chart.axis.DateAxis;
 import org.jfree.chart.axis.LogAxis;
 import org.jfree.chart.axis.NumberAxis;
+import org.jfree.chart.axis.ValueAxis;
 import org.jfree.chart.labels.StandardXYToolTipGenerator;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYItemRenderer;
@@ -120,7 +121,7 @@ private void initialize()
 	    URL url = cldr.getResource("res/icon.png");
 
 	    if (url == null)
-	        JOptionPane.showMessageDialog(null, "no good");
+	        JOptionPane.showMessageDialog(null, "Could not load icon.");
 
 		try
 		{
@@ -253,6 +254,8 @@ private void initialize()
 		// create the chart
 		chart = ChartFactory.createTimeSeriesChart("Gamma Scout measured data",
 				"time", "value", dataset, false, true, false);
+		chart.getXYPlot().setRangePannable(true);
+		chart.getXYPlot().setDomainPannable(true);
 		DateAxis dateAxis = (DateAxis) chart.getXYPlot().getDomainAxis();
 		dateAxis.setTimeZone(Tools.UTC_TIMEZONE);
 		chartPanel = new ChartPanel(chart);
@@ -269,6 +272,8 @@ private void initialize()
 		chartPanel.setMaximumDrawWidth(7000);
 		chartPanel.setMaximumDrawHeight(4000);
 		chartPanel.setForeground(Color.BLACK);
+		chartPanel.setMouseWheelEnabled(true);
+		
 		frmOpenGammaTool.getContentPane().add(chartPanel);
 
 		btnLoadData = new JButton("Load data");
diff --git a/OpenGammaTool/src/com/gammascout/usb/Reading.java b/OpenGammaTool/src/com/gammascout/usb/Reading.java
@@ -12,6 +12,8 @@
  */
 public class Reading
 {
+	//number of counts per minute per microSievert per hour. Divice CPM by this number to get uSv/h
+	private static final double CONVERSION_FACTOR = 236;
 	private long time;
 	private long count;
 	private long interval;
@@ -106,7 +108,7 @@ public double getCountsPerMinute()
 	 */
 	public double getMicroSievertsPerHour()
 	{
-		return getCountsPerMinute()/142;
+		return getCountsPerMinute()/CONVERSION_FACTOR;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`*/`
`13`	`13`	`public class Reading`
`14`	`14`	`{`
	`15`	`+ //number of counts per minute per microSievert per hour. Divice CPM by this number to get uSv/h`
	`16`	`+ private static final double CONVERSION_FACTOR = 236;`
`15`	`17`	`private long time;`
`16`	`18`	`private long count;`
`17`	`19`	`private long interval;`
`@@ -106,7 +108,7 @@ public double getCountsPerMinute()`
`106`	`108`	`*/`
`107`	`109`	`public double getMicroSievertsPerHour()`
`108`	`110`	`{`
`109`		`- return getCountsPerMinute()/142;`
	`111`	`+ return getCountsPerMinute()/CONVERSION_FACTOR;`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`/**`