Revision: 18559
http://sourceforge.net/p/jmol/code/18559
Author: hansonr
Date: 2013-08-13 22:47:30 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
___JmolVersion="13.3.4_dev_2013.08.13"
bug fix: screen repaints were being requested far too frequently
*indicates when a refresh is made (external apps and applets only)
external apps only
via loadInline(List)*
createModelSetAndReturnError
script LOAD
openDOM, openReader, openFile, openFiles*
via loadModelFromFile(*)
createModelSetAndReturnError
script CALCULATE HYDROGENS, PLOT, ZAP (modelkit)
loadInLine(String)* via loadInLineScript(*)
FileDropper (string drop) via openStringInline*
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 Paths:
--------------
trunk/Jmol/src/org/jmol/render/RepaintManager.java
trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/src/org/jmol/render/RepaintManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/RepaintManager.java 2013-08-13 22:21:44 UTC
(rev 18558)
+++ trunk/Jmol/src/org/jmol/render/RepaintManager.java 2013-08-13 22:47:30 UTC
(rev 18559)
@@ -134,7 +134,7 @@
*
*/
{
- System.out.println("RepaintMan repaintNow " + why);
+ //System.out.println("RepaintMan repaintNow " + why);
viewer.apiPlatform.repaint(viewer.getDisplay());
}
Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-08-13 22:21:44 UTC
(rev 18558)
+++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-08-13 22:47:30 UTC
(rev 18559)
@@ -9408,7 +9408,7 @@
if (timeMsg)
Logger.startTimer("load");
errMsg = viewer.loadModelFromFile(null, filename, filenames, null,
- isAppend, htParams, loadScript, tokType, false);
+ isAppend, htParams, loadScript, tokType);
if (os != null)
try {
viewer.setFileInfo(new String[] { localName, localName, localName });
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-13 22:21:44 UTC (rev
18558)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-13 22:47:30 UTC (rev
18559)
@@ -1934,13 +1934,12 @@
// via loadInline(List)*
// createModelSetAndReturnError
//
- // script LOAD
- // openDOM, openReader, openFile, openFiles*
- // via loadModelFromFile(*)
+ // script LOAD 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
// createModelSetAndReturnError
@@ -1975,7 +1974,7 @@
@Override
public String openFile(String fileName) {
zap(true, true, false);
- return loadModelFromFile(null, fileName, null, null, false, null, null, 0,
true);
+ return loadModelFromFileRepaint(null, fileName, null, null);
}
/**
@@ -1987,7 +1986,7 @@
@Override
public String openFiles(String[] fileNames) {
zap(true, true, false);
- return loadModelFromFile(null, null, fileNames, null, false, null, null,
0, true);
+ return loadModelFromFileRepaint(null, null, fileNames, null);
}
/**
@@ -2001,8 +2000,7 @@
@Override
public String openReader(String fullPathName, String fileName, Reader
reader) {
zap(true, true, false);
- return loadModelFromFile(fullPathName, fileName, null, reader, false, null,
- null, 0, true);
+ return loadModelFromFileRepaint(fullPathName, fileName, null, reader);
}
/**
@@ -2016,9 +2014,16 @@
public String openDOM(Object DOMNode) {
// applet.loadDOMNode
zap(true, true, false);
- return loadModelFromFile("?", "?", null, DOMNode, false, null, null, 0,
true);
+ return loadModelFromFileRepaint("?", "?", null, DOMNode);
}
+ private String loadModelFromFileRepaint(String fullPathName, String fileName,
+ String[] fileNames, Object reader) {
+ String ret = loadModelFromFile(fullPathName, fileName, fileNames, reader,
false, null, null, 0);
+ refresh(1, "loadModelFromFileRepaint");
+ return ret;
+ }
+
/**
* Used by the ScriptEvaluator LOAD command to open one or more files. Now
* necessary for EVERY load of a file, as loadScript must be passed to the
@@ -2034,14 +2039,13 @@
* @param htParams
* @param loadScript
* @param tokType
- * @param andRepaint TODO
* @return null or error
*/
public String loadModelFromFile(String fullPathName, String fileName,
String[] fileNames, Object reader,
boolean isAppend,
Map<String, Object> htParams, SB loadScript,
- int tokType, boolean andRepaint) {
+ int tokType) {
if (htParams == null)
htParams = setLoadParameters(null, isAppend);
Object atomSetCollection;
@@ -2126,11 +2130,8 @@
// and finally to create the model set...
- String ret = createModelSetAndReturnError(atomSetCollection, isAppend,
+ return createModelSetAndReturnError(atomSetCollection, isAppend,
loadScript, htParams);
- if (andRepaint)
- refresh(1, "loadModelFromFile");
- return ret;
}
Map<String, Object> ligandModels;
@@ -2261,7 +2262,7 @@
if (haveFileData) {
strModel = (String) htParams.get("fileData");
if (htParams.containsKey("isData")) {
- return loadInlineScript(strModel, '\0', isAppend, htParams, false);
+ return loadInlineScript(strModel, '\0', isAppend, htParams);
}
} else if (isString) {
strModel = modelSet.getInlineData(-1);
@@ -2314,7 +2315,7 @@
@Override
public String loadInline(String strModel) {
// jmolViewer interface
- return loadInlineScript(strModel, global.inlineNewlineChar, false, null,
true);
+ return loadInlineScriptRepaint(strModel, global.inlineNewlineChar, false);
}
/** external apps only
@@ -2324,27 +2325,34 @@
@Override
public String loadInline(String strModel, char newLine) {
// JmolViewer interface
- return loadInlineScript(strModel, newLine, false, null, true);
+ return loadInlineScriptRepaint(strModel, newLine, false);
}
- /** external apps only
- *
+ /**
+ * used by applet and console
*/
@Override
- public String loadInline(String[] arrayModels) {
+ public String loadInline(String strModel, boolean isAppend) {
// JmolViewer interface
- return loadInline(arrayModels, false);
+ return loadInlineScriptRepaint(strModel, '\0', isAppend);
}
- /**
- * used by applet and console
+ private String loadInlineScriptRepaint(String strModel, char newLine,
+ boolean isAppend) {
+ String ret = loadInlineScript(strModel, newLine, isAppend, null);
+ refresh(1, "loadInlineScript");
+ return ret;
+ }
+
+ /** external apps only
+ *
*/
@Override
- public String loadInline(String strModel, boolean isAppend) {
+ public String loadInline(String[] arrayModels) {
// JmolViewer interface
- return loadInlineScript(strModel, '\0', isAppend, null, true);
+ return loadInline(arrayModels, false);
}
/**
@@ -2394,11 +2402,10 @@
* @param newLine
* @param isAppend
* @param htParams
- * @param andRepaint TODO
* @return null or error message
*/
private String loadInlineScript(String strModel, char newLine,
- boolean isAppend, Map<String, Object>
htParams, boolean andRepaint) {
+ boolean isAppend, Map<String, Object>
htParams) {
if (strModel == null || strModel.length() == 0)
return null;
strModel = fixInlineString(strModel, newLine);
@@ -2410,7 +2417,6 @@
Logger.debug(strModel);
String datasep = getDataSeparator();
int i;
- String ret;
if (datasep != null && datasep != ""
&& (i = strModel.indexOf(datasep)) >= 0
&& strModel.indexOf("# Jmol state") < 0) {
@@ -2426,14 +2432,9 @@
strModels[i] = strModel.substring(pt0, pt);
pt0 = pt + datasep.length();
}
- ret = openStringsInlineParamsAppend(strModels, htParams, isAppend);
- } else {
- ret = openStringInlineParamsAppend(strModel, htParams, isAppend);
+ return openStringsInlineParamsAppend(strModels, htParams, isAppend);
}
- if (andRepaint)
- refresh(1, "loadInlineScript");
- return ret;
-
+ return openStringInlineParamsAppend(strModel, htParams, isAppend);
}
public static String fixInlineString(String strModel, char newLine) {
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
