Revision: 20125
http://sourceforge.net/p/jmol/code/20125
Author: hansonr
Date: 2014-11-25 12:42:40 +0000 (Tue, 25 Nov 2014)
Log Message:
-----------
Jmol.___JmolVersion="14.2.9_2014.11.24"
bug fix: reading of JVXL file saved with noFill still does fill
bug fix: CASTEP DENSITY surface file reader does not do downsampling
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/jvxl/readers/CastepDensityReader.java
branches/v14_2/Jmol/src/org/jmol/shapesurface/Isosurface.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_2/Jmol/src/org/jmol/jvxl/readers/CastepDensityReader.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/jvxl/readers/CastepDensityReader.java
2014-11-25 03:49:48 UTC (rev 20124)
+++ branches/v14_2/Jmol/src/org/jmol/jvxl/readers/CastepDensityReader.java
2014-11-25 12:42:40 UTC (rev 20125)
@@ -38,7 +38,7 @@
@Override
void init2(SurfaceGenerator sg, BufferedReader br) {
init2VFR(sg, br);
- canDownsample = isProgressive = false;
+ isProgressive = false;
isAngstroms = true;
}
@@ -95,15 +95,29 @@
@Override
protected void getPeriodicVoxels() throws Exception {
- // no downsampling (yet), because CASTEP writes x, y, z info.
- for (int i = 0; i < nFilePoints; i++) {
- int x = parseIntStr(line) - 1;
- int y = parseInt() - 1;
- int z = parseInt() - 1;
- if (nSkip > 0)
- skipPoints(nSkip);
- voxelData[x][y][z] = recordData(parseFloat());
- rd();
+ int dsf = downsampleFactor;
+ if (dsf > 1) {
+ for (int i = 0; i < nFilePoints; i++) {
+ int x = parseIntStr(line) - 1;
+ int y = parseInt() - 1;
+ int z = parseInt() - 1;
+ if (x % dsf == 0 && y % dsf == 0 && z % dsf == 0) {
+ if (nSkip > 0)
+ skipPoints(nSkip);
+ voxelData[x / dsf][y / dsf][z / dsf] = recordData(parseFloat());
+ }
+ rd();
+ }
+ } else {
+ for (int i = 0; i < nFilePoints; i++) {
+ int x = parseIntStr(line) - 1;
+ int y = parseInt() - 1;
+ int z = parseInt() - 1;
+ if (nSkip > 0)
+ skipPoints(nSkip);
+ voxelData[x][y][z] = recordData(parseFloat());
+ rd();
+ }
}
}
Modified: branches/v14_2/Jmol/src/org/jmol/shapesurface/Isosurface.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/shapesurface/Isosurface.java
2014-11-25 03:49:48 UTC (rev 20124)
+++ branches/v14_2/Jmol/src/org/jmol/shapesurface/Isosurface.java
2014-11-25 12:42:40 UTC (rev 20125)
@@ -1439,11 +1439,9 @@
@Override
public void notifySurfaceMappingCompleted() {
- if (!thisMesh.isMerged) {
- thisMesh.initialize(sg.isFullyLit() ? T.fullylit
- : T.frontlit, null, sg.getPlane());
- thisMesh.setJvxlDataRendering();
- }
+ if (!thisMesh.isMerged)
+ thisMesh.initialize(sg.isFullyLit() ? T.fullylit : T.frontlit, null,
+ sg.getPlane());
setBsVdw();
thisMesh.isColorSolid = false;
thisMesh.colorDensity = jvxlData.colorDensity;
@@ -1454,8 +1452,13 @@
explicitContours = true;
if (explicitContours && thisMesh.jvxlData.jvxlPlane != null)
thisMesh.havePlanarContours = true;
- setPropertySuper("token", Integer.valueOf(explicitContours ? T.nofill :
T.fill), null);
- setPropertySuper("token", Integer.valueOf(explicitContours ?
T.contourlines : T.nocontourlines), null);
+ setPropertySuper("token",
+ Integer.valueOf(explicitContours ? T.nofill : T.fill), null);
+ setPropertySuper("token",
+ Integer.valueOf(explicitContours ? T.contourlines : T.nocontourlines),
+ null);
+ if (!thisMesh.isMerged)
+ thisMesh.setJvxlDataRendering();
Lst<Object[]> slabInfo = sg.getSlabInfo();
if (slabInfo != null) {
thisMesh.slabPolygonsList(slabInfo, false);
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-25
03:49:48 UTC (rev 20124)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-25
12:42:40 UTC (rev 20125)
@@ -4,8 +4,13 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.9_2014.11.23"
+Jmol.___JmolVersion="14.2.9_2014.11.24"
+bug fix: reading of JVXL file saved with noFill still does fill
+bug fix: CASTEP DENSITY surface file reader does not do downsampling
+
+JmolVersion="14.2.9_2014.11.23"
+
released as Jmol 14.3.9 and Jmol 14.2.9
bug fix: isosurface slab plane -xy not recognizing "-"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
