X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=69ae398c406fd127a84ca284ecbf4c82fc7ffbd0;hb=9a4258bfc6277f67d677ce0e62f6ffd6bcc3d436;hp=f30c41c65ba0d9782f43cec04a0cb8dca0454a0f;hpb=cc4553c3b742463f2b325b2219480b304ce662cb;p=jalview.git

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index f30c41c..69ae398 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -363,20 +363,10 @@ public class AnnotationPanel extends JPanel implements MouseListener,
                 }
                 else if(aa[i].graph>0)
                 {
-                  if(SwingUtilities.isRightMouseButton(evt)
-                      && aa[i].graphLines!=null
-                       && aa[i].graphLines.size()>0)
-                  {
-                    SliderPanel sp = new SliderPanel(aa[i], ap);
-                    return;
-                  }
-                  else
-                  {
                     //Stretch Graph
                     graphStretch = i;
                     graphStretchY = evt.getY();
                     activeRes = null;
-                  }
                 }
                 else
                 {
@@ -978,21 +968,18 @@ public class AnnotationPanel extends JPanel implements MouseListener,
       g.drawLine(x-av.charWidth,y2,(eRes-sRes+1)*av.charWidth,y2);
 
 
-      if(aa.graphLines!=null)
+      if(aa.threshold!=null)
       {
-        for(int l=0; l<aa.graphLines.size(); l++)
-        {
-          g.setColor(aa.getGraphLine(l).colour);
+          g.setColor(aa.threshold.colour);
           Graphics2D g2 = (Graphics2D)g;
           g2.setStroke(new BasicStroke(1,
                                         BasicStroke.CAP_SQUARE,
                                         BasicStroke.JOIN_ROUND, 3f,
                                         new float[] { 5f, 3f }, 0f));
 
-          y2 = (int)(y - ((aa.getGraphLine(l).value-min) / range)*graphHeight);
+          y2 = (int)(y - ((aa.threshold.value-min) / range)*graphHeight);
           g.drawLine(x-av.charWidth,y2,(eRes-sRes+1)*av.charWidth,y2);
           g2.setStroke(new BasicStroke());
-        }
       }
 
       eRes = Math.min(eRes, aa.annotations.length);
@@ -1023,21 +1010,18 @@ public class AnnotationPanel extends JPanel implements MouseListener,
 
       float range = max - min;
 
-      if(aa.graphLines!=null)
+      if(aa.threshold!=null)
       {
-        for(int l=0; l<aa.graphLines.size(); l++)
-        {
-          g.setColor(aa.getGraphLine(l).colour);
+          g.setColor(aa.threshold.colour);
           Graphics2D g2 = (Graphics2D)g;
           g2.setStroke(new BasicStroke(1,
                                         BasicStroke.CAP_SQUARE,
                                         BasicStroke.JOIN_ROUND, 3f,
                                         new float[] { 5f, 3f }, 0f));
 
-          y2 = (int)(y - ((aa.getGraphLine(l).value-min) / range)*aa.graphHeight);
+          y2 = (int)(y - ((aa.threshold.value-min) / range)*aa.graphHeight);
           g.drawLine(x-av.charWidth,y2,(eRes-sRes+1)*av.charWidth,y2);
           g2.setStroke(new BasicStroke());
-        }
       }
 
       y1 = y2 = y;