git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57fd113
)
JAL-3619 fix up error messages and try to bail quietly if the viewer doesn’t open
author
Jim Procter
<j.procter@dundee.ac.uk>
Wed, 2 Mar 2022 15:10:53 +0000
(15:10 +0000)
committer
Jim Procter
<j.procter@dundee.ac.uk>
Wed, 2 Mar 2022 15:10:53 +0000
(15:10 +0000)
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
patch
|
blob
|
history
src/jalview/gui/ChimeraViewFrame.java
patch
|
blob
|
history
src/jalview/gui/PymolBindingModel.java
patch
|
blob
|
history
src/jalview/gui/PymolViewer.java
patch
|
blob
|
history
diff --git
a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index
c78a82b
..
399bad9
100644
(file)
--- a/
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@
-311,7
+311,7
@@
public abstract class JalviewChimeraBinding extends AAStructureBindingModel
@Override
public boolean isViewerRunning()
{
@Override
public boolean isViewerRunning()
{
- return chimeraManager.isChimeraLaunched();
+ return chimeraManager!=null && chimeraManager.isChimeraLaunched();
}
/**
}
/**
diff --git
a/src/jalview/gui/ChimeraViewFrame.java
b/src/jalview/gui/ChimeraViewFrame.java
index
4f1f26b
..
3a17ea3
100644
(file)
--- a/
src/jalview/gui/ChimeraViewFrame.java
+++ b/
src/jalview/gui/ChimeraViewFrame.java
@@
-445,6
+445,12
@@
public class ChimeraViewFrame extends StructureViewerBase
Console.error("Couldn't open Chimera viewer!", ex);
}
}
Console.error("Couldn't open Chimera viewer!", ex);
}
}
+ if (!jmb.isViewerRunning())
+ {
+ // nothing to do
+ // TODO: ensure we tidy up JAL-3619
+ return;
+ }
int num = -1;
for (PDBEntry pe : filePDB)
{
int num = -1;
for (PDBEntry pe : filePDB)
{
diff --git
a/src/jalview/gui/PymolBindingModel.java
b/src/jalview/gui/PymolBindingModel.java
index
6aba7b6
..
42a537b
100644
(file)
--- a/
src/jalview/gui/PymolBindingModel.java
+++ b/
src/jalview/gui/PymolBindingModel.java
@@
-121,7
+121,7
@@
public class PymolBindingModel extends AAStructureBindingModel
@Override
public boolean isViewerRunning()
{
@Override
public boolean isViewerRunning()
{
- return pymolManager.isPymolLaunched();
+ return pymolManager !=null && pymolManager.isPymolLaunched();
}
@Override
}
@Override
diff --git
a/src/jalview/gui/PymolViewer.java
b/src/jalview/gui/PymolViewer.java
index
3b6ea99
..
2fd4957
100644
(file)
--- a/
src/jalview/gui/PymolViewer.java
+++ b/
src/jalview/gui/PymolViewer.java
@@
-215,6
+215,14
@@
public class PymolViewer extends StructureViewerBase
return;
}
}
return;
}
}
+ if (!binding.isViewerRunning())
+ {
+ // nothing to do
+ // TODO: ensure we tidy up JAL-3619
+
+ return;
+ }
+
int num = -1;
for (PDBEntry pe : filePDB)
{
int num = -1;
for (PDBEntry pe : filePDB)
{
@@
-252,7
+260,7
@@
public class PymolViewer extends StructureViewerBase
} catch (Exception ex)
{
Console.error(
} catch (Exception ex)
{
Console.error(
- "Couldn't open " + pe.getFile() + " in Chimera viewer!",
+ "Couldn't open " + pe.getFile() + " in "+getViewerName()+"!",
ex);
} finally
{
ex);
} finally
{