Revision: 20302
http://sourceforge.net/p/jmol/code/20302
Author: hansonr
Date: 2015-02-18 05:09:25 +0000 (Wed, 18 Feb 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/adapter/readers/xtal/VaspPoscarReader.java
trunk/Jmol/src/org/jmol/adapter/smarter/AtomSetCollectionReader.java
trunk/Jmol/src/org/jmol/adapter/smarter/XtalSymmetry.java
Modified: trunk/Jmol/src/org/jmol/adapter/readers/xtal/VaspPoscarReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/xtal/VaspPoscarReader.java
2015-02-18 00:44:51 UTC (rev 20301)
+++ trunk/Jmol/src/org/jmol/adapter/readers/xtal/VaspPoscarReader.java
2015-02-18 05:09:25 UTC (rev 20302)
@@ -5,8 +5,6 @@
import javajs.util.PT;
import javajs.util.SB;
-import org.jmol.util.Logger;
-
/**
* http://cms.mpi.univie.ac.at/vasp/
*
Modified: trunk/Jmol/src/org/jmol/adapter/smarter/AtomSetCollectionReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/smarter/AtomSetCollectionReader.java
2015-02-18 00:44:51 UTC (rev 20301)
+++ trunk/Jmol/src/org/jmol/adapter/smarter/AtomSetCollectionReader.java
2015-02-18 05:09:25 UTC (rev 20302)
@@ -256,7 +256,7 @@
binaryDoc.setOutputChannel(out);
processBinaryDocument();
}
- finalizeSubclassReader(); // upstairs
+ finalizeSubclassReader(); // upstairs
if (!isFinalized)
finalizeReaderASCR();
} catch (Throwable e) {
@@ -466,8 +466,8 @@
if (asc.errorMessage != null)
return asc.errorMessage + "\nfor file " + filePath
+ "\ntype " + name;
- if ((asc.bsAtoms == null ? asc.ac
- : asc.bsAtoms.nextSetBit(0)) <= 0
+ if ((asc.bsAtoms == null ? asc.ac == 0
+ : asc.bsAtoms.nextSetBit(0) < 0)
&& fileType.indexOf("DataOnly") < 0 && asc.atomSetInfo.get("dataOnly")
== null)
return "No atoms found\nfor file " + filePath + "\ntype " + name;
fixBaseIndices();
Modified: trunk/Jmol/src/org/jmol/adapter/smarter/XtalSymmetry.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/smarter/XtalSymmetry.java 2015-02-18
00:44:51 UTC (rev 20301)
+++ trunk/Jmol/src/org/jmol/adapter/smarter/XtalSymmetry.java 2015-02-18
05:09:25 UTC (rev 20302)
@@ -986,6 +986,7 @@
if (biomts.size() < 2)
return;
symmetry = null;
+ // it's not clear to me why you would do this:
if (!Float.isNaN(notionalUnitCell[0])) // PDB can do this;
setNotionalUnitCell(notionalUnitCell, null, unitCellOffset);
getSymmetry().setSpaceGroup(doNormalize);
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=190641631&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
