Revision: 5231
Author: hansonr
Date: 2006-06-16 16:29:06 -0700 (Fri, 16 Jun 2006)
ViewCVS: http://svn.sourceforge.net/jmol/?rev=5231&view=rev
Log Message:
-----------
bob200603 viewer fix for dipoles and consolidation of set flags
Modified Paths:
--------------
branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java
Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java 2006-06-16
23:28:15 UTC (rev 5230)
+++ branches/bob200603/Jmol/src/org/jmol/viewer/Viewer.java 2006-06-16
23:29:06 UTC (rev 5231)
@@ -501,70 +501,18 @@
transformManager.scaleFitToScreen();
}
- public void setPerspectiveDepth(boolean perspectiveDepth) {
- transformManager.setPerspectiveDepth(perspectiveDepth);
- refresh(0, "Viewer:setPerspectiveDepth()");
- }
-
- public void setAxesOrientationRasmol(boolean axesOrientationRasmol) {
- transformManager.setAxesOrientationRasmol(axesOrientationRasmol);
- refresh(0, "Viewer:setAxesOrientationRasmol()");
- }
-
- public boolean getAxesOrientationRasmol() {
- return transformManager.axesOrientationRasmol;
- }
-
- private int axesMode = JmolConstants.AXES_MODE_BOUNDBOX;
private boolean axesAreTainted = false;
-
- void setCrystallographicDefaults() {
- styleManager.setCrystallographicDefaults();
- }
-
- void setAxesModeMolecular(boolean TF) {
- axesMode = (TF ? JmolConstants.AXES_MODE_MOLECULAR
- : JmolConstants.AXES_MODE_BOUNDBOX);
- axesAreTainted = true;
- }
-
- void setAxesModeUnitCell(boolean TF) {
- axesMode = (TF ? JmolConstants.AXES_MODE_UNITCELL
- : JmolConstants.AXES_MODE_BOUNDBOX);
- axesAreTainted = true;
- }
-
- boolean areAxesTainted() {
+ boolean areAxesTainted() {
boolean TF = axesAreTainted;
axesAreTainted = false;
return TF;
}
- int getAxesMode() {
- return axesMode;
- }
- private boolean displayCellParameters = true;
- void setDisplayCellParameters(boolean displayCellParameters) {
- this.displayCellParameters = displayCellParameters;
+ void setCrystallographicDefaults() {
+ styleManager.setCrystallographicDefaults();
}
-
- boolean getDisplayCellParameters() {
- return displayCellParameters;
- }
-
- public boolean getPerspectiveDepth() {
- return transformManager.getPerspectiveDepth();
- }
-
- void setCameraDepth(float depth) {
- transformManager.setCameraDepth(depth);
- }
-
- float getCameraDepth() {
- return transformManager.getCameraDepth();
- }
-
+
void checkCameraDistance() {
if (!allowCameraMove())
return;
@@ -881,30 +829,6 @@
return selectionHaloEnabled && selectionManager.isSelected(atomIndex);
}
- boolean selectionHaloEnabled = false;
-
- public void setSelectionHaloEnabled(boolean selectionHaloEnabled) {
- if (this.selectionHaloEnabled != selectionHaloEnabled) {
- this.selectionHaloEnabled = selectionHaloEnabled;
- refresh(0, "Viewer:setSelectionHaloEnabled()");
- }
- }
-
- boolean getSelectionHaloEnabled() {
- return selectionHaloEnabled;
- }
-
- private boolean bondSelectionModeOr;
-
- void setBondSelectionModeOr(boolean bondSelectionModeOr) {
- this.bondSelectionModeOr = bondSelectionModeOr;
- refresh(0, "Viewer:setBondSelectionModeOr()");
- }
-
- boolean getBondSelectionModeOr() {
- return bondSelectionModeOr;
- }
-
public void selectAll() {
selectionManager.selectAll();
refresh(0, "Viewer:selectAll()");
@@ -1458,46 +1382,6 @@
transformManager.setRotationPointXY(center);
}
- boolean windowCenteredFlag = true;
-
- boolean isWindowCentered() {
- return windowCenteredFlag;
- }
-
- void setWindowCentered(boolean TF) {
- windowCenteredFlag = TF;
- }
-
- boolean adjustCameraFlag = true;
-
- boolean isCameraAdjustable() {
- return adjustCameraFlag;
- }
-
- void setAdjustCamera(boolean TF) {
- adjustCameraFlag = TF;
- }
-
- boolean rangeSelected = false;
-
- boolean isRangeSelected() {
- return rangeSelected;
- }
-
- void setRangeSelected(boolean TF) {
- rangeSelected = TF;
- }
-
- boolean allowCameraMoveFlag = true;
-
- boolean allowCameraMove() {
- return allowCameraMoveFlag;
- }
-
- void setAllowCameraMove(boolean TF) {
- allowCameraMoveFlag = TF;
- }
-
public void setCenterSelected() {
setCenterBitSet(selectionManager.bsSelection, true);
}
@@ -1525,16 +1409,7 @@
return modelManager.minBondDistance;
}
- public void setAutoBond(boolean ab) {
- modelManager.setAutoBond(ab);
- refresh(0, "Viewer:setAutoBond()");
- }
-
- public boolean getAutoBond() {
- return modelManager.autoBond;
- }
-
- BitSet getAtomBits(String setType) {
+ BitSet getAtomBits(String setType) {
return modelManager.getAtomBits(setType);
}
@@ -1562,26 +1437,6 @@
return modelManager.getAtomsConnected(min, max, bs);
}
- void setSolventProbeRadius(float radius) {
- modelManager.setSolventProbeRadius(radius);
- }
-
- float getSolventProbeRadius() {
- return modelManager.solventProbeRadius;
- }
-
- float getCurrentSolventProbeRadius() {
- return modelManager.solventOn ? modelManager.solventProbeRadius : 0;
- }
-
- void setSolventOn(boolean solventOn) {
- modelManager.setSolventOn(solventOn);
- }
-
- boolean getSolventOn() {
- return modelManager.solventOn;
- }
-
int getAtomIndexFromAtomNumber(int atomNumber) {
return modelManager.getAtomIndexFromAtomNumber(atomNumber);
}
@@ -2105,40 +1960,6 @@
return defaultLoadScript;
}
- boolean chainCaseSensitive = false;
-
- boolean getChainCaseSensitive() {
- return chainCaseSensitive;
- }
-
- void setChainCaseSensitive(boolean chainCaseSensitive) {
- this.chainCaseSensitive = chainCaseSensitive;
- }
-
- boolean ribbonBorder = false;
-
- boolean getRibbonBorder() {
- return ribbonBorder;
- }
-
- void setRibbonBorder(boolean borderOn) {
- this.ribbonBorder = borderOn;
- }
-
- boolean hideNameInPopup = false;
-
- boolean getHideNameInPopup() {
- return hideNameInPopup;
- }
-
- void setHideNameInPopup(boolean hideNameInPopup) {
- this.hideNameInPopup = hideNameInPopup;
- }
-
- void setSsbondsBackbone(boolean ssbondsBackbone) {
- styleManager.setSsbondsBackbone(ssbondsBackbone);
- }
-
String getStandardLabelFormat() {
return styleManager.getStandardLabelFormat();
}
@@ -2608,8 +2429,63 @@
}
System.out.println("viewer.setBooleanProperty(" + key + "," + value
+ ") - unrecognized");
+ scriptStatus("Script ERROR: unrecognized subcommand: set " + key);
}
+ //////// flags and settings ////////
+ boolean rangeSelected = false;
+
+ boolean isRangeSelected() {
+ return rangeSelected;
+ }
+
+ void setRangeSelected(boolean TF) {
+ rangeSelected = TF;
+ }
+
+ boolean windowCenteredFlag = true;
+ boolean isWindowCentered() {
+ return windowCenteredFlag;
+ }
+ void setWindowCentered(boolean TF) {
+ windowCenteredFlag = TF;
+ }
+
+ boolean adjustCameraFlag = true;
+ boolean isCameraAdjustable() {
+ return adjustCameraFlag;
+ }
+ void setAdjustCamera(boolean TF) {
+ adjustCameraFlag = TF;
+ }
+
+ boolean allowCameraMoveFlag = true;
+ boolean allowCameraMove() {
+ return allowCameraMoveFlag;
+ }
+ void setAllowCameraMove(boolean TF) {
+ allowCameraMoveFlag = TF;
+ }
+
+ float solventProbeRadius = 1.2f;
+ void setSolventProbeRadius(float radius) {
+ solventProbeRadius = radius;
+ }
+ float getSolventProbeRadius() {
+ return solventProbeRadius;
+ }
+ float getCurrentSolventProbeRadius() {
+ return solventOn ? solventProbeRadius : 0;
+ }
+
+ boolean solventOn = false;
+ void setSolventOn(boolean isOn) {
+ solventOn = isOn;
+ }
+ boolean getSolventOn() {
+ return solventOn;
+ }
+
void setAllowStatusReporting(boolean TF){
statusManager.setAllowStatusReporting(TF);
}
@@ -2653,7 +2529,130 @@
boolean getTestFlag4() {
return testFlag4;
}
+
+ public void setPerspectiveDepth(boolean perspectiveDepth) {
+ transformManager.setPerspectiveDepth(perspectiveDepth);
+ refresh(0, "Viewer:setPerspectiveDepth()");
+ }
+ public void setAxesOrientationRasmol(boolean axesOrientationRasmol) {
+ transformManager.setAxesOrientationRasmol(axesOrientationRasmol);
+ refresh(0, "Viewer:setAxesOrientationRasmol()");
+ }
+
+ public boolean getAxesOrientationRasmol() {
+ return transformManager.axesOrientationRasmol;
+ }
+
+ private int axesMode = JmolConstants.AXES_MODE_BOUNDBOX;
+
+ void setAxesModeMolecular(boolean TF) {
+ axesMode = (TF ? JmolConstants.AXES_MODE_MOLECULAR
+ : JmolConstants.AXES_MODE_BOUNDBOX);
+ axesAreTainted = true;
+ }
+
+ void setAxesModeUnitCell(boolean TF) {
+ axesMode = (TF ? JmolConstants.AXES_MODE_UNITCELL
+ : JmolConstants.AXES_MODE_BOUNDBOX);
+ axesAreTainted = true;
+ }
+
+ int getAxesMode() {
+ return axesMode;
+ }
+
+ private boolean displayCellParameters = true;
+ void setDisplayCellParameters(boolean displayCellParameters) {
+ this.displayCellParameters = displayCellParameters;
+ }
+
+ boolean getDisplayCellParameters() {
+ return displayCellParameters;
+ }
+
+ public boolean getPerspectiveDepth() {
+ return transformManager.getPerspectiveDepth();
+ }
+
+ void setCameraDepth(float depth) {
+ transformManager.setCameraDepth(depth);
+ }
+
+ float getCameraDepth() {
+ return transformManager.getCameraDepth();
+ }
+
+
+ boolean selectionHaloEnabled = false;
+
+ public void setSelectionHaloEnabled(boolean selectionHaloEnabled) {
+ if (this.selectionHaloEnabled != selectionHaloEnabled) {
+ this.selectionHaloEnabled = selectionHaloEnabled;
+ refresh(0, "Viewer:setSelectionHaloEnabled()");
+ }
+ }
+
+ boolean getSelectionHaloEnabled() {
+ return selectionHaloEnabled;
+ }
+
+ private boolean bondSelectionModeOr;
+
+ void setBondSelectionModeOr(boolean bondSelectionModeOr) {
+ this.bondSelectionModeOr = bondSelectionModeOr;
+ refresh(0, "Viewer:setBondSelectionModeOr()");
+ }
+
+ boolean getBondSelectionModeOr() {
+ return bondSelectionModeOr;
+ }
+
+ boolean chainCaseSensitive = false;
+
+ boolean getChainCaseSensitive() {
+ return chainCaseSensitive;
+ }
+
+ void setChainCaseSensitive(boolean chainCaseSensitive) {
+ this.chainCaseSensitive = chainCaseSensitive;
+ }
+
+ boolean ribbonBorder = false;
+
+ boolean getRibbonBorder() {
+ return ribbonBorder;
+ }
+
+ void setRibbonBorder(boolean borderOn) {
+ this.ribbonBorder = borderOn;
+ }
+
+ boolean hideNameInPopup = false;
+
+ boolean getHideNameInPopup() {
+ return hideNameInPopup;
+ }
+
+ void setHideNameInPopup(boolean hideNameInPopup) {
+ this.hideNameInPopup = hideNameInPopup;
+ }
+
+ void setSsbondsBackbone(boolean ssbondsBackbone) {
+ styleManager.setSsbondsBackbone(ssbondsBackbone);
+ }
+
+ public void setAutoBond(boolean ab) {
+ modelManager.setAutoBond(ab);
+ refresh(0, "Viewer:setAutoBond()");
+ }
+
+ public boolean getAutoBond() {
+ return modelManager.autoBond;
+ }
+
+
+
// //////////////////////////////////////////////////////////////
// Graphics3D
// //////////////////////////////////////////////////////////////
@@ -3198,13 +3197,11 @@
return;
}
- float dipoleScale = 1.0f; //for now -- global
public void setDipoleScale(float scale) {
- dipoleScale = scale;
+ loadShape(JmolConstants.SHAPE_DIPOLES);
+ setShapeProperty(JmolConstants.SHAPE_DIPOLES, "dipoleVectorScale",
+ new Float(scale));
}
- public float getDipoleScale() {
- return dipoleScale;
- }
void getAtomIdentityInfo(int atomIndex, Hashtable info) {
modelManager.getAtomIdentityInfo(atomIndex, info);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Jmol-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jmol-commits
