From: <pau...@us...> - 2006-03-27 18:04:49
|
Revision: 4788 Author: pauldana Date: 2006-03-27 10:04:14 -0800 (Mon, 27 Mar 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4788&view=rev Log Message: ----------- testing a simple commit... changed 'private' member variable from Jmol to 'protected' for use with a custom class that extends Jmol. Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-03-27 17:40:31 UTC (rev 4787) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-03-27 18:04:14 UTC (rev 4788) @@ -71,7 +71,7 @@ public AtomSetChooser atomSetChooser; private ExecuteScriptAction executeScriptAction; protected JFrame frame; - private static File currentDir; + protected static File currentDir; FileChooser openChooser; private JFileChooser saveChooser; private FileTyper fileTyper; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2006-03-27 18:16:17
|
Revision: 4789 Author: pauldana Date: 2006-03-27 10:15:43 -0800 (Mon, 27 Mar 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4789&view=rev Log Message: ----------- testing a simple commit... changed 'private' member variable from Jmol to 'protected' for use with a custom class that extends Jmol. Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-03-27 18:04:14 UTC (rev 4788) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-03-27 18:15:43 UTC (rev 4789) @@ -71,7 +71,7 @@ public AtomSetChooser atomSetChooser; private ExecuteScriptAction executeScriptAction; protected JFrame frame; - protected static File currentDir; + protected static File currentDir; FileChooser openChooser; private JFileChooser saveChooser; private FileTyper fileTyper; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mig...@us...> - 2006-03-28 13:18:00
|
Revision: 4831 Author: migueljmol Date: 2006-03-28 05:08:27 -0800 (Tue, 28 Mar 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=4831&view=rev Log Message: ----------- r4788 private -> protected for jmol-pfaat Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-03-28 12:58:56 UTC (rev 4830) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-03-28 13:08:27 UTC (rev 4831) @@ -71,7 +71,7 @@ public AtomSetChooser atomSetChooser; private ExecuteScriptAction executeScriptAction; protected JFrame frame; - private static File currentDir; + protected static File currentDir; FileChooser openChooser; private JFileChooser saveChooser; private FileTyper fileTyper; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-09-25 20:13:04
|
Revision: 5720 http://svn.sourceforge.net/jmol/?rev=5720&view=rev Author: hansonr Date: 2006-09-25 13:12:58 -0700 (Mon, 25 Sep 2006) Log Message: ----------- D options back in -- but I can't get them to work on Windows. Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-25 19:47:37 UTC (rev 5719) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-25 20:12:58 UTC (rev 5720) @@ -387,6 +387,12 @@ OptionBuilder.hasArg(); options.addOption(OptionBuilder.create("s")); + OptionBuilder.withArgName(GT._("property=value")); + OptionBuilder.hasArg(); + OptionBuilder.withValueSeparator(); + OptionBuilder.withDescription(GT._("supported options are given below")); + options.addOption(OptionBuilder.create("D")); + OptionBuilder.withLongOpt("geometry"); OptionBuilder.withDescription(GT._("window size 500x500")); OptionBuilder.withValueSeparator(); @@ -412,6 +418,17 @@ if (line.hasOption("h")) { HelpFormatter formatter = new HelpFormatter(); formatter.printHelp("Jmol", options); + + // now report on the -D options + System.out.println(); + System.out.println(GT._("The -D options are as follows (defaults in parathesis):")); + System.out.println(" cdk.debugging=[true|false] (false)"); + System.out.println(" cdk.debug.stdout=[true|false] (false)"); + System.out.println(" display.speed=[fps|ms] (ms)"); + System.out.println(" JmolConsole=[true|false] (true)"); + System.out.println(" plugin.dir (unset)"); + System.out.println(" user.language=[DE|EN|ES|FR|NL|PL] (EN)"); + System.exit(0); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-09-27 23:08:21
|
Revision: 5758 http://svn.sourceforge.net/jmol/?rev=5758&view=rev Author: hansonr Date: 2006-09-27 16:08:17 -0700 (Wed, 27 Sep 2006) Log Message: ----------- there Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-27 23:02:53 UTC (rev 5757) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-27 23:08:17 UTC (rev 5758) @@ -385,7 +385,7 @@ Options options = new Options(); options.addOption("h", "help", false, GT._("give this help page")); - options.addOption("n", "nodisplay", false, GT._("no display")); + options.addOption("n", "nodisplay", false, GT._("no display (and also exit when done")); options.addOption("i", "silent", false, GT._("silent startup operation")); options.addOption("o", "noconsole", false, GT._("no console -- all output to sysout")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-10-01 06:39:28
|
Revision: 5788 http://svn.sourceforge.net/jmol/?rev=5788&view=rev Author: nicove Date: 2006-09-30 23:39:20 -0700 (Sat, 30 Sep 2006) Log Message: ----------- Logger parameters on the command line Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-10-01 04:43:22 UTC (rev 5787) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-10-01 06:39:20 UTC (rev 5788) @@ -446,6 +446,12 @@ System.out.println(" cdk.debug.stdout=[true|false] (false)"); System.out.println(" display.speed=[fps|ms] (ms)"); System.out.println(" JmolConsole=[true|false] (true)"); + System.out.println(" jmol.logger.debug=[true|false] (false)"); + System.out.println(" jmol.logger.error=[true|false] (false)"); + System.out.println(" jmol.logger.fatal=[true|false] (false)"); + System.out.println(" jmol.logger.info=[true|false] (true)"); + System.out.println(" jmol.logger.logLevel=[true|false] (false)"); + System.out.println(" jmol.logger.warn=[true|false] (false)"); System.out.println(" plugin.dir (unset)"); System.out.println(" user.language=[DE|EN|ES|FR|NL|PL] (EN)"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-10-05 04:28:01
|
Revision: 5827 http://svn.sourceforge.net/jmol/?rev=5827&view=rev Author: nicove Date: 2006-10-04 21:27:53 -0700 (Wed, 04 Oct 2006) Log Message: ----------- Fixed warning Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-10-04 23:27:57 UTC (rev 5826) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-10-05 04:27:53 UTC (rev 5827) @@ -24,14 +24,11 @@ package org.openscience.jmol.app; import org.jmol.api.*; -//import org.jmol.adapter.cdk.CdkJmolAdapter; import org.jmol.adapter.smarter.SmarterJmolAdapter; import org.jmol.popup.JmolPopup; import org.jmol.i18n.GT; import org.jmol.util.*; -import org.jmol.viewer.JmolConstants; -//import org.openscience.cdk.applications.plugin.CDKPluginManager; import Acme.JPM.Encoders.PpmEncoder; import com.lowagie.text.Document; import com.lowagie.text.DocumentException; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-12-04 00:42:19
|
Revision: 6378 http://svn.sourceforge.net/jmol/?rev=6378&view=rev Author: hansonr Date: 2006-12-03 16:42:18 -0800 (Sun, 03 Dec 2006) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-12-04 00:11:21 UTC (rev 6377) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-12-04 00:42:18 UTC (rev 6378) @@ -527,6 +527,9 @@ */ Point b = historyFile.getWindowBorder(JMOL_WINDOW_NAME); + //first one is just approximate, but this is set in doClose() + //so it will reset properly -- still, not perfect + //since it is always one step behind. if (b == null) border = new Point(12, 116); else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-02-10 21:30:16
|
Revision: 6781 http://svn.sourceforge.net/jmol/?rev=6781&view=rev Author: hansonr Date: 2007-02-10 13:30:14 -0800 (Sat, 10 Feb 2007) Log Message: ----------- was having some problems with this, but it went away Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-02-10 21:28:24 UTC (rev 6780) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-02-10 21:30:14 UTC (rev 6781) @@ -546,6 +546,7 @@ if (indexX > 0) { startupWidth = parseInt(geometry.substring(0, indexX)) + border.x; startupHeight = parseInt(geometry.substring(indexX + 1)) + border.y; + //System.out.println("setting geometry to " + geometry + " " + border + " " + startupWidth + startupHeight); } } if (startupWidth <= 0 || startupHeight <= 0) { @@ -674,6 +675,7 @@ // Save window positions and status in the history if (historyFile != null) { historyFile.addWindowInfo(JMOL_WINDOW_NAME, this.frame, border); + //System.out.println("doClose border: " + border); //historyFile.addWindowInfo(CONSOLE_WINDOW_NAME, consoleframe); if (scriptWindow != null) historyFile.addWindowInfo(SCRIPT_WINDOW_NAME, scriptWindow, null); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2007-03-25 11:09:50
|
Revision: 7221 http://svn.sourceforge.net/jmol/?rev=7221&view=rev Author: nicove Date: 2007-03-25 04:09:49 -0700 (Sun, 25 Mar 2007) Log Message: ----------- FindBugs fixes: closing reader Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-03-25 10:51:34 UTC (rev 7220) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-03-25 11:09:49 UTC (rev 7221) @@ -930,42 +930,51 @@ } protected void addMacrosMenuBar(JMenuBar menuBar) { - // ok, here needs to be added the funny stuff - JMenu macroMenu = new JMenu(GT._("Macros")); - File macroDir = new File( - System.getProperty("user.home") + System.getProperty("file.separator") - + ".jmol" + System.getProperty("file.separator") + "macros" - ); - report("User macros dir: " + macroDir); - report(" exists: " + macroDir.exists()); - report(" isDirectory: " + macroDir.isDirectory()); - if (macroDir.exists() && macroDir.isDirectory()) { - File[] macros = macroDir.listFiles(); - for (int i=0; i<macros.length; i++) { - // loop over these files and load them - String macroName = macros[i].getName(); - if (macroName.endsWith(".macro")) { - if (Logger.isActiveLevel(Logger.LEVEL_DEBUG)) { - Logger.debug("Possible macro found: " + macroName); - } - try { - FileInputStream macro = new FileInputStream(macros[i]); - Properties macroProps = new Properties(); - macroProps.load(macro); - String macroTitle = macroProps.getProperty("Title"); - String macroScript = macroProps.getProperty("Script"); - JMenuItem mi = new JMenuItem(macroTitle); - mi.setActionCommand(macroScript); - mi.addActionListener(executeScriptAction); - macroMenu.add(mi); - } catch (IOException exception) { - System.err.println("Could not load macro file: "); - System.err.println(exception); - } + // ok, here needs to be added the funny stuff + JMenu macroMenu = new JMenu(GT._("Macros")); + File macroDir = new File( + System.getProperty("user.home") + System.getProperty("file.separator") + + ".jmol" + System.getProperty("file.separator") + "macros"); + report("User macros dir: " + macroDir); + report(" exists: " + macroDir.exists()); + report(" isDirectory: " + macroDir.isDirectory()); + if (macroDir.exists() && macroDir.isDirectory()) { + File[] macros = macroDir.listFiles(); + for (int i=0; i<macros.length; i++) { + // loop over these files and load them + String macroName = macros[i].getName(); + if (macroName.endsWith(".macro")) { + if (Logger.isActiveLevel(Logger.LEVEL_DEBUG)) { + Logger.debug("Possible macro found: " + macroName); + } + FileInputStream macro = null; + try { + macro = new FileInputStream(macros[i]); + Properties macroProps = new Properties(); + macroProps.load(macro); + String macroTitle = macroProps.getProperty("Title"); + String macroScript = macroProps.getProperty("Script"); + JMenuItem mi = new JMenuItem(macroTitle); + mi.setActionCommand(macroScript); + mi.addActionListener(executeScriptAction); + macroMenu.add(mi); + } catch (IOException exception) { + System.err.println("Could not load macro file: "); + System.err.println(exception); + } finally { + if (macro != null) { + try { + macro.close(); + } catch (IOException e) { + // Nothing } + macro = null; + } } + } } - menuBar.add(macroMenu); + } + menuBar.add(macroMenu); } protected void addNormalMenuBar(JMenuBar menuBar) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-04-13 17:11:11
|
Revision: 7399 http://svn.sourceforge.net/jmol/?rev=7399&view=rev Author: hansonr Date: 2007-04-13 10:11:10 -0700 (Fri, 13 Apr 2007) Log Message: ----------- 11.1.29 better handling of "javascript" in application Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-04-13 16:58:51 UTC (rev 7398) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-04-13 17:11:10 UTC (rev 7399) @@ -1528,6 +1528,7 @@ class MyStatusListener implements JmolStatusListener { public String eval(String strEval) { + sendConsoleMessage("javascript: " + strEval); return "# 'eval' is implemented only for the applet."; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-05-31 17:33:19
|
Revision: 7822 http://svn.sourceforge.net/jmol/?rev=7822&view=rev Author: hansonr Date: 2007-05-31 10:33:17 -0700 (Thu, 31 May 2007) Log Message: ----------- 11.1.45 bug fix for app not writing state from export menu Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-31 07:54:33 UTC (rev 7821) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-31 17:33:17 UTC (rev 7822) @@ -1463,7 +1463,13 @@ file = exportChooser.getSelectedFile(); if (file != null) { ImageCreator c = new ImageCreator(viewer, status); - c.createImage(file.getAbsolutePath(), it.getType(), it.getQuality()); + int iQuality = it.getQuality(); + String sType = it.getType(); + if (sType.equals("SPT")) { + sType = viewer.getStateInfo(); + iQuality = Integer.MIN_VALUE; + } + c.createImage(file.getAbsolutePath(), sType, iQuality); } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-12-04 22:47:02
|
Revision: 8733 http://jmol.svn.sourceforge.net/jmol/?rev=8733&view=rev Author: hansonr Date: 2007-12-04 14:46:58 -0800 (Tue, 04 Dec 2007) Log Message: ----------- typo Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-12-04 21:56:30 UTC (rev 8732) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-12-04 22:46:58 UTC (rev 8733) @@ -510,7 +510,7 @@ OptionBuilder.withLongOpt("quality"); // OptionBuilder.withDescription(GT._("overall window width x height, e.g. {0}", "-g512x616")); - OptionBuilder.withDescription(GT._("JPG image quality (1-100; default 75) or PNG image compression (0-9; default 2, maximum compression 9")); + OptionBuilder.withDescription(GT._("JPG image quality (1-100; default 75) or PNG image compression (0-9; default 2, maximum compression 9)")); OptionBuilder.withValueSeparator(); OptionBuilder.hasArg(); options.addOption(OptionBuilder.create("q")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-09-27 23:02:58
|
Revision: 5757 http://svn.sourceforge.net/jmol/?rev=5757&view=rev Author: hansonr Date: 2006-09-27 16:02:53 -0700 (Wed, 27 Sep 2006) Log Message: ----------- one last thing -- moving out -x Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-27 20:50:35 UTC (rev 5756) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-27 23:02:53 UTC (rev 5757) @@ -402,19 +402,19 @@ options.addOption(OptionBuilder.create("D")); OptionBuilder.withLongOpt("geometry"); - OptionBuilder.withDescription(GT._("window size 500x500")); + OptionBuilder.withDescription(GT._("window size, e.g. -g500x500")); OptionBuilder.withValueSeparator(); OptionBuilder.hasArg(); options.addOption(OptionBuilder.create("g")); OptionBuilder.withLongOpt("write"); - OptionBuilder.withDescription(GT._(" JPG|PNG|PPM:filename")); + OptionBuilder.withDescription(GT._("CLIP or JPG|PNG|PPM:filename")); OptionBuilder.withValueSeparator(); OptionBuilder.hasArg(); options.addOption(OptionBuilder.create("w")); OptionBuilder.withLongOpt("exit"); - OptionBuilder.withDescription(GT._("run script and exit")); + OptionBuilder.withDescription(GT._("exit after script (implicit with -n)")); OptionBuilder.withValueSeparator('='); OptionBuilder.hasArg(); options.addOption(OptionBuilder.create("x")); @@ -435,7 +435,12 @@ // now report on the -D options System.out.println(); + System.out.println(GT._("For example:")); + System.out.println(); + System.out.println("Jmol -ions myscript.spt -w JPEG:myfile.jpg > output.txt"); + System.out.println(); System.out.println(GT._("The -D options are as follows (defaults in parathesis):")); + System.out.println(); System.out.println(" cdk.debugging=[true|false] (false)"); System.out.println(" cdk.debug.stdout=[true|false] (false)"); System.out.println(" display.speed=[fps|ms] (ms)"); @@ -467,17 +472,17 @@ } if (line.hasOption("n")) { - commandOptions += "-n"; + commandOptions += "-n-x"; haveDisplay = Boolean.FALSE; } - //modelFilename = "caffeine.xyz"; //Eclipse TESTING ONLY if (line.hasOption("s")) { commandOptions += "-s"; scriptFilename = line.getOptionValue("s"); - } else if (line.hasOption("x")) { + } + + if (line.hasOption("x")) { commandOptions += "-x"; - scriptFilename = line.getOptionValue("x"); } if (line.hasOption("w")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-09-29 06:01:47
|
Revision: 5775 http://svn.sourceforge.net/jmol/?rev=5775&view=rev Author: hansonr Date: 2006-09-28 23:01:43 -0700 (Thu, 28 Sep 2006) Log Message: ----------- for Nico. :) Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-29 04:22:19 UTC (rev 5774) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-09-29 06:01:43 UTC (rev 5775) @@ -473,6 +473,7 @@ } if (line.hasOption("n")) { + // this ensures that noDisplay also exits commandOptions += "-n-x"; haveDisplay = Boolean.FALSE; } @@ -480,6 +481,10 @@ if (line.hasOption("s")) { commandOptions += "-s"; scriptFilename = line.getOptionValue("s"); + } else if (line.hasOption("n")) { + // noDisplay but also no script -- get out of here! + System.out.println("?Que? ?-n pero no -s?"); + System.exit(1); } if (line.hasOption("x")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2006-10-01 06:42:12
|
Revision: 5790 http://svn.sourceforge.net/jmol/?rev=5790&view=rev Author: nicove Date: 2006-09-30 23:42:07 -0700 (Sat, 30 Sep 2006) Log Message: ----------- Logger parameters on the command line Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-10-01 06:40:56 UTC (rev 5789) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-10-01 06:42:07 UTC (rev 5790) @@ -447,11 +447,11 @@ System.out.println(" display.speed=[fps|ms] (ms)"); System.out.println(" JmolConsole=[true|false] (true)"); System.out.println(" jmol.logger.debug=[true|false] (false)"); - System.out.println(" jmol.logger.error=[true|false] (false)"); - System.out.println(" jmol.logger.fatal=[true|false] (false)"); + System.out.println(" jmol.logger.error=[true|false] (true)"); + System.out.println(" jmol.logger.fatal=[true|false] (true)"); System.out.println(" jmol.logger.info=[true|false] (true)"); System.out.println(" jmol.logger.logLevel=[true|false] (false)"); - System.out.println(" jmol.logger.warn=[true|false] (false)"); + System.out.println(" jmol.logger.warn=[true|false] (true)"); System.out.println(" plugin.dir (unset)"); System.out.println(" user.language=[DE|EN|ES|FR|NL|PL] (EN)"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-12-06 23:27:55
|
Revision: 6412 http://svn.sourceforge.net/jmol/?rev=6412&view=rev Author: hansonr Date: 2006-12-06 15:06:20 -0800 (Wed, 06 Dec 2006) Log Message: ----------- bug fix -- Jmol not exiting after scripts with -x flag Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-12-06 23:05:47 UTC (rev 6411) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-12-06 23:06:20 UTC (rev 6412) @@ -570,7 +570,7 @@ report("Executing script: " + scriptFilename); if (haveDisplay.booleanValue()) jmol.splash.showStatus(GT._("Executing script...")); - jmol.viewer.openFile(scriptFilename); //now the same interface + jmol.viewer.evalFile(scriptFilename); } } catch (Throwable t) { System.out.println("uncaught exception: " + t); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2006-12-07 07:13:18
|
Revision: 6424 http://svn.sourceforge.net/jmol/?rev=6424&view=rev Author: hansonr Date: 2006-12-06 23:13:17 -0800 (Wed, 06 Dec 2006) Log Message: ----------- png encoder fix -- was missing compression Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-12-07 07:07:08 UTC (rev 6423) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-12-07 07:13:17 UTC (rev 6424) @@ -1677,6 +1677,7 @@ pc.encode(); } else if (type_or_text.equalsIgnoreCase("PNG")) { PngEncoder png = new PngEncoder(eImage); + png.setCompressionLevel(2); //reasonable? 500x500 is 38K byte[] pngbytes = png.pngEncode(); os.write(pngbytes); } else if (type_or_text.equalsIgnoreCase("JPG64")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-05-05 20:49:18
|
Revision: 7593 http://svn.sourceforge.net/jmol/?rev=7593&view=rev Author: hansonr Date: 2007-05-05 13:49:16 -0700 (Sat, 05 May 2007) Log Message: ----------- 11.1.32 trying to acheive consistency across applets. Untested. Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-05 20:49:01 UTC (rev 7592) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-05 20:49:16 UTC (rev 7593) @@ -1544,7 +1544,7 @@ public void setCallbackFunction(String callbackType, String callbackFunction) { if (callbackType.equalsIgnoreCase("language")) { - new GT(callbackFunction); + GT.getTranslation(callbackFunction); jmolpopup = JmolPopup.newJmolPopup(viewer, true); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-05-05 23:31:30
|
Revision: 7595 http://svn.sourceforge.net/jmol/?rev=7595&view=rev Author: hansonr Date: 2007-05-05 16:31:28 -0700 (Sat, 05 May 2007) Log Message: ----------- reverting Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-05 23:27:56 UTC (rev 7594) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-05 23:31:28 UTC (rev 7595) @@ -1544,7 +1544,7 @@ public void setCallbackFunction(String callbackType, String callbackFunction) { if (callbackType.equalsIgnoreCase("language")) { - GT.getTranslation(callbackFunction); + new GT(callbackFunction); jmolpopup = JmolPopup.newJmolPopup(viewer, true); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-05-17 02:50:34
|
Revision: 7726 http://svn.sourceforge.net/jmol/?rev=7726&view=rev Author: hansonr Date: 2007-05-16 19:50:27 -0700 (Wed, 16 May 2007) Log Message: ----------- 11.1.41 full language conversion in application. To do this absolutely right, we would have to have a linked list of open windows and have them all "reboot" -- probably not worth it. Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-16 23:52:58 UTC (rev 7725) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-17 02:50:27 UTC (rev 7726) @@ -148,6 +148,11 @@ Jmol(Splash splash, JFrame frame, Jmol parent, int startupWidth, int startupHeight, String commandOptions) { + this(splash, frame, parent, startupWidth, startupHeight, commandOptions, null); + } + + Jmol(Splash splash, JFrame frame, Jmol parent, int startupWidth, + int startupHeight, String commandOptions, Point loc) { super(true); this.frame = frame; this.startupWidth = startupWidth; @@ -292,7 +297,9 @@ } // prevent new Jmol from covering old Jmol - if (parent != null) { + if (loc != null) { + frame.setLocation(loc); + }else if (parent != null) { Point location = parent.frame.getLocationOnScreen(); int maxX = screenSize.width - 50; int maxY = screenSize.height - 50; @@ -731,27 +738,44 @@ } void doClose() { - // Save window positions and status in the history - if (historyFile != null) { - historyFile.addWindowInfo(JMOL_WINDOW_NAME, this.frame, border); - //System.out.println("doClose border: " + border); - //historyFile.addWindowInfo(CONSOLE_WINDOW_NAME, consoleframe); - if (scriptWindow != null) - historyFile.addWindowInfo(SCRIPT_WINDOW_NAME, scriptWindow, null); - } - + // Save window positions and status in the history + if (historyFile != null) { + historyFile.addWindowInfo(JMOL_WINDOW_NAME, this.frame, border); + //System.out.println("doClose border: " + border); + //historyFile.addWindowInfo(CONSOLE_WINDOW_NAME, consoleframe); + } + dispose(this.frame); + } + + private void dispose(JFrame f) { + if (historyFile != null && scriptWindow != null) + historyFile.addWindowInfo(SCRIPT_WINDOW_NAME, scriptWindow, null); + if (numWindows <= 1) { // Close Jmol + report(GT._("Closing Jmol...")); + // pluginManager.closePlugins(); + System.exit(0); + } else { numWindows--; - if (numWindows <= 1) { - report(GT._("Closing Jmol...")); - // pluginManager.closePlugins(); - System.exit(0); - } else { - this.frame.dispose(); + f.dispose(); + if (scriptWindow != null) { + scriptWindow.dispose(); } + } } - + protected void setupNewFrame(String state) { + JFrame newFrame = new JFrame(); + JFrame f = this.frame; + Jmol j = new Jmol(null, newFrame, Jmol.this, startupWidth, startupHeight, + "", (state == null ? null : f.getLocationOnScreen())); + newFrame.show(); + if (state != null) { + dispose(f); + j.viewer.script(state); + } + } + /** * @return The hosting frame, for the file-chooser dialog. */ @@ -1593,8 +1617,9 @@ if (callbackType.equalsIgnoreCase("language")) { new GT(callbackFunction); language = GT.getLanguage(); - jmolpopup = JmolPopup.newJmolPopup(viewer, true); setupUIManager(); + String state = viewer.getStateInfo(); + setupNewFrame(state); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2007-05-18 03:15:34
|
Revision: 7738 http://svn.sourceforge.net/jmol/?rev=7738&view=rev Author: hansonr Date: 2007-05-17 20:15:32 -0700 (Thu, 17 May 2007) Log Message: ----------- 11.1.42 bug fix for memory hole in changing languages in application Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-17 22:52:20 UTC (rev 7737) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2007-05-18 03:15:32 UTC (rev 7738) @@ -28,6 +28,7 @@ import org.jmol.popup.JmolPopup; import org.jmol.i18n.GT; import org.jmol.util.*; +import org.jmol.viewer.JmolConstants; import Acme.JPM.Encoders.PpmEncoder; import com.lowagie.text.Document; @@ -774,6 +775,7 @@ System.exit(0); } else { numWindows--; + viewer.setModeMouse(JmolConstants.MOUSE_NONE); f.dispose(); if (scriptWindow != null) { scriptWindow.dispose(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |