From: <ha...@us...> - 2008-09-27 16:17:44
|
Revision: 9945 http://jmol.svn.sourceforge.net/jmol/?rev=9945&view=rev Author: hansonr Date: 2008-09-27 16:17:40 +0000 (Sat, 27 Sep 2008) Log Message: ----------- version=11.6.RC17_dev # bug fix: drag/drop not enabled on consoles Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/applet/Console.java branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_6/Jmol/src/org/openscience/jmol/app/ScriptWindow.java Modified: branches/v11_6/Jmol/src/org/jmol/applet/Console.java =================================================================== --- branches/v11_6/Jmol/src/org/jmol/applet/Console.java 2008-09-27 01:20:44 UTC (rev 9944) +++ branches/v11_6/Jmol/src/org/jmol/applet/Console.java 2008-09-27 16:17:40 UTC (rev 9945) @@ -191,6 +191,8 @@ private void setupInput() { input.setLineWrap(true); input.setWrapStyleWord(true); + input.setDragEnabled(true); + output.setDragEnabled(true); //input.setText("Input a command in the box below or select a menu item from above."); Keymap map = input.getKeymap(); @@ -203,6 +205,7 @@ private void setupOutput() { output.setEditable(false); + output.setDragEnabled(true); // output.setLineWrap(true); // output.setWrapStyleWord(true); StyleConstants.setBold(attributesCommand, true); Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2008-09-27 01:20:44 UTC (rev 9944) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2008-09-27 16:17:40 UTC (rev 9945) @@ -3,6 +3,7 @@ version=11.6.RC17_dev +# bug fix: drag/drop not enabled on consoles # bug fix: Jmol state command "calculate surfaceDistance WITHIN ({...})" not passing compiler # bug fix: Swing antialiasDisplay broken due to setTransparentBackground debugging # bug fix: trajectories not enabled Modified: branches/v11_6/Jmol/src/org/openscience/jmol/app/ScriptWindow.java =================================================================== --- branches/v11_6/Jmol/src/org/openscience/jmol/app/ScriptWindow.java 2008-09-27 01:20:44 UTC (rev 9944) +++ branches/v11_6/Jmol/src/org/openscience/jmol/app/ScriptWindow.java 2008-09-27 16:17:40 UTC (rev 9945) @@ -78,6 +78,7 @@ void layoutWindow(Container container) { console = new ConsoleTextPane(this); console.setPrompt(); + console.setDragEnabled(true); JScrollPane consolePane = new JScrollPane(console); JPanel buttonPanel = new JPanel(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2008-10-24 19:15:39
|
Revision: 10140 http://jmol.svn.sourceforge.net/jmol/?rev=10140&view=rev Author: hansonr Date: 2008-10-24 19:15:34 +0000 (Fri, 24 Oct 2008) Log Message: ----------- version=11.6.2_dev # code: ScriptWindow public: sendConsoleEcho,sendConsoleMessage,notifyScriptStart,notifyScriptTermination Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_6/Jmol/src/org/openscience/jmol/app/ScriptWindow.java Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2008-10-24 19:06:13 UTC (rev 10139) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2008-10-24 19:15:34 UTC (rev 10140) @@ -3,6 +3,8 @@ version=11.6.2_dev +# code: ScriptWindow public: sendConsoleEcho,sendConsoleMessage,notifyScriptStart,notifyScriptTermination + # ----------------------------------------------------------------------------- version=11.6.1 Modified: branches/v11_6/Jmol/src/org/openscience/jmol/app/ScriptWindow.java =================================================================== --- branches/v11_6/Jmol/src/org/openscience/jmol/app/ScriptWindow.java 2008-10-24 19:06:13 UTC (rev 10139) +++ branches/v11_6/Jmol/src/org/openscience/jmol/app/ScriptWindow.java 2008-10-24 19:15:34 UTC (rev 10140) @@ -155,11 +155,11 @@ } boolean isError = false; - void setError(boolean TF) { + private void setError(boolean TF) { isError = TF; } - void sendConsoleMessage(String strStatus) { + public void sendConsoleMessage(String strStatus) { if (strStatus == null) { console.clearContent(); console.outputStatus(""); @@ -173,12 +173,12 @@ } } - void notifyScriptStart() { + public void notifyScriptStart() { runButton.setEnabled(true); haltButton.setEnabled(true); } - void notifyScriptTermination() { + public void notifyScriptTermination() { runButton.setEnabled(true); haltButton.setEnabled(false); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2008-11-27 15:46:59
|
Revision: 10381 http://jmol.svn.sourceforge.net/jmol/?rev=10381&view=rev Author: hansonr Date: 2008-11-27 15:46:56 +0000 (Thu, 27 Nov 2008) Log Message: ----------- version=11.6.8 (one more for version) # bug fix: write image CLIPBOARD broken Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/applet/Jmol.java branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_6/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: branches/v11_6/Jmol/src/org/jmol/applet/Jmol.java =================================================================== --- branches/v11_6/Jmol/src/org/jmol/applet/Jmol.java 2008-11-27 13:17:44 UTC (rev 10380) +++ branches/v11_6/Jmol/src/org/jmol/applet/Jmol.java 2008-11-27 15:46:56 UTC (rev 10381) @@ -1052,30 +1052,35 @@ return ""; } - public String createImage(String file, String type, Object text_or_bytes, + /** + * + * @param fileName + * @param type + * @param text_or_bytes + * @param quality + * @return null (canceled) or a message starting with OK or an error message + */ + public String createImage(String fileName, String type, Object text_or_bytes, int quality) { - String err = "OK"; - if (file == null) { - if (jvm12 != null) - jvm12.clipImage(); - } else if (file.equalsIgnoreCase("CLIPBOARD")) { - if (jvm12 != null) - jvm12.clipImage(); - } else if (isSigned) { + boolean isImage = (quality != Integer.MIN_VALUE); + if (isSigned) { if (jvm12 != null) { + if (isImage && (fileName == null || fileName.equalsIgnoreCase("CLIPBOARD"))) { + jvm12.clipImage(); + return "OK"; + } try { - return jvm12.createImage(file, type, text_or_bytes, quality); + return jvm12.createImage(fileName, type, text_or_bytes, quality); } catch (Exception e) { } - return GT._("File creation failed."); } - } else if (quality != Integer.MAX_VALUE) { + } else if (isImage) { return GT ._( "File creation by this applet is not allowed. For Base64 JPEG format, use {0}.", "jmolGetPropertyAsString('image')"); } - return (text_or_bytes instanceof String ? (String) text_or_bytes : err); + return GT._("File creation failed."); } public float[][] functionXY(String functionName, int nX, int nY) { Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2008-11-27 13:17:44 UTC (rev 10380) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2008-11-27 15:46:56 UTC (rev 10381) @@ -3,6 +3,7 @@ version=11.6.8 +# bug fix: write image CLIPBOARD broken # bug fix: select {*.ca} (phi < select(y; {*.ca}; y.resno = _x.resno + 1).phi) fails when atomExpression is ({}) # bug fix: applet compilation error not sent in termination message # bug fix: build javax package does not include Matrix4d.class, AxisAngle4d.class Modified: branches/v11_6/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- branches/v11_6/Jmol/src/org/openscience/jmol/app/Jmol.java 2008-11-27 13:17:44 UTC (rev 10380) +++ branches/v11_6/Jmol/src/org/openscience/jmol/app/Jmol.java 2008-11-27 15:46:56 UTC (rev 10381) @@ -1543,18 +1543,21 @@ } } - String createImageStatus(String file, String type, Object text_or_bytes, + String createImageStatus(String fileName, String type, Object text_or_bytes, int quality) { ImageCreator c = new ImageCreator(viewer); - String msg = c.createImage(file, type, text_or_bytes, quality); - if (msg != null) { - if (msg.startsWith("OK")) - return msg; - if (status != null) { - status.setStatus(1, GT._("IO Exception:")); - status.setStatus(2, msg); - } + if (quality != Integer.MIN_VALUE + && (fileName == null || fileName.equalsIgnoreCase("CLIPBOARD"))) { + c.clipImage(null); + return "OK"; } + String msg = c.createImage(fileName, type, text_or_bytes, quality); + if (msg == null || msg.startsWith("OK")) + return msg; + if (status != null) { + status.setStatus(1, GT._("IO Exception:")); + status.setStatus(2, msg); + } return msg; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-03-10 13:58:04
|
Revision: 10709 http://jmol.svn.sourceforge.net/jmol/?rev=10709&view=rev Author: hansonr Date: 2009-03-10 13:57:59 +0000 (Tue, 10 Mar 2009) Log Message: ----------- version=11.6.19_dev # bug fix: (application) measurement tool bar icon not toggling Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_6/Jmol/src/org/openscience/jmol/Properties/Jmol-resources.properties Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-03-08 16:33:38 UTC (rev 10708) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-03-10 13:57:59 UTC (rev 10709) @@ -3,6 +3,7 @@ version=11.6.19_dev +# bug fix: (application) measurement tool bar icon not toggling # bug fix: "color MO" if executed twice can crash Jmol # ----------------------------------------------------------------------------- Modified: branches/v11_6/Jmol/src/org/openscience/jmol/Properties/Jmol-resources.properties =================================================================== --- branches/v11_6/Jmol/src/org/openscience/jmol/Properties/Jmol-resources.properties 2009-03-08 16:33:38 UTC (rev 10708) +++ branches/v11_6/Jmol/src/org/openscience/jmol/Properties/Jmol-resources.properties 2009-03-10 13:57:59 UTC (rev 10709) @@ -216,6 +216,7 @@ home - - \ animateRewindScript animatePrevScript animateNextScript animateLastScript viewMeasurementTableImage=rulerButton.gif +viewMeasurementTableToggle=true rotateScriptImage=rotateButton.gif rotateScriptToggle=true rotateScriptToggleSelected=true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-04-09 14:46:57
|
Revision: 10785 http://jmol.svn.sourceforge.net/jmol/?rev=10785&view=rev Author: hansonr Date: 2009-04-09 14:46:54 +0000 (Thu, 09 Apr 2009) Log Message: ----------- version=11.6.21_dev # bug fix: (application) animation tooltips incorrect # bug fix: V3000 reader chokes on CHG=n and does not recognize MASS=n Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/adapter/readers/more/V3000Reader.java branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_6/Jmol/src/org/openscience/jmol/app/GuiMap.java Modified: branches/v11_6/Jmol/src/org/jmol/adapter/readers/more/V3000Reader.java =================================================================== --- branches/v11_6/Jmol/src/org/jmol/adapter/readers/more/V3000Reader.java 2009-04-09 14:40:10 UTC (rev 10784) +++ branches/v11_6/Jmol/src/org/jmol/adapter/readers/more/V3000Reader.java 2009-04-09 14:46:54 UTC (rev 10785) @@ -25,6 +25,7 @@ package org.jmol.adapter.readers.more; import org.jmol.adapter.smarter.*; +import org.jmol.api.JmolAdapter; import java.io.BufferedReader; @@ -96,15 +97,19 @@ atom.atomSerial = parseInt(tokens[2]); atom.elementSymbol = tokens[3]; atom.set(parseFloat(tokens[4]), parseFloat(tokens[5]), parseFloat(tokens[6])); - parseInt(); // discard aamap - while (true) { - String option = parseToken(); - if (option == null) + for (int j = 8; j < tokens.length; j++) { + String token = tokens[j]; + if (token.startsWith("CHG=")) { + int charge = parseInt(token, 4); + atom.formalCharge = (charge > 3 ? 4 - charge : charge); break; - if (option.startsWith("CHG=")) - atom.formalCharge = parseInt(option, 4); + } else if (token.startsWith("MASS=")) { + int isotope = parseInt(token, 5); + atom.elementNumber = (short) ((isotope << 7) + JmolAdapter + .getElementNumber(atom.elementSymbol)); + } } - atomSetCollection.addAtomWithMappedSerialNumber(atom); + atomSetCollection.addAtomWithMappedSerialNumber(atom); } readLine(); if (line == null || ! line.startsWith("M V30 END ATOM")) Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-04-09 14:40:10 UTC (rev 10784) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-04-09 14:46:54 UTC (rev 10785) @@ -3,6 +3,8 @@ version=11.6.21_dev +# bug fix: (application) animation tooltips incorrect +# bug fix: V3000 reader chokes on CHG=n and does not recognize MASS=n # bug fix: MOL files within ZIP files do not respect bonding. # (not fully fixed, but fixed when reading single MOL files from ZIP files) Modified: branches/v11_6/Jmol/src/org/openscience/jmol/app/GuiMap.java =================================================================== --- branches/v11_6/Jmol/src/org/openscience/jmol/app/GuiMap.java 2009-04-09 14:40:10 UTC (rev 10784) +++ branches/v11_6/Jmol/src/org/openscience/jmol/app/GuiMap.java 2009-04-09 14:46:54 UTC (rev 10785) @@ -41,153 +41,156 @@ Hashtable labels = null; private Hashtable setupLabels() { - String x; - Hashtable labels = new Hashtable(); - labels.put("macros", GT._("&Macros")); - labels.put("file", GT._("&File")); - labels.put("newwin", GT._("&New")); - labels.put("open", GT._("&Open")); - labels.put("openTip", GT._("Open a file.")); - labels.put("openurl", GT._("Open &URL")); - labels.put("script", GT._("Scrip&t...")); - labels.put("atomsetchooser", GT._("AtomSet&Chooser...")); - labels.put("saveas", GT._("&Save As...")); - labels.put("exportMenu", GT._("&Export")); - labels.put("export", GT._("Export &Image...")); - labels.put("exportTip", GT._("Save current view as an image.")); - labels.put("toweb", GT._("Export to &Web Page...")); - labels.put("towebTip", GT._("Export one or more views to a web page.")); - labels.put("povray", GT._("Render in POV-&Ray...")); - labels.put("povrayTip", GT._("Render in POV-Ray")); - labels.put("write", GT._("Write &State...")); - labels.put("writeTip", GT._("Save current view as a Jmol state script.")); - labels.put("print", GT._("&Print...")); - labels.put("printTip", GT._("Print view.")); - labels.put("close", GT._("&Close")); - labels.put("exit", GT._("E&xit")); - labels.put("recentFiles", GT._("Recent &Files...")); - labels.put("edit", GT._("&Edit")); - //labels.put("makecrystal", GT. _("Make crystal...")); - labels.put("selectall", GT._("Select &All")); - labels.put("deselectall", GT._("Deselect All")); - labels.put("copyImage", GT._("Copy &Image")); - labels.put("copyScript", GT._("Copy Script")); - labels.put("prefs", GT._("Pr&eferences...")); - labels.put("pasteClipboard", GT._("&Paste")); - labels.put("editSelectAllScript", GT._("Select &All")); - labels.put("selectMenu", GT._("&Select")); - labels.put("selectAllScript", GT._("&All")); - labels.put("selectNoneScript", GT._("&None")); - labels.put("selectHydrogenScript", GT._("Hydrogen")); - labels.put("selectCarbonScript", GT._("Carbon")); - labels.put("selectNitrogenScript", GT._("Nitrogen")); - labels.put("selectOxygenScript", GT._("Oxygen")); - labels.put("selectPhosphorusScript", GT._("Phosphorus")); - labels.put("selectSulfurScript", GT._("Sulfur")); - labels.put("selectAminoScript", GT._("Amino")); - labels.put("selectNucleicScript", GT._("Nucleic")); - labels.put("selectWaterScript", GT._("Water")); - labels.put("selectHeteroScript", GT._("Hetero")); - labels.put("display", GT._("&Display")); - labels.put("atomMenu", GT._("&Atom")); - labels.put("atomNoneScript", GT._("&None")); - labels.put("atom15Script", GT._("{0}% van der Waals", "15")); - labels.put("atom20Script", GT._("{0}% van der Waals", "20")); - labels.put("atom25Script", GT._("{0}% van der Waals", "25")); - labels.put("atom100Script", GT._("{0}% van der Waals","100")); - labels.put("bondMenu", GT._("&Bond")); - labels.put("bondNoneScript", GT._("&None")); - labels.put("bondWireframeScript", GT._("&Wireframe")); - labels.put("bond100Script", GT._("{0} \u00C5", "0.10")); - labels.put("bond150Script", GT._("{0} \u00C5", "0.15")); - labels.put("bond200Script", GT._("{0} \u00C5", "0.20")); - labels.put("labelMenu", GT._("&Label")); - labels.put("labelNoneScript", GT._("&None")); - labels.put("labelSymbolScript", GT._("&Symbol")); - labels.put("labelNameScript", GT._("&Name")); - labels.put("labelNumberScript", GT._("&Number")); - labels.put("labelCenteredScript", GT._("&Centered")); - labels.put("labelUpperRightScript", GT._("&Upper right")); - labels.put("vectorMenu", GT._("&Vector")); - labels.put("vectorOffScript", GT._("&None")); - labels.put("vectorOnScript", GT._("&On")); - labels.put("vector3Script", GT._("{0} pixels", "3" )); - labels.put("vector005Script", GT._("{0} \u00C5", "0.05" )); - labels.put("vector01Script", GT._("{0} \u00C5", "0.1" )); - labels.put("vectorScale02Script", GT._("Scale {0}", "0.2" )); - labels.put("vectorScale05Script", GT._("Scale {0}", "0.5" )); - labels.put("vectorScale1Script", GT._("Scale {0}", "1" )); - labels.put("vectorScale2Script", GT._("Scale {0}", "2" )); - labels.put("vectorScale5Script", GT._("Scale {0}", "5" )); - labels.put("zoomMenu", GT._("&Zoom")); - labels.put("zoom100Script", GT._("{0}%", "100" )); - labels.put("zoom150Script", GT._("{0}%", "150" )); - labels.put("zoom200Script", GT._("{0}%", "200" )); - labels.put("zoom400Script", GT._("{0}%", "400" )); - labels.put("zoom800Script", GT._("{0}%", "800" )); - labels.put("perspectiveCheck", GT._("&Perspective Depth")); - labels.put("axesCheck", GT._("A&xes")); - labels.put("boundboxCheck", GT._("B&ounding Box")); - labels.put("hydrogensCheck", GT._("&Hydrogens")); - labels.put("vectorsCheck", GT._("V&ectors")); - labels.put("measurementsCheck", GT._("&Measurements")); - labels.put("view", GT._("&View")); - labels.put("front", GT._("&Front")); - labels.put("top", GT._("&Top")); - labels.put("bottom", GT._("&Bottom")); - labels.put("right", GT._("&Right")); - labels.put("left", GT._("&Left")); - labels.put("transform", GT._("Tr&ansform...")); - labels.put("definecenter", GT._("Define &Center")); - labels.put("tools", GT._("&Tools")); - labels.put("viewMeasurementTable", GT._("&Measurements")+"..."); - labels.put("viewMeasurementTableTip", GT._("Click atoms to measure distances")); - labels.put("distanceUnitsMenu", GT._("Distance &Units")); - labels.put("distanceNanometersScript", GT._("&Nanometers 1E-9")); - labels.put("distanceAngstromsScript", GT._("&Angstroms 1E-10")); - labels.put("distancePicometersScript", GT._("&Picometers 1E-12")); - labels.put("animateMenu", GT._("&Animate...")); - labels.put("vibrateMenu", GT._("&Vibrate...")); - labels.put("graph", GT._("&Graph...")); - labels.put("chemicalShifts", GT._("Calculate chemical &shifts...")); - labels.put("crystprop", GT._("&Crystal Properties")); - labels.put("animateOnceScript", GT._("&Once")); - labels.put("animateLoopScript", GT._("&Loop")); - labels.put("animatePalindromeScript", GT._("P&alindrome")); - labels.put("animateStopScript", GT._("&Stop animation")); - labels.put("animateRewindScript", x = GT._("&Rewind to first frame")); - labels.put("animateRewindScriptTip",x); - labels.put("animateNextScript", x = GT._("Go to &next frame")); - labels.put("animateNextScriptTip", x); - labels.put("animatePrevScript", x = GT._("Go to &previous frame")); - labels.put("animatePrevScriptTip", x); - labels.put("animateLastScript", x = GT._("Go to &last frame")); - labels.put("animateLastScriptTip", x); - labels.put("vibrateStartScript", GT._("Start &vibration")); - labels.put("vibrateStopScript", GT._("&Stop vibration")); - labels.put("vibrateRewindScript", GT._("&First frequency")); - labels.put("vibrateNextScript", GT._("&Next frequency")); - labels.put("vibratePrevScript", GT._("&Previous frequency")); - labels.put("help", GT._("&Help")); - labels.put("about", GT._("About Jmol")); - labels.put("uguide", GT._("User Guide")); - labels.put("whatsnew", GT._("What's New")); - labels.put("console", GT._("Jmol Java &Console")); - labels.put("Prefs.showHydrogens", GT._("Hydrogens")); - labels.put("Prefs.showMeasurements", GT._("Measurements")); - labels.put("Prefs.perspectiveDepth", GT._("Perspective Depth")); - labels.put("Prefs.showAxes", GT._("Axes")); - labels.put("Prefs.showBoundingBox", GT._("Bounding Box")); - labels.put("Prefs.axesOrientationRasmol", GT._("RasMol/Chime compatible axes orientation/rotations")); - labels.put("Prefs.openFilePreview", GT._("File Preview (requires restarting Jmol)")); - labels.put("Prefs.clearConsoleButton", GT._("Clear console button (requires restarting Jmol)")); - labels.put("Prefs.isLabelAtomColor", GT._("Use Atom Color")); - labels.put("Prefs.isBondAtomColor", GT._("Use Atom Color")); - labels.put("rotateScriptTip", GT._("Rotate molecule.")); - labels.put("pickScriptTip", GT._("Select a set of atoms using SHIFT-LEFT- DRAG.")); - labels.put("homeTip", GT._("Return molecule to home position.")); - - return labels; + Hashtable labels = new Hashtable(); + labels.put("macros", GT._("&Macros")); + labels.put("file", GT._("&File")); + labels.put("newwin", GT._("&New")); + labels.put("open", GT._("&Open")); + labels.put("openTip", GT._("Open a file.")); + labels.put("openurl", GT._("Open &URL")); + labels.put("script", GT._("Scrip&t...")); + labels.put("atomsetchooser", GT._("AtomSet&Chooser...")); + labels.put("saveas", GT._("&Save As...")); + labels.put("exportMenu", GT._("&Export")); + labels.put("export", GT._("Export &Image...")); + labels.put("exportTip", GT._("Save current view as an image.")); + labels.put("toweb", GT._("Export to &Web Page...")); + labels.put("towebTip", GT._("Export one or more views to a web page.")); + labels.put("povray", GT._("Render in POV-&Ray...")); + labels.put("povrayTip", GT._("Render in POV-Ray")); + labels.put("write", GT._("Write &State...")); + labels.put("writeTip", GT._("Save current view as a Jmol state script.")); + labels.put("print", GT._("&Print...")); + labels.put("printTip", GT._("Print view.")); + labels.put("close", GT._("&Close")); + labels.put("exit", GT._("E&xit")); + labels.put("recentFiles", GT._("Recent &Files...")); + labels.put("edit", GT._("&Edit")); + // labels.put("makecrystal", GT. _("Make crystal...")); + labels.put("selectall", GT._("Select &All")); + labels.put("deselectall", GT._("Deselect All")); + labels.put("copyImage", GT._("Copy &Image")); + labels.put("copyScript", GT._("Copy Script")); + labels.put("prefs", GT._("Pr&eferences...")); + labels.put("pasteClipboard", GT._("&Paste")); + labels.put("editSelectAllScript", GT._("Select &All")); + labels.put("selectMenu", GT._("&Select")); + labels.put("selectAllScript", GT._("&All")); + labels.put("selectNoneScript", GT._("&None")); + labels.put("selectHydrogenScript", GT._("Hydrogen")); + labels.put("selectCarbonScript", GT._("Carbon")); + labels.put("selectNitrogenScript", GT._("Nitrogen")); + labels.put("selectOxygenScript", GT._("Oxygen")); + labels.put("selectPhosphorusScript", GT._("Phosphorus")); + labels.put("selectSulfurScript", GT._("Sulfur")); + labels.put("selectAminoScript", GT._("Amino")); + labels.put("selectNucleicScript", GT._("Nucleic")); + labels.put("selectWaterScript", GT._("Water")); + labels.put("selectHeteroScript", GT._("Hetero")); + labels.put("display", GT._("&Display")); + labels.put("atomMenu", GT._("&Atom")); + labels.put("atomNoneScript", GT._("&None")); + labels.put("atom15Script", GT._("{0}% van der Waals", "15")); + labels.put("atom20Script", GT._("{0}% van der Waals", "20")); + labels.put("atom25Script", GT._("{0}% van der Waals", "25")); + labels.put("atom100Script", GT._("{0}% van der Waals", "100")); + labels.put("bondMenu", GT._("&Bond")); + labels.put("bondNoneScript", GT._("&None")); + labels.put("bondWireframeScript", GT._("&Wireframe")); + labels.put("bond100Script", GT._("{0} \u00C5", "0.10")); + labels.put("bond150Script", GT._("{0} \u00C5", "0.15")); + labels.put("bond200Script", GT._("{0} \u00C5", "0.20")); + labels.put("labelMenu", GT._("&Label")); + labels.put("labelNoneScript", GT._("&None")); + labels.put("labelSymbolScript", GT._("&Symbol")); + labels.put("labelNameScript", GT._("&Name")); + labels.put("labelNumberScript", GT._("&Number")); + labels.put("labelCenteredScript", GT._("&Centered")); + labels.put("labelUpperRightScript", GT._("&Upper right")); + labels.put("vectorMenu", GT._("&Vector")); + labels.put("vectorOffScript", GT._("&None")); + labels.put("vectorOnScript", GT._("&On")); + labels.put("vector3Script", GT._("{0} pixels", "3")); + labels.put("vector005Script", GT._("{0} \u00C5", "0.05")); + labels.put("vector01Script", GT._("{0} \u00C5", "0.1")); + labels.put("vectorScale02Script", GT._("Scale {0}", "0.2")); + labels.put("vectorScale05Script", GT._("Scale {0}", "0.5")); + labels.put("vectorScale1Script", GT._("Scale {0}", "1")); + labels.put("vectorScale2Script", GT._("Scale {0}", "2")); + labels.put("vectorScale5Script", GT._("Scale {0}", "5")); + labels.put("zoomMenu", GT._("&Zoom")); + labels.put("zoom100Script", GT._("{0}%", "100")); + labels.put("zoom150Script", GT._("{0}%", "150")); + labels.put("zoom200Script", GT._("{0}%", "200")); + labels.put("zoom400Script", GT._("{0}%", "400")); + labels.put("zoom800Script", GT._("{0}%", "800")); + labels.put("perspectiveCheck", GT._("&Perspective Depth")); + labels.put("axesCheck", GT._("A&xes")); + labels.put("boundboxCheck", GT._("B&ounding Box")); + labels.put("hydrogensCheck", GT._("&Hydrogens")); + labels.put("vectorsCheck", GT._("V&ectors")); + labels.put("measurementsCheck", GT._("&Measurements")); + labels.put("view", GT._("&View")); + labels.put("front", GT._("&Front")); + labels.put("top", GT._("&Top")); + labels.put("bottom", GT._("&Bottom")); + labels.put("right", GT._("&Right")); + labels.put("left", GT._("&Left")); + labels.put("transform", GT._("Tr&ansform...")); + labels.put("definecenter", GT._("Define &Center")); + labels.put("tools", GT._("&Tools")); + labels.put("viewMeasurementTable", GT._("&Measurements") + "..."); + labels.put("viewMeasurementTableTip", GT + ._("Click atoms to measure distances")); + labels.put("distanceUnitsMenu", GT._("Distance &Units")); + labels.put("distanceNanometersScript", GT._("&Nanometers 1E-9")); + labels.put("distanceAngstromsScript", GT._("&Angstroms 1E-10")); + labels.put("distancePicometersScript", GT._("&Picometers 1E-12")); + labels.put("animateMenu", GT._("&Animate...")); + labels.put("vibrateMenu", GT._("&Vibrate...")); + labels.put("graph", GT._("&Graph...")); + labels.put("chemicalShifts", GT._("Calculate chemical &shifts...")); + labels.put("crystprop", GT._("&Crystal Properties")); + labels.put("animateOnceScript", GT._("&Once")); + labels.put("animateLoopScript", GT._("&Loop")); + labels.put("animatePalindromeScript", GT._("P&alindrome")); + labels.put("animateStopScript", GT._("&Stop animation")); + labels.put("animateRewindScript", GT._("&Rewind to first frame")); + labels.put("animateRewindScriptTip", GT._("Rewind to first frame")); + labels.put("animateNextScript", GT._("Go to &next frame")); + labels.put("animateNextScriptTip", GT._("Go to next frame")); + labels.put("animatePrevScript", GT._("Go to &previous frame")); + labels.put("animatePrevScriptTip", GT._("Go to previous frame")); + labels.put("animateLastScript", GT._("Go to &last frame")); + labels.put("animateLastScriptTip", GT._("Go to last frame")); + labels.put("vibrateStartScript", GT._("Start &vibration")); + labels.put("vibrateStopScript", GT._("&Stop vibration")); + labels.put("vibrateRewindScript", GT._("&First frequency")); + labels.put("vibrateNextScript", GT._("&Next frequency")); + labels.put("vibratePrevScript", GT._("&Previous frequency")); + labels.put("help", GT._("&Help")); + labels.put("about", GT._("About Jmol")); + labels.put("uguide", GT._("User Guide")); + labels.put("whatsnew", GT._("What's New")); + labels.put("console", GT._("Jmol Java &Console")); + labels.put("Prefs.showHydrogens", GT._("Hydrogens")); + labels.put("Prefs.showMeasurements", GT._("Measurements")); + labels.put("Prefs.perspectiveDepth", GT._("Perspective Depth")); + labels.put("Prefs.showAxes", GT._("Axes")); + labels.put("Prefs.showBoundingBox", GT._("Bounding Box")); + labels.put("Prefs.axesOrientationRasmol", GT + ._("RasMol/Chime compatible axes orientation/rotations")); + labels.put("Prefs.openFilePreview", GT + ._("File Preview (requires restarting Jmol)")); + labels.put("Prefs.clearConsoleButton", GT + ._("Clear console button (requires restarting Jmol)")); + labels.put("Prefs.isLabelAtomColor", GT._("Use Atom Color")); + labels.put("Prefs.isBondAtomColor", GT._("Use Atom Color")); + labels.put("rotateScriptTip", GT._("Rotate molecule.")); + labels.put("pickScriptTip", GT + ._("Select a set of atoms using SHIFT-LEFT- DRAG.")); + labels.put("homeTip", GT._("Return molecule to home position.")); + return labels; } String getLabel(String key) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pim...@us...> - 2009-04-18 16:33:23
|
Revision: 10820 http://jmol.svn.sourceforge.net/jmol/?rev=10820&view=rev Author: pimpimpim Date: 2009-04-18 16:33:17 +0000 (Sat, 18 Apr 2009) Log Message: ----------- bug fix: autoBond option in Preference menu was not writing to properties file in $HOME/.jmol Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_6/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-04-18 14:03:41 UTC (rev 10819) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-04-18 16:33:17 UTC (rev 10820) @@ -3,6 +3,7 @@ version=11.6.22_dev +# bug fix: autoBond option in Preference menu was not writing to properties file in $HOME/.jmol # bug fix: load file:///xxx.xxx (file:/// with file in root path) causes unrecoverable exception # bug fix: signed applet JmolAppletSigned0.jar does not include minimizer in internal jar index # bug fix: rotate -x n rotates wrong direction Modified: branches/v11_6/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java =================================================================== --- branches/v11_6/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java 2009-04-18 14:03:41 UTC (rev 10819) +++ branches/v11_6/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java 2009-04-18 16:33:17 UTC (rev 10820) @@ -344,6 +344,7 @@ c.weightx = 1.0; c.weighty = 1.0; + // Automatic calculation of bonds upon molecule load JPanel autobondPanel = new JPanel(); autobondPanel.setLayout(new BoxLayout(autobondPanel, BoxLayout.Y_AXIS)); autobondPanel.setBorder(new TitledBorder(GT._("Compute Bonds"))); @@ -359,14 +360,17 @@ abYes.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - viewer.setBooleanProperty("autoBond", true); + viewer.setBooleanProperty("autoBond", true); + currentProperties.put("autoBond", "" + "true"); } }); + abNo.setSelected(!viewer.getAutoBond()); abNo.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { viewer.setBooleanProperty("autoBond", false); + currentProperties.put("autoBond", "" + "false"); } }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-05-04 21:56:23
|
Revision: 10847 http://jmol.svn.sourceforge.net/jmol/?rev=10847&view=rev Author: hansonr Date: 2009-05-04 21:56:13 +0000 (Mon, 04 May 2009) Log Message: ----------- version=11.6.23_dev data "append" # bug fix: data "append" does not set model the way load "append" does # bug fix: application frame arrows do not work after loading multiple models Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/viewer/Eval.java branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_6/Jmol/src/org/openscience/jmol/Properties/Jmol-resources.properties Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Eval.java 2009-05-04 20:10:49 UTC (rev 10846) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Eval.java 2009-05-04 21:56:13 UTC (rev 10847) @@ -4132,7 +4132,14 @@ char newLine = viewer.getInlineChar(); if (dataString.length() > 0 && dataString.charAt(0) != newLine) newLine = '\0'; + int modelCount = viewer.getModelCount() + - (viewer.getFileName().equals("zapped") ? 1 : 0); + boolean appendNew = viewer.getAppendNew(); viewer.loadInline(dataString, newLine, isAppend); + if (isAppend && appendNew) { + viewer.setAnimationRange(-1, -1); + viewer.setCurrentModelIndex(modelCount); + } return; } if (isSyntaxCheck) Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-05-04 20:10:49 UTC (rev 10846) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-05-04 21:56:13 UTC (rev 10847) @@ -3,6 +3,8 @@ version=11.6.23_dev +# bug fix: data "append" does not set model the way load "append" does +# bug fix: application frame arrows do not work after loading multiple models # bug fix: isosurface incorrectly setting number of grid points for MEP surface map # ----------------------------------------------------------------------------- Modified: branches/v11_6/Jmol/src/org/openscience/jmol/Properties/Jmol-resources.properties =================================================================== --- branches/v11_6/Jmol/src/org/openscience/jmol/Properties/Jmol-resources.properties 2009-05-04 20:10:49 UTC (rev 10846) +++ branches/v11_6/Jmol/src/org/openscience/jmol/Properties/Jmol-resources.properties 2009-05-04 21:56:13 UTC (rev 10847) @@ -172,10 +172,10 @@ animateLoopScript=script inline "frame " + _firstFrame; anim mode loop; anim on animatePalindromeScript=script inline "frame " + _firstFrame; anim mode palindrome; anim on animateStopScript=anim off -animateRewindScript=script inline "frame " + _firstFrame +animateRewindScript=script inline "frame 0.0;frame " + _firstFrame animateNextScript=frame next animatePrevScript=frame prev -animateLastScript=frame last +animateLastScript=frame 0.0;frame last animateOnceScriptImage=playOnceButton.png animateLoopScriptImage=playLoopButton.png This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-06-28 14:21:48
|
Revision: 11142 http://jmol.svn.sourceforge.net/jmol/?rev=11142&view=rev Author: hansonr Date: 2009-06-28 13:33:32 +0000 (Sun, 28 Jun 2009) Log Message: ----------- version=11.7.45 FOR RELEASE # bug fix: dipole offsetside not working for molecular dipole (EVER!) Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/shapespecial/DipolesRenderer.java branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_6/Jmol/src/org/openscience/jmol/app/webexport/WebPanel.java Modified: branches/v11_6/Jmol/src/org/jmol/shapespecial/DipolesRenderer.java =================================================================== --- branches/v11_6/Jmol/src/org/jmol/shapespecial/DipolesRenderer.java 2009-06-28 13:31:02 UTC (rev 11141) +++ branches/v11_6/Jmol/src/org/jmol/shapespecial/DipolesRenderer.java 2009-06-28 13:33:32 UTC (rev 11142) @@ -75,23 +75,23 @@ private boolean transform(Dipole dipole) { Vector3f vector = dipole.vector; offset.set(vector); - if (dipole.center == null) { + if (dipole.center == null) { offset.scale(dipole.offsetAngstroms / dipole.dipoleValue); if (dipoleVectorScale < 0) offset.add(vector); - points[cylinderBase].set(dipole.origin); - points[cylinderBase].add(offset); + points[cylinderBase].set(dipole.origin); + points[cylinderBase].add(offset); } else { offset.scale(-0.5f * dipoleVectorScale); points[cylinderBase].set(dipole.center); - points[cylinderBase].add(offset); - if (dipole.offsetAngstroms != 0) { + points[cylinderBase].add(offset); + if (dipole.offsetAngstroms != 0) { offset.set(vector); offset.scale(dipole.offsetAngstroms / dipole.dipoleValue); - points[cylinderBase].add(offset); + points[cylinderBase].add(offset); } } - + points[cross].scaleAdd(dipoleVectorScale * crossOffset, vector, points[cylinderBase]); points[crossEnd].scaleAdd(dipoleVectorScale * (crossOffset + crossWidth), @@ -103,21 +103,20 @@ points[arrowHeadTip].scaleAdd(dipoleVectorScale, vector, points[cylinderBase]); - if (dipole.atoms[0] != null) { - if (modelSet.isAtomHidden(dipole.atoms[0].getAtomIndex())) - return false; - offset.set(points[center]); + if (dipole.atoms[0] != null + && modelSet.isAtomHidden(dipole.atoms[0].getAtomIndex())) + return false; + offset.set(points[center]); + offset.cross(offset, vector); + if (offset.length() == 0) { + offset.set(points[center].x + 0.2345f, points[center].y + 0.1234f, + points[center].z + 0.4321f); offset.cross(offset, vector); - if (offset.length() == 0) { - offset.set(points[center].x + 0.2345f, points[center].y + 0.1234f, - points[center].z + 0.4321f); - offset.cross(offset, vector); - } - offset.scale(dipole.offsetSide / offset.length()); - for (int i = 0; i < 6; i++) - points[i].add(offset); } + offset.scale(dipole.offsetSide / offset.length()); for (int i = 0; i < 6; i++) + points[i].add(offset); + for (int i = 0; i < 6; i++) viewer.transformPoint(points[i], screens[i]); viewer.transformPoint(points[cross], cross0); viewer.transformPoint(points[crossEnd], cross1); Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-06-28 13:31:02 UTC (rev 11141) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-06-28 13:33:32 UTC (rev 11142) @@ -1,8 +1,9 @@ # Developers: to add a description of changes you have made, # add it on a line starting with # below the "version=..." line -version=11.6.25_dev +version=11.6.25 +# bug fix: dipole offsetside not working for molecular dipole (EVER!) # bug fix: 2 pixels off in y for labels. Don't know why I thought that was necessary in Text.java::setBoxXY. # bug fix: dipoles cannot be colored by name # bug fix: dipole settings not accessible via wildcards Modified: branches/v11_6/Jmol/src/org/openscience/jmol/app/webexport/WebPanel.java =================================================================== --- branches/v11_6/Jmol/src/org/openscience/jmol/app/webexport/WebPanel.java 2009-06-28 13:31:02 UTC (rev 11141) +++ branches/v11_6/Jmol/src/org/openscience/jmol/app/webexport/WebPanel.java 2009-06-28 13:33:32 UTC (rev 11142) @@ -515,7 +515,7 @@ private static String copyBinaryFile(String fullPathName, String dataPath) { String name = fullPathName.substring(fullPathName.lastIndexOf('/') + 1); name = dataPath + "/" + name; - String gzname = name.concat(".gz"); + String gzname = name + ".gz"; File outFile = new File(name); File gzoutFile = new File(gzname); if (outFile.exists()) @@ -563,7 +563,7 @@ private static String writeFileBytes(String path, byte[] data) { try { if (data.length>=524288 && !path.endsWith("JmolApplet.jar") ){ //gzip it - path = path.concat(".gz"); + path += ".gz"; GZIPOutputStream gzFile = new GZIPOutputStream(new FileOutputStream(path)); gzFile.write(data); LogPanel.log(" ..." + GT._("compressing large data file to") + "\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |