개정판 b37ef4b3
issue #923: add CopyCommand, CutCommand, PasteCommand
Change-Id: I3688e8a8d3b2d17eb76f70914dd79961cd858d0b
| KCOM/Common/SelectionSet.cs | ||
|---|---|---|
| 70 | 70 |
} |
| 71 | 71 |
|
| 72 | 72 |
/// <summary> |
| 73 |
/// select all controls |
|
| 74 |
/// - unselect selected items |
|
| 75 |
/// - adornerset을 생성하고 SelectLayer에 추가한다 |
|
| 76 |
/// </summary> |
|
| 77 |
public void SelectAll() |
|
| 78 |
{
|
|
| 79 |
/// 선택된 어도너가 있을 시 취소하고 전체 선택 |
|
| 80 |
this.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
| 81 |
|
|
| 82 |
List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>(); |
|
| 83 |
var controls = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.GetType().Name != "" |
|
| 84 |
&& data.Visibility != Visibility.Hidden).ToList(); |
|
| 85 |
|
|
| 86 |
foreach (var item in controls) adornerSet.Add(item); |
|
| 87 |
|
|
| 88 |
if (adornerSet.Count > 0) |
|
| 89 |
{
|
|
| 90 |
Controls.AdornerFinal final = new Controls.AdornerFinal(adornerSet); |
|
| 91 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 92 |
} |
|
| 93 |
} |
|
| 94 |
|
|
| 95 |
/// <summary> |
|
| 73 | 96 |
/// select item which's bouding rectangle is inside of given rect |
| 74 | 97 |
/// </summary> |
| 75 | 98 |
/// <author>humkyung</author> |
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 157 | 157 |
} |
| 158 | 158 |
catch //(Exception ex) |
| 159 | 159 |
{
|
| 160 |
|
|
| 161 | 160 |
} |
| 162 | 161 |
finally |
| 163 | 162 |
{
|
| KCOM/Events/CopyCommand.cs | ||
|---|---|---|
| 1 |
using KCOM.Common; |
|
| 2 |
using KCOM.Controls; |
|
| 3 |
using KCOM.Views; |
|
| 4 |
using MarkupToPDF.Common; |
|
| 5 |
using MarkupToPDF.Controls.Parsing; |
|
| 6 |
using Newtonsoft.Json; |
|
| 7 |
using Newtonsoft.Json.Converters; |
|
| 8 |
using Newtonsoft.Json.Linq; |
|
| 9 |
using Newtonsoft.Json.Serialization; |
|
| 10 |
using System; |
|
| 11 |
using System.Collections; |
|
| 12 |
using System.Collections.Generic; |
|
| 13 |
using System.ComponentModel; |
|
| 14 |
using System.Data; |
|
| 15 |
using System.IO; |
|
| 16 |
using System.Linq; |
|
| 17 |
using System.Reflection; |
|
| 18 |
using System.Runtime.Serialization.Formatters; |
|
| 19 |
using System.Runtime.Serialization.Formatters.Binary; |
|
| 20 |
using System.Runtime.Serialization.Json; |
|
| 21 |
using System.Text; |
|
| 22 |
using System.Windows; |
|
| 23 |
using System.Windows.Media; |
|
| 24 |
using System.Xml; |
|
| 25 |
using System.Xml.Serialization; |
|
| 26 |
|
|
| 27 |
namespace KCOM |
|
| 28 |
{
|
|
| 29 |
public class CopyCommand |
|
| 30 |
{
|
|
| 31 |
private static readonly CopyCommand _instance = new CopyCommand(); |
|
| 32 |
|
|
| 33 |
// Explicit static constructor to tell C# compiler |
|
| 34 |
// not to mark type as beforefieldinit |
|
| 35 |
static CopyCommand() |
|
| 36 |
{
|
|
| 37 |
} |
|
| 38 |
|
|
| 39 |
private CopyCommand() |
|
| 40 |
{
|
|
| 41 |
} |
|
| 42 |
|
|
| 43 |
public static CopyCommand Instance |
|
| 44 |
{
|
|
| 45 |
get |
|
| 46 |
{
|
|
| 47 |
return _instance; |
|
| 48 |
} |
|
| 49 |
} |
|
| 50 |
|
|
| 51 |
/// <summary> |
|
| 52 |
/// copy selected controls |
|
| 53 |
/// </summary> |
|
| 54 |
/// <author>humkyung</author> |
|
| 55 |
/// <date>2019.06.18</date> |
|
| 56 |
/// <param name="comments"></param> |
|
| 57 |
public void Execute() |
|
| 58 |
{
|
|
| 59 |
if (Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Count > 0) |
|
| 60 |
{
|
|
| 61 |
string MarkupData = string.Empty; |
|
| 62 |
|
|
| 63 |
foreach (var item in Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children) |
|
| 64 |
{
|
|
| 65 |
string id = string.Empty; |
|
| 66 |
if (item.GetType().Name == "AdornerFinal") |
|
| 67 |
{
|
|
| 68 |
foreach (var InnerItem in (item as Controls.AdornerFinal).Members.Cast<Controls.AdornerMember>()) |
|
| 69 |
{
|
|
| 70 |
var data = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID); |
|
| 71 |
id = (InnerItem.Symbol_ID != null) ? "|SymbolID|" + InnerItem.Symbol_ID : ""; |
|
| 72 |
MarkupData += "|OR|" + data.ConvertData + id; |
|
| 73 |
} |
|
| 74 |
|
|
| 75 |
Clipboard.SetText(MarkupData); |
|
| 76 |
} |
|
| 77 |
} |
|
| 78 |
} |
|
| 79 |
} |
|
| 80 |
} |
|
| 81 |
} |
|
| KCOM/Events/CutCommand.cs | ||
|---|---|---|
| 1 |
using KCOM.Common; |
|
| 2 |
using KCOM.Controls; |
|
| 3 |
using KCOM.Views; |
|
| 4 |
using MarkupToPDF.Common; |
|
| 5 |
using MarkupToPDF.Controls.Parsing; |
|
| 6 |
using Newtonsoft.Json; |
|
| 7 |
using Newtonsoft.Json.Converters; |
|
| 8 |
using Newtonsoft.Json.Linq; |
|
| 9 |
using Newtonsoft.Json.Serialization; |
|
| 10 |
using System; |
|
| 11 |
using System.Collections; |
|
| 12 |
using System.Collections.Generic; |
|
| 13 |
using System.ComponentModel; |
|
| 14 |
using System.Data; |
|
| 15 |
using System.IO; |
|
| 16 |
using System.Linq; |
|
| 17 |
using System.Reflection; |
|
| 18 |
using System.Runtime.Serialization.Formatters; |
|
| 19 |
using System.Runtime.Serialization.Formatters.Binary; |
|
| 20 |
using System.Runtime.Serialization.Json; |
|
| 21 |
using System.Text; |
|
| 22 |
using System.Windows; |
|
| 23 |
using System.Windows.Media; |
|
| 24 |
using System.Xml; |
|
| 25 |
using System.Xml.Serialization; |
|
| 26 |
|
|
| 27 |
namespace KCOM |
|
| 28 |
{
|
|
| 29 |
public class CutCommand |
|
| 30 |
{
|
|
| 31 |
private static readonly CutCommand _instance = new CutCommand(); |
|
| 32 |
|
|
| 33 |
// Explicit static constructor to tell C# compiler |
|
| 34 |
// not to mark type as beforefieldinit |
|
| 35 |
static CutCommand() |
|
| 36 |
{
|
|
| 37 |
} |
|
| 38 |
|
|
| 39 |
private CutCommand() |
|
| 40 |
{
|
|
| 41 |
} |
|
| 42 |
|
|
| 43 |
public static CutCommand Instance |
|
| 44 |
{
|
|
| 45 |
get |
|
| 46 |
{
|
|
| 47 |
return _instance; |
|
| 48 |
} |
|
| 49 |
} |
|
| 50 |
|
|
| 51 |
/// <summary> |
|
| 52 |
/// cut selected controls |
|
| 53 |
/// </summary> |
|
| 54 |
/// <author>humkyung</author> |
|
| 55 |
/// <date>2019.06.18</date> |
|
| 56 |
/// <param name="comments"></param> |
|
| 57 |
public void Execute() |
|
| 58 |
{
|
|
| 59 |
if (Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Count > 0) |
|
| 60 |
{
|
|
| 61 |
string MarkupData = string.Empty; |
|
| 62 |
|
|
| 63 |
foreach (var item in Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children) |
|
| 64 |
{
|
|
| 65 |
string id = string.Empty; |
|
| 66 |
if (item.GetType().Name == "AdornerFinal") |
|
| 67 |
{
|
|
| 68 |
foreach (var InnerItem in (item as Controls.AdornerFinal).Members.Cast<Controls.AdornerMember>()) |
|
| 69 |
{
|
|
| 70 |
var data = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID); |
|
| 71 |
id = (InnerItem.Symbol_ID != null) ? "|SymbolID|" + InnerItem.Symbol_ID : ""; |
|
| 72 |
MarkupData += "|OR|" + data.ConvertData + id; |
|
| 73 |
} |
|
| 74 |
|
|
| 75 |
Clipboard.SetText(MarkupData); |
|
| 76 |
} |
|
| 77 |
} |
|
| 78 |
|
|
| 79 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Clear(); |
|
| 80 |
} |
|
| 81 |
} |
|
| 82 |
} |
|
| 83 |
} |
|
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 97 | 97 |
|
| 98 | 98 |
if (Common.ViewerDataModel.Instance.MarkupControls_USER.Count > 0) |
| 99 | 99 |
{
|
| 100 |
//전체 선택 시 선택된 토글 해제 |
|
| 100 |
/// 전체 선택 시 선택된 토글 해제
|
|
| 101 | 101 |
var TogList = this.dzTopMenu.Parent.ChildrenOfType<RadToggleButton>(); |
| 102 | 102 |
this.dzMainMenu.controlType = MarkupToPDF.Controls.Common.ControlType.None; |
| 103 | 103 |
this.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.None; |
| 104 | 104 |
|
| 105 |
//컨트롤을 그리는 도중일 경우 컨트롤 삭제 |
|
| 105 |
/// 컨트롤을 그리는 도중일 경우 컨트롤 삭제
|
|
| 106 | 106 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(this.dzMainMenu.currentControl); |
| 107 | 107 |
this.dzMainMenu.currentControl = null; |
| 108 | 108 |
|
| ... | ... | |
| 111 | 111 |
tog.IsChecked = false; |
| 112 | 112 |
} |
| 113 | 113 |
|
| 114 |
//선택된 어도너가 있을 시 취소하고 전체 선택 |
|
| 115 |
SelectionSet.Instance.UnSelect(this.dzMainMenu); |
|
| 116 |
|
|
| 117 |
UndoData = new Undo_data() |
|
| 118 |
{
|
|
| 119 |
IsUndo = false, |
|
| 120 |
Event = Event_Type.Select, |
|
| 121 |
EventTime = DateTime.Now, |
|
| 122 |
Markup_List = new List<Multi_Undo_data>() |
|
| 123 |
}; |
|
| 124 |
|
|
| 125 |
List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>(); |
|
| 126 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.GetType().Name != "" |
|
| 127 |
&& data.Visibility != Visibility.Hidden).ToList(); |
|
| 128 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data(); |
|
| 129 |
|
|
| 130 |
foreach (var item in control) |
|
| 131 |
{
|
|
| 132 |
adornerSet.Add(item); |
|
| 133 |
//multi_Undo_Data.Markup = item; |
|
| 134 |
multi_Undo_Data = this.dzMainMenu.Control_Style(item); |
|
| 135 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
| 136 |
|
|
| 137 |
multi_Undo_Data = new Multi_Undo_data(); |
|
| 138 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item); |
|
| 139 |
|
|
| 140 |
} |
|
| 141 |
|
|
| 142 |
if (adornerSet.Count > 0) |
|
| 143 |
{
|
|
| 144 |
Controls.AdornerFinal final = new Controls.AdornerFinal(adornerSet); |
|
| 145 |
this.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 146 |
} |
|
| 147 |
|
|
| 148 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i => |
|
| 149 |
{
|
|
| 150 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
|
| 151 |
}); |
|
| 152 |
|
|
| 153 |
|
|
| 154 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
| 114 |
SelectionSet.Instance.SelectAll(); |
|
| 155 | 115 |
} |
| 156 | 116 |
} |
| 157 | 117 |
} |
| 158 | 118 |
break; |
| 159 | 119 |
#endregion |
| 160 | 120 |
|
| 161 |
|
|
| 162 |
|
|
| 163 | 121 |
#region 복사하기(Ctrl + C) |
| 164 | 122 |
case Key.C: |
| 165 | 123 |
{
|
| 166 |
if (ViewerDataModel.Instance.IsPressCtrl) |
|
| 167 |
{
|
|
| 168 |
if (this.dzMainMenu.SelectLayer.Children.Count > 0) |
|
| 169 |
{
|
|
| 170 |
string MarkupData = ""; |
|
| 171 |
|
|
| 172 |
foreach (var item in this.dzMainMenu.SelectLayer.Children) |
|
| 173 |
{
|
|
| 174 |
string id = ""; |
|
| 175 |
if (item.GetType().Name == "AdornerFinal") |
|
| 176 |
{
|
|
| 177 |
foreach (var InnerItem in (item as Controls.AdornerFinal).Members.Cast<Controls.AdornerMember>()) |
|
| 178 |
{
|
|
| 179 |
if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData)) |
|
| 180 |
{
|
|
| 181 |
markupReturn = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID); |
|
| 182 |
|
|
| 183 |
var Item_ = ViewerDataModel.Instance.MyMarkupList.Where(d => d.ID == (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault(); |
|
| 184 |
|
|
| 185 |
if (Item_ != null) |
|
| 186 |
{
|
|
| 187 |
id = "|SymbolID|" + ViewerDataModel.Instance.MyMarkupList.Where |
|
| 188 |
(d => d.ID == (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault().Symbol_ID; |
|
| 189 |
} |
|
| 190 |
else |
|
| 191 |
{
|
|
| 192 |
if (InnerItem.Symbol_ID != null) |
|
| 193 |
{
|
|
| 194 |
id = "|SymbolID|" + InnerItem.Symbol_ID; |
|
| 195 |
|
|
| 196 |
} |
|
| 197 |
else |
|
| 198 |
{
|
|
| 199 |
id = ""; |
|
| 200 |
} |
|
| 201 |
} |
|
| 202 |
MarkupData += "|OR|" + markupReturn.ConvertData + id; |
|
| 203 |
} |
|
| 204 |
} |
|
| 205 |
Clipboard.SetText(MarkupData); |
|
| 206 |
} |
|
| 207 |
} |
|
| 208 |
} |
|
| 209 |
} |
|
| 124 |
if (ViewerDataModel.Instance.IsPressCtrl) CopyCommand.Instance.Execute(); |
|
| 210 | 125 |
} |
| 211 | 126 |
break; |
| 212 | 127 |
#endregion |
| ... | ... | |
| 214 | 129 |
#region 잘라내기(Ctrl + X) |
| 215 | 130 |
case Key.X: |
| 216 | 131 |
{
|
| 217 |
if (ViewerDataModel.Instance.IsPressCtrl) |
|
| 218 |
{
|
|
| 219 |
if (this.dzMainMenu.SelectLayer.Children.Count > 0) |
|
| 220 |
{
|
|
| 221 |
foreach (var item in this.dzMainMenu.SelectLayer.Children) |
|
| 222 |
{
|
|
| 223 |
string MarkupData = ""; |
|
| 224 |
|
|
| 225 |
if (item.GetType().Name == "AdornerFinal") |
|
| 226 |
{
|
|
| 227 |
foreach (var InnerItem in (item as Controls.AdornerFinal).Members.Cast<Controls.AdornerMember>()) |
|
| 228 |
{
|
|
| 229 |
if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData)) |
|
| 230 |
{
|
|
| 231 |
markupReturn = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID); |
|
| 232 |
MarkupData += "|OR|" + markupReturn.ConvertData; |
|
| 233 |
} |
|
| 234 |
} |
|
| 235 |
Clipboard.SetText(MarkupData); |
|
| 236 |
} |
|
| 237 |
} |
|
| 238 |
this.dzMainMenu.SelectLayer.Children.Clear(); |
|
| 239 |
} |
|
| 240 |
} |
|
| 241 |
|
|
| 132 |
if (ViewerDataModel.Instance.IsPressCtrl) CutCommand.Instance.Execute(); |
|
| 242 | 133 |
} |
| 243 | 134 |
break; |
| 244 | 135 |
#endregion |
| ... | ... | |
| 248 | 139 |
{
|
| 249 | 140 |
if (ViewerDataModel.Instance.IsPressCtrl && (App.ViewInfo.CreateFinalPDFPermission || App.ViewInfo.NewCommentPermission)) |
| 250 | 141 |
{
|
| 251 |
//마크업 붙여넣기 |
|
| 252 |
//if (Clipboard.GetText().Contains("|DZ|"))
|
|
| 253 |
if (Clipboard.GetText().Contains("|OR||DZ|"))
|
|
| 254 |
{
|
|
| 255 |
List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>(); |
|
| 256 |
|
|
| 257 |
string[] delimiterChars = { "|OR|" };
|
|
| 258 |
string[] delimiterChars2 = { "|OR|", "|SymbolID|" };
|
|
| 259 |
string[] data = Clipboard.GetText().Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries); |
|
| 260 |
|
|
| 261 |
SelectionSet.Instance.UnSelect(this.dzMainMenu); |
|
| 262 |
|
|
| 263 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data(); |
|
| 264 |
|
|
| 265 |
//강인구 Undo/Redo 보류 |
|
| 266 |
UndoData = new Undo_data() |
|
| 267 |
{
|
|
| 268 |
IsUndo = false, |
|
| 269 |
Event = Event_Type.Create, |
|
| 270 |
EventTime = DateTime.Now, |
|
| 271 |
Markup_List = new List<Multi_Undo_data>() |
|
| 272 |
}; |
|
| 273 |
|
|
| 274 |
ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i => |
|
| 275 |
{
|
|
| 276 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
|
| 277 |
}); |
|
| 278 |
|
|
| 279 |
foreach (string parse in data) |
|
| 280 |
{
|
|
| 281 |
if(parse != "") |
|
| 282 |
{
|
|
| 283 |
string[] data2 = new string[2]; |
|
| 284 |
data2 = parse.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 285 |
|
|
| 286 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, data2[0], ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty); |
|
| 287 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid(); |
|
| 288 |
if(data2.Length >= 2) |
|
| 289 |
{
|
|
| 290 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = data2[1]; |
|
| 291 |
} |
|
| 292 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 293 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 294 |
|
|
| 295 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 296 |
|
|
| 297 |
//Controls.AdornerFinal final = new Controls.AdornerFinal(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 298 |
//this.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 299 |
|
|
| 300 |
multi_Undo_Data = dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 301 |
|
|
| 302 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
| 303 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
| 304 |
} |
|
| 305 |
} |
|
| 306 |
Controls.AdornerFinal final = new Controls.AdornerFinal(adornerSet); |
|
| 307 |
|
|
| 308 |
double realPointX = this.dzMainMenu.getCurrentPoint.X - final.BorderSize.X - (final.BorderSize.Width / 2); |
|
| 309 |
double realPointY = this.dzMainMenu.getCurrentPoint.Y - final.BorderSize.Y - (final.BorderSize.Height / 2); |
|
| 310 |
final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(realPointX, realPointY)); |
|
| 311 |
|
|
| 312 |
if (final.Members.Where(type => type.Drawingtype == MarkupToPDF.Controls.Common.ControlType.TextControl).FirstOrDefault() != null) |
|
| 313 |
{
|
|
| 314 |
final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(0.001, 0.001)); //dummy |
|
| 315 |
} |
|
| 316 |
|
|
| 317 |
this.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 318 |
} |
|
| 319 |
//외부 이미지 붙여넣기 |
|
| 320 |
else if (Clipboard.GetImage() != null) |
|
| 321 |
{
|
|
| 322 |
try |
|
| 323 |
{
|
|
| 324 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data(); |
|
| 325 |
|
|
| 326 |
//강인구 Undo/Redo 보류 |
|
| 327 |
UndoData = new Undo_data() |
|
| 328 |
{
|
|
| 329 |
IsUndo = false, |
|
| 330 |
Event = Event_Type.Create, |
|
| 331 |
EventTime = DateTime.Now, |
|
| 332 |
Markup_List = new List<Multi_Undo_data>() |
|
| 333 |
}; |
|
| 334 |
|
|
| 335 |
string temppath = System.IO.Path.GetTempPath(); |
|
| 336 |
//string filename = KCOM.Events.Save.shortCommentKey(); |
|
| 337 |
string filename = Commons.shortFileKey(); |
|
| 338 |
|
|
| 339 |
System.Drawing.Image clipboardImage = System.Windows.Forms.Clipboard.GetImage(); |
|
| 340 |
clipboardImage.Save(temppath + "\\" + filename); |
|
| 341 |
|
|
| 342 |
System.IO.FileInfo fileInfo = new System.IO.FileInfo(temppath + "\\" + filename); |
|
| 343 |
String strFile = System.IO.Path.GetFileName(fileInfo.FullName); |
|
| 344 |
long numByte = fileInfo.Length; |
|
| 345 |
double dLen = Convert.ToDouble(fileInfo.Length / 1000000); |
|
| 346 |
kr.co.devdoftech.cloud.FileUpload fileUploader = new kr.co.devdoftech.cloud.FileUpload(); |
|
| 347 |
|
|
| 348 |
if (dLen < 4) |
|
| 349 |
{
|
|
| 350 |
System.IO.FileStream fStream = new System.IO.FileStream(fileInfo.FullName, |
|
| 351 |
System.IO.FileMode.Open, System.IO.FileAccess.Read); |
|
| 352 |
System.IO.BinaryReader br = new System.IO.BinaryReader(fStream); |
|
| 353 |
byte[] data = br.ReadBytes((int)numByte); |
|
| 354 |
|
|
| 355 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, this.dzMainMenu._DocItem.DOCUMENT_NO, App.ViewInfo.UserID, strFile + ".png", data); |
|
| 356 |
|
|
| 357 |
Check_Uri.UriCheck(filename); |
|
| 358 |
|
|
| 359 |
br.Close(); |
|
| 360 |
fStream.Close(); |
|
| 361 |
fStream.Dispose(); |
|
| 362 |
} |
|
| 363 |
else |
|
| 364 |
{
|
|
| 365 |
dzMainMenu.DialogMessage_Alert("Available Memory less than 4 mega byte", "Alert");
|
|
| 366 |
return; |
|
| 367 |
} |
|
| 368 |
|
|
| 369 |
fileInfo.Delete(); |
|
| 370 |
|
|
| 371 |
//System.Drawing.Image clipboardImage = System.Windows.Forms.Clipboard.GetImage(); |
|
| 372 |
System.Drawing.Bitmap bmp = new System.Drawing.Bitmap(clipboardImage); |
|
| 373 |
IntPtr hBitmap = bmp.GetHbitmap(); |
|
| 374 |
System.Windows.Media.ImageSource WpfBitmap = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(hBitmap, IntPtr.Zero, Int32Rect.Empty, System.Windows.Media.Imaging.BitmapSizeOptions.FromEmptyOptions()); |
|
| 375 |
Image img = new Image(); |
|
| 376 |
//img.Source = new System.Windows.Media.Imaging.BitmapImage(new Uri(filename)); |
|
| 377 |
if (filename.Contains(".svg"))
|
|
| 378 |
{
|
|
| 379 |
byte[] imageData = null; |
|
| 380 |
DrawingImage image = null; |
|
| 381 |
using (System.Net.WebClient web = new System.Net.WebClient()) |
|
| 382 |
{
|
|
| 383 |
imageData = web.DownloadData(new Uri(filename)); |
|
| 384 |
System.IO.Stream stream = new System.IO.MemoryStream(imageData); |
|
| 385 |
image = SvgReader.Load(stream); |
|
| 386 |
} |
|
| 387 |
img.Source = image; |
|
| 388 |
} |
|
| 389 |
else |
|
| 390 |
{
|
|
| 391 |
img.Source = new BitmapImage(new Uri(filename)); |
|
| 392 |
} |
|
| 393 |
var currentControl = new MarkupToPDF.Controls.Etc.ImgControl |
|
| 394 |
{
|
|
| 395 |
PointSet = new List<Point>(), |
|
| 396 |
//FilePath = img.Source.ToString(), |
|
| 397 |
FilePath = filename, |
|
| 398 |
ImageData = img.Source, |
|
| 399 |
StartPoint = new Point(100, 100), |
|
| 400 |
EndPoint = new Point(200, 200), |
|
| 401 |
TopRightPoint = new Point(100, 200), |
|
| 402 |
LeftBottomPoint = new Point(200, 100) |
|
| 403 |
}; |
|
| 404 |
|
|
| 405 |
currentControl.TopRightPoint = new Point(currentControl.StartPoint.X + clipboardImage.Width, currentControl.StartPoint.Y); |
|
| 406 |
currentControl.LeftBottomPoint = new Point(currentControl.StartPoint.X, currentControl.StartPoint.Y + clipboardImage.Height); |
|
| 407 |
currentControl.EndPoint = new Point(currentControl.StartPoint.X + clipboardImage.Width, currentControl.StartPoint.Y + clipboardImage.Height); |
|
| 408 |
|
|
| 409 |
currentControl.PointSet = new List<Point> |
|
| 410 |
{
|
|
| 411 |
currentControl.StartPoint, |
|
| 412 |
currentControl.LeftBottomPoint, |
|
| 413 |
currentControl.EndPoint, |
|
| 414 |
currentControl.TopRightPoint, |
|
| 415 |
}; |
|
| 416 |
|
|
| 417 |
multi_Undo_Data = dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 418 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
| 419 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
| 420 |
|
|
| 421 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 422 |
currentControl.CommentID = Commons.shortGuid(); |
|
| 423 |
|
|
| 424 |
currentControl.ApplyTemplate(); |
|
| 425 |
currentControl.SetImage(); |
|
| 426 |
|
|
| 427 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 428 |
Controls.AdornerFinal final = new Controls.AdornerFinal(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 429 |
this.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 430 |
|
|
| 431 |
double realPointX = this.dzMainMenu.getCurrentPoint.X - final.BorderSize.X - (final.BorderSize.Width / 2); |
|
| 432 |
double realPointY = this.dzMainMenu.getCurrentPoint.Y - final.BorderSize.Y - (final.BorderSize.Height / 2); |
|
| 433 |
final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(realPointX, realPointY)); |
|
| 434 |
|
|
| 435 |
#region 주석 |
|
| 436 |
|
|
| 437 |
//주석 |
|
| 438 |
//ViewerDataModel.Instance.MarkupControls_USER.Remove(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 439 |
//Controls.AdornerFinal final = new Controls.AdornerFinal(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 440 |
//this.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 441 |
|
|
| 442 |
//string MarkupData = ""; |
|
| 443 |
|
|
| 444 |
//if (!ViewerDataModel.Instance.MarkupControls.Contains(currentControl)) |
|
| 445 |
//{
|
|
| 446 |
// markupReturn = layer.MarkupToString(currentControl, App.ViewInfo.UserID); |
|
| 447 |
// MarkupData += "|OR|" + markupReturn.ConvertData; |
|
| 448 |
//} |
|
| 449 |
//Clipboard.SetText(MarkupData); |
|
| 450 |
//this.dzMainMenu.SelectLayer.Children.Clear(); |
|
| 451 |
|
|
| 452 |
//List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>(); |
|
| 453 |
|
|
| 454 |
//string[] delimiterChars = { "|OR|" };
|
|
| 455 |
//string[] data1 = Clipboard.GetText().Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries); |
|
| 456 |
|
|
| 457 |
//this.dzMainMenu.ReleaseAdorner(); |
|
| 458 |
|
|
| 459 |
//foreach (string parse in data1) |
|
| 460 |
//{
|
|
| 461 |
// if (parse != "") |
|
| 462 |
// {
|
|
| 463 |
// System.Windows.Controls.Control item = layer.markupParse_Paste(parse, ViewerDataModel.Instance.MarkupControls_USER); |
|
| 464 |
// (item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid(); |
|
| 465 |
|
|
| 466 |
// ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 467 |
// ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 468 |
|
|
| 469 |
// adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 470 |
|
|
| 471 |
// //Controls.AdornerFinal final = new Controls.AdornerFinal(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 472 |
// //this.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 473 |
// } |
|
| 474 |
//} |
|
| 475 |
//Controls.AdornerFinal final = new Controls.AdornerFinal(adornerSet); |
|
| 476 |
|
|
| 477 |
//double realPointX = this.dzMainMenu.getCurrentPoint.X - final.BorderSize.X - (final.BorderSize.Width / 2); |
|
| 478 |
//double realPointY = this.dzMainMenu.getCurrentPoint.Y - final.BorderSize.Y - (final.BorderSize.Height / 2); |
|
| 479 |
//final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(realPointX, realPointY)); |
|
| 480 |
|
|
| 481 |
//if (final.MemberSet.Where(type => type.Drawingtype == MarkupToPDF.Controls.Common.ControlType.TextControl).FirstOrDefault() != null) |
|
| 482 |
//{
|
|
| 483 |
// final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(0.001, 0.001)); //dummy |
|
| 484 |
//} |
|
| 485 |
|
|
| 486 |
//this.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 487 |
#endregion |
|
| 488 |
|
|
| 489 |
} |
|
| 490 |
catch(Exception ex) |
|
| 491 |
{
|
|
| 492 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.DialogMessage_Alert("" + ex, "Alert");
|
|
| 493 |
} |
|
| 494 |
} |
|
| 142 |
PasteCommand.Instance.Execute(); |
|
| 495 | 143 |
} |
| 496 | 144 |
} |
| 497 | 145 |
break; |
| KCOM/Events/PasteCommand.cs | ||
|---|---|---|
| 1 |
using KCOM.Common; |
|
| 2 |
using KCOM.Controls; |
|
| 3 |
using KCOM.Views; |
|
| 4 |
using MarkupToPDF.Common; |
|
| 5 |
using MarkupToPDF.Controls.Parsing; |
|
| 6 |
using Newtonsoft.Json; |
|
| 7 |
using Newtonsoft.Json.Converters; |
|
| 8 |
using Newtonsoft.Json.Linq; |
|
| 9 |
using Newtonsoft.Json.Serialization; |
|
| 10 |
using Svg2Xaml; |
|
| 11 |
using System; |
|
| 12 |
using System.Collections; |
|
| 13 |
using System.Collections.Generic; |
|
| 14 |
using System.ComponentModel; |
|
| 15 |
using System.Data; |
|
| 16 |
using System.IO; |
|
| 17 |
using System.Linq; |
|
| 18 |
using System.Reflection; |
|
| 19 |
using System.Runtime.Serialization.Formatters; |
|
| 20 |
using System.Runtime.Serialization.Formatters.Binary; |
|
| 21 |
using System.Runtime.Serialization.Json; |
|
| 22 |
using System.Text; |
|
| 23 |
using System.Windows; |
|
| 24 |
using System.Windows.Media; |
|
| 25 |
using System.Windows.Media.Imaging; |
|
| 26 |
using System.Xml; |
|
| 27 |
using System.Xml.Serialization; |
|
| 28 |
|
|
| 29 |
namespace KCOM |
|
| 30 |
{
|
|
| 31 |
public class PasteCommand |
|
| 32 |
{
|
|
| 33 |
private static readonly PasteCommand _instance = new PasteCommand(); |
|
| 34 |
|
|
| 35 |
// Explicit static constructor to tell C# compiler |
|
| 36 |
// not to mark type as beforefieldinit |
|
| 37 |
static PasteCommand() |
|
| 38 |
{
|
|
| 39 |
} |
|
| 40 |
|
|
| 41 |
private PasteCommand() |
|
| 42 |
{
|
|
| 43 |
} |
|
| 44 |
|
|
| 45 |
public static PasteCommand Instance |
|
| 46 |
{
|
|
| 47 |
get |
|
| 48 |
{
|
|
| 49 |
return _instance; |
|
| 50 |
} |
|
| 51 |
} |
|
| 52 |
|
|
| 53 |
/// <summary> |
|
| 54 |
/// paste controls |
|
| 55 |
/// </summary> |
|
| 56 |
/// <author>humkyung</author> |
|
| 57 |
/// <date>2019.06.18</date> |
|
| 58 |
/// <param name="comments"></param> |
|
| 59 |
public void Execute() |
|
| 60 |
{
|
|
| 61 |
if (Clipboard.GetText().Contains("|OR||DZ|"))
|
|
| 62 |
{
|
|
| 63 |
List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>(); |
|
| 64 |
|
|
| 65 |
SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
| 66 |
|
|
| 67 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data(); |
|
| 68 |
|
|
| 69 |
//강인구 Undo/Redo 보류 |
|
| 70 |
MarkupToPDF.Common.Undo_data UndoData = new Undo_data() |
|
| 71 |
{
|
|
| 72 |
IsUndo = false, |
|
| 73 |
Event = Event_Type.Create, |
|
| 74 |
EventTime = DateTime.Now, |
|
| 75 |
Markup_List = new List<Multi_Undo_data>() |
|
| 76 |
}; |
|
| 77 |
|
|
| 78 |
ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i => |
|
| 79 |
{
|
|
| 80 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
|
| 81 |
}); |
|
| 82 |
|
|
| 83 |
string[] delimiterChars = { "|OR|" };
|
|
| 84 |
string[] delimiterChars2 = { "|OR|", "|SymbolID|" };
|
|
| 85 |
string[] data = Clipboard.GetText().Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries); |
|
| 86 |
foreach (string parse in data) |
|
| 87 |
{
|
|
| 88 |
if (parse != "") |
|
| 89 |
{
|
|
| 90 |
string[] data2 = new string[2]; |
|
| 91 |
data2 = parse.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
|
| 92 |
|
|
| 93 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, data2[0], ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty); |
|
| 94 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid(); |
|
| 95 |
if (data2.Length >= 2) |
|
| 96 |
{
|
|
| 97 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = data2[1]; |
|
| 98 |
} |
|
| 99 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 100 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 101 |
|
|
| 102 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 103 |
|
|
| 104 |
multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 105 |
|
|
| 106 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
| 107 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
| 108 |
} |
|
| 109 |
} |
|
| 110 |
Controls.AdornerFinal final = new Controls.AdornerFinal(adornerSet); |
|
| 111 |
|
|
| 112 |
double realPointX = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.getCurrentPoint.X - final.BorderSize.X - (final.BorderSize.Width / 2); |
|
| 113 |
double realPointY = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.getCurrentPoint.Y - final.BorderSize.Y - (final.BorderSize.Height / 2); |
|
| 114 |
final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(realPointX, realPointY)); |
|
| 115 |
|
|
| 116 |
if (final.Members.Where(type => type.Drawingtype == MarkupToPDF.Controls.Common.ControlType.TextControl).FirstOrDefault() != null) |
|
| 117 |
{
|
|
| 118 |
final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(0.001, 0.001)); //dummy |
|
| 119 |
} |
|
| 120 |
|
|
| 121 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 122 |
} |
|
| 123 |
/// 외부 이미지 붙여넣기 |
|
| 124 |
else if (Clipboard.GetImage() != null) |
|
| 125 |
{
|
|
| 126 |
try |
|
| 127 |
{
|
|
| 128 |
Multi_Undo_data multi_Undo_Data = new Multi_Undo_data(); |
|
| 129 |
|
|
| 130 |
MarkupToPDF.Common.Undo_data UndoData = new Undo_data() |
|
| 131 |
{
|
|
| 132 |
IsUndo = false, |
|
| 133 |
Event = Event_Type.Create, |
|
| 134 |
EventTime = DateTime.Now, |
|
| 135 |
Markup_List = new List<Multi_Undo_data>() |
|
| 136 |
}; |
|
| 137 |
|
|
| 138 |
string temppath = System.IO.Path.GetTempPath(); |
|
| 139 |
string filename = Commons.shortFileKey(); |
|
| 140 |
|
|
| 141 |
System.Drawing.Image clipboardImage = System.Windows.Forms.Clipboard.GetImage(); |
|
| 142 |
clipboardImage.Save(Path.Combine(temppath , filename)); |
|
| 143 |
|
|
| 144 |
/// upload image file to server |
|
| 145 |
System.IO.FileInfo fileInfo = new System.IO.FileInfo(Path.Combine(temppath , filename)); |
|
| 146 |
String strFile = System.IO.Path.GetFileName(fileInfo.FullName); |
|
| 147 |
long numByte = fileInfo.Length; |
|
| 148 |
double dLen = Convert.ToDouble(fileInfo.Length / 1000000); |
|
| 149 |
kr.co.devdoftech.cloud.FileUpload fileUploader = new kr.co.devdoftech.cloud.FileUpload(); |
|
| 150 |
if (dLen < 4) |
|
| 151 |
{
|
|
| 152 |
System.IO.FileStream fStream = new System.IO.FileStream(fileInfo.FullName, |
|
| 153 |
System.IO.FileMode.Open, System.IO.FileAccess.Read); |
|
| 154 |
System.IO.BinaryReader br = new System.IO.BinaryReader(fStream); |
|
| 155 |
byte[] data = br.ReadBytes((int)numByte); |
|
| 156 |
|
|
| 157 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocItem.DOCUMENT_NO, App.ViewInfo.UserID, strFile + ".png", data); |
|
| 158 |
|
|
| 159 |
Check_Uri.UriCheck(filename); |
|
| 160 |
|
|
| 161 |
br.Close(); |
|
| 162 |
fStream.Close(); |
|
| 163 |
fStream.Dispose(); |
|
| 164 |
} |
|
| 165 |
else |
|
| 166 |
{
|
|
| 167 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.DialogMessage_Alert("Available Memory less than 4 mega byte", "Alert");
|
|
| 168 |
return; |
|
| 169 |
} |
|
| 170 |
|
|
| 171 |
fileInfo.Delete(); |
|
| 172 |
|
|
| 173 |
System.Drawing.Bitmap bmp = new System.Drawing.Bitmap(clipboardImage); |
|
| 174 |
IntPtr hBitmap = bmp.GetHbitmap(); |
|
| 175 |
System.Windows.Media.ImageSource WpfBitmap = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(hBitmap, IntPtr.Zero, Int32Rect.Empty, System.Windows.Media.Imaging.BitmapSizeOptions.FromEmptyOptions()); |
|
| 176 |
System.Windows.Controls.Image img = new System.Windows.Controls.Image(); |
|
| 177 |
if (filename.Contains(".svg"))
|
|
| 178 |
{
|
|
| 179 |
byte[] imageData = null; |
|
| 180 |
DrawingImage image = null; |
|
| 181 |
using (System.Net.WebClient web = new System.Net.WebClient()) |
|
| 182 |
{
|
|
| 183 |
imageData = web.DownloadData(new Uri(filename)); |
|
| 184 |
System.IO.Stream stream = new System.IO.MemoryStream(imageData); |
|
| 185 |
image = SvgReader.Load(stream); |
|
| 186 |
} |
|
| 187 |
img.Source = image; |
|
| 188 |
} |
|
| 189 |
else |
|
| 190 |
{
|
|
| 191 |
img.Source = new BitmapImage(new Uri(filename)); |
|
| 192 |
} |
|
| 193 |
var currentControl = new MarkupToPDF.Controls.Etc.ImgControl |
|
| 194 |
{
|
|
| 195 |
PointSet = new List<Point>(), |
|
| 196 |
FilePath = filename, |
|
| 197 |
ImageData = img.Source, |
|
| 198 |
StartPoint = new Point(100, 100), |
|
| 199 |
EndPoint = new Point(200, 200), |
|
| 200 |
TopRightPoint = new Point(100, 200), |
|
| 201 |
LeftBottomPoint = new Point(200, 100) |
|
| 202 |
}; |
|
| 203 |
|
|
| 204 |
currentControl.TopRightPoint = new Point(currentControl.StartPoint.X + clipboardImage.Width, currentControl.StartPoint.Y); |
|
| 205 |
currentControl.LeftBottomPoint = new Point(currentControl.StartPoint.X, currentControl.StartPoint.Y + clipboardImage.Height); |
|
| 206 |
currentControl.EndPoint = new Point(currentControl.StartPoint.X + clipboardImage.Width, currentControl.StartPoint.Y + clipboardImage.Height); |
|
| 207 |
|
|
| 208 |
currentControl.PointSet = new List<Point> |
|
| 209 |
{
|
|
| 210 |
currentControl.StartPoint, |
|
| 211 |
currentControl.LeftBottomPoint, |
|
| 212 |
currentControl.EndPoint, |
|
| 213 |
currentControl.TopRightPoint, |
|
| 214 |
}; |
|
| 215 |
|
|
| 216 |
multi_Undo_Data = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.Control_Style(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 217 |
UndoData.Markup_List.Add(multi_Undo_Data); |
|
| 218 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
| 219 |
|
|
| 220 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 221 |
currentControl.CommentID = Commons.shortGuid(); |
|
| 222 |
|
|
| 223 |
currentControl.ApplyTemplate(); |
|
| 224 |
currentControl.SetImage(); |
|
| 225 |
|
|
| 226 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 227 |
Controls.AdornerFinal final = new Controls.AdornerFinal(currentControl as MarkupToPDF.Common.CommentUserInfo); |
|
| 228 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SelectLayer.Children.Add(final); |
|
| 229 |
|
|
| 230 |
double realPointX = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.getCurrentPoint.X - final.BorderSize.X - (final.BorderSize.Width / 2); |
|
| 231 |
double realPointY = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.getCurrentPoint.Y - final.BorderSize.Y - (final.BorderSize.Height / 2); |
|
| 232 |
final.MoveAdorner(new System.Windows.Controls.Primitives.DragDeltaEventArgs(realPointX, realPointY)); |
|
| 233 |
} |
|
| 234 |
catch (Exception ex) |
|
| 235 |
{
|
|
| 236 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.DialogMessage_Alert("" + ex, "Alert");
|
|
| 237 |
} |
|
| 238 |
} |
|
| 239 |
} |
|
| 240 |
} |
|
| 241 |
} |
|
| KCOM/KCOM.csproj | ||
|---|---|---|
| 322 | 322 |
<Compile Include="Controls\TeighaD3DImage.cs" /> |
| 323 | 323 |
<Compile Include="Controls\TeighaD3DImageResult.cs" /> |
| 324 | 324 |
<Compile Include="Events\ConsolidateCommand.cs" /> |
| 325 |
<Compile Include="Events\CopyCommand.cs" /> |
|
| 326 |
<Compile Include="Events\CutCommand.cs" /> |
|
| 325 | 327 |
<Compile Include="Events\DeleteCommand.cs" /> |
| 326 | 328 |
<Compile Include="Events\Move.cs" /> |
| 329 |
<Compile Include="Events\PasteCommand.cs" /> |
|
| 327 | 330 |
<Compile Include="Events\TeamConsolidateCommand.cs" /> |
| 328 | 331 |
<Compile Include="Events\UndoCommand.cs" /> |
| 329 | 332 |
<Compile Include="Events\SaveCommand.cs" /> |
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 2 | 2 |
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 3 | 3 |
<PropertyGroup> |
| 4 | 4 |
<ReferencePath>C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\KCOM\x64\;C:\Users\Admin\Downloads\KCOM 2018-02-04(통합)\KCOM\x86\</ReferencePath> |
| 5 |
<ProjectView>ShowAllFiles</ProjectView>
|
|
| 5 |
<ProjectView>ProjectFiles</ProjectView>
|
|
| 6 | 6 |
</PropertyGroup> |
| 7 | 7 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> |
| 8 | 8 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOmZhbHNlLCJOZXdDb21tZW50UGVybWlzc2lvbiI6dHJ1ZSwiUHJvamVjdE5PIjoiMDAwMDAwIiwiVXNlcklEIjoiZG9mdGVjaCIsIk1vZGUiOjB9</StartArguments> |
내보내기 Unified diff
