import java.io.File;
import java.io.IOException;
-import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Map.Entry;
import jalview.analysis.AlignmentUtils;
import jalview.bin.argparser.Arg;
import jalview.bin.argparser.ArgParser;
+import jalview.bin.argparser.ArgParser.Position;
import jalview.bin.argparser.ArgValue;
import jalview.bin.argparser.ArgValues;
import jalview.bin.argparser.ArgValuesMap;
import jalview.bin.argparser.SubVals;
-import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.SequenceI;
import jalview.datamodel.annotations.AlphaFoldAnnotationRowBuilder;
import jalview.gui.Preferences;
import jalview.gui.StructureChooser;
import jalview.gui.StructureViewer;
+import jalview.gui.StructureViewer.ViewerType;
import jalview.io.AppletFormatAdapter;
import jalview.io.DataSourceType;
import jalview.io.FileFormat;
import jalview.io.FileLoader;
import jalview.io.HtmlSvgOutput;
import jalview.io.IdentifyFile;
-import jalview.schemes.AnnotationColourGradient;
import jalview.structure.StructureImportSettings.TFType;
import jalview.structure.StructureSelectionManager;
import jalview.util.HttpUtils;
import jalview.util.MessageManager;
import jalview.util.Platform;
-import mc_view.PDBChain;
public class Commands
{
* m.get(Arg.OPEN).getValue(); String data = null; FileFormatI format = null;
* DataSourceType protocol = null;
*/
- if (avm.containsArg(Arg.OPEN) || avm.containsArg(Arg.OPENNEW))
+ if (avm.containsArg(Arg.APPEND) || avm.containsArg(Arg.OPEN))
{
commandArgsProvided = true;
long progress = -1;
boolean first = true;
boolean progressBarSet = false;
AlignFrame af;
- // Combine the OPEN and OPENNEW files into one list, along with whether it
- // was OPEN or OPENNEW
- List<Entry<Arg, ArgValue>> openAvList = new ArrayList<>();
- avm.getArgValueList(Arg.OPEN).stream()
- .forEachOrdered(av -> openAvList.add(
- new AbstractMap.SimpleEntry<Arg, ArgValue>(Arg.OPEN,
- av)));
- avm.getArgValueList(Arg.OPENNEW).stream()
- .forEachOrdered(av -> openAvList
- .add(new AbstractMap.SimpleEntry<Arg, ArgValue>(
- Arg.OPENNEW, av)));
- for (Entry<Arg, ArgValue> aav : openAvList)
+ // Combine the APPEND and OPEN files into one list, along with whether it
+ // was APPEND or OPEN
+ List<ArgValue> openAvList = new ArrayList<>();
+ openAvList.addAll(avm.getArgValueList(Arg.OPEN));
+ openAvList.addAll(avm.getArgValueList(Arg.APPEND));
+ // sort avlist based on av.getArgIndex()
+ Collections.sort(openAvList);
+ for (ArgValue av : openAvList)
{
- Arg a = aav.getKey();
- ArgValue av = aav.getValue();
+ Arg a = av.getArg();
+ SubVals sv = av.getSubVals();
String openFile = av.getValue();
if (openFile == null)
continue;
}
af = afMap.get(id);
+ // When to open a new AlignFrame
if (af == null || "true".equals(av.getSubVal("new"))
- || a == Arg.OPENNEW || format == FileFormat.Jalview)
+ || a == Arg.OPEN || format == FileFormat.Jalview)
{
/*
* this approach isn't working yet // get default annotations before opening
- * AlignFrame if (m.get(Arg.SSANNOTATION) != null) {
- * Console.debug("##### SSANNOTATION=" + m.get(Arg.SSANNOTATION).getBoolean());
+ * AlignFrame if (m.get(Arg.SSANNOTATIONS) != null) {
+ * Console.debug("##### SSANNOTATIONS=" + m.get(Arg.SSANNOTATIONS).getBoolean());
* } if (m.get(Arg.NOTEMPFAC) != null) { Console.debug( "##### NOTEMPFAC=" +
* m.get(Arg.NOTEMPFAC).getBoolean()); } boolean showSecondaryStructure =
- * (m.get(Arg.SSANNOTATION) != null) ? m.get(Arg.SSANNOTATION).getBoolean() :
+ * (m.get(Arg.SSANNOTATIONS) != null) ? m.get(Arg.SSANNOTATIONS).getBoolean() :
* false; boolean showTemperatureFactor = (m.get(Arg.NOTEMPFAC) != null) ?
* !m.get(Arg.NOTEMPFAC).getBoolean() : false; Console.debug("##### tempfac=" +
* showTemperatureFactor + ", showSS=" + showSecondaryStructure);
af = fileLoader.LoadFileWaitTillLoaded(openFile, protocol,
format);
+ boolean showAnnotations = ArgParser.getFromSubValArgOrPref(avm,
+ Arg.ANNOTATIONS, av.getSubVals(), null,
+ "SHOW_ANNOTATIONS", true);
+ af.setAnnotationsVisibility(showAnnotations, false, true);
// wrap alignment?
- if (avm.getBoolean(Arg.WRAP))
- {
- af.getCurrentView().setWrapAlignment(true);
- }
+ boolean wrap = ArgParser.getFromSubValArgOrPref(avm, Arg.WRAP, sv,
+ null, "WRAP_ALIGNMENT", false);
+ af.getCurrentView().setWrapAlignment(wrap);
// colour aligment?
- if (avm.containsArg(Arg.COLOUR))
+ String colour = ArgParser.getFromSubValArgOrPref(avm, Arg.COLOUR,
+ sv, null, "DEFAULT_COLOUR_PROT", "");
+
+ if ("" != colour)
{
- af.changeColour_actionPerformed(avm.getValue(Arg.COLOUR));
+ af.changeColour_actionPerformed(colour);
}
// change alignment frame title
- if (avm.containsArg(Arg.TITLE))
- af.setTitle(avm.getValue(Arg.TITLE));
+ String title = ArgParser.getFromSubValArgOrPref(avm, Arg.TITLE,
+ sv, null, null, null);
+ if (title != null)
+ af.setTitle(title);
- /* hacky approach to hiding the annotations */
// show secondary structure annotations?
- if (avm.getBoolean(Arg.SSANNOTATION))
+ boolean showSSAnnotations = ArgParser.getFromSubValArgOrPref(avm,
+ Arg.SSANNOTATIONS, av.getSubVals(), null,
+ "STRUCT_FROM_PDB", true);
+ if (avm.getBoolean(Arg.SSANNOTATIONS))
{
- // do this better (annotation types?)
+ af.setAnnotationsVisibility(showSSAnnotations, true, false);
+ /*
AlignmentUtils.showOrHideSequenceAnnotations(
af.getCurrentView().getAlignment(),
Collections.singleton("Secondary Structure"), null,
false, false);
+ */
}
// show temperature factor annotations?
* (showTemperatureFactor)
*/
{
+ /*
if (avm.containsArg(Arg.TEMPFAC_LABEL))
{
AlignmentAnnotation aa = AlignmentUtils
+ label);
}
}
+ */
}
// store the AlignFrame for this id
{
Console.debug(
"Opening '" + openFile + "' in existing alignment frame");
- af.getCurrentView().addFile(new File(openFile), format, false);
+ DataSourceType dst = HttpUtils.startsWithHttpOrHttps(openFile)
+ ? DataSourceType.URL
+ : DataSourceType.FILE;
+ FileLoader fileLoader = new FileLoader(!headless);
+ fileLoader.LoadFile(af.getCurrentView(), openFile, dst, null,
+ false);
}
- Console.debug("Command " + Arg.OPEN + " executed successfully!");
+ Console.debug("Command " + Arg.APPEND + " executed successfully!");
}
if (first) // first=true means nothing opened
}
}
- // get TEMPFAC type from subvals or Arg.TEMPFAC
+ // showing annotations from structure file or not
+ boolean ssFromStructure = ArgParser.getFromSubValArgOrPref(avm,
+ Arg.SSANNOTATIONS, subVals, null, "STRUCT_FROM_PDB",
+ true);
+
+ // get TEMPFAC type from subvals or Arg.TEMPFAC in case user Adds
+ // reference annotations
String tftString = subVals.get("tempfac");
TFType tft = avm.getBoolean(Arg.NOTEMPFAC) ? null
: TFType.DEFAULT;
}
}
- // TODO pass PAE label
+ String sViewer = ArgParser.getFromSubValArgOrPref(avm,
+ Arg.STRUCTUREVIEWER, Position.AFTER, av, subVals,
+ "viewer", null, "jmol");
+ ViewerType viewerType = null;
+ if (!"none".equals(sViewer))
+ {
+ for (ViewerType v : EnumSet.allOf(ViewerType.class))
+ {
+ String name = v.name().toLowerCase(Locale.ROOT)
+ .replaceAll(" ", "");
+ if (sViewer.equals(name))
+ {
+ viewerType = v;
+ break;
+ }
+ }
+ }
+
+ boolean addTempFac = tft != null
+ || Cache.getDefault("ADD_TEMPFACT_ANN", false);
+
+ // TODO use ssFromStructure
StructureChooser.openStructureFileForSequence(null, null, ap, seq,
- false, structureFilepath, tft, paeFilepath, false);
+ false, structureFilepath, tft, paeFilepath, false,
+ ssFromStructure, false, viewerType);
}
}
}
+ /*
boolean doShading = avm.getBoolean(Arg.TEMPFAC_SHADING);
if (doShading)
{
Console.info("Changed colour " + acg.toString());
}
}
+ */
return theseArgsWereParsed;
}