From c80292bb7e300539b0ea8665ed3bee3fa6735dad Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Fri, 20 May 2005 15:18:11 +0000
Subject: [PATCH] added placeholder indicators and menu item

---
 src/jalview/appletgui/IdCanvas.java  |    3 +++
 src/jalview/appletgui/SeqCanvas.java |    5 +++--
 src/jalview/gui/IdCanvas.java        |    4 ++++
 src/jalview/gui/SeqCanvas.java       |    5 +++--
 src/jalview/jbgui/GTreePanel.java    |   19 ++++++++++++++++++-
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/jalview/appletgui/IdCanvas.java b/src/jalview/appletgui/IdCanvas.java
index 80533f2..a8f8456 100755
--- a/src/jalview/appletgui/IdCanvas.java
+++ b/src/jalview/appletgui/IdCanvas.java
@@ -106,6 +106,9 @@ public class IdCanvas extends Panel
     imgHeight = getSize().height;
     imgHeight -= imgHeight % av.charHeight;
 
+    if (imgHeight<1)
+      return;
+
     if(image==null || imgHeight!=image.getHeight(this))
     {
       image = createImage(getSize().width, imgHeight);
diff --git a/src/jalview/appletgui/SeqCanvas.java b/src/jalview/appletgui/SeqCanvas.java
index db91d08..e028819 100755
--- a/src/jalview/appletgui/SeqCanvas.java
+++ b/src/jalview/appletgui/SeqCanvas.java
@@ -184,12 +184,13 @@ public void fastPaint(int horizontal, int vertical)
     // this draws the whole of the alignment
       imgWidth  = this.getSize().width;
       imgHeight = this.getSize().height;
-      if(imgWidth<1 || imgHeight<1)
-        return;
 
       imgWidth -= imgWidth%av.charWidth;
       imgHeight-= imgHeight%av.charHeight;
 
+      if(imgWidth<1 || imgHeight<1)
+              return;
+
       if(img==null || imgWidth!=img.getWidth(this) || imgHeight!=img.getHeight(this))
       {
         img = createImage(imgWidth, imgHeight);
diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 882ed7a..4f5288d 100755
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -105,6 +105,10 @@ public class IdCanvas extends JPanel
 
     imgHeight = getHeight();
     imgHeight -= imgHeight % av.charHeight;
+
+    if (imgHeight<1)
+      return;
+
     image = new BufferedImage(getWidth(), imgHeight, BufferedImage.TYPE_INT_RGB);
     gg = (Graphics2D) image.getGraphics();
     //Fill in the background
diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 12659a8..b2e9d3e 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -188,12 +188,13 @@ public void fastPaint(int horizontal, int vertical)
     // this draws the whole of the alignment
       imgWidth  = getWidth();
       imgHeight = getHeight();
-      if(imgWidth<1 || imgHeight<1)
-        return;
 
       imgWidth -= imgWidth%av.charWidth;
       imgHeight-= imgHeight%av.charHeight;
 
+      if(imgWidth<1 || imgHeight<1)
+        return;
+
       img = new BufferedImage(imgWidth,imgHeight,BufferedImage.TYPE_INT_RGB);
       gg  = (Graphics2D)img.getGraphics();
       gg.setFont(av.getFont());
diff --git a/src/jalview/jbgui/GTreePanel.java b/src/jalview/jbgui/GTreePanel.java
index 27b5c5c..e7030b8 100755
--- a/src/jalview/jbgui/GTreePanel.java
+++ b/src/jalview/jbgui/GTreePanel.java
@@ -17,6 +17,7 @@ public class GTreePanel extends JInternalFrame
   protected JCheckBoxMenuItem bootstrapMenu = new JCheckBoxMenuItem();
   protected JCheckBoxMenuItem distanceMenu = new JCheckBoxMenuItem();
   protected JCheckBoxMenuItem fitToWindow = new JCheckBoxMenuItem();
+  protected JCheckBoxMenuItem placeholdersMenu = new JCheckBoxMenuItem();
   JMenuItem pngTree = new JMenuItem();
   JMenuItem epsTree = new JMenuItem();
   JMenu saveAsMenu = new JMenu();
@@ -108,6 +109,16 @@ public class GTreePanel extends JInternalFrame
       }
     });
     saveAsMenu.setText("Save as");
+    placeholdersMenu.setToolTipText(
+        "Marks leaves of tree not associated with a sequence");
+    placeholdersMenu.setText("Mark unlinked leaves");
+    placeholdersMenu.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent e)
+      {
+        placeholdersMenu_actionPerformed(e);
+      }
+    });
     this.getContentPane().add(scrollPane, BorderLayout.CENTER);
     jMenuBar1.add(jMenu1);
     jMenuBar1.add(jMenu2);
@@ -117,6 +128,7 @@ public class GTreePanel extends JInternalFrame
     jMenu2.add(fontSize);
     jMenu2.add(distanceMenu);
     jMenu2.add(bootstrapMenu);
+    jMenu2.add(placeholdersMenu);
     saveAsMenu.add(saveAsNewick);
     saveAsMenu.add(epsTree);
     saveAsMenu.add(pngTree);
@@ -158,7 +170,12 @@ public class GTreePanel extends JInternalFrame
 
   }
 
-  public void saveAsNewick_actionPerformed(ActionEvent e)
+  protected void saveAsNewick_actionPerformed(ActionEvent e)
+  {
+
+  }
+
+  protected void placeholdersMenu_actionPerformed(ActionEvent e)
   {
 
   }
-- 
1.7.10.2