Changeset 10006

Timestamp:

09/25/13 13:55:12 (11 years ago)

Author:

abeham

Message:

#2107: merged r9946 and r10002 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/ImageExportDialog.cs (modified) (4 diffs)

stable/HeuristicLab.Visualization.ChartControlsExtensions/3.3/ImageExportDialog.cs

@@ -68 +68 @@
         Width = 305;
         Height = 625;
-      } finally { SuppressEvents = false; }
+      }
+      finally { SuppressEvents = false; }
       #endregion
     }
@@ -93 +94 @@
         if (workingChart.Legends.Count == 0) legendFontSizeComboBox.Text = "6";
         else legendFontSizeComboBox.Text = workingChart.Legends[0].Font.SizeInPoints.ToString();
-      } finally {
+      }
+      finally {
         SuppressEvents = false;
       }
@@ -209 +211 @@
           }
         }
-      } finally { SuppressEvents = false; }
+      }
+      finally { SuppressEvents = false; }
       base.OnShown(e);
 
@@ -438 +441 @@
       float height;
       GetImageParameters(out dpi, out width, out height);
-
       var image = new Bitmap((int)Math.Round(width), (int)Math.Round(height));
       image.SetResolution(dpi, dpi);
-      using (var graphics = Graphics.FromImage(image)) {
-        workingChart.Printing.PrintPaint(graphics, new Rectangle(0, 0, image.Width, image.Height));
-      }
-
       if (titleTextBox.Text.Trim() != String.Empty) saveFileDialog.FileName = titleTextBox.Text.Trim();
       if (saveFileDialog.ShowDialog() == DialogResult.OK) {
         var format = ImageFormat.Bmp;
         var filename = saveFileDialog.FileName.ToLower();
-        if (filename.EndsWith("jpg")) {
-          format = ImageFormat.Jpeg;
-        } else if (filename.EndsWith("emf")) {
-          format = ImageFormat.Emf;
-        } else if (filename.EndsWith("gif")) {
-          format = ImageFormat.Gif;
-        } else if (filename.EndsWith("png")) {
-          format = ImageFormat.Png;
-        } else if (filename.EndsWith("tif")) {
-          format = ImageFormat.Tiff;
-        }
-        image.Save(saveFileDialog.FileName, format);
-      }
-
+        if (filename.EndsWith("emf")) {
+          using (var graphics = Graphics.FromImage(image)) {
+            var rectangle = new Rectangle(0, 0, image.Width, image.Height);
+            using (var metafile = new Metafile(filename, graphics.GetHdc(), rectangle, MetafileFrameUnit.Pixel, EmfType.EmfPlusDual)) {
+              graphics.ReleaseHdc();
+              using (var g = Graphics.FromImage(metafile)) {
+                workingChart.Printing.PrintPaint(g, rectangle);
+              }
+            }
+          }
+        } else {
+          using (var graphics = Graphics.FromImage(image)) {
+            workingChart.Printing.PrintPaint(graphics, new Rectangle(0, 0, image.Width, image.Height));
+          }
+          if (filename.EndsWith("jpg")) {
+            format = ImageFormat.Jpeg;
+          } else if (filename.EndsWith("gif")) {
+            format = ImageFormat.Gif;
+          } else if (filename.EndsWith("png")) {
+            format = ImageFormat.Png;
+          } else if (filename.EndsWith("tif")) {
+            format = ImageFormat.Tiff;
+          }
+          image.Save(saveFileDialog.FileName, format);
+        }
+      }
       image.Dispose();
-
       Cleanup();
     }