X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPCAPanel.java;h=576f3b2954a7fc07a70832fcd6a2c612158309a9;hb=eb3e681d6e82ccdd5d312d1981dfb306e7f479f0;hp=6c76c3e42fe251ac4ea127d85ddccf3c96ace4b8;hpb=9a20ebe6844fd13b704e5b73fe752bd00230aba6;p=jalview.git diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java index 6c76c3e..576f3b2 100644 --- a/src/jalview/gui/PCAPanel.java +++ b/src/jalview/gui/PCAPanel.java @@ -20,11 +20,28 @@ */ package jalview.gui; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.print.PageFormat; +import java.awt.print.Printable; +import java.awt.print.PrinterException; +import java.awt.print.PrinterJob; + +import javax.swing.ButtonGroup; +import javax.swing.JMenuItem; +import javax.swing.JRadioButtonMenuItem; +import javax.swing.event.InternalFrameAdapter; +import javax.swing.event.InternalFrameEvent; + import jalview.analysis.scoremodels.ScoreModels; import jalview.api.AlignViewportI; import jalview.api.analysis.ScoreModelI; import jalview.api.analysis.SimilarityParamsI; -import jalview.bin.Cache; +import jalview.bin.Console; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; import jalview.datamodel.AlignmentView; @@ -32,6 +49,7 @@ import jalview.datamodel.HiddenColumns; import jalview.datamodel.SequenceI; import jalview.gui.ImageExporter.ImageWriterI; import jalview.gui.JalviewColourChooser.ColourChooserListener; +import jalview.io.exceptions.ImageOutputException; import jalview.jbgui.GPCAPanel; import jalview.math.RotatableMatrix.Axis; import jalview.util.ImageMaker; @@ -39,23 +57,6 @@ import jalview.util.MessageManager; import jalview.viewmodel.AlignmentViewport; import jalview.viewmodel.PCAModel; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.print.PageFormat; -import java.awt.print.Printable; -import java.awt.print.PrinterException; -import java.awt.print.PrinterJob; - -import javax.swing.ButtonGroup; -import javax.swing.JMenuItem; -import javax.swing.JRadioButtonMenuItem; -import javax.swing.event.InternalFrameAdapter; -import javax.swing.event.InternalFrameEvent; - /** * The panel holding the Principal Component Analysis 3-D visualisation */ @@ -92,6 +93,7 @@ public class PCAPanel extends GPCAPanel SimilarityParamsI params) { super(); + this.setFrameIcon(null); this.av = alignPanel.av; this.ap = alignPanel; boolean nucleotide = av.getAlignment().isNucleotide(); @@ -122,8 +124,8 @@ public class PCAPanel extends GPCAPanel ScoreModelI scoreModel = ScoreModels.getInstance() .getScoreModel(modelName, ap); - setPcaModel(new PCAModel(seqstrings, seqs, nucleotide, scoreModel, - params)); + setPcaModel( + new PCAModel(seqstrings, seqs, nucleotide, scoreModel, params)); PaintRefresher.Register(this, av.getSequenceSetId()); setRotatableCanvas(new RotatableCanvas(alignPanel)); @@ -297,7 +299,7 @@ public class PCAPanel extends GPCAPanel // JAL-2647 disabled after load from project (until save to project done) if (getPcaModel().getInputData() == null) { - Cache.log.info( + Console.info( "Unexpected call to originalSeqData_actionPerformed - should have hidden this menu action."); return; } @@ -426,9 +428,9 @@ public class PCAPanel extends GPCAPanel @Override public void exportImage(Graphics g) throws Exception { - RotatableCanvas canvas = getRotatableCanvas(); - canvas.drawBackground(g); - canvas.drawScene(g); + RotatableCanvas canvas = getRotatableCanvas(); + canvas.drawBackground(g); + canvas.drawScene(g); if (canvas.drawAxes) { canvas.drawAxes(g); @@ -437,7 +439,14 @@ public class PCAPanel extends GPCAPanel }; String pca = MessageManager.getString("label.pca"); ImageExporter exporter = new ImageExporter(writer, null, type, pca); - exporter.doExport(null, this, width, height, pca); + try + { + exporter.doExport(null, this, width, height, pca); + } catch (ImageOutputException ioex) + { + Console.error("Unexpected error whilst writing " + type.toString(), + ioex); + } } @Override @@ -621,7 +630,8 @@ public class PCAPanel extends GPCAPanel final IProgressIndicatorHandler handler) { progressBar.registerHandler(id, handler); - // if (progressBarHandlers == null || !progressBars.contains(Long.valueOf(id))) + // if (progressBarHandlers == null || + // !progressBars.contains(Long.valueOf(id))) // { // throw new // Error(MessageManager.getString("error.call_setprogressbar_before_registering_handler"));