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
Merge remote-tracking branch
[jalview.git]
/
src
/
jalview
/
datamodel
/
StructureViewerModel.java
diff --git
a/src/jalview/datamodel/StructureViewerModel.java
b/src/jalview/datamodel/StructureViewerModel.java
index
098372b
..
8bc745a
100644
(file)
--- a/
src/jalview/datamodel/StructureViewerModel.java
+++ b/
src/jalview/datamodel/StructureViewerModel.java
@@
-27,6
+27,11
@@
public class StructureViewerModel
private String stateData = "";
private String stateData = "";
+ private String viewId;
+
+ // CHIMERA or JMOL (for projects from Jalview 2.9 on)
+ private String type;
+
private Map<File, StructureData> fileData = new HashMap<File, StructureData>();
public class StructureData
private Map<File, StructureData> fileData = new HashMap<File, StructureData>();
public class StructureData
@@
-36,7
+41,6
@@
public class StructureViewerModel
private String pdbId;
private List<SequenceI> seqList;
private String pdbId;
private List<SequenceI> seqList;
-
// TODO and possibly a list of chains?
/**
// TODO and possibly a list of chains?
/**
@@
-85,7
+89,7
@@
public class StructureViewerModel
public StructureViewerModel(int x, int y, int width, int height,
boolean alignWithPanel, boolean colourWithAlignPanel,
public StructureViewerModel(int x, int y, int width, int height,
boolean alignWithPanel, boolean colourWithAlignPanel,
- boolean colourByViewer)
+ boolean colourByViewer, String viewId, String type)
{
this.x = x;
this.y = y;
{
this.x = x;
this.y = y;
@@
-94,6
+98,8
@@
public class StructureViewerModel
this.alignWithPanel = alignWithPanel;
this.colourWithAlignPanel = colourWithAlignPanel;
this.colourByViewer = colourByViewer;
this.alignWithPanel = alignWithPanel;
this.colourWithAlignPanel = colourWithAlignPanel;
this.colourByViewer = colourByViewer;
+ this.viewId = viewId;
+ this.type = type;
}
public int getX()
}
public int getX()
@@
-186,4
+192,13
@@
public class StructureViewerModel
this.fileData = fileData;
}
this.fileData = fileData;
}
+ public String getViewId()
+ {
+ return this.viewId;
+ }
+
+ public String getType()
+ {
+ return this.type;
+ }
}
}