개정판 53880c83
issue #886: Symbol legend 생성 작업 중....
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 1 | 1 |
using KCOM.Common; |
| 2 | 2 |
using MarkupToPDF.Common; |
| 3 |
using Svg2Xaml; |
|
| 3 | 4 |
using System; |
| 4 | 5 |
using System.Collections.Generic; |
| 5 | 6 |
using System.ComponentModel; |
| ... | ... | |
| 8 | 9 |
using System.Windows; |
| 9 | 10 |
using System.Windows.Controls; |
| 10 | 11 |
using System.Windows.Input; |
| 12 |
using System.Windows.Media; |
|
| 13 |
using System.Windows.Media.Imaging; |
|
| 11 | 14 |
using Telerik.Windows.Controls; |
| 12 | 15 |
//using static KCOM.Views.MainMenu; |
| 13 | 16 |
|
| ... | ... | |
| 184 | 187 |
markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID); |
| 185 | 188 |
|
| 186 | 189 |
var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.ID == (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault(); |
| 190 |
|
|
| 187 | 191 |
if (Item_ != null) |
| 188 | 192 |
{
|
| 189 | 193 |
id = "|SymbolID|" + ViewerDataModel.Instance.MarkupList_USER.Where |
| ... | ... | |
| 375 | 379 |
IntPtr hBitmap = bmp.GetHbitmap(); |
| 376 | 380 |
System.Windows.Media.ImageSource WpfBitmap = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(hBitmap, IntPtr.Zero, Int32Rect.Empty, System.Windows.Media.Imaging.BitmapSizeOptions.FromEmptyOptions()); |
| 377 | 381 |
Image img = new Image(); |
| 378 |
img.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri(filename)); |
|
| 379 |
|
|
| 382 |
//img.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri(filename)); |
|
| 383 |
if (filename.Contains(".svg"))
|
|
| 384 |
{
|
|
| 385 |
byte[] imageData = null; |
|
| 386 |
DrawingImage image = null; |
|
| 387 |
using (System.Net.WebClient web = new System.Net.WebClient()) |
|
| 388 |
{
|
|
| 389 |
imageData = web.DownloadData(new Uri(filename)); |
|
| 390 |
System.IO.Stream stream = new System.IO.MemoryStream(imageData); |
|
| 391 |
image = SvgReader.Load(stream); |
|
| 392 |
} |
|
| 393 |
img.Source = image; |
|
| 394 |
} |
|
| 395 |
else |
|
| 396 |
{
|
|
| 397 |
img.Source = new BitmapImage(new Uri(filename)); |
|
| 398 |
} |
|
| 380 | 399 |
var currentControl = new MarkupToPDF.Controls.Etc.ImgControl |
| 381 | 400 |
{
|
| 382 | 401 |
PointSet = new List<Point>(), |
| 383 |
FilePath = img.Source.ToString(), |
|
| 402 |
//FilePath = img.Source.ToString(), |
|
| 403 |
FilePath = filename, |
|
| 384 | 404 |
ImageData = img.Source, |
| 385 | 405 |
StartPoint = new Point(100, 100), |
| 386 | 406 |
EndPoint = new Point(200, 200), |
내보내기 Unified diff
