*/
package jalview.io;
-import jalview.api.AlignExportSettingI;
+import java.io.File;
+import java.io.IOException;
+import java.util.Locale;
+
+import jalview.api.AlignExportSettingsI;
import jalview.api.AlignmentViewPanel;
import jalview.bin.Cache;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
-import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
+import jalview.structure.StructureImportSettings;
+import jalview.structure.StructureImportSettings.TFType;
import jalview.util.Comparison;
-import java.io.IOException;
-
/**
* Additional formatting methods used by the application in a number of places.
*
}
public FormatAdapter(AlignmentViewPanel alignPanel,
- AlignExportSettingI settings)
+ AlignExportSettingsI settings)
{
super(alignPanel, settings);
}
private void init()
{
- if (jalview.bin.Cache.getDefault("STRUCT_FROM_PDB", true))
+ if (Cache.getDefault("STRUCT_FROM_PDB", true))
{
- annotFromStructure = jalview.bin.Cache.getDefault("ADD_TEMPFACT_ANN",
- true);
- localSecondaryStruct = jalview.bin.Cache.getDefault("ADD_SS_ANN",
- true);
- serviceSecondaryStruct = jalview.bin.Cache.getDefault("USE_RNAVIEW",
- true);
+ annotFromStructure = Cache.getDefault("ADD_TEMPFACT_ANN", true);
+ localSecondaryStruct = Cache.getDefault("ADD_SS_ANN", true);
+ serviceSecondaryStruct = Cache.getDefault("USE_RNAVIEW", true);
}
else
{
startIndex = startEnd[0];
endIndex = startEnd[1];
// get first non-gaped residue start position
- while (Comparison.isGap(seqs[i]
- .getCharAt(startIndex)) && startIndex < endIndex)
+ while (Comparison.isGap(seqs[i].getCharAt(startIndex))
+ && startIndex < endIndex)
{
startIndex++;
}
public boolean getCacheSuffixDefault(FileFormatI format)
{
- return Cache.getDefault(format.getName() + "_JVSUFFIX", true);
+ return Cache.getDefault(
+ format.getName().toUpperCase(Locale.ROOT) + "_JVSUFFIX", true);
}
public String formatSequences(FileFormatI format, AlignmentI alignment,
- String[] omitHidden, int[] exportRange, ColumnSelection colSel)
+ String[] omitHidden, int[] exportRange, HiddenColumns hidden)
{
return formatSequences(format, alignment, omitHidden, exportRange,
- getCacheSuffixDefault(format), colSel, null);
+ getCacheSuffixDefault(format), hidden, null);
}
/**
- * hack function to replace seuqences with visible sequence strings before
+ * hack function to replace sequences with visible sequence strings before
* generating a string of the alignment in the given format.
*
* @param format
*/
public String formatSequences(FileFormatI format, AlignmentI alignment,
String[] omitHidden, int[] exportRange, boolean suffix,
- ColumnSelection colSel)
+ HiddenColumns hidden)
{
return formatSequences(format, alignment, omitHidden, exportRange,
- suffix, colSel, null);
+ suffix, hidden, null);
}
public String formatSequences(FileFormatI format, AlignmentI alignment,
String[] omitHidden, int[] exportRange, boolean suffix,
- ColumnSelection colSel, SequenceGroup selgp)
+ HiddenColumns hidden, SequenceGroup selgp)
{
if (omitHidden != null)
{
AlignmentAnnotation na = new AlignmentAnnotation(ala[i]);
if (selgp != null)
{
- colSel.makeVisibleAnnotation(selgp.getStartRes(),
- selgp.getEndRes(), na);
+ na.makeVisibleAnnotation(selgp.getStartRes(), selgp.getEndRes(),
+ hidden);
}
else
{
- colSel.makeVisibleAnnotation(na);
+ na.makeVisibleAnnotation(hidden);
}
alv.addAnnotation(na);
}
}
@Override
+ public AlignmentI readFile(File selectedFile, String file,
+ DataSourceType sourceType, FileFormatI fileFormat,
+ StructureImportSettings.TFType tempfacType) throws IOException
+ {
+ AlignmentI al = super.readFile(selectedFile, file, sourceType,
+ fileFormat, tempfacType);
+ return al;
+ }
+
+ @Override
public AlignmentI readFile(String file, DataSourceType sourceType,
FileFormatI fileFormat) throws IOException
{
return al;
}
+ public AlignmentI readFile(File file, DataSourceType sourceType,
+ FileFormatI fileFormat) throws IOException
+ {
+ AlignmentI al = super.readFile(file, null, sourceType, fileFormat);
+ return al;
+ }
+
@Override
public AlignmentI readFromFile(FileParse source, FileFormatI format)
throws IOException
selectedOnly);
}
- public AlignmentI readFromFile(AlignmentFileI source, FileFormatI format)
- throws IOException
+ public AlignmentI readFromFile(AlignmentFileReaderI source,
+ FileFormatI format) throws IOException
{
FileParse fp = new FileParse(source.getInFile(),
source.getDataSourceType());