From c015b474562665ecc6ad3c1bd25c2b3ffea3d94a Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Thu, 6 Mar 2008 16:36:01 +0000
Subject: [PATCH] fix for user plot
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@7203 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
uk/ac/sanger/artemis/components/BasePlot.java | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/uk/ac/sanger/artemis/components/BasePlot.java b/uk/ac/sanger/artemis/components/BasePlot.java
index 172396f8c..0c6824ed8 100644
--- a/uk/ac/sanger/artemis/components/BasePlot.java
+++ b/uk/ac/sanger/artemis/components/BasePlot.java
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/BasePlot.java,v 1.9 2008-03-06 14:34:05 tjc Exp $
+ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/components/BasePlot.java,v 1.10 2008-03-06 16:36:01 tjc Exp $
**/
package uk.ac.sanger.artemis.components;
@@ -54,7 +54,7 @@ import javax.swing.JTextField;
* scale is tied to a FeatureDisplay component.
*
* @author Kim Rutherford
- * @version $Id: BasePlot.java,v 1.9 2008-03-06 14:34:05 tjc Exp $
+ * @version $Id: BasePlot.java,v 1.10 2008-03-06 16:36:01 tjc Exp $
**/
public class BasePlot extends Plot
@@ -385,8 +385,17 @@ public class BasePlot extends Plot
else
defaultKey = Key.CDS;
+ Entry entry = entryGroup.getDefaultEntry();
+ if(entry == null)
+ {
+ JOptionPane.showMessageDialog(null,
+ "Please select a default entry\nand try again!", "No default entry",
+ JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+
KeyChoice keyChoice = new KeyChoice(
- entryGroup.getDefaultEntry().getEntryInformation(), defaultKey);
+ entry.getEntryInformation(), defaultKey);
c.gridx = 1;
c.gridy = 2;
@@ -440,8 +449,8 @@ public class BasePlot extends Plot
for(int i = 0 ; i < number_of_values ; ++i)
{
- getBaseAlgorithm().getValues(i * step_size,
- i * step_size +
+ getBaseAlgorithm().getValues((i * step_size) + 1,
+ (i * step_size) + 1 +
getWindowSize() - 1,
temp_values);
--
GitLab