개정판 f1f822e9
issue #00000 svg 기능 수정
Change-Id: Ic1575964db1f861ca637c7073dfa382fee4bbcd4
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 12 | 12 |
using MarkupToPDF.Controls.Polygon; |
| 13 | 13 |
using MarkupToPDF.Controls.Shape; |
| 14 | 14 |
using MarkupToPDF.Controls.Text; |
| 15 |
using Svg2Xaml; |
|
| 16 | 15 |
using System; |
| 17 | 16 |
using System.Collections.Generic; |
| 18 | 17 |
using System.Diagnostics; |
| ... | ... | |
| 565 | 564 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.searchPanel_Instance.SetSerachPDFFile(instnaceFile); |
| 566 | 565 |
ViewerDataModel.Instance.IsDownloadOriginal = true; |
| 567 | 566 |
(sender as IIpc.WcfServer).IpcFileDownloadReceived -= WcfServer_IpcFileDownloadReceived; |
| 568 |
//(sender as IIpc.WcfServer).Stop();
|
|
| 567 |
(sender as IIpc.WcfServer).Stop(); |
|
| 569 | 568 |
} |
| 570 | 569 |
} |
| 571 | 570 |
catch (Exception ex) |
| ... | ... | |
| 2634 | 2633 |
//img.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri(Data_)); |
| 2635 | 2634 |
if (Data_.Contains(".svg"))
|
| 2636 | 2635 |
{
|
| 2637 |
byte[] imageData = null; |
|
| 2638 |
DrawingImage image = null; |
|
| 2639 |
using (System.Net.WebClient web = new System.Net.WebClient()) |
|
| 2640 |
{
|
|
| 2641 |
imageData = web.DownloadData(new Uri(Data_)); |
|
| 2642 |
System.IO.Stream stream = new System.IO.MemoryStream(imageData); |
|
| 2643 |
image = SvgReader.Load(stream); |
|
| 2644 |
} |
|
| 2645 |
img.Source = image; |
|
| 2636 |
SharpVectors.Converters.SvgImageExtension svgImage = new SharpVectors.Converters.SvgImageExtension(Data_); |
|
| 2637 |
img.Source = (DrawingImage)svgImage.ProvideValue(null); |
|
| 2646 | 2638 |
} |
| 2647 | 2639 |
else |
| 2648 | 2640 |
{
|
| ... | ... | |
| 3758 | 3750 |
Image img = new Image(); |
| 3759 | 3751 |
if (filename.Contains(".svg"))
|
| 3760 | 3752 |
{
|
| 3761 |
byte[] imageData = null; |
|
| 3762 |
DrawingImage image = null; |
|
| 3763 |
using (System.Net.WebClient web = new System.Net.WebClient()) |
|
| 3764 |
{
|
|
| 3765 |
imageData = web.DownloadData(uri.Uri); |
|
| 3766 |
System.IO.Stream stream = new System.IO.MemoryStream(imageData); |
|
| 3767 |
image = SvgReader.Load(stream); |
|
| 3768 |
} |
|
| 3769 |
img.Source = image; |
|
| 3753 |
SharpVectors.Converters.SvgImageExtension svgImage = new SharpVectors.Converters.SvgImageExtension(uri.Uri.ToString()); |
|
| 3754 |
img.Source = (DrawingImage)svgImage.ProvideValue(null); |
|
| 3770 | 3755 |
} |
| 3771 | 3756 |
else |
| 3772 | 3757 |
{
|
내보내기 Unified diff
