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-1563 further modificaiton of the uniprot data column configuration file
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
b1944b4
..
b449d19
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-21,6
+21,7
@@
package jalview.io;
import jalview.api.ComplexAlignFile;
package jalview.io;
import jalview.api.ComplexAlignFile;
+import jalview.api.FeatureSettingsModelI;
import jalview.api.FeaturesDisplayedI;
import jalview.api.FeaturesSourceI;
import jalview.bin.Jalview;
import jalview.api.FeaturesDisplayedI;
import jalview.api.FeaturesSourceI;
import jalview.bin.Jalview;
@@
-362,8
+363,14
@@
public class FileLoader implements Runnable
}
}
}
}
+ FeatureSettingsModelI proxyColourScheme = source
+ .getFeatureColourScheme();
if (viewport != null)
{
if (viewport != null)
{
+ if (proxyColourScheme != null)
+ {
+ viewport.applyFeaturesStyle(proxyColourScheme);
+ }
// append to existing alignment
viewport.addAlignment(al, title);
}
// append to existing alignment
viewport.addAlignment(al, title);
}
@@
-407,7
+414,11
@@
public class FileLoader implements Runnable
{
alignFrame.setFileName(file, format);
}
{
alignFrame.setFileName(file, format);
}
-
+ if (proxyColourScheme != null)
+ {
+ alignFrame.getViewport()
+ .applyFeaturesStyle(proxyColourScheme);
+ }
alignFrame.statusBar.setText(MessageManager.formatMessage(
"label.successfully_loaded_file",
new String[] { title }));
alignFrame.statusBar.setText(MessageManager.formatMessage(
"label.successfully_loaded_file",
new String[] { title }));