From: Michael T H. <mic...@us...> - 2003-10-22 10:46:54
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/managers In directory sc8-pr-cvs1:/tmp/cvs-serv14126/src/org/openscience/jmol/viewer/managers Modified Files: TransformManager.java Log Message: initial slab implementation Index: TransformManager.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/managers/TransformManager.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- TransformManager.java 6 Oct 2003 12:46:03 -0000 1.14 +++ TransformManager.java 22 Oct 2003 10:42:10 -0000 1.15 @@ -241,7 +241,6 @@ public boolean slabEnabled = false; public int modeSlab; - public int slabValue; public int slabPercentSetting = 100; public boolean getSlabEnabled() { @@ -257,12 +256,10 @@ if (percent == 0) percent = (pixels < 0) ? -1 : 1; slabPercentSetting += percent; - calcSlab(); } public void slabToPercent(int percentSlab) { slabPercentSetting = percentSlab; - calcSlab(); } public void slabByPercent(int percentSlab) { @@ -270,13 +267,11 @@ if (delta == 0) delta = (percentSlab < 0) ? -1 : 1; slabPercentSetting += delta; - calcSlab(); } public void setSlabEnabled(boolean slabEnabled) { if (this.slabEnabled != slabEnabled) { this.slabEnabled = slabEnabled; - calcSlab(); } } @@ -288,7 +283,8 @@ return modeSlab; } - private void calcSlab() { + private int calcSlabValue() { + int slab = 0; if (slabEnabled) { if (slabPercentSetting < 0) slabPercentSetting = 0; @@ -299,8 +295,9 @@ // a slab percentage of 0 should map to -diameter int radius = (int)(viewer.getRotationRadius() * scalePixelsPerAngstrom); - slabValue = (int)((-100+slabPercentSetting) * 2*radius / 100); + slab = (int)((100-slabPercentSetting) * 2 * radius / 100); } + return slab; } /**************************************************************** @@ -440,6 +437,7 @@ public void calcTransformMatrices() { calcPointTransformMatrix(); calcVectorTransformMatrix(); + viewer.setSlabValue(calcSlabValue()); } private void calcPointTransformMatrix() { |