개정판 5b48dae7
issue #00000 stringToColorBrushConvert 추가
Change-Id: I8a6212b33194e6409ef223dbca64eeae80f949c2
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 25 | 25 |
using System.Web; |
| 26 | 26 |
using Markus.Fonts; |
| 27 | 27 |
using System.Threading.Tasks; |
| 28 |
using System.Windows.Threading; |
|
| 28 | 29 |
|
| 29 | 30 |
namespace KCOM.Views |
| 30 | 31 |
{
|
| ... | ... | |
| 2423 | 2424 |
|
| 2424 | 2425 |
#region Copy |
| 2425 | 2426 |
case "Copy": |
| 2426 |
Copy_Start(); |
|
| 2427 |
CopyCommand.Instance.Execute(); |
|
| 2428 |
//Copy_Start(); |
|
| 2427 | 2429 |
instanceToggle.IsChecked = false; |
| 2428 | 2430 |
ViewerDataModel.Instance.SelectedControl = ""; |
| 2429 | 2431 |
ViewerDataModel.Instance.ControlTag = null; |
| ... | ... | |
| 2444 | 2446 |
#endregion |
| 2445 | 2447 |
#region Paste |
| 2446 | 2448 |
case "Paste": |
| 2447 |
Paste_Start(); |
|
| 2449 |
PasteCommand.Instance.Execute(); |
|
| 2450 |
//Paste_Start(); |
|
| 2448 | 2451 |
instanceToggle.IsChecked = false; |
| 2449 | 2452 |
ViewerDataModel.Instance.SelectedControl = ""; |
| 2450 | 2453 |
ViewerDataModel.Instance.ControlTag = null; |
| ... | ... | |
| 3008 | 3011 |
|
| 3009 | 3012 |
foreach (var item in this.ParentOfType<MainWindow>().dzMainMenu.SelectLayer.Children) |
| 3010 | 3013 |
{
|
| 3014 |
string id = string.Empty; |
|
| 3011 | 3015 |
if (item.GetType().Name == "AdornerFinal") |
| 3012 | 3016 |
{
|
| 3013 | 3017 |
foreach (var InnerItem in (item as Controls.AdornerFinal).Members.Cast<Controls.AdornerMember>()) |
| ... | ... | |
| 3016 | 3020 |
if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData)) |
| 3017 | 3021 |
{
|
| 3018 | 3022 |
MarkupToPDF.Controls.Parsing.MarkupParser.MarkupReturn res = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID); |
| 3019 |
MarkupData += "|OR|" + res.ConvertData; |
|
| 3023 |
id = (InnerItem.Symbol_ID != null) ? "|SymbolID|" + InnerItem.Symbol_ID : ""; |
|
| 3024 |
MarkupData += "|OR|" + res.ConvertData + id; |
|
| 3020 | 3025 |
} |
| 3021 | 3026 |
} |
| 3022 |
Clipboard.SetDataObject(MarkupData); |
|
| 3027 |
|
|
| 3028 |
this.Dispatcher.Invoke(() => |
|
| 3029 |
{
|
|
| 3030 |
Clipboard.SetData(DataFormats.StringFormat, MarkupData); |
|
| 3031 |
}, DispatcherPriority.Background); |
|
| 3023 | 3032 |
} |
| 3024 | 3033 |
} |
| 3025 | 3034 |
} |
| ... | ... | |
| 3054 | 3063 |
public async void Paste_Start() |
| 3055 | 3064 |
{
|
| 3056 | 3065 |
//마크업 붙여넣기 |
| 3057 |
if (Clipboard.GetText().Contains("|OR||DZ|"))
|
|
| 3066 |
|
|
| 3067 |
var markupData = Clipboard.GetData(DataFormats.StringFormat); |
|
| 3068 |
|
|
| 3069 |
if (markupData.GetType() == typeof(string) && markupData.ToString().Contains("|OR||DZ|"))
|
|
| 3058 | 3070 |
{
|
| 3059 | 3071 |
List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>(); |
| 3060 | 3072 |
|
| 3061 | 3073 |
string[] delimiterChars = { "|OR|" };
|
| 3062 |
string[] data = Clipboard.GetText().Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries);
|
|
| 3074 |
string[] data = markupData.ToString().Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries);
|
|
| 3063 | 3075 |
|
| 3064 | 3076 |
SelectionSet.Instance.UnSelect(this.ParentOfType<MainWindow>().dzMainMenu); |
| 3065 | 3077 |
|
내보내기 Unified diff
