Revision: 5161
Author: hansonr
Date: 2006-05-23 05:09:25 -0700 (Tue, 23 May 2006)
ViewCVS: http://svn.sourceforge.net/jmol/?rev=5161&view=rev
Log Message:
-----------
bob200603 just changing venue to office; working on frame range visibility
Modified Paths:
--------------
branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
branches/bob200603/Jmol/src/org/jmol/viewer/RepaintManager.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
2006-05-23 12:08:14 UTC (rev 5160)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/ModelManager.java
2006-05-23 12:09:25 UTC (rev 5161)
@@ -1289,6 +1289,8 @@
Polyhedra p = (Polyhedra) frame.shapes[JmolConstants.SHAPE_POLYHEDRA];
if (p != null)
p.setVisibilityFlags(bs);
+ System.out.println(bs + " " + isOneFrame + " " + displayModelIndex);
+
for (int i = frame.atomCount; --i >= 0; ) {
Atom atom = atoms[i];
atom.shapeVisibilityFlags &= (
@@ -1298,7 +1300,8 @@
if (atom.madAtom == JmolConstants.MAR_DELETED
|| ! showHydrogens && atom.elementNumber == 1)
continue;
- if (! isOneFrame || atom.modelIndex == displayModelIndex) {
+ if (! isOneFrame && bs.get(atom.modelIndex)
+ || atom.modelIndex == displayModelIndex) {
atom.shapeVisibilityFlags |= JmolConstants.ATOM_IN_MODEL;
if (atom.madAtom != 0)
atom.shapeVisibilityFlags |= ballVisibilityFlag;
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/RepaintManager.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/RepaintManager.java
2006-05-23 12:08:14 UTC (rev 5160)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/RepaintManager.java
2006-05-23 12:09:25 UTC (rev 5161)
@@ -40,9 +40,9 @@
frameRenderer = new FrameRenderer(viewer);
}
- BitSet bsVisibleFrames = null;
int displayModelIndex = 0;
boolean setDisplayModelIndex(int modelIndex) {
+ System.out.println("repaintman" + modelIndex);
Frame frame = viewer.getFrame();
if (frame == null ||
modelIndex < 0 ||
@@ -50,28 +50,33 @@
displayModelIndex = -1;
else
displayModelIndex = modelIndex;
+ System.out.println("repaintman" + modelIndex + " " + displayModelIndex);
viewer.setTainted(true);
viewer.setStatusFrameChanged(modelIndex);
- bsVisibleFrames = getAnimationRangeVisible();
+ getAnimationRangeVisible();
return true;
}
+ private BitSet bsVisibleFrames = new BitSet();
BitSet getVisibleFramesBitSet() {
return bsVisibleFrames;
}
- BitSet getAnimationRangeVisible() {
- BitSet bs = new BitSet();
+ void getAnimationRangeVisible() {
+ bsVisibleFrames.clear();
+ System.out.println("repaintman getAnimRangeV this " + displayModelIndex +
" first " + firstModelIndex+ " last " + lastModelIndex);
if (displayModelIndex >= 0) {
- bs.set(displayModelIndex);
- return bs;
+ bsVisibleFrames.set(displayModelIndex);
+ return;
}
if (frameStep == 0)
- return bs;
+ return;
for (int i = firstModelIndex; i != lastModelIndex; i += frameStep)
- bs.set(i);
- bs.set(lastModelIndex);
- return bs;
+ bsVisibleFrames.set(i);
+ System.out.println("bsvisible now " + bsVisibleFrames);
+ bsVisibleFrames.set(lastModelIndex);
+ System.out.println("bsvisible+last " + bsVisibleFrames);
+ return;
}
AnimationThread animationThread;
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
