Odd edit bug with represented seqs fixed
authoramwaterhouse <Andrew Waterhouse>
Tue, 25 Jul 2006 15:50:35 +0000 (15:50 +0000)
committeramwaterhouse <Andrew Waterhouse>
Tue, 25 Jul 2006 15:50:35 +0000 (15:50 +0000)
src/jalview/gui/SeqPanel.java

index 9d6b925..9ea087e 100755 (executable)
@@ -883,10 +883,17 @@ public class SeqPanel extends JPanel implements MouseListener,
                   return;\r
                 }\r
 \r
+                int alWidth = av.alignment.getWidth();\r
+                if(av.hasHiddenRows)\r
+                {\r
+                  int hwidth = av.alignment.getHiddenSequences().getWidth();\r
+                  if(hwidth>alWidth)\r
+                    alWidth = hwidth;\r
+                }\r
                 //We can still insert gaps if the selectionGroup\r
                 //contains all the sequences\r
                 sg.setEndRes(sg.getEndRes()+startres-lastres);\r
-                fixedRight = av.alignment.getWidth()+startres-lastres;\r
+                fixedRight = alWidth+startres-lastres;\r
               }\r
               else\r
               {\r
@@ -969,19 +976,6 @@ public class SeqPanel extends JPanel implements MouseListener,
             {\r
               if (fixedColumns && fixedRight != -1)\r
               {\r
-                /*if (sg!=null &&\r
-                    sg.getStartRes() == 0\r
-                    && sg.getEndRes()  == fixedRight\r
-                    && !jalview.util.Comparison.isGap(seq.getCharAt(fixedRight)))\r
-                {\r
-                  System.out.println("still here");\r
-                  //Single sequence edit, whole sequence selected,\r
-                  //extend the selection group\r
-                  sg.setEndRes(av.alignment.getWidth() -1 + startres - lastres);\r
-                  fixedColumns = false;\r
-                  insertChar(j, seq);\r
-                }\r
-                else*/\r
                   insertChar(j, seq, fixedRight);\r
               }\r
               else\r
@@ -1038,6 +1032,9 @@ public class SeqPanel extends JPanel implements MouseListener,
 \r
       if (blankColumn <= j)\r
       {\r
+        System.out.println("END HERE "+seq.getName()+" "+seq.getLength()+" "+j+" "\r
+            +blankColumn+" "+fixedColumn);\r
+        blankColumn = fixedColumn;\r
         endEditing();\r
         return;\r
       }\r