Revision: 5164
Author: hansonr
Date: 2006-05-23 20:57:59 -0700 (Tue, 23 May 2006)
ViewCVS: http://svn.sourceforge.net/jmol/?rev=5164&view=rev
Log Message:
-----------
bob200603 additional work on dipoles
Modified Paths:
--------------
branches/bob200603/Jmol/src/org/jmol/viewer/DipolesRenderer.java
branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java
branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/DipolesRenderer.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/DipolesRenderer.java
2006-05-24 01:01:59 UTC (rev 5163)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/DipolesRenderer.java
2006-05-24 03:57:59 UTC (rev 5164)
@@ -74,7 +74,12 @@
Vector3f vector = dipole.vector;
offset.set(vector);
offset.scale(dipole.offsetAngstroms / dipole.dipoleValue);
- //System.out.println("render dipoloe "+offset + dipole.offsetAngstroms);
+/*
+ System.out.println("render dipole " + " value=" + dipole.dipoleValue
+ + " vector=" + dipole.vector
+ + " offset=" + offset + " offsetAngstroms=" + dipole.offsetAngstroms);
+
+ */
pointCylinderBase.set(dipole.origin);
pointCylinderBase.add(offset);
pointCross.scaleAdd(dipoleVectorScale * crossOffset, vector,
@@ -93,7 +98,7 @@
short mad = dipole.mad;
diameter = (mad <= 20) ? mad : viewer.scaleToScreen(screenCylinderBase.z,
mad);
- headWidthPixels = (int)(diameter * arrowHeadWidthFactor);
+ headWidthPixels = (int) (diameter * arrowHeadWidthFactor);
if (headWidthPixels < diameter + 10)
headWidthPixels = diameter + 10;
crossWidthPixels = headWidthPixels;
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java 2006-05-24
01:01:59 UTC (rev 5163)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java 2006-05-24
03:57:59 UTC (rev 5164)
@@ -2517,14 +2517,6 @@
viewer.setShapeProperty(JmolConstants.SHAPE_DIPOLES, "set", null);
}
- void dipoleScale() throws ScriptException {
- checkLength3();
- float scale = floatParameter(2);
- if (scale < -10 || scale > 10)
- numberOutOfRange(-10f, 10f);
- viewer.setDipoleScale(scale);
- }
-
void animationMode() throws ScriptException {
float startDelay = 1, endDelay = 1;
if (statementLength < 3 || statementLength > 5)
@@ -2976,7 +2968,8 @@
notImplemented(1);
break;
case Token.identifier:
- if (((String) statement[1].value).equalsIgnoreCase("defaultLattice")) {
+ String str = (String) statement[1].value;
+ if (str.equalsIgnoreCase("defaultLattice")) {
if (statement.length < 3)
badArgumentCount();
Point3f pt;
@@ -2987,15 +2980,24 @@
pt = getCoordinate(2, false);
}
viewer.setDefaultLattice(pt);
- } else if (((String) statement[1].value)
- .equalsIgnoreCase("defaultLoadScript")) {
+ break;
+ }
+ if (str.equalsIgnoreCase("defaultLoadScript")) {
checkLength3();
if (statement[2].tok != Token.string)
stringExpected();
viewer.setDefaultLoadScript((String) statement[2].value);
- } else {
- viewer.setBooleanProperty((String) statement[1].value,
getSetBoolean());
+ break;
+ }
+ if (str.equalsIgnoreCase("dipoleScale")) {
+ checkLength3();
+ float scale = floatParameter(2);
+ if (scale < -10 || scale > 10)
+ numberOutOfRange(-10f, 10f);
+ viewer.setDipoleScale(scale);
+ break;
}
+ viewer.setBooleanProperty((String) statement[1].value, getSetBoolean());
break;
case Token.background:
case Token.stereo:
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java 2006-05-24
01:01:59 UTC (rev 5163)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java 2006-05-24
03:57:59 UTC (rev 5164)
@@ -3155,7 +3155,7 @@
float dipoleScale = 1.0f; //for now -- global
public void setDipoleScale(float scale) {
- dipoleScale = 1.0f;
+ dipoleScale = scale;
}
public float getDipoleScale() {
return dipoleScale;
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
