git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3033 formatting
[jalview.git]
/
src
/
jalview
/
gui
/
PCAPanel.java
diff --git
a/src/jalview/gui/PCAPanel.java
b/src/jalview/gui/PCAPanel.java
index
f861a7c
..
7ceceee
100644
(file)
--- a/
src/jalview/gui/PCAPanel.java
+++ b/
src/jalview/gui/PCAPanel.java
@@
-79,6
+79,8
@@
public class PCAPanel extends GPCAPanel
int top = 0;
int top = 0;
+ private boolean working;
+
/**
* Creates a new PCAPanel object using default score model and parameters
*
/**
* Creates a new PCAPanel object using default score model and parameters
*
@@
-234,6
+236,7
@@
public class PCAPanel extends GPCAPanel
message = MessageManager.getString("label.pca_calculating");
}
progress.setProgressBar(message, progId);
message = MessageManager.getString("label.pca_calculating");
}
progress.setProgressBar(message, progId);
+ working = true;
try
{
calcSettings.setEnabled(false);
try
{
calcSettings.setEnabled(false);
@@
-252,6
+255,7
@@
public class PCAPanel extends GPCAPanel
} catch (OutOfMemoryError er)
{
new OOMWarning("calculating PCA", er);
} catch (OutOfMemoryError er)
{
new OOMWarning("calculating PCA", er);
+ working = false;
return;
} finally
{
return;
} finally
{
@@
-266,6
+270,7
@@
public class PCAPanel extends GPCAPanel
.getString("label.principal_component_analysis"), 475, 450);
this.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
}
.getString("label.principal_component_analysis"), 475, 450);
this.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
}
+ working = false;
}
@Override
}
@Override
@@
-459,7
+464,16
@@
public class PCAPanel extends GPCAPanel
public void run()
{
PrinterJob printJob = PrinterJob.getPrinterJob();
public void run()
{
PrinterJob printJob = PrinterJob.getPrinterJob();
- PageFormat pf = printJob.pageDialog(printJob.defaultPage());
+ PageFormat defaultPage = printJob.defaultPage();
+ PageFormat pf = printJob.pageDialog(defaultPage);
+
+ if (defaultPage == pf)
+ {
+ /*
+ * user cancelled
+ */
+ return;
+ }
printJob.setPrintable(this, pf);
printJob.setPrintable(this, pf);
@@
-788,4
+802,14
@@
public class PCAPanel extends GPCAPanel
top = t;
zCombobox.setSelectedIndex(2);
}
top = t;
zCombobox.setSelectedIndex(2);
}
+
+ /**
+ * Answers true if PCA calculation is in progress, else false
+ *
+ * @return
+ */
+ public boolean isWorking()
+ {
+ return working;
+ }
}
}