changes to printing when a BamView panel is included in ACT

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@13701 ee4ac58c-ac51-4696-9907-e4b3aa274f04

uk/ac/sanger/artemis/components/MultiComparator.java

@@ -1123,5 +1123,13 @@ public class MultiComparator extends JFrame
   {
     return base_plot_group_array;
   }
+  
+  /**
+   *  Return the Bam JPanel objects that were created in the constructor.
+   **/
+  protected JPanel[] getBamPanelArray() 
+  {
+    return bamPanel;
+  }
 
 }

uk/ac/sanger/artemis/components/PrintACT.java

@@ -90,9 +90,14 @@ public class PrintACT extends ScrollPanel implements Printable
             g2d.translate(0,((BasePlot)c[j]).getHeight());
           }
         }
+        
+        if(mc.getBamPanelArray()[i].isVisible())
+        {
+          mc.getBamPanelArray()[i].paintComponents(g2d);
+          g2d.translate(0,mc.getBamPanelArray()[i].getHeight());
+        }
       }
-
-
+      
       mc.getFeatureDisplayArray()[i].paintComponent(g2d);
       g2d.translate(0,mc.getFeatureDisplayArray()[i].getHeight());
 
@@ -108,6 +113,12 @@ public class PrintACT extends ScrollPanel implements Printable
             g2d.translate(0,((BasePlot)c[j]).getHeight());
           }
         }
+        
+        if(mc.getBamPanelArray()[i].isVisible())
+        {
+          mc.getBamPanelArray()[i].paintComponents(g2d);
+          g2d.translate(0,mc.getBamPanelArray()[i].getHeight());
+        }
       }
 
       if(i < mc.getAlignmentViewerArray().length)
@@ -143,6 +154,9 @@ public class PrintACT extends ScrollPanel implements Printable
               width = ((BasePlot)c[j]).getSize().width;
           }
       }
+      
+      if(mc.getBamPanelArray()[i].isVisible())
+        height += mc.getBamPanelArray()[i].getHeight();
 
       height += mc.getFeatureDisplayArray()[i].getHeight();
       if(mc.getFeatureDisplayArray()[i].getWidth() < width)
@@ -362,6 +376,9 @@ public class PrintACT extends ScrollPanel implements Printable
           }
       }
 
+      if(mc.getBamPanelArray()[i].isVisible())
+        height += mc.getBamPanelArray()[i].getHeight();
+      
       height += mc.getFeatureDisplayArray()[i].getHeight();
       if(mc.getFeatureDisplayArray()[i].getWidth() < width)
         width = mc.getFeatureDisplayArray()[i].getWidth();