various tweaks to export

rstudio · May 12, 2011 · 20b9d15 · 20b9d15
1 parent e58e166
commit 20b9d15
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/src/cpp/session/modules/SessionPlots.cpp b/src/cpp/session/modules/SessionPlots.cpp
@@ -172,7 +172,7 @@ Error savePlotAsPdf(const json::JsonRpcRequest& request,
    // save plot
    using namespace r::session::graphics;
    Display& display = r::session::graphics::display();
-   error =  display.savePlotAsPdf(plotPath, width, height);
+   error = display.savePlotAsPdf(plotPath, width, height);
    if (error)
       return error;
 
@@ -322,14 +322,6 @@ Error getSavePlotContext(const json::JsonRpcRequest& request,
    if(supportsSvg())
       formats.push_back(plotExportFormat("SVG", kSvgFormat));
    formats.push_back(plotExportFormat("Postscript", kPostscriptFormat));
-
-
-
-/*
-   formats.push_back(plotExportFormat("XFig", "fix"));
-   formats.push_back(plotExportFormat("PicTeX", "tex"));
-*/
-
    contextJson["formats"] = formats;
 
    // get directory path

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/plots/ui/export/SavePlotAsHandler.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/plots/ui/export/SavePlotAsHandler.java
@@ -96,7 +96,7 @@ private void webSavePlotAs(final FileSystemItem targetPath,
                               final boolean viewAfterSave,
                               final Operation onCompleted)
    {
-      globalDisplay_.openProgressWindow("_rstudio_save_plot_as",
+      globalDisplay_.openProgressWindow("_blank",
             "Converting Plot...", 
             new OperationWithInput<WindowEx>() {                                        
          public void execute(final WindowEx window)

diff --git a/...wt/src/org/rstudio/studio/client/workbench/views/plots/ui/export/SavePlotAsPdfDialog.java b/...wt/src/org/rstudio/studio/client/workbench/views/plots/ui/export/SavePlotAsPdfDialog.java
@@ -455,6 +455,11 @@ private double readSizeEntry(TextBox textBox, double defaultValue)
          try
          {
             size = Double.parseDouble(textBox.getText().trim());
+
+            if (size < kMimimumSize)
+               size = defaultValue;
+            else if (size > kMaximumSize)
+               size = defaultValue;
          }
          catch(NumberFormatException e)
          {
@@ -469,6 +474,9 @@ private double readSizeEntry(TextBox textBox, double defaultValue)
       private final TextBox heightTextBox_;
       private final List<PaperSize> paperSizes_ = new ArrayList<PaperSize>(); 
       private final NumberFormat sizeFormat_ = NumberFormat.getFormat("##0.00");
+
+      private final double kMimimumSize = 3.0;
+      private final double kMaximumSize = 100.0;
    }
 
 

diff --git a/...src/org/rstudio/studio/client/workbench/views/plots/ui/export/SavePlotAsTargetEditor.java b/...src/org/rstudio/studio/client/workbench/views/plots/ui/export/SavePlotAsTargetEditor.java
@@ -23,9 +23,6 @@
 import com.google.gwt.user.client.ui.ListBox;
 import com.google.gwt.user.client.ui.TextBox;
 
-// TODO: other image formats
-
-
 public class SavePlotAsTargetEditor extends Composite implements CanFocus
 {
    public SavePlotAsTargetEditor(String defaultFormat,