From: Bob H. <ha...@us...> - 2006-02-26 05:38:22
|
Update of /cvsroot/jmol/Jmol/src/org/jmol/viewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10461/src/org/jmol/viewer Modified Files: Viewer.java Eval.java StatusManager.java TransformManager.java Log Message: statusManager: minor augmentation to orientationInfo Index: Viewer.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/Viewer.java,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- Viewer.java 25 Feb 2006 23:19:14 -0000 1.86 +++ Viewer.java 26 Feb 2006 05:38:19 -0000 1.87 @@ -332,6 +332,10 @@ return transformManager.getTranslationZPercent(); } + String getTranslationScript() { + return transformManager.getTranslationScript(); + } + void translateByXPercent(float percent) { translateToXPercent(getTranslationXPercent() + percent); } @@ -1151,8 +1155,6 @@ return errorMsg; } openClientFile(fullPathName, fileName, clientFile); - setStatusFileLoaded(3, fullPathName,fileName, modelManager.getModelSetName(), - clientFile, null); return null; } @@ -1187,6 +1189,8 @@ // or something like that here // for when CdkEditBus calls this directly + setStatusFileLoaded(2, fullPathName,fileName, modelManager.getModelSetName(), + clientFile, null); pushHoldRepaint(); modelManager.setClientFile(fullPathName, fileName, clientFile); homePosition(); @@ -1199,7 +1203,7 @@ setFrankOn(styleManager.frankOn); repaintManager.initializePointers(1); popHoldRepaint(); - setStatusFileLoaded(2, fullPathName, fileName, modelManager.getModelSetName(), + setStatusFileLoaded(3, fullPathName, fileName, modelManager.getModelSetName(), clientFile, null); } Index: Eval.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/Eval.java,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- Eval.java 25 Feb 2006 23:19:14 -0000 1.99 +++ Eval.java 26 Feb 2006 05:38:19 -0000 1.100 @@ -3391,6 +3391,8 @@ } data = viewer.simpleReplace(data,"|","\n"); data = viewer.simpleReplace(data,"\n\n","\n"); + data = viewer.simpleReplace(data,"\n\n","\n"); + data = viewer.simpleReplace(data,"\n\n","\n"); System.out.println("pmesh inline data:\n" + data); t = viewer.getBufferedReaderForString(data); } else { Index: StatusManager.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/StatusManager.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- StatusManager.java 25 Feb 2006 23:19:14 -0000 1.13 +++ StatusManager.java 26 Feb 2006 05:38:19 -0000 1.14 @@ -140,7 +140,7 @@ } synchronized void setStatusScriptTermination(String statusMessage, int msWalltime){ - statusMessage = "Jmol script completed" + (compileError == null ? "" : ": " + compileError); + statusMessage = "Jmol script terminated" + (compileError == null ? "" : ": " + compileError); setStatusChanged("scriptTerminated", msWalltime, statusMessage, false); if (jmolStatusListener == null) return; Index: TransformManager.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/TransformManager.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- TransformManager.java 25 Feb 2006 17:44:18 -0000 1.26 +++ TransformManager.java 26 Feb 2006 05:38:19 -0000 1.27 @@ -170,6 +170,17 @@ return 0; } + String getTranslationScript() { + String info = ""; + float f = getTranslationXPercent(); + if(f != 0.0) + info += "translate x " + f + ";"; + f = getTranslationYPercent(); + if(f != 0.0) + info += "translate y " + f + ";"; + return info; + } + void translateCenterTo(int x, int y) { xTranslation = x; yTranslation = y; @@ -187,6 +198,8 @@ info.put("moveTo", getMoveToText()); info.put("rotateZYZ", getRotateZyzText(false)); info.put("rotateXYZ", getRotateXyzText()); + info.put("transXPercent", new Float(getTranslationXPercent())); + info.put("transYPercent", new Float(getTranslationYPercent())); info.put("zoom",new Integer(zoomPercent)); return info; } |