Revision: 18561
http://sourceforge.net/p/jmol/code/18561
Author: hansonr
Date: 2013-08-13 22:53:44 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Modified Paths:
--------------
branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties
branches/v13_2/Jmol/src/org/jmol/viewer/Viewer.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-13
22:49:06 UTC (rev 18560)
+++ branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-13
22:53:44 UTC (rev 18561)
@@ -20,18 +20,27 @@
via loadInline(List)*
createModelSetAndReturnError
- script LOAD
- openDOM, openReader, openFile, openFiles*
- via loadModelFromFile(*)
+ openDOM, openReader, openFile, openFiles
+ via loadModelFromFileRepaint*
createModelSetAndReturnError
- script CALCULATE HYDROGENS, PLOT, ZAP (modelkit)
- loadInLine(String)* via loadInLineScript(*)
+ loadInLine(String) via loadInLineScriptRepaint*
FileDropper (string drop) via openStringInline*
- openStringInlineParamsAppend
+ via openStringInlineParamsAppend
createModelSetAndReturnError
+
+ external apps, applet only, via loadInline(String[])*
+ via openStringsInlineParamsAppend
+ createModelSetAndReturnError
+
+ script LOAD
+ via loadModelFromFile
+ createModelSetAndReturnError
+
+ script CALCULATE HYDROGENS, PLOT, ZAP (modelkit)
+ via openStringInlineParamsAppend
+ createModelSetAndReturnError
- external apps, applet only, via loadInline(String[])*
script LOAD DATA via loadFileFull and loadInlineScript
openStringsInlineParamsAppend
createModelSetAndReturnError
Modified: branches/v13_2/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-13 22:49:06 UTC
(rev 18560)
+++ branches/v13_2/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-13 22:53:44 UTC
(rev 18561)
@@ -1927,22 +1927,32 @@
// //////////////// methods that open a file to create a model set
///////////
// *indicates when a refresh is made (external apps and applets only)
- //
+ //
// external apps only
// via loadInline(List)*
// createModelSetAndReturnError
- //
- // script LOAD via loadModelFromFile
- // openDOM, openReader, openFile, openFiles via loadModelFromFileRepaint*
+ //
+ // openDOM, openReader, openFile, openFiles
+ // via loadModelFromFileRepaint*
// createModelSetAndReturnError
- //
- // script CALCULATE HYDROGENS, PLOT, ZAP (modelkit)
+ //
// loadInLine(String) via loadInLineScriptRepaint*
// FileDropper (string drop) via openStringInline*
- // openStringInlineParamsAppend
+ // via openStringInlineParamsAppend
// createModelSetAndReturnError
//
// external apps, applet only, via loadInline(String[])*
+ // via openStringsInlineParamsAppend
+ // createModelSetAndReturnError
+ //
+ // script LOAD
+ // via loadModelFromFile
+ // createModelSetAndReturnError
+ //
+ // script CALCULATE HYDROGENS, PLOT, ZAP (modelkit)
+ // via openStringInlineParamsAppend
+ // createModelSetAndReturnError
+ //
// script LOAD DATA via loadFileFull and loadInlineScript
// openStringsInlineParamsAppend
// createModelSetAndReturnError
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-13 22:49:06 UTC
(rev 18560)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-13 22:53:44 UTC
(rev 18561)
@@ -21,23 +21,31 @@
via loadInline(List)*
createModelSetAndReturnError
- script LOAD
- openDOM, openReader, openFile, openFiles*
- via loadModelFromFile(*)
+ openDOM, openReader, openFile, openFiles
+ via loadModelFromFileRepaint*
createModelSetAndReturnError
- script CALCULATE HYDROGENS, PLOT, ZAP (modelkit)
- loadInLine(String)* via loadInLineScript(*)
+ loadInLine(String) via loadInLineScriptRepaint*
FileDropper (string drop) via openStringInline*
- openStringInlineParamsAppend
+ via openStringInlineParamsAppend
createModelSetAndReturnError
+
+ external apps, applet only, via loadInline(String[])*
+ via openStringsInlineParamsAppend
+ createModelSetAndReturnError
+
+ script LOAD
+ via loadModelFromFile
+ createModelSetAndReturnError
+
+ script CALCULATE HYDROGENS, PLOT, ZAP (modelkit)
+ via openStringInlineParamsAppend
+ createModelSetAndReturnError
- external apps, applet only, via loadInline(String[])*
script LOAD DATA via loadFileFull and loadInlineScript
openStringsInlineParamsAppend
createModelSetAndReturnError
-
new feature: incommensurate modulation of ADPs.
new feature: Jana2006 M40/M50 file reading
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-13 22:49:06 UTC (rev
18560)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-13 22:53:44 UTC (rev
18561)
@@ -1929,22 +1929,32 @@
// *indicates when a refresh is made (external apps and applets only)
- //
+ //
// external apps only
// via loadInline(List)*
// createModelSetAndReturnError
- //
- // script LOAD via loadModelFromFile
- // openDOM, openReader, openFile, openFiles via loadModelFromFileRepaint*
+ //
+ // openDOM, openReader, openFile, openFiles
+ // via loadModelFromFileRepaint*
// createModelSetAndReturnError
- //
- // script CALCULATE HYDROGENS, PLOT, ZAP (modelkit)
+ //
// loadInLine(String) via loadInLineScriptRepaint*
// FileDropper (string drop) via openStringInline*
- // openStringInlineParamsAppend
+ // via openStringInlineParamsAppend
// createModelSetAndReturnError
//
// external apps, applet only, via loadInline(String[])*
+ // via openStringsInlineParamsAppend
+ // createModelSetAndReturnError
+ //
+ // script LOAD
+ // via loadModelFromFile
+ // createModelSetAndReturnError
+ //
+ // script CALCULATE HYDROGENS, PLOT, ZAP (modelkit)
+ // via openStringInlineParamsAppend
+ // createModelSetAndReturnError
+ //
// script LOAD DATA via loadFileFull and loadInlineScript
// openStringsInlineParamsAppend
// createModelSetAndReturnError
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
