fix wrap alignment vscroll visible amount

[jalview.git] / src / jalview / gui / SeqPanel.java

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index 8e7141b..0b84fa5 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -115,8 +115,7 @@ public class SeqPanel extends JPanel
 \r
     seqEditOccurred = -1;\r
 \r
-    ap.RefreshPanels();\r
-    repaint();\r
+    ap.repaint();\r
 \r
   }\r
 \r
@@ -175,8 +174,6 @@ public class SeqPanel extends JPanel
       y %= chunkHeight;\r
       seq =     y / av.getCharHeight() + av.getStartSeq();\r
 \r
-      //   chunkHeight =  (da.getHeight() + 2)*charHeight;\r
-      //  startx += chunkWidth;\r
     }\r
     else\r
     {\r
@@ -250,7 +247,9 @@ public class SeqPanel extends JPanel
        // Group editing\r
        if (evt.isAltDown() || evt.isControlDown())\r
         {\r
-         SequenceGroup sg = av.getAlignment().findGroup(startseq);\r
+         SequenceGroup sg = av.getSelectionGroup();\r
+          if(sg==null)\r
+            av.getAlignment().findGroup(startseq);\r
           if (sg != null)\r
           {\r
             boolean deleteAllowed = false;\r
@@ -360,21 +359,8 @@ public class SeqPanel extends JPanel
 \r
   void updateConservation(int i)\r
   {\r
-  /*  Alignment al = (Alignment) av.getAlignment();\r
-    SequenceGroup sg = av.alignment.findGroup( al.getSequenceAt(i));\r
-    if(sg==null || !(sg.cs instanceof ConservationColourScheme))\r
-      return;\r
-\r
-    Conservation c = sg.getConservation();\r
-\r
-    c = new Conservation("All", al.cons,\r
-                         ResidueProperties.propHash, 3, sg.sequences, 0,\r
-                         al.getWidth());\r
-    c.calculate();\r
-    c.verdict(false, 100);\r
-    sg.setConservation(c);\r
-    ConservationColourScheme ccs = (ConservationColourScheme)sg.cs;\r
-    ccs.conserve = c;*/\r
+    av.updateConservation();\r
+    av.updateConsensus();\r
   }\r
 \r
 //////////////////////////////////////////\r
@@ -397,7 +383,7 @@ public class SeqPanel extends JPanel
     if(stretchGroup == null)\r
      {\r
        stretchGroup = av.alignment.findGroup( sequence );\r
-       if(res>stretchGroup.getStartRes() && res<stretchGroup.getEndRes())\r
+       if(stretchGroup!=null && res>stretchGroup.getStartRes() && res<stretchGroup.getEndRes())\r
          av.setSelectionGroup(stretchGroup);\r
        else\r
          stretchGroup = null;\r
@@ -433,14 +419,9 @@ public class SeqPanel extends JPanel
       stretchGroup = sg;\r
 \r
       if(av.getConservationSelected())\r
-        Desktop.setConservationSliderSource(ap, av.getGlobalColourScheme(), "Background");\r
-      else if(av.getGlobalColourScheme()!=null && av.getGlobalColourScheme().canThreshold())\r
-      {\r
-        ResidueColourScheme rcs = (ResidueColourScheme) av.getGlobalColourScheme();\r
-        int threshold = rcs.getThreshold();\r
-        if (threshold > 0)\r
-          Desktop.setPIDSliderSource(ap, av.getGlobalColourScheme(), "Background");\r
-      }\r
+        SliderPanel.setConservationSlider(ap, av.getGlobalColourScheme(), "Background");\r
+      if(av.getAbovePIDThreshold())\r
+        SliderPanel.setPIDSliderSource(ap, av.getGlobalColourScheme(), "Background");\r
 \r
     }\r
     else if( javax.swing.SwingUtilities.isRightMouseButton(evt))\r
@@ -460,7 +441,6 @@ public class SeqPanel extends JPanel
       changeStartRes = true;\r
 \r
 \r
-    seqCanvas.paintFlag = true;\r
     repaint();\r
 \r
   }\r
@@ -481,21 +461,15 @@ public class SeqPanel extends JPanel
     if(stretchGroup.cs instanceof ClustalxColourScheme)\r
     {\r
       stretchGroup.cs = new ClustalxColourScheme(stretchGroup.sequences, av.alignment.getWidth());\r
-      seqCanvas.paintFlag = true;\r
       repaint();\r
     }\r
 \r
     else if(stretchGroup.cs instanceof ConservationColourScheme)\r
     {\r
-      ConservationColourScheme ccs = (ConservationColourScheme)stretchGroup.cs;\r
-\r
-\r
+       ConservationColourScheme ccs = (ConservationColourScheme)stretchGroup.cs;\r
        stretchGroup.cs = ccs;\r
+       SliderPanel.setConservationSlider(ap, stretchGroup.cs, stretchGroup.getName()) ;\r
 \r
-\r
-       Desktop.setConservationSliderSource(ap, stretchGroup.cs, stretchGroup.getName()) ;\r
-\r
-       seqCanvas.paintFlag = true;\r
        repaint();\r
     }\r
     else\r
@@ -503,9 +477,7 @@ public class SeqPanel extends JPanel
       if(stretchGroup.cs !=null && stretchGroup.cs.canThreshold())\r
       {\r
         ResidueColourScheme rcs =  (ResidueColourScheme) stretchGroup.cs;\r
-        int threshold = rcs.getThreshold();\r
-        if(threshold>0)\r
-          Desktop.setPIDSliderSource(ap, stretchGroup.cs, stretchGroup.getName());\r
+        SliderPanel.setPIDSliderSource(ap, stretchGroup.cs, stretchGroup.getName());\r
       }\r
 \r
     }\r
@@ -527,6 +499,10 @@ public class SeqPanel extends JPanel
     if(stretchGroup==null)\r
       return;\r
 \r
+    if(res>av.alignment.getWidth()-2)\r
+      res = av.alignment.getWidth()-2;\r
+\r
+\r
     if(stretchGroup.getEndRes()==res)\r
       // Edit end res position of selected group\r
       changeEndRes = true;\r
@@ -558,7 +534,7 @@ public class SeqPanel extends JPanel
     else if (y < oldSeq)\r
       dragDirection = -1;\r
 \r
-    while (y != oldSeq && oldSeq>0)\r
+    while (y != oldSeq && oldSeq>0 && y<av.alignment.getHeight())\r
     {\r
       // This routine ensures we don't skip any sequences, as the\r
       // selection is quite slow.\r
@@ -574,6 +550,7 @@ public class SeqPanel extends JPanel
       }\r
       else\r
       {\r
+       if(seq!=null)\r
         stretchGroup.addSequence(seq);\r
         stretchGroup.addSequence(nextSeq);\r
       }\r
@@ -583,7 +560,6 @@ public class SeqPanel extends JPanel
     if(scrollThread!=null)\r
       scrollThread.setEvent(evt);\r
 \r
-    seqCanvas.paintFlag = true;\r
     repaint();\r
   }\r
 \r
@@ -644,7 +620,6 @@ public class SeqPanel extends JPanel
             running = ap.scrollRight(false);\r
         }\r
 \r
-        ap.repaint();\r
         try\r
         {\r
           Thread.sleep(75);\r