From: <ha...@us...> - 2012-02-28 15:43:25
|
Revision: 16838 http://jmol.svn.sourceforge.net/jmol/?rev=16838&view=rev Author: hansonr Date: 2012-02-28 15:43:17 +0000 (Tue, 28 Feb 2012) Log Message: ----------- oops Modified Paths: -------------- trunk/Jmol/src/org/jmol/util/ColorEncoder.java Modified: trunk/Jmol/src/org/jmol/util/ColorEncoder.java =================================================================== --- trunk/Jmol/src/org/jmol/util/ColorEncoder.java 2012-02-25 18:45:24 UTC (rev 16837) +++ trunk/Jmol/src/org/jmol/util/ColorEncoder.java 2012-02-28 15:43:17 UTC (rev 16838) @@ -260,7 +260,7 @@ if (name.length() > 0) isOverloaded = true; int n = 0; - if (!colorScheme.contains("[")) { + if (colorScheme.length() > pt + 1 && !colorScheme.contains("[")) { // also allow xxx=red,blue,green colorScheme = "[" + colorScheme.substring(pt + 1).trim() + "]"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2022-08-16 02:23:42
|
Revision: 22454 http://sourceforge.net/p/jmol/code/22454 Author: hansonr Date: 2022-08-16 02:23:40 +0000 (Tue, 16 Aug 2022) Log Message: ----------- Jmol.___JmolVersion="14.32.71" // P also 15.2.71 bug fix: isosurface slab designations "xy" "xz" "yz" "-xy", "-xz" "-yz" etc. are not correct new feature: isosurface slab designations "a=" "b=" "c=" "-a=" "-b=" "-c=" "ab" "bc" "ac" "-ab" "-bc" "-ac" -- like x, y, and z, but for unit cell axes for example: load spacegroup 1 unitcell [3 3 3 60 60 60] isosurface sphere 5.0 slab -a=1 -- note that negative options and unit cell options are not documented new feature: color property xxxx [quoted schemeFileNameOrURL] -- adds nine more standard color schemes, including five "universally readable" scientific palettes (batlow,cividis,kry,thermal,viridis) as discussed in https://www.nature.com/articles/s41467-020-19160-7 as well as four more (inferno,magma,plasma,turbo) that are from the R-Project viridis package https://cran.r-project.org/web/packages/viridis/vignettes/intro-to-viridis.html for example: load *1crn color property atomno "viridis" -- scheme palettes are located as *.lut.txt in the src/org/jmol/util/colorschemes/ directory -- column format .lut.txt (three columns of r g b per line, either 0-255 or 0-1, or four columns where first column is the index 1-256) -- also reads files using https://... from any online source in binary or ASCII formats: binary [optional 32-bit header ignored][rrrr...(256)][gggg...(256)][bbbb...(256)] 768 or 800 bytes total ASCIIt (either three columns of r g b per line, or four columns index r g b) for example: load *1crn color property atomno "https://github.com/fiji/fiji/blob/master/luts/cool.lut?raw=true" -- filenames also work in the color() function: print color("viridis").colors print color("https://github.com/Image-Py/imagepy/blob/master/imagepy/data/luts/Others/morgenstemning.lut?raw=true").colors Modified Paths: -------------- trunk/Jmol/src/org/jmol/util/ColorEncoder.java Modified: trunk/Jmol/src/org/jmol/util/ColorEncoder.java =================================================================== --- trunk/Jmol/src/org/jmol/util/ColorEncoder.java 2022-08-16 02:10:29 UTC (rev 22453) +++ trunk/Jmol/src/org/jmol/util/ColorEncoder.java 2022-08-16 02:23:40 UTC (rev 22454) @@ -327,7 +327,7 @@ Logger.info("ColorEncoder opening colorschemes/" + s); Rdr.readAllAsString( FileManager.getBufferedReaderForResource(vwr, new C(), - "org/jmol/util", "colorschemes/" + s), + "org/jmol/util/", "colorschemes/" + s), -1, false, data, 0); } catch (IOException e) { Logger.info("ColorEncoder " + e); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |