Should call deselectAll when escape pressed
[jalview.git] / src / jalview / appletgui / AlignmentPanel.java
index b46876a..81b999f 100755 (executable)
@@ -22,13 +22,9 @@ package jalview.appletgui;
 import java.awt.*;\r
 import java.awt.event.*;\r
 \r
-import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
-import jalview.jbappletgui.*;\r
-import jalview.schemes.*;\r
 \r
-public class AlignmentPanel\r
-    extends GAlignmentPanel implements AdjustmentListener\r
+public class AlignmentPanel extends Panel implements AdjustmentListener\r
 {\r
 \r
   AlignViewport av;\r
@@ -44,8 +40,22 @@ public class AlignmentPanel
   // this value is set false when selection area being dragged\r
   boolean fastPaint = true;\r
 \r
+  boolean MAC = false;\r
+\r
   public AlignmentPanel(AlignFrame af, final AlignViewport av)\r
   {\r
+    try\r
+    {\r
+      jbInit();\r
+    }\r
+    catch (Exception e)\r
+    {\r
+      e.printStackTrace();\r
+    }\r
+\r
+    if(System.getProperty("os.name").startsWith("Mac"))\r
+      MAC = true;\r
+\r
     alignFrame = af;\r
     this.av = av;\r
     seqPanel = new SeqPanel(av, this);\r
@@ -102,8 +112,7 @@ public class AlignmentPanel
       switch (evt.getKeyCode())\r
       {\r
         case 27: // escape key\r
-          av.setSelectionGroup(null);\r
-          alignFrame.alignPanel.repaint();\r
+          alignFrame.deselectAllSequenceMenuItem_actionPerformed(null);\r
           break;\r
         case KeyEvent.VK_X:\r
           if (evt.isControlDown())\r
@@ -167,6 +176,9 @@ public class AlignmentPanel
     hscrollFillerPanel.setSize(d);\r
 \r
     alignFrame.pack();\r
+\r
+    if(overviewPanel!=null)\r
+          overviewPanel.updateOverviewImage();\r
   }\r
 \r
   public void setIdWidth(int w, int h)\r
@@ -198,14 +210,7 @@ public class AlignmentPanel
     while (i < al.getHeight() && al.getSequenceAt(i) != null)\r
     {\r
       SequenceI s = al.getSequenceAt(i);\r
-      if (av.getShowFullId())\r
-      {\r
-        id = s.getDisplayId();\r
-      }\r
-      else\r
-      {\r
-        id = s.getName();\r
-      }\r
+      id = s.getDisplayId(av.getShowJVSuffix());\r
 \r
       if (fm.stringWidth(id) > idWidth)\r
       {\r
@@ -266,21 +271,33 @@ public class AlignmentPanel
 \r
   public void setAnnotationVisible(boolean b)\r
   {\r
-    annotationSpaceFillerHolder.setVisible(b);\r
-    annotationScroller.setVisible(b);\r
+    if (!av.wrapAlignment)\r
+    {\r
+      annotationSpaceFillerHolder.setVisible(b);\r
+      annotationScroller.setVisible(b);\r
+    }\r
     validate();\r
     repaint();\r
   }\r
 \r
   public void setWrapAlignment(boolean wrap)\r
   {\r
+    av.startSeq = 0;\r
     scalePanelHolder.setVisible(!wrap);\r
     hscroll.setVisible(!wrap);\r
     idwidthAdjuster.setVisible(!wrap);\r
 \r
-    av.setShowAnnotation(!wrap);\r
-    annotationScroller.setVisible(!wrap);\r
-    annotationSpaceFillerHolder.setVisible(!wrap);\r
+    if (wrap)\r
+    {\r
+      annotationScroller.setVisible(false);\r
+      annotationSpaceFillerHolder.setVisible(false);\r
+    }\r
+    else if (av.showAnnotation)\r
+    {\r
+      annotationScroller.setVisible(true);\r
+      annotationSpaceFillerHolder.setVisible(true);\r
+    }\r
+\r
     idSpaceFillerPanel1.setVisible(!wrap);\r
 \r
     validate();\r
@@ -429,7 +446,7 @@ public class AlignmentPanel
       overviewPanel.setBoxPosition();\r
     }\r
 \r
-    if (av.getWrapAlignment() || !fastPaint)\r
+    if (av.getWrapAlignment() || !fastPaint || MAC)\r
     {\r
       repaint();\r
     }\r
@@ -459,19 +476,14 @@ public class AlignmentPanel
     idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height);\r
     annotationSpaceFillerHolder.setSize(d.width,\r
                                         annotationPanel.getSize().height);\r
-    alabels.setSize(d.width, annotationPanel.getSize().height);\r
 \r
-    alabels.repaint();\r
-    idPanel.idCanvas.repaint();\r
-    seqPanel.seqCanvas.repaint();\r
-    scalePanel.repaint();\r
-    annotationPanel.repaint();\r
+    alabels.setSize(d.width, annotationPanel.getSize().height);\r
 \r
     if (av.getWrapAlignment())\r
     {\r
       int max = av.alignment.getWidth() /\r
           seqPanel.seqCanvas.\r
-          getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width);\r
+          getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width) +1;\r
       vscroll.setMaximum(max);\r
       vscroll.setUnitIncrement(1);\r
       vscroll.setVisibleAmount(1);\r
@@ -481,5 +493,86 @@ public class AlignmentPanel
       setScrollValues(av.getStartRes(), av.getStartSeq());\r
     }\r
 \r
+    alabels.repaint();\r
+    idPanel.idCanvas.repaint();\r
+    seqPanel.seqCanvas.repaint();\r
+    scalePanel.repaint();\r
+    annotationPanel.repaint();\r
+\r
+    if (getBounds() == g.getClipBounds())\r
+    {\r
+      if (overviewPanel != null)\r
+        overviewPanel.updateOverviewImage();\r
+    }\r
+\r
+  }\r
+\r
+  protected Panel sequenceHolderPanel = new Panel();\r
+  protected Scrollbar vscroll = new Scrollbar();\r
+  protected Scrollbar hscroll = new Scrollbar();\r
+  protected Panel seqPanelHolder = new Panel();\r
+  BorderLayout borderLayout1 = new BorderLayout();\r
+  BorderLayout borderLayout3 = new BorderLayout();\r
+  protected Panel scalePanelHolder = new Panel();\r
+  protected Panel idPanelHolder = new Panel();\r
+  BorderLayout borderLayout5 = new BorderLayout();\r
+  protected Panel idSpaceFillerPanel1 = new Panel();\r
+  public Panel annotationSpaceFillerHolder = new Panel();\r
+  BorderLayout borderLayout6 = new BorderLayout();\r
+  BorderLayout borderLayout7 = new BorderLayout();\r
+  Panel hscrollHolder = new Panel();\r
+  BorderLayout borderLayout10 = new BorderLayout();\r
+  protected Panel hscrollFillerPanel = new Panel();\r
+  BorderLayout borderLayout11 = new BorderLayout();\r
+  public Panel annotationScroller = new Panel();\r
+  BorderLayout borderLayout4 = new BorderLayout();\r
+  BorderLayout borderLayout2 = new BorderLayout();\r
+\r
+  private void jbInit() throws Exception {\r
+      //  idPanelHolder.setPreferredSize(new Dimension(70, 10));\r
+      this.setLayout(borderLayout7);\r
+\r
+      //   sequenceHolderPanel.setPreferredSize(new Dimension(150, 150));\r
+      sequenceHolderPanel.setLayout(borderLayout3);\r
+      seqPanelHolder.setLayout(borderLayout1);\r
+      scalePanelHolder.setBackground(Color.white);\r
+\r
+      // scalePanelHolder.setPreferredSize(new Dimension(10, 30));\r
+      scalePanelHolder.setLayout(borderLayout6);\r
+      idPanelHolder.setLayout(borderLayout5);\r
+      idSpaceFillerPanel1.setBackground(Color.white);\r
+\r
+      //  idSpaceFillerPanel1.setPreferredSize(new Dimension(10, 30));\r
+      idSpaceFillerPanel1.setLayout(borderLayout11);\r
+      annotationSpaceFillerHolder.setBackground(Color.white);\r
+\r
+      //  annotationSpaceFillerHolder.setPreferredSize(new Dimension(10, 80));\r
+      annotationSpaceFillerHolder.setLayout(borderLayout4);\r
+      hscroll.setOrientation(Scrollbar.HORIZONTAL);\r
+      hscrollHolder.setLayout(borderLayout10);\r
+      hscrollFillerPanel.setBackground(Color.white);\r
+\r
+      //  hscrollFillerPanel.setPreferredSize(new Dimension(70, 10));\r
+      hscrollHolder.setBackground(Color.white);\r
+\r
+      //    annotationScroller.setPreferredSize(new Dimension(10, 80));\r
+      //  this.setPreferredSize(new Dimension(220, 166));\r
+      seqPanelHolder.setBackground(Color.white);\r
+      idPanelHolder.setBackground(Color.white);\r
+      annotationScroller.setLayout(borderLayout2);\r
+      sequenceHolderPanel.add(scalePanelHolder, BorderLayout.NORTH);\r
+      sequenceHolderPanel.add(seqPanelHolder, BorderLayout.CENTER);\r
+      seqPanelHolder.add(vscroll, BorderLayout.EAST);\r
+      sequenceHolderPanel.add(annotationScroller, BorderLayout.SOUTH);\r
+\r
+      //  Panel3.add(secondaryPanelHolder,  BorderLayout.SOUTH);\r
+      this.add(idPanelHolder, BorderLayout.WEST);\r
+      idPanelHolder.add(idSpaceFillerPanel1, BorderLayout.NORTH);\r
+      idPanelHolder.add(annotationSpaceFillerHolder, BorderLayout.SOUTH);\r
+      this.add(hscrollHolder, BorderLayout.SOUTH);\r
+      hscrollHolder.add(hscroll, BorderLayout.CENTER);\r
+      hscrollHolder.add(hscrollFillerPanel, BorderLayout.WEST);\r
+      this.add(sequenceHolderPanel, BorderLayout.CENTER);\r
   }\r
+\r
 }\r