From: <ha...@us...> - 2010-09-06 01:18:06
|
Revision: 14246 http://jmol.svn.sourceforge.net/jmol/?rev=14246&view=rev Author: hansonr Date: 2010-09-06 01:17:59 +0000 (Mon, 06 Sep 2010) Log Message: ----------- version=12.0.12_dev # color structure for carbohydrate fails Modified Paths: -------------- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties branches/v12_0/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-09-05 20:40:50 UTC (rev 14245) +++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-09-06 01:17:59 UTC (rev 14246) @@ -4,6 +4,7 @@ version=12.0.12_dev +# color structure for carbohydrate fails # new feature: reset SPIN # bug fix: reset should not reset spin (introduced in 11.7.47); new RESET SPIN includes reset spinning # bug fix: SMILES generator allowing sp3 center in aromatic Modified: branches/v12_0/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/JmolConstants.java 2010-09-05 20:40:50 UTC (rev 14245) +++ branches/v12_0/Jmol/src/org/jmol/viewer/JmolConstants.java 2010-09-06 01:17:59 UTC (rev 14246) @@ -1357,8 +1357,16 @@ 0xFFFF0080, // PROTEIN_STRUCTURE_HELIX 0xFFAE00FE, // PROTEIN_STRUCTURE_DNA 0xFFFD0162, // PROTEIN_STRUCTURE_RNA + 0xFFA6A6FA, // PROTEIN_STRUCTURE_CARBOHYDRATE }; + static { + if (proteinStructureNames.length != argbsStructure.length - 1) { + System.out.println("protineStructureNames.length != argbsStructure.length"); + throw new NullPointerException(); + } + } + public final static int[] argbsAmino = { 0xFFBEA06E, // default tan // note that these are the rasmol colors and names, not xwindows This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |