Revision: 5162
Author: hansonr
Date: 2006-05-23 07:12:16 -0700 (Tue, 23 May 2006)
ViewCVS: http://svn.sourceforge.net/jmol/?rev=5162&view=rev
Log Message:
-----------
bob200603 10.x.06
distinguishing "frame all" from "frame 0"
in the case of frame range:
frame range 3 5
frame 0 # show frames 3-5
frame all # reset range to full range and show all frames
minor edits relative to use of modelSetTypeName
Modified Paths:
--------------
branches/bob200603/Jmol/src/org/jmol/viewer/Atom.java
branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java
branches/bob200603/Jmol/src/org/jmol/viewer/Frame.java
branches/bob200603/Jmol/src/org/jmol/viewer/JmolConstants.java
branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
branches/bob200603/Jmol/src/org/jmol/viewer/RepaintManager.java
branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Atom.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Atom.java 2006-05-23
12:09:25 UTC (rev 5161)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Atom.java 2006-05-23
14:12:16 UTC (rev 5162)
@@ -491,8 +491,7 @@
int[] atomSerials = group.chain.frame.atomSerials;
if (atomSerials != null)
return atomSerials[atomIndex];
- if (group.chain.frame.modelSetTypeName == "xyz" &&
- group.chain.frame.viewer.getZeroBasedXyzRasmol())
+ if (group.chain.frame.isZeroBased)
return atomIndex;
return atomIndex + 1;
}
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java 2006-05-23
12:09:25 UTC (rev 5161)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java 2006-05-23
14:12:16 UTC (rev 5162)
@@ -2721,10 +2721,12 @@
int frameNumber2 = -1;
boolean isPlay = false;
boolean isRange = false;
+ boolean isAll = false;
while (offset < statementLength) {
int token = statement[offset].tok;
switch (token) {
case Token.all:
+ isAll = true;
case Token.asterisk:
break;
case Token.none:
@@ -2748,6 +2750,11 @@
}
if (offset == statementLength - 1) {
+ if (isAll) {
+ viewer.setAnimationRange(-1, -1);
+ viewer.setDisplayModelIndex(-1);
+ return;
+ }
int modelIndex = (useModelNumber ? viewer
.getModelNumberIndex(frameNumber) : frameNumber - 1);
if (!isPlay && !isRange || modelIndex >= 0) {
@@ -2758,7 +2765,6 @@
int modelIndex2 = (useModelNumber ? viewer
.getModelNumberIndex(frameNumber2) : frameNumber2 - 1);
// System.out.println("isPlay " + modelIndex +" "+ modelIndex2);
-
viewer.setAnimationDirection(1);
viewer.setAnimationRange(modelIndex, modelIndex2);
}
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Frame.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Frame.java 2006-05-23
12:09:25 UTC (rev 5161)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Frame.java 2006-05-23
14:12:16 UTC (rev 5162)
@@ -44,12 +44,12 @@
final Viewer viewer;
final JmolAdapter adapter;
final FrameRenderer frameRenderer;
- // NOTE: these strings are interned and are lower case
- // therefore, we can do == comparisions against string constants
- // if (modelSetTypeName == "xyz")
- final String modelSetTypeName;
+ private String modelSetTypeName;
+ final boolean isXYZ;
final boolean isPDB;
final boolean isMultiFile;
+ final boolean isArrayOfFiles;
+ boolean isZeroBased;
final Mmset mmset;
final Graphics3D g3d;
// the maximum BondingRadius seen in this set of atoms
@@ -182,12 +182,10 @@
this.adapter = adapter;
//long timeBegin = System.currentTimeMillis();
- String fileTypeName = adapter.getFileTypeName(clientFile);
- // NOTE: these strings are interned and are lower case
- // therefore, we can do == comparisions against string constants
- // if (modelSetTypeName == "xyz") { }
- modelSetTypeName = fileTypeName.toLowerCase().intern();
-
+ modelSetTypeName =
adapter.getFileTypeName(clientFile).toLowerCase().intern();
+ isXYZ = (modelSetTypeName == "xyz");
+ isArrayOfFiles = (modelSetTypeName == "array");
+ setZeroBased();
mmset = new Mmset(this);
frameRenderer = viewer.getFrameRenderer();
g3d = viewer.getGraphics3D();
@@ -320,6 +318,10 @@
dumpAtomSetNameDiagnostics(clientFile);
}
+ void setZeroBased() {
+ isZeroBased = isXYZ && viewer.getZeroBasedXyzRasmol();
+ }
+
void dumpAtomSetNameDiagnostics(Object clientFile) {
if (true)
return;
@@ -795,6 +797,7 @@
return modelSetTypeName;
}
+
Properties getModelProperties(int modelIndex) {
return mmset.getModelProperties(modelIndex);
}
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/JmolConstants.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/JmolConstants.java
2006-05-23 12:09:25 UTC (rev 5161)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/JmolConstants.java
2006-05-23 14:12:16 UTC (rev 5162)
@@ -42,7 +42,7 @@
// for now, just update this by hand
// perhaps use ant filter later ... but mth doesn't like it :-(
public final static String copyright = "(C) 2006 Jmol Development";
- public final static String version = "10.x.05(branch bob200603)";
+ public final static String version = "10.x.06(branch bob200603)";
public final static String cvsDate = "$Date$";
public final static String date = cvsDate.substring(7, 23);
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
2006-05-23 12:09:25 UTC (rev 5161)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
2006-05-23 14:12:16 UTC (rev 5162)
@@ -1443,6 +1443,9 @@
frame.clearBfactorRange();
}
-
-
+ void setZeroBased() {
+ if (frame == null)
+ return;
+ frame.setZeroBased();
+ }
}
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/RepaintManager.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/RepaintManager.java
2006-05-23 12:09:25 UTC (rev 5161)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/RepaintManager.java
2006-05-23 14:12:16 UTC (rev 5162)
@@ -42,7 +42,6 @@
int displayModelIndex = 0;
boolean setDisplayModelIndex(int modelIndex) {
- System.out.println("repaintman" + modelIndex);
Frame frame = viewer.getFrame();
if (frame == null ||
modelIndex < 0 ||
@@ -50,7 +49,6 @@
displayModelIndex = -1;
else
displayModelIndex = modelIndex;
- System.out.println("repaintman" + modelIndex + " " + displayModelIndex);
viewer.setTainted(true);
viewer.setStatusFrameChanged(modelIndex);
getAnimationRangeVisible();
@@ -64,7 +62,6 @@
void getAnimationRangeVisible() {
bsVisibleFrames.clear();
- System.out.println("repaintman getAnimRangeV this " + displayModelIndex +
" first " + firstModelIndex+ " last " + lastModelIndex);
if (displayModelIndex >= 0) {
bsVisibleFrames.set(displayModelIndex);
return;
@@ -73,9 +70,7 @@
return;
for (int i = firstModelIndex; i != lastModelIndex; i += frameStep)
bsVisibleFrames.set(i);
- System.out.println("bsvisible now " + bsVisibleFrames);
bsVisibleFrames.set(lastModelIndex);
- System.out.println("bsvisible+last " + bsVisibleFrames);
return;
}
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java 2006-05-23
12:09:25 UTC (rev 5161)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java 2006-05-23
14:12:16 UTC (rev 5162)
@@ -2810,6 +2810,7 @@
void setZeroBasedXyzRasmol(boolean zeroBasedXyzRasmol) {
styleManager.setZeroBasedXyzRasmol(zeroBasedXyzRasmol);
+ modelManager.setZeroBased();
}
boolean getZeroBasedXyzRasmol() {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Jmol-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jmol-commits
