Revision: 5137
Author: hansonr
Date: 2006-05-17 21:17:16 -0700 (Wed, 17 May 2006)
ViewCVS: http://svn.sourceforge.net/jmol/?rev=5137&view=rev
Log Message:
-----------
bob200603
-corrects bug also in 10.2 relative to measurements and restrict.
-removes mouse action status reports.
Modified Paths:
--------------
branches/bob200603/Jmol/src/org/jmol/viewer/Measurement.java
branches/bob200603/Jmol/src/org/jmol/viewer/Measures.java
branches/bob200603/Jmol/src/org/jmol/viewer/MeasuresRenderer.java
branches/bob200603/Jmol/src/org/jmol/viewer/MouseManager.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Measurement.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Measurement.java
2006-05-18 04:15:42 UTC (rev 5136)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Measurement.java
2006-05-18 04:17:16 UTC (rev 5137)
@@ -35,7 +35,8 @@
int[] countPlusIndices;
String strMeasurement;
float value;
-
+ boolean isVisible = true;
+
AxisAngle4f aa;
Point3f pointArc;
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Measures.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Measures.java 2006-05-18
04:15:42 UTC (rev 5136)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Measures.java 2006-05-18
04:17:16 UTC (rev 5137)
@@ -291,6 +291,21 @@
void reformatDistances() {
for (int i = measurementCount; --i >= 0; )
- measurements[i].reformatDistanceIfSelected();
+ measurements[i].reformatDistanceIfSelected();
}
+
+ void setVisibilityInfo() {
+ out:
+ for (int i = measurementCount; --i >= 0; ) {
+ measurements[i].isVisible = false;
+ if(mad == 0)
+ continue;
+ for (int iAtom = measurements[i].count; iAtom > 0; iAtom--) {
+ if
(!frame.getAtomAt(measurements[i].countPlusIndices[iAtom]).isClickable())
+ continue out;
+ }
+ measurements[i].isVisible = true;
+ }
+ }
+
}
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/MeasuresRenderer.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/MeasuresRenderer.java
2006-05-18 04:15:42 UTC (rev 5136)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/MeasuresRenderer.java
2006-05-18 04:17:16 UTC (rev 5137)
@@ -36,7 +36,6 @@
boolean showMeasurementNumbers;
short measurementMad;
Font3D font3d;
-
Measurement measurement;
void render() {
@@ -49,13 +48,11 @@
measurementMad = measures.mad;
font3d = measures.font3d;
showMeasurementNumbers = measures.showMeasurementNumbers;
- //System.out.println(measures.measurementCount);
-
for (int i = measures.measurementCount; --i >= 0; ) {
+ if (! measures.measurements[i].isVisible)
+ continue;
renderMeasurement(measures.measurements[i], colix);
-
}
-
renderPendingMeasurement(measures.pendingMeasurement);
}
@@ -97,32 +94,20 @@
}
void renderDistance(short colix) {
+
renderDistance(frame.getAtomAt(measurement.countPlusIndices[1]),
frame.getAtomAt(measurement.countPlusIndices[2]), colix);
}
void renderDistance(Atom atomA, Atom atomB, short colix) {
- /*
- Miguel commented this out on 31 Aug 2005
- and sent an email to the list asking why it would have been here
- if (! (atomA.isClickable() && atomB.isClickable()))
- return;
-
- 1 Sep 2005 ... the previous hack was put in to control the
- display of measurements when there are multiple models.
- The code below should do a better job ... Miguel
- */
- if (displayModelIndex >= 0 &&
- (displayModelIndex != atomA.modelIndex ||
- displayModelIndex != atomB.modelIndex))
- return;
int zA = atomA.getScreenZ() - atomA.getScreenD() - 10;
int zB = atomB.getScreenZ() - atomB.getScreenD() - 10;
int radius = drawSegment(atomA.getScreenX(), atomA.getScreenY(), zA,
atomB.getScreenX(), atomB.getScreenY(), zB,
colix);
+ int z = (viewer.getLabelsFrontFlag() ? 1 : (zA + zB) / 2);
paintMeasurementString((atomA.getScreenX() + atomB.getScreenX()) / 2,
(atomA.getScreenY() + atomB.getScreenY()) / 2,
- ((zA + zB) / 2), radius, colix);
+ z, radius, colix);
}
@@ -139,15 +124,6 @@
void renderAngle(Atom atomA, Atom atomB, Atom atomC,
short colix, boolean renderArcs) {
- /*
- if (! (atomA.isClickable() && atomB.isClickable() && atomC.isClickable()))
- return;
- */
- if (displayModelIndex >= 0 &&
- (displayModelIndex != atomA.modelIndex ||
- displayModelIndex != atomB.modelIndex ||
- displayModelIndex != atomC.modelIndex))
- return;
g3d.setColix(colix);
int zA = atomA.getScreenZ() - atomA.getScreenD() - 10;
int zB = atomB.getScreenZ() - atomB.getScreenD() - 10;
@@ -211,17 +187,6 @@
void renderTorsion(Atom atomA, Atom atomB, Atom atomC, Atom atomD,
short colix, boolean renderArcs) {
- /*
- if (! (atomA.isClickable() && atomB.isClickable() &&
- atomC.isClickable() && atomD.isClickable()))
- return;
- */
- if (displayModelIndex >= 0 &&
- (displayModelIndex != atomA.modelIndex ||
- displayModelIndex != atomB.modelIndex ||
- displayModelIndex != atomC.modelIndex ||
- displayModelIndex != atomD.modelIndex))
- return;
int zA = atomA.getScreenZ() - atomA.getScreenD() - 10;
int zB = atomB.getScreenZ() - atomB.getScreenD() - 10;
int zC = atomC.getScreenZ() - atomC.getScreenD() - 10;
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/MouseManager.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/MouseManager.java
2006-05-18 04:15:42 UTC (rev 5136)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/MouseManager.java
2006-05-18 04:17:16 UTC (rev 5137)
@@ -141,7 +141,7 @@
modifiersWhenPressed = modifiers;
wasDragged = false;
- viewer.setStatusUserAction("mousePressed: " + modifiers);
+ //viewer.setStatusUserAction("mousePressed: " + modifiers);
switch (modifiers & BUTTON_MODIFIER_MASK) {
/****************************************************************
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
