You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/03/04 16:33:53 UTC
svn commit: r383138 - in /jakarta/jmeter/branches/rel-2-1:
src/core/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/gui/util/
src/core/org/apache/jmeter/resources/ xdocs/
Author: sebb
Date: Sat Mar 4 07:33:52 2006
New Revision: 383138
URL: http://svn.apache.org/viewcvs?rev=383138&view=rev
Log:
Add Save All As Image - saves entire JMeter screen
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=383138&r1=383137&r2=383138&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java Sat Mar 4 07:33:52 2006
@@ -65,6 +65,7 @@
public final static String SAVE_ALL_AS = "save_all_as"; // $NON-NLS-1$
public final static String SAVE_AS = "save_as"; // $NON-NLS-1$
public static final String SAVE_GRAPHICS = "save_graphics"; // $NON-NLS-1$
+ public static final String SAVE_GRAPHICS_ALL= "save_graphics_all"; // $NON-NLS-1$
public static final String SSL_MANAGER = "sslManager"; // $NON-NLS-1$
public static final String SUB_TREE_LOADED = "sub_tree_loaded"; // $NON-NLS-1$
public static final String SUB_TREE_SAVED = "sub_tree_saved"; // $NON-NLS-1$
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java?rev=383138&r1=383137&r2=383138&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java Sat Mar 4 07:33:52 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
@@ -44,6 +44,7 @@
private static Set commands = new HashSet();
static {
commands.add(ActionNames.SAVE_GRAPHICS);
+ commands.add(ActionNames.SAVE_GRAPHICS_ALL);
}
private static final String[] extensions
@@ -75,29 +76,39 @@
// get the JComponent from the visualizer
if (component instanceof Printable) {
comp = ((Printable) component).getPrintableComponent();
-
- String filename;
- JFileChooser chooser = FileDialoger.promptToSaveFile(GuiPackage.getInstance().getTreeListener()
- .getCurrentNode().getName(), extensions);
- if (chooser == null) {
- return;
- }
- // Get the string given from the choose and check
- // the file extension.
- filename = chooser.getSelectedFile().getAbsolutePath();
- if (filename != null) {
- SaveGraphicsService save = new SaveGraphicsService();
- String ext = filename.substring(filename.length() - 4);
- String name = filename.substring(0, filename.length() - 4);
- if (ext.equals(SaveGraphicsService.PNG_EXTENSION)) {
- save.saveJComponent(name, SaveGraphicsService.PNG, comp);
- } else if (ext.equals(SaveGraphicsService.TIFF_EXTENSION)) {
- save.saveJComponent(name, SaveGraphicsService.TIFF, comp);
- } else {
- save.saveJComponent(filename, SaveGraphicsService.PNG, comp);
- }
- }
+ saveImage(comp);
}
}
+ if (e.getActionCommand().equals(ActionNames.SAVE_GRAPHICS_ALL)) {
+ component = GuiPackage.getInstance().getCurrentGui();
+ comp=((JComponent) component).getRootPane();
+ saveImage(comp);
+ }
}
+
+ private void saveImage(JComponent comp){
+
+ String filename;
+ JFileChooser chooser = FileDialoger.promptToSaveFile(GuiPackage.getInstance().getTreeListener()
+ .getCurrentNode().getName(), extensions);
+ if (chooser == null) {
+ return;
+ }
+ // Get the string given from the choose and check
+ // the file extension.
+ filename = chooser.getSelectedFile().getAbsolutePath();
+ if (filename != null) {
+ SaveGraphicsService save = new SaveGraphicsService();
+ String ext = filename.substring(filename.length() - 4);
+ String name = filename.substring(0, filename.length() - 4);
+ if (ext.equals(SaveGraphicsService.PNG_EXTENSION)) {
+ save.saveJComponent(name, SaveGraphicsService.PNG, comp);
+ } else if (ext.equals(SaveGraphicsService.TIFF_EXTENSION)) {
+ save.saveJComponent(name, SaveGraphicsService.TIFF, comp);
+ } else {
+ save.saveJComponent(filename, SaveGraphicsService.PNG, comp);
+ }
+ }
+
+ }
}
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=383138&r1=383137&r2=383138&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java Sat Mar 4 07:33:52 2006
@@ -166,6 +166,12 @@
if (!(GuiPackage.getInstance().getCurrentGui() instanceof Printable)) {
savePicture.setEnabled(false);
}
+
+ JMenuItem savePictureAll = makeMenuItem(JMeterUtils.getResString("save_as_image_all"),
+ "Save Image All", ActionNames.SAVE_GRAPHICS_ALL,
+ KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_MASK| KeyEvent.SHIFT_DOWN_MASK));
+ menu.add(savePictureAll);
+
JMenuItem disabled = makeMenuItem(JMeterUtils.getResString("disable"), "Disable", ActionNames.DISABLE);
JMenuItem enabled = makeMenuItem(JMeterUtils.getResString("enable"), "Enable", ActionNames.ENABLE);
boolean isEnabled = GuiPackage.getInstance().getTreeListener().getCurrentNode().isEnabled();
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties?rev=383138&r1=383137&r2=383138&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties Sat Mar 4 07:33:52 2006
@@ -565,7 +565,8 @@
save?=Save?
save_all_as=Save Test Plan as
save_as=Save As...
-save_as_image=Save As Image
+save_as_image=Save Node As Image
+save_as_image_all=Save Screen As Image
save_assertionresultsfailuremessage=Save Assertion Results Failure Message
save_assertions=Save Assertion Results
save_asxml=Save As XML
Modified: jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml?rev=383138&r1=383137&r2=383138&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml Sat Mar 4 07:33:52 2006
@@ -50,6 +50,7 @@
<li>Don't reset Regex Extractor variable if default is empty</li>
<li>includecontroller.prefix property added</li>
<li>Regular Expression Extractor sets group count</li>
+<li>Can now save entire screen as an image, not just the right-hand pane</li>
</ul>
<h4>Bug fixes:</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org
Re: svn commit: r383138 - in /jakarta/jmeter/branches/rel-2-1: src/core/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/gui/util/ src/core/org/apache/jmeter/resources/ xdocs/
Posted by sebb <se...@gmail.com>.
Thanks - I was working on updating the screen dumps, so wanted a quick
way of doing this. Turned out to be quite easy.
The dump does not include the title bar - I could not get that to
work. It only printed a black rectangle.
However, that's not essential.
If we really do want the title, I've found that one can use
Robot.createScreenCapture().
There is also a method in java 1.4:
boolean javax.imageio.ImageIO.write(RenderedImage im, String
formatName, File output)
Writes an image using an arbitrary ImageWriter that supports the given
format to a File.
If there is already a File present, its contents are discarded.
Parameters:
* im a RenderedImage to be written.
* formatName a String containg the informal name of the format.
* output a File to be written to.
Formats seem to include PNG, JPEG, RAF (whatever that is), and GIF
(reader only).
S.
On 05/03/06, Peter Lin <wo...@gmail.com> wrote:
> sweet!
>
> that's quite useful feature to have sebb.
>
> peter
>
>
> On 3/4/06, sebb@apache.org <se...@apache.org> wrote:
> >
> > Author: sebb
> > Date: Sat Mar 4 07:33:52 2006
> > New Revision: 383138
> >
> > URL: http://svn.apache.org/viewcvs?rev=383138&view=rev
> > Log:
> > Add Save All As Image - saves entire JMeter screen
> >
> > Modified:
> >
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
> >
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
> >
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
> >
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
> > jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
> >
> > Modified:
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
> > URL:
> > http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=383138&r1=383137&r2=383138&view=diff
> >
> > ==============================================================================
> > ---
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
> > (original)
> > +++
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
> > Sat Mar 4 07:33:52 2006
> > @@ -65,6 +65,7 @@
> > public final static String SAVE_ALL_AS = "save_all_as"; //
> > $NON-NLS-1$
> > public final static String SAVE_AS = "save_as"; //
> > $NON-NLS-1$
> > public static final String SAVE_GRAPHICS = "save_graphics"; //
> > $NON-NLS-1$
> > + public static final String SAVE_GRAPHICS_ALL= "save_graphics_all"; //
> > $NON-NLS-1$
> > public static final String SSL_MANAGER = "sslManager"; //
> > $NON-NLS-1$
> > public static final String SUB_TREE_LOADED = "sub_tree_loaded"; //
> > $NON-NLS-1$
> > public static final String SUB_TREE_SAVED = "sub_tree_saved"; //
> > $NON-NLS-1$
> >
> > Modified:
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
> > URL:
> > http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java?rev=383138&r1=383137&r2=383138&view=diff
> >
> > ==============================================================================
> > ---
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
> > (original)
> > +++
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
> > Sat Mar 4 07:33:52 2006
> > @@ -1,5 +1,5 @@
> > /*
> > - * Copyright 2001-2005 The Apache Software Foundation.
> > + * Copyright 2001-2006 The Apache Software Foundation.
> > *
> > * Licensed under the Apache License, Version 2.0 (the "License"); you
> > may not
> > * use this file except in compliance with the License. You may obtain a
> > copy
> > @@ -44,6 +44,7 @@
> > private static Set commands = new HashSet();
> > static {
> > commands.add(ActionNames.SAVE_GRAPHICS);
> > + commands.add(ActionNames.SAVE_GRAPHICS_ALL);
> > }
> >
> > private static final String[] extensions
> > @@ -75,29 +76,39 @@
> > // get the JComponent from the visualizer
> > if (component instanceof Printable) {
> > comp = ((Printable)
> > component).getPrintableComponent();
> > -
> > - String filename;
> > - JFileChooser chooser =
> > FileDialoger.promptToSaveFile(GuiPackage.getInstance().getTreeListener()
> > -
> > .getCurrentNode().getName(), extensions);
> > - if (chooser == null) {
> > - return;
> > - }
> > - // Get the string given from the choose
> > and check
> > - // the file extension.
> > - filename = chooser.getSelectedFile
> > ().getAbsolutePath();
> > - if (filename != null) {
> > - SaveGraphicsService save = new
> > SaveGraphicsService();
> > - String ext = filename.substring(
> > filename.length() - 4);
> > - String name = filename.substring(0,
> > filename.length() - 4);
> > - if (ext.equals(
> > SaveGraphicsService.PNG_EXTENSION)) {
> > - save.saveJComponent(name,
> > SaveGraphicsService.PNG, comp);
> > - } else if (ext.equals(
> > SaveGraphicsService.TIFF_EXTENSION)) {
> > - save.saveJComponent(name,
> > SaveGraphicsService.TIFF, comp);
> > - } else {
> > - save.saveJComponent(filename,
> > SaveGraphicsService.PNG, comp);
> > - }
> > - }
> > + saveImage(comp);
> > }
> > }
> > + if (e.getActionCommand().equals(ActionNames.SAVE_GRAPHICS_ALL)) {
> > + component = GuiPackage.getInstance().getCurrentGui();
> > + comp=((JComponent) component).getRootPane();
> > + saveImage(comp);
> > + }
> > }
> > +
> > + private void saveImage(JComponent comp){
> > +
> > + String filename;
> > + JFileChooser chooser = FileDialoger.promptToSaveFile(
> > GuiPackage.getInstance().getTreeListener()
> > + .getCurrentNode().getName(), extensions);
> > + if (chooser == null) {
> > + return;
> > + }
> > + // Get the string given from the choose and check
> > + // the file extension.
> > + filename = chooser.getSelectedFile().getAbsolutePath();
> > + if (filename != null) {
> > + SaveGraphicsService save = new SaveGraphicsService();
> > + String ext = filename.substring(filename.length() - 4);
> > + String name = filename.substring(0, filename.length() - 4);
> > + if (ext.equals(SaveGraphicsService.PNG_EXTENSION)) {
> > + save.saveJComponent(name, SaveGraphicsService.PNG, comp);
> > + } else if (ext.equals(SaveGraphicsService.TIFF_EXTENSION)) {
> > + save.saveJComponent(name, SaveGraphicsService.TIFF,
> > comp);
> > + } else {
> > + save.saveJComponent(filename, SaveGraphicsService.PNG,
> > comp);
> > + }
> > + }
> > +
> > + }
> > }
> >
> > Modified:
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
> > URL:
> > http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=383138&r1=383137&r2=383138&view=diff
> >
> > ==============================================================================
> > ---
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
> > (original)
> > +++
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
> > Sat Mar 4 07:33:52 2006
> > @@ -166,6 +166,12 @@
> > if (!(GuiPackage.getInstance().getCurrentGui() instanceof
> > Printable)) {
> > savePicture.setEnabled(false);
> > }
> > +
> > + JMenuItem savePictureAll = makeMenuItem(JMeterUtils.getResString
> > ("save_as_image_all"),
> > + "Save Image All", ActionNames.SAVE_GRAPHICS_ALL,
> > + KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_MASK|
> > KeyEvent.SHIFT_DOWN_MASK));
> > + menu.add(savePictureAll);
> > +
> > JMenuItem disabled = makeMenuItem(JMeterUtils.getResString("disable"),
> > "Disable", ActionNames.DISABLE);
> > JMenuItem enabled = makeMenuItem(JMeterUtils.getResString("enable"),
> > "Enable", ActionNames.ENABLE);
> > boolean isEnabled = GuiPackage.getInstance
> > ().getTreeListener().getCurrentNode().isEnabled();
> >
> > Modified:
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
> > URL:
> > http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties?rev=383138&r1=383137&r2=383138&view=diff
> >
> > ==============================================================================
> > ---
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
> > (original)
> > +++
> > jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
> > Sat Mar 4 07:33:52 2006
> > @@ -565,7 +565,8 @@
> > save?=Save?
> > save_all_as=Save Test Plan as
> > save_as=Save As...
> > -save_as_image=Save As Image
> > +save_as_image=Save Node As Image
> > +save_as_image_all=Save Screen As Image
> > save_assertionresultsfailuremessage=Save Assertion Results Failure Message
> > save_assertions=Save Assertion Results
> > save_asxml=Save As XML
> >
> > Modified: jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
> > URL:
> > http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml?rev=383138&r1=383137&r2=383138&view=diff
> >
> > ==============================================================================
> > --- jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml (original)
> > +++ jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml Sat Mar 4 07:33:52
> > 2006
> > @@ -50,6 +50,7 @@
> > <li>Don't reset Regex Extractor variable if default is empty</li>
> > <li>includecontroller.prefix property added</li>
> > <li>Regular Expression Extractor sets group count</li>
> > +<li>Can now save entire screen as an image, not just the right-hand
> > pane</li>
> > </ul>
> >
> > <h4>Bug fixes:</h4>
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org
> >
> >
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org
Re: svn commit: r383138 - in /jakarta/jmeter/branches/rel-2-1: src/core/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/gui/util/ src/core/org/apache/jmeter/resources/ xdocs/
Posted by Peter Lin <wo...@gmail.com>.
sweet!
that's quite useful feature to have sebb.
peter
On 3/4/06, sebb@apache.org <se...@apache.org> wrote:
>
> Author: sebb
> Date: Sat Mar 4 07:33:52 2006
> New Revision: 383138
>
> URL: http://svn.apache.org/viewcvs?rev=383138&view=rev
> Log:
> Add Save All As Image - saves entire JMeter screen
>
> Modified:
>
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
>
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
>
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
>
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
> jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
>
> Modified:
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
> URL:
> http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=383138&r1=383137&r2=383138&view=diff
>
> ==============================================================================
> ---
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
> (original)
> +++
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/ActionNames.java
> Sat Mar 4 07:33:52 2006
> @@ -65,6 +65,7 @@
> public final static String SAVE_ALL_AS = "save_all_as"; //
> $NON-NLS-1$
> public final static String SAVE_AS = "save_as"; //
> $NON-NLS-1$
> public static final String SAVE_GRAPHICS = "save_graphics"; //
> $NON-NLS-1$
> + public static final String SAVE_GRAPHICS_ALL= "save_graphics_all"; //
> $NON-NLS-1$
> public static final String SSL_MANAGER = "sslManager"; //
> $NON-NLS-1$
> public static final String SUB_TREE_LOADED = "sub_tree_loaded"; //
> $NON-NLS-1$
> public static final String SUB_TREE_SAVED = "sub_tree_saved"; //
> $NON-NLS-1$
>
> Modified:
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
> URL:
> http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java?rev=383138&r1=383137&r2=383138&view=diff
>
> ==============================================================================
> ---
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
> (original)
> +++
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
> Sat Mar 4 07:33:52 2006
> @@ -1,5 +1,5 @@
> /*
> - * Copyright 2001-2005 The Apache Software Foundation.
> + * Copyright 2001-2006 The Apache Software Foundation.
> *
> * Licensed under the Apache License, Version 2.0 (the "License"); you
> may not
> * use this file except in compliance with the License. You may obtain a
> copy
> @@ -44,6 +44,7 @@
> private static Set commands = new HashSet();
> static {
> commands.add(ActionNames.SAVE_GRAPHICS);
> + commands.add(ActionNames.SAVE_GRAPHICS_ALL);
> }
>
> private static final String[] extensions
> @@ -75,29 +76,39 @@
> // get the JComponent from the visualizer
> if (component instanceof Printable) {
> comp = ((Printable)
> component).getPrintableComponent();
> -
> - String filename;
> - JFileChooser chooser =
> FileDialoger.promptToSaveFile(GuiPackage.getInstance().getTreeListener()
> -
> .getCurrentNode().getName(), extensions);
> - if (chooser == null) {
> - return;
> - }
> - // Get the string given from the choose
> and check
> - // the file extension.
> - filename = chooser.getSelectedFile
> ().getAbsolutePath();
> - if (filename != null) {
> - SaveGraphicsService save = new
> SaveGraphicsService();
> - String ext = filename.substring(
> filename.length() - 4);
> - String name = filename.substring(0,
> filename.length() - 4);
> - if (ext.equals(
> SaveGraphicsService.PNG_EXTENSION)) {
> - save.saveJComponent(name,
> SaveGraphicsService.PNG, comp);
> - } else if (ext.equals(
> SaveGraphicsService.TIFF_EXTENSION)) {
> - save.saveJComponent(name,
> SaveGraphicsService.TIFF, comp);
> - } else {
> - save.saveJComponent(filename,
> SaveGraphicsService.PNG, comp);
> - }
> - }
> + saveImage(comp);
> }
> }
> + if (e.getActionCommand().equals(ActionNames.SAVE_GRAPHICS_ALL)) {
> + component = GuiPackage.getInstance().getCurrentGui();
> + comp=((JComponent) component).getRootPane();
> + saveImage(comp);
> + }
> }
> +
> + private void saveImage(JComponent comp){
> +
> + String filename;
> + JFileChooser chooser = FileDialoger.promptToSaveFile(
> GuiPackage.getInstance().getTreeListener()
> + .getCurrentNode().getName(), extensions);
> + if (chooser == null) {
> + return;
> + }
> + // Get the string given from the choose and check
> + // the file extension.
> + filename = chooser.getSelectedFile().getAbsolutePath();
> + if (filename != null) {
> + SaveGraphicsService save = new SaveGraphicsService();
> + String ext = filename.substring(filename.length() - 4);
> + String name = filename.substring(0, filename.length() - 4);
> + if (ext.equals(SaveGraphicsService.PNG_EXTENSION)) {
> + save.saveJComponent(name, SaveGraphicsService.PNG, comp);
> + } else if (ext.equals(SaveGraphicsService.TIFF_EXTENSION)) {
> + save.saveJComponent(name, SaveGraphicsService.TIFF,
> comp);
> + } else {
> + save.saveJComponent(filename, SaveGraphicsService.PNG,
> comp);
> + }
> + }
> +
> + }
> }
>
> Modified:
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
> URL:
> http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=383138&r1=383137&r2=383138&view=diff
>
> ==============================================================================
> ---
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
> (original)
> +++
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/MenuFactory.java
> Sat Mar 4 07:33:52 2006
> @@ -166,6 +166,12 @@
> if (!(GuiPackage.getInstance().getCurrentGui() instanceof
> Printable)) {
> savePicture.setEnabled(false);
> }
> +
> + JMenuItem savePictureAll = makeMenuItem(JMeterUtils.getResString
> ("save_as_image_all"),
> + "Save Image All", ActionNames.SAVE_GRAPHICS_ALL,
> + KeyStroke.getKeyStroke(KeyEvent.VK_G, KeyEvent.CTRL_MASK|
> KeyEvent.SHIFT_DOWN_MASK));
> + menu.add(savePictureAll);
> +
> JMenuItem disabled = makeMenuItem(JMeterUtils.getResString("disable"),
> "Disable", ActionNames.DISABLE);
> JMenuItem enabled = makeMenuItem(JMeterUtils.getResString("enable"),
> "Enable", ActionNames.ENABLE);
> boolean isEnabled = GuiPackage.getInstance
> ().getTreeListener().getCurrentNode().isEnabled();
>
> Modified:
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
> URL:
> http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties?rev=383138&r1=383137&r2=383138&view=diff
>
> ==============================================================================
> ---
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
> (original)
> +++
> jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/resources/messages.properties
> Sat Mar 4 07:33:52 2006
> @@ -565,7 +565,8 @@
> save?=Save?
> save_all_as=Save Test Plan as
> save_as=Save As...
> -save_as_image=Save As Image
> +save_as_image=Save Node As Image
> +save_as_image_all=Save Screen As Image
> save_assertionresultsfailuremessage=Save Assertion Results Failure Message
> save_assertions=Save Assertion Results
> save_asxml=Save As XML
>
> Modified: jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
> URL:
> http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml?rev=383138&r1=383137&r2=383138&view=diff
>
> ==============================================================================
> --- jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml (original)
> +++ jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml Sat Mar 4 07:33:52
> 2006
> @@ -50,6 +50,7 @@
> <li>Don't reset Regex Extractor variable if default is empty</li>
> <li>includecontroller.prefix property added</li>
> <li>Regular Expression Extractor sets group count</li>
> +<li>Can now save entire screen as an image, not just the right-hand
> pane</li>
> </ul>
>
> <h4>Bug fixes:</h4>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org
>
>