Revision: 5180
Author: hansonr
Date: 2006-05-25 22:13:07 -0700 (Thu, 25 May 2006)
ViewCVS: http://svn.sourceforge.net/jmol/?rev=5180&view=rev
Log Message:
-----------
bob200603 10.x.07 allows selective measurement coloring. All is the same as in
previous versions
EXCEPT if you want to RECOLOR all measures after coloring them a particular
color,
with this change you need to "color measures NONE" before issuing that second
command.
So v10.x "color measures none;color measures xxxx" is an exact replacement for
v10.2 "color measures xxxx",
and v10.x "color measures" is much more fun.
Modified Paths:
--------------
branches/bob200603/Jmol/src/org/jmol/viewer/JmolConstants.java
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/PendingMeasurement.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/JmolConstants.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/JmolConstants.java
2006-05-26 03:42:19 UTC (rev 5179)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/JmolConstants.java
2006-05-26 05:13:07 UTC (rev 5180)
@@ -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.06(branch bob200603)";
+ public final static String version = "10.x.07(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/Measurement.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Measurement.java
2006-05-26 03:42:19 UTC (rev 5179)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Measurement.java
2006-05-26 05:13:07 UTC (rev 5180)
@@ -36,17 +36,20 @@
String strMeasurement;
float value;
boolean isVisible = true;
+ short colix;
AxisAngle4f aa;
Point3f pointArc;
- Measurement(Frame frame, int[] atomCountPlusIndices) {
+ Measurement(Frame frame, int[] atomCountPlusIndices, short colix) {
this.frame = frame;
+ this.colix = colix;
setInfo(frame, atomCountPlusIndices, Float.MAX_VALUE);
}
- Measurement(Frame frame, int[] atomCountPlusIndices, float value) {
+ Measurement(Frame frame, int[] atomCountPlusIndices, float value, short
colix) {
this.frame = frame;
+ this.colix = colix;
setInfo(frame, atomCountPlusIndices, value);
}
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Measures.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Measures.java 2006-05-26
03:42:19 UTC (rev 5179)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Measures.java 2006-05-26
05:13:07 UTC (rev 5180)
@@ -75,7 +75,7 @@
return;
}
//System.out.println("define " + rangeMinMax[0] + "-" + rangeMinMax[1] +
";" + value);
- Measurement measureNew = new Measurement(frame, atomCountPlusIndices,
value);
+ Measurement measureNew = new Measurement(frame, atomCountPlusIndices,
value, colix);
if (measurementCount == measurements.length) {
measurements =(Measurement[])Util.setLength(measurements,
measurementCount +
@@ -195,11 +195,16 @@
void setProperty(String propertyName, Object value,
BitSet bsSelected){
- if ("color".equals(propertyName))
- {
+ if ("color".equals(propertyName)) {
//System.out.println("Measures.color set to:" + value);
- colix = value == null ? 0 : Graphics3D.getColix(value); return; }
- else if ("font".equals(propertyName))
+ colix = (value == null ? 0 : Graphics3D.getColix(value));
+ for (int i = 0; i < measurements.length; i++)
+ if (measurements[i] != null
+ && (colix == 0 || measurements[i].colix == 0))
+ measurements[i].colix = colix;
+ return;
+ }
+ if ("font".equals(propertyName))
{ font3d = (Font3D)value; return; }
else if ("define".equals(propertyName))
{ define((int[])value); }
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/MeasuresRenderer.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/MeasuresRenderer.java
2006-05-26 03:42:19 UTC (rev 5179)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/MeasuresRenderer.java
2006-05-26 05:13:07 UTC (rev 5180)
@@ -32,7 +32,6 @@
class MeasuresRenderer extends ShapeRenderer {
- short colix;
boolean showMeasurementNumbers;
short measurementMad;
Font3D font3d;
@@ -40,18 +39,22 @@
void render() {
- Measures measures = (Measures)shape;
+ Measures measures = (Measures) shape;
- colix = measures.colix;
- if (colix == 0)
- colix = viewer.getColixBackgroundContrast();
measurementMad = measures.mad;
font3d = measures.font3d;
showMeasurementNumbers = measures.showMeasurementNumbers;
measures.setVisibilityInfo();
- for (int i = measures.measurementCount; --i >= 0; ) {
- if (! measures.measurements[i].isVisible)
+ short colix;
+ for (int i = measures.measurementCount; --i >= 0;) {
+ if (!measures.measurements[i].isVisible)
continue;
+ colix = measures.measurements[i].colix;
+ if (colix == 0)
+ colix = measures.colix;
+ if (colix == 0)
+ colix = viewer.getColixBackgroundContrast();
+
renderMeasurement(measures.measurements[i], colix);
}
renderPendingMeasurement(measures.pendingMeasurement);
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/PendingMeasurement.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/PendingMeasurement.java
2006-05-26 03:42:19 UTC (rev 5179)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/PendingMeasurement.java
2006-05-26 05:13:07 UTC (rev 5180)
@@ -28,7 +28,7 @@
boolean isActive = false;
PendingMeasurement(Frame frame) {
- super(frame, null);
+ super(frame, null, (short) 0);
this.countPlusIndices = new int[5];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
Jmol-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jmol-commits
