From: <ha...@us...> - 2011-10-25 05:20:26
|
Revision: 16403 http://jmol.svn.sourceforge.net/jmol/?rev=16403&view=rev Author: hansonr Date: 2011-10-25 05:20:20 +0000 (Tue, 25 Oct 2011) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2011-10-25 05:20:14 UTC (rev 16402) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2011-10-25 05:20:20 UTC (rev 16403) @@ -8639,6 +8639,11 @@ // > : all OTHER applets // . : just me // ~ : disable send (just me) + // = : disable send (just me) and force slave + if ("=".equals(applet)) { + applet = "~"; + statusManager.setSyncDriver(StatusManager.SYNC_SLAVE); + } boolean disableSend = "~".equals(applet); // null same as ">" -- "all others" if (port > 0 || !disableSend && !".".equals(applet)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-10-29 05:26:09
|
Revision: 16420 http://jmol.svn.sourceforge.net/jmol/?rev=16420&view=rev Author: hansonr Date: 2011-10-29 05:26:03 +0000 (Sat, 29 Oct 2011) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2011-10-29 05:24:00 UTC (rev 16419) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2011-10-29 05:26:03 UTC (rev 16420) @@ -8319,7 +8319,7 @@ } public void showNMR(String smiles) { - // nmrdb cannot handle "." separator + // nmrdb cannot handle "." separator and cannot handle c=c showUrl(global.nmrUrlFormat + Escape.escapeUrl(getChemicalInfo(smiles, '/', "smiles"))); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-02-13 15:10:31
|
Revision: 16792 http://jmol.svn.sourceforge.net/jmol/?rev=16792&view=rev Author: hansonr Date: 2012-02-13 15:10:20 +0000 (Mon, 13 Feb 2012) Log Message: ----------- script echo of title of <PeakData> record (or full record with SET DEBUG) Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-02-13 13:11:19 UTC (rev 16791) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-02-13 15:10:20 UTC (rev 16792) @@ -5394,9 +5394,13 @@ int syncMode = statusManager.getSyncMode(); if (syncMode != StatusManager.SYNC_DRIVER) return; - String peaks = modelSet.getPeakAtomRecord(atomIndex); - if (peaks != null) - statusManager.syncSend(fullName + "JSpecView: " + peaks, ">", 0); + String peak = modelSet.getPeakAtomRecord(atomIndex); + if (peak != null) { + String msg = Parser.getQuotedAttribute(peak, "title"); + if (msg != null) + scriptEcho(Logger.debugging ? peak : msg); + statusManager.syncSend(fullName + "JSpecView: " + peak, ">", 0); + } } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-02-13 15:12:35
|
Revision: 16793 http://jmol.svn.sourceforge.net/jmol/?rev=16793&view=rev Author: hansonr Date: 2012-02-13 15:12:29 +0000 (Mon, 13 Feb 2012) Log Message: ----------- script echo of title of <PeakData> record (or full record with SET DEBUG) Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-02-13 15:10:20 UTC (rev 16792) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-02-13 15:12:29 UTC (rev 16793) @@ -5154,7 +5154,7 @@ return; String peak = (String) getModelAuxiliaryInfo(modelIndex, "jdxModelSelect"); if (peak != null) - statusManager.syncSend(fullName + "JSpecView: " + peak, ">", 0); + sendJSpecView(peak); } /* @@ -5395,12 +5395,8 @@ if (syncMode != StatusManager.SYNC_DRIVER) return; String peak = modelSet.getPeakAtomRecord(atomIndex); - if (peak != null) { - String msg = Parser.getQuotedAttribute(peak, "title"); - if (msg != null) - scriptEcho(Logger.debugging ? peak : msg); - statusManager.syncSend(fullName + "JSpecView: " + peak, ">", 0); - } + if (peak != null) + sendJSpecView(peak); } /* @@ -5411,6 +5407,13 @@ * myResizeCallback(width, height) {} */ + private void sendJSpecView(String peak) { + String msg = Parser.getQuotedAttribute(peak, "title"); + if (msg != null) + scriptEcho(Logger.debugging ? peak : msg); + statusManager.syncSend(fullName + "JSpecView: " + peak, ">", 0); + } + public void setStatusResized(int width, int height) { statusManager.setStatusResized(width, height); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-04-24 04:28:05
|
Revision: 17044 http://jmol.svn.sourceforge.net/jmol/?rev=17044&view=rev Author: hansonr Date: 2012-04-24 04:27:58 +0000 (Tue, 24 Apr 2012) Log Message: ----------- version=12.3.23_dev # new feature: PubChem search for name (which can be a CAS number), cid, or SMILES using ":" # from pubChemFormat = "http://pubchem.ncbi.nlm.nih.gov/rest/pug/compound/%FILE/SDF?record_type=3d"; # (many thanks to Evan Bolton and Paul Thiessen (NIH) for their assistance on this. # load :name:tylenol # or load :tylenol or load :103-90-2 # load :cid:1983 # or load :1983 # load :smiles:C/C=C/C Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-04-24 02:05:49 UTC (rev 17043) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-04-24 04:27:58 UTC (rev 17044) @@ -4690,19 +4690,19 @@ return TextFormat.formatString(s, "FILE", f); case ':': // PubChem format = global.pubChemFormat; + String fl = f.toLowerCase(); try { - f = f.toLowerCase(); f = "cid/" + String.valueOf(Integer.valueOf(f).intValue()); } catch (Exception e) { - if (f.startsWith("smiles:")) { + if (fl.startsWith("smiles:")) { format += "?POST?smiles=" + f.substring(7); f = "smiles"; - } else if (f.startsWith("cid:")) { + } else if (fl.startsWith("cid:")) { f = "cid/" + f.substring(4); } else { - if (f.startsWith("name:")) + if (fl.startsWith("name:")) f = f.substring(5); - if (f.startsWith("cas:")) + if (fl.startsWith("cas:")) f = f.substring(4); f = "name/" + Escape.escapeUrl(f); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-05-09 04:01:43
|
Revision: 17099 http://jmol.svn.sourceforge.net/jmol/?rev=17099&view=rev Author: hansonr Date: 2012-05-09 04:01:37 +0000 (Wed, 09 May 2012) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-05-09 04:00:40 UTC (rev 17098) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-05-09 04:01:37 UTC (rev 17099) @@ -8630,7 +8630,7 @@ */ @Override public String getSetHistory(int howFarBack) { - System.out.println("getSetHistory " + howFarBack); + //System.out.println("getSetHistory " + howFarBack); return commandHistory.getSetHistory(howFarBack); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-05-16 14:50:41
|
Revision: 17147 http://jmol.svn.sourceforge.net/jmol/?rev=17147&view=rev Author: hansonr Date: 2012-05-16 14:50:32 +0000 (Wed, 16 May 2012) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-05-16 14:15:55 UTC (rev 17146) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-05-16 14:50:32 UTC (rev 17147) @@ -5784,6 +5784,7 @@ case Token.forcefield: // 12.3.25 global.forceField = value; + minimizer = null; break; case Token.nmrurlformat: // 12.3.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-07-04 15:11:46
|
Revision: 17341 http://jmol.svn.sourceforge.net/jmol/?rev=17341&view=rev Author: hansonr Date: 2012-07-04 15:11:35 +0000 (Wed, 04 Jul 2012) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-07-02 16:43:56 UTC (rev 17340) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-07-04 15:11:35 UTC (rev 17341) @@ -5568,7 +5568,7 @@ if (msg != null) scriptEcho(Logger.debugging ? peak : msg); peak = fullName + "JSpecView: " + peak; - Logger.info("Jmol sending to JSpecView: " + peak); + Logger.info("Jmol>JSV " + peak); statusManager.syncSend(peak, ">", 0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-07-24 20:54:37
|
Revision: 17411 http://jmol.svn.sourceforge.net/jmol/?rev=17411&view=rev Author: hansonr Date: 2012-07-24 20:54:31 +0000 (Tue, 24 Jul 2012) Log Message: ----------- reset cache to include PNGJ cache Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-07-24 13:49:42 UTC (rev 17410) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-07-24 20:54:31 UTC (rev 17411) @@ -10495,6 +10495,7 @@ public void cacheClear() { statusManager.cacheClear(); + fileManager.clearPngjCache(); } public void setCurrentModelID(String id) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-09-22 15:53:57
|
Revision: 17575 http://jmol.svn.sourceforge.net/jmol/?rev=17575&view=rev Author: hansonr Date: 2012-09-22 15:53:50 +0000 (Sat, 22 Sep 2012) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-09-22 15:48:44 UTC (rev 17574) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-09-22 15:53:50 UTC (rev 17575) @@ -4044,17 +4044,17 @@ * * Sequence is as follows: * - * 1) RepaintManager.refresh() checks flags and then calls Viewer.repaint() 2) - * Viewer.repaint() invokes display.repaint(), provided display is not null - * (headless) 3) The system responds with an invocation of - * Jmol.update(Graphics g), which we are routing through Jmol.paint(Graphics - * g). 4) Jmol.update invokes Viewer.setScreenDimension(size), which makes the - * necessary changes in parameters for any new window size. 5) Jmol.update - * invokes Viewer.renderScreenImage(g, size, rectClip) 6) - * Viewer.renderScreenImage checks object visibility, invokes render1 to do + * 1) RepaintManager.refresh() checks flags and then calls Viewer.repaint() + * 2) Viewer.repaint() invokes display.repaint(), provided display is not null + * (headless) + * 3) The system responds with an invocation of Jmol.update(Graphics g), which we are routing through Jmol.paint(Graphics g). + * 4) Jmol.update invokes Viewer.setScreenDimension(size), which makes the + * necessary changes in parameters for any new window size. + * 5) Jmol.update invokes Viewer.renderScreenImage(g, size, rectClip) + * 6) Viewer.renderScreenImage checks object visibility, invokes render1 to do * the actual creation of the image pixel map and send it to the screen, and - * then invokes repaintView() 7) Viewer.repaintView() invokes - * RepaintManager.repaintDone(), to clear the flags and then use notify() to + * then invokes repaintView() + * 7) Viewer.repaintView() invokes RepaintManager.repaintDone(), to clear the flags and then use notify() to * release any threads holding on wait(). * * @param mode This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-09-26 07:42:31
|
Revision: 17581 http://jmol.svn.sourceforge.net/jmol/?rev=17581&view=rev Author: hansonr Date: 2012-09-26 07:42:25 +0000 (Wed, 26 Sep 2012) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-09-26 07:03:49 UTC (rev 17580) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-09-26 07:42:25 UTC (rev 17581) @@ -4081,7 +4081,8 @@ * @j2sNative * if ((mode == 2 || mode == 7) && typeof Jmol != "undefined") { * this.transformManager.finalizeTransformParameters(); - * Jmol.refresh(this.htmlName, mode, strWhy, + * if (Jmol._refresh) + * Jmol._refresh(this.htmlName, mode, strWhy, * [this.transformManager.fixedRotationCenter, * this.transformManager.getRotationQuaternion(), * this.transformManager.xTranslationFraction, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-01-02 14:29:02
|
Revision: 17838 http://jmol.svn.sourceforge.net/jmol/?rev=17838&view=rev Author: hansonr Date: 2013-01-02 14:28:55 +0000 (Wed, 02 Jan 2013) Log Message: ----------- JSmol not allowing frank off Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2012-12-31 22:50:00 UTC (rev 17837) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-01-02 14:28:55 UTC (rev 17838) @@ -183,7 +183,7 @@ private Object display; private GData gdata; private JmolAdapter modelAdapter; - public boolean isJS2D, isJS3D; + public boolean isJS, isJS2D, isJS3D; public enum ACCESS { NONE, READSPT, ALL } @@ -437,6 +437,7 @@ platform = (String) o; isJS3D = (platform.indexOf(".awtjs.") >= 0); isJS2D = (platform.indexOf("2d") >= 0); + isJS = (isJS2D || isJS3D); o = Interface.getInterface(platform); } apiPlatform = (ApiPlatform) o; @@ -7261,7 +7262,7 @@ } public void showString(String str, boolean isPrint) { - if (isScriptQueued && (!isSilent || isPrint) && !isSingleThreaded) + if (isScriptQueued && (!isSilent || isPrint) && !isJS) Logger.warn(str); // warn here because we still want to be be able to turn this off scriptEcho(str); } @@ -7824,7 +7825,7 @@ public boolean getShowFrank() { if (isPreviewOnly || isApplet && creatingImage) return false; - return (isSignedApplet && !isSignedAppletLocal || frankOn); + return (!isJS && isSignedApplet && !isSignedAppletLocal || frankOn); } public boolean isSignedApplet() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-01-08 00:44:27
|
Revision: 17848 http://jmol.svn.sourceforge.net/jmol/?rev=17848&view=rev Author: hansonr Date: 2013-01-08 00:44:19 +0000 (Tue, 08 Jan 2013) Log Message: ----------- preliminary JavaScript refactoring for PNG, PNGJ, JMOL file creation. Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-01-07 18:31:47 UTC (rev 17847) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-01-08 00:44:19 UTC (rev 17848) @@ -4521,8 +4521,7 @@ type = type.toLowerCase(); if (!Parser.isOneOf(type, "jpg;jpeg;jpg64;jpeg64")) try { - c = (JmolImageCreatorInterface) Interface - .getOptionInterface("export.image.ImageCreator"); + c = getImageCreator(); } catch (Error er) { // unsigned applet will not have this interface // and thus will not use os or filename @@ -8966,8 +8965,7 @@ return "no"; JmolImageCreatorInterface c; try { - c = (JmolImageCreatorInterface) Interface - .getOptionInterface("export.image.ImageCreator"); + c = getImageCreator(); c.setViewer(this, privateKey); return c.clipImage(text); } catch (Error er) { @@ -9166,8 +9164,7 @@ quality); if (err == null) { // application can do it itself or allow Jmol to do it here - JmolImageCreatorInterface c = (JmolImageCreatorInterface) Interface - .getOptionInterface(isJS2D ? "exportjs.JSImageCreator" : "export.image.AwtImageCreator"); + JmolImageCreatorInterface c = getImageCreator(); c.setViewer(this, privateKey); err = c.createImage(fileName, type, text, bytes, scripts, null, quality); if (err instanceof String) @@ -9188,6 +9185,11 @@ return ("CANCELED".equals(err) ? null : err); } + private JmolImageCreatorInterface getImageCreator() { + return (JmolImageCreatorInterface) Interface + .getOptionInterface(isJS2D ? "exportjs.JSImageCreator" : "export.image.AwtImageCreator"); + } + private String getFileNameFromDialog(String fileName, int quality) { if (fileName == null || isKiosk) return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-02-06 15:34:00
|
Revision: 17913 http://jmol.svn.sourceforge.net/jmol/?rev=17913&view=rev Author: hansonr Date: 2013-02-06 15:33:53 +0000 (Wed, 06 Feb 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-02-06 15:33:01 UTC (rev 17912) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-02-06 15:33:53 UTC (rev 17913) @@ -1982,7 +1982,7 @@ } } else if (type.equals("Jmol")) { cmd = "load "; - } else if (type.equals(".Cube")) { + } else if (type.equals("Cube")) { cmd = "isosurface sign red blue "; } else if (type.equals("PyMOL")) { cmd = "zap;load SYNC " + Escape.escapeStr(fileName) + " filter 'DORESIZE'"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-02-06 15:35:36
|
Revision: 17914 http://jmol.svn.sourceforge.net/jmol/?rev=17914&view=rev Author: hansonr Date: 2013-02-06 15:35:27 +0000 (Wed, 06 Feb 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-02-06 15:33:53 UTC (rev 17913) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-02-06 15:35:27 UTC (rev 17914) @@ -1966,9 +1966,14 @@ fileName = "file://" + (fileName.startsWith("/") ? "" : "/") + fileName; String cmd = null; - if (fileName.endsWith("jvxl")) + if (fileName.endsWith("jvxl")) { cmd = "isosurface "; - else if (!fileName.endsWith(".spt")) { + } else if (fileName.endsWith(".pse")) { + cmd = "zap;load SYNC " + Escape.escapeStr(fileName) + + " filter 'DORESIZE'"; + return; + } + if (!fileName.endsWith(".spt")) { String type = fileManager.getFileTypeName(fileName); if (type == null) { type = JmolBinary @@ -1984,9 +1989,6 @@ cmd = "load "; } else if (type.equals("Cube")) { cmd = "isosurface sign red blue "; - } else if (type.equals("PyMOL")) { - cmd = "zap;load SYNC " + Escape.escapeStr(fileName) + " filter 'DORESIZE'"; - return; } else if (!type.equals("spt")) { cmd = global.defaultDropScript; cmd = TextFormat.simpleReplace(cmd, "%FILE", fileName); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-02-27 23:43:10
|
Revision: 17954 http://jmol.svn.sourceforge.net/jmol/?rev=17954&view=rev Author: hansonr Date: 2013-02-27 23:43:03 +0000 (Wed, 27 Feb 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-02-27 19:10:09 UTC (rev 17953) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-02-27 23:43:03 UTC (rev 17954) @@ -4644,7 +4644,7 @@ format = global.pubChemFormat; String fl = f.toLowerCase(); int fi = Parser.parseInt(f); - if (fi == Integer.MIN_VALUE) { + if (fi != Integer.MIN_VALUE) { f = "cid/" + fi; } else { if (fl.startsWith("smiles:")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-03-10 02:04:12
|
Revision: 17966 http://jmol.svn.sourceforge.net/jmol/?rev=17966&view=rev Author: hansonr Date: 2013-03-10 02:04:06 +0000 (Sun, 10 Mar 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-03-10 02:03:47 UTC (rev 17965) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-03-10 02:04:06 UTC (rev 17966) @@ -603,7 +603,7 @@ } public void setDisplay(Object canvas) { - // used in JavaScript when a canvas is resized + // used by JSmol/HTML5 when a canvas is resized display = canvas; apiPlatform.setViewer(this, canvas); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-04-01 12:18:05
|
Revision: 18052 http://sourceforge.net/p/jmol/code/18052 Author: hansonr Date: 2013-04-01 12:18:02 +0000 (Mon, 01 Apr 2013) Log Message: ----------- openFile for scriptless JSmol Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-04-01 12:17:02 UTC (rev 18051) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-04-01 12:18:02 UTC (rev 18052) @@ -1965,10 +1965,8 @@ /** * - * @j2sIgnore + * for JmolSimpleViewer -- external applications only (and no-script JavaScript) * - * for JmolSimpleViewer -- external applications only - * * @param fileName * @return null or error */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-04-28 17:19:59
|
Revision: 18180 http://sourceforge.net/p/jmol/code/18180 Author: hansonr Date: 2013-04-28 17:19:54 +0000 (Sun, 28 Apr 2013) Log Message: ----------- test suite fails Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-04-28 16:49:59 UTC (rev 18179) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-04-28 17:19:54 UTC (rev 18180) @@ -472,7 +472,7 @@ display = info.get("display"); isSingleThreaded = apiPlatform.isSingleThreaded(); noGraphicsAllowed = (display == null && checkOption2("noGraphics", "-n")); - haveDisplay = (!noGraphicsAllowed && !isHeadless() && !checkOption2( + haveDisplay = (display != null && !noGraphicsAllowed && !isHeadless() && !checkOption2( "isDataOnly", "\0")); if (haveDisplay) { mustRender = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-05-21 14:02:22
|
Revision: 18239 http://sourceforge.net/p/jmol/code/18239 Author: hansonr Date: 2013-05-21 14:02:18 +0000 (Tue, 21 May 2013) Log Message: ----------- viewer haveDisplay not set properly for test suite. Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-05-21 13:39:33 UTC (rev 18238) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-05-21 14:02:18 UTC (rev 18239) @@ -471,9 +471,10 @@ apiPlatform = (ApiPlatform) o; display = info.get("display"); isSingleThreaded = apiPlatform.isSingleThreaded(); - noGraphicsAllowed = (display == null && checkOption2("noGraphics", "-n")); + noGraphicsAllowed = checkOption2("noGraphics", "-n"); haveDisplay = (display != null && !noGraphicsAllowed && !isHeadless() && !checkOption2( "isDataOnly", "\0")); + noGraphicsAllowed &= (display == null); if (haveDisplay) { mustRender = true; multiTouch = checkOption2("multiTouch", "-multitouch"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-07 06:44:07
|
Revision: 18918 http://sourceforge.net/p/jmol/code/18918 Author: hansonr Date: 2013-11-07 06:44:03 +0000 (Thu, 07 Nov 2013) Log Message: ----------- oops -- app console broken earlier today Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-11-06 19:58:53 UTC (rev 18917) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-11-07 06:44:03 UTC (rev 18918) @@ -8007,9 +8007,9 @@ } } } + if (appConsole != null) + appConsole.start(this); } - if (appConsole != null) - appConsole.start(this); scriptEditor = (isJS || appConsole == null ? null : appConsole .getScriptEditor()); return appConsole; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2014-01-24 16:51:28
|
Revision: 19211 http://sourceforge.net/p/jmol/code/19211 Author: hansonr Date: 2014-01-24 16:51:21 +0000 (Fri, 24 Jan 2014) Log Message: ----------- JSV work Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-01-24 02:23:31 UTC (rev 19210) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-01-24 16:51:21 UTC (rev 19211) @@ -4362,6 +4362,23 @@ } } + /** + * File has been loaded or model has been changed or atom picked. + * This is a call to Jmol.View for view sets (new in Jmol 14.1.8) + * + * @param imodel + * @param iatom + * + */ + private void updateJSView(int imodel, int iatom) { + /** + * @j2sNative + * + * this.applet && this.applet._viewSet != null && Jmol.updateView(this.applet, imodel, iatom); + * + */ + {} + } private boolean updateWindow(int width, int height) { //System.out.println("Viewer updateWindow " + width + " " + height); if (!refreshing || creatingImage) @@ -5235,6 +5252,8 @@ currentFrame, entryName); if (doHaveJDX()) getJSV().setModel(modelIndex); + if (isJS) + updateJSView(modelIndex, -1); } // interaction with JSpecView @@ -5416,8 +5435,13 @@ setStatusFrameChanged(false, false); statusManager.setFileLoadStatus(fullPathName, fileName, modelName, strError, ptLoad.getCode(), doCallback, isAsync); - if (doCallback && doHaveJDX()) - getJSV().setModel(getCurrentModelIndex()); + if (doCallback) { + if(doHaveJDX()) + getJSV().setModel(getCurrentModelIndex()); + if (isJS) + updateJSView(getCurrentModelIndex(), -2); + } + } public String getZapName() { @@ -5541,6 +5565,7 @@ if (syncMode != StatusManager.SYNC_DRIVER || !doHaveJDX()) return; getJSV().atomPicked(atomIndex); + updateJSView(getAtomModelIndex(atomIndex), atomIndex); } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2014-02-01 16:35:13
|
Revision: 19242 http://sourceforge.net/p/jmol/code/19242 Author: hansonr Date: 2014-02-01 16:35:08 +0000 (Sat, 01 Feb 2014) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-02-01 16:33:57 UTC (rev 19241) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-02-01 16:35:08 UTC (rev 19242) @@ -1823,6 +1823,7 @@ selectionManager.invertSelection(); } + @Override public BS getSelectionSet(boolean includeDeleted) { return selectionManager.getSelectionSet(includeDeleted); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2014-02-03 04:24:40
|
Revision: 19253 http://sourceforge.net/p/jmol/code/19253 Author: hansonr Date: 2014-02-03 04:24:37 +0000 (Mon, 03 Feb 2014) Log Message: ----------- better implementation of Info.menuFile Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-02-03 04:22:55 UTC (rev 19252) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-02-03 04:24:37 UTC (rev 19253) @@ -5085,6 +5085,7 @@ return jmolpopup.jpiGetMenuAsObject(); } + @Override public void setMenu(String fileOrText, boolean isFile) { if (isFile) Logger.info("Setting menu " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2014-02-10 03:50:13
|
Revision: 19301 http://sourceforge.net/p/jmol/code/19301 Author: hansonr Date: 2014-02-10 03:50:08 +0000 (Mon, 10 Feb 2014) Log Message: ----------- adds Jmol.extend("viewer") Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-02-10 02:54:20 UTC (rev 19300) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2014-02-10 03:50:08 UTC (rev 19301) @@ -186,6 +186,17 @@ @J2SIgnoreImport( { Runtime.class }) public class Viewer extends JmolViewer implements AtomDataServer, PlatformViewer { + static { + /** + * @j2sNative + * + * self.Jmol && Jmol.extend && Jmol.extend("viewer", org.jmol.viewer.Viewer.prototype); + * + */ + {} + } + + @Override protected void finalize() throws Throwable { if (Logger.debugging) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |