개정판 de6499db
issue #999: rename Save.cs to SaveCommand.cs
Change-Id: I92582328e6335a5ca7de684dbeeba521b72e3c76
| KCOM/Controls/CheckList.xaml.cs | ||
|---|---|---|
| 679 | 679 |
{
|
| 680 | 680 |
Application.Current.MainWindow.Focus(); |
| 681 | 681 |
|
| 682 |
Common.ViewerDataModel.Instance.CheckList_ID = KCOM.Events.Save.shortGuid(); |
|
| 682 |
Common.ViewerDataModel.Instance.CheckList_ID = KCOM.Events.SaveCommand.shortGuid();
|
|
| 683 | 683 |
Common.ViewerDataModel.Instance.Capture_Opacity = 0.5; |
| 684 | 684 |
(Application.Current.MainWindow as MainWindow).dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Capture; |
| 685 | 685 |
} |
| ... | ... | |
| 781 | 781 |
{
|
| 782 | 782 |
Check_History = new CHECK_LIST_HISTORY() |
| 783 | 783 |
{
|
| 784 |
ID = Events.Save.shortGuid(), |
|
| 784 |
ID = Events.SaveCommand.shortGuid(),
|
|
| 785 | 785 |
CHECKLIST_ID = Check_ID, |
| 786 | 786 |
REVISION = ViewerDataModel.Instance.SystemMain.dzMainMenu.CurrentDoc.Revision, |
| 787 | 787 |
STATUS = state, |
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 269 | 269 |
byte[] Img_byte = fs.ToArray(); |
| 270 | 270 |
|
| 271 | 271 |
kr.co.devdoftech.cloud.FileUpload fileUploader = new kr.co.devdoftech.cloud.FileUpload(); |
| 272 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocItem.DOCUMENT_NO, App.ViewInfo.UserID, Save.shortGuid() + ".png", Img_byte); |
|
| 272 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocItem.DOCUMENT_NO, App.ViewInfo.UserID, SaveCommand.shortGuid() + ".png", Img_byte);
|
|
| 273 | 273 |
Check_Uri.UriCheck(filename); |
| 274 | 274 |
if (RadTab.SelectedIndex == 0) |
| 275 | 275 |
{
|
| ... | ... | |
| 297 | 297 |
{
|
| 298 | 298 |
SYMBOL_PRIVATE symbol_private = new SYMBOL_PRIVATE |
| 299 | 299 |
{
|
| 300 |
ID = Events.Save.shortGuid(), |
|
| 300 |
ID = Events.SaveCommand.shortGuid(),
|
|
| 301 | 301 |
MEMBER_USER_ID = App.ViewInfo.UserID, |
| 302 | 302 |
NAME = Name, |
| 303 | 303 |
IMAGE_URL = Url, |
| ... | ... | |
| 320 | 320 |
{
|
| 321 | 321 |
SYMBOL_PUBLIC symbol_public = new SYMBOL_PUBLIC |
| 322 | 322 |
{
|
| 323 |
ID = Events.Save.shortGuid(), |
|
| 323 |
ID = Events.SaveCommand.shortGuid(),
|
|
| 324 | 324 |
DEPARTMENT = Department, |
| 325 | 325 |
NAME = Name, |
| 326 | 326 |
IMAGE_URL = Url, |
| ... | ... | |
| 442 | 442 |
if (parse != "") |
| 443 | 443 |
{
|
| 444 | 444 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty); |
| 445 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
|
| 445 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.SaveCommand.shortGuid();
|
|
| 446 | 446 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = id; |
| 447 | 447 |
(item as MarkupToPDF.Common.CommentUserInfo).GroupID = group_id; |
| 448 | 448 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| ... | ... | |
| 557 | 557 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 558 | 558 |
|
| 559 | 559 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 560 |
currentControl.CommentID = Events.Save.shortGuid(); |
|
| 560 |
currentControl.CommentID = Events.SaveCommand.shortGuid();
|
|
| 561 | 561 |
currentControl.SymbolID = id; |
| 562 | 562 |
currentControl.GroupID = group_id; |
| 563 | 563 |
currentControl.ApplyTemplate(); |
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 302 | 302 |
data2 = parse.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries); |
| 303 | 303 |
|
| 304 | 304 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, data2[0], ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty); |
| 305 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
|
| 305 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.SaveCommand.shortGuid();
|
|
| 306 | 306 |
if(data2.Length >= 2) |
| 307 | 307 |
{
|
| 308 | 308 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = data2[1]; |
| ... | ... | |
| 357 | 357 |
|
| 358 | 358 |
string temppath = System.IO.Path.GetTempPath(); |
| 359 | 359 |
//string filename = KCOM.Events.Save.shortCommentKey(); |
| 360 |
string filename = KCOM.Events.Save.shortFileKey(); |
|
| 360 |
string filename = KCOM.Events.SaveCommand.shortFileKey();
|
|
| 361 | 361 |
|
| 362 | 362 |
System.Drawing.Image clipboardImage = System.Windows.Forms.Clipboard.GetImage(); |
| 363 | 363 |
clipboardImage.Save(temppath + "\\" + filename); |
| ... | ... | |
| 442 | 442 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 443 | 443 |
|
| 444 | 444 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 445 |
currentControl.CommentID = Events.Save.shortGuid(); |
|
| 445 |
currentControl.CommentID = Events.SaveCommand.shortGuid();
|
|
| 446 | 446 |
|
| 447 | 447 |
currentControl.ApplyTemplate(); |
| 448 | 448 |
currentControl.SetImage(); |
| ... | ... | |
| 484 | 484 |
// if (parse != "") |
| 485 | 485 |
// {
|
| 486 | 486 |
// System.Windows.Controls.Control item = layer.markupParse_Paste(parse, ViewerDataModel.Instance.MarkupControls_USER); |
| 487 |
// (item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
|
| 487 |
// (item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.SaveCommand.shortGuid();
|
|
| 488 | 488 |
|
| 489 | 489 |
// ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| 490 | 490 |
// ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 470 | 470 |
{
|
| 471 | 471 |
this.ParentOfType<MainWindow>().dzMainMenu.InkControl_Convert(); |
| 472 | 472 |
|
| 473 |
Save save = new Save(); |
|
| 474 |
|
|
| 475 |
//추가 |
|
| 476 |
List<IKCOM.MarkupInfoItem> MySelectItem = new List<IKCOM.MarkupInfoItem>(); |
|
| 477 |
|
|
| 478 |
foreach(var item in menu.gridViewMarkup.SelectedItems) |
|
| 479 |
{
|
|
| 480 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID) |
|
| 481 |
{
|
|
| 482 |
MySelectItem.Add(item as IKCOM.MarkupInfoItem); |
|
| 483 |
} |
|
| 484 |
} |
|
| 485 |
|
|
| 486 |
//MySelectItem = (menu.gridViewMarkup.SelectedItems.FirstOrDefault() as IKCOM.MarkupInfoItem); |
|
| 487 |
|
|
| 488 |
|
|
| 489 |
save.Project_No = App.ViewInfo.ProjectNO; |
|
| 490 |
save.document_id = App.ViewInfo.DocumentItemID; |
|
| 491 |
save.user_id = App.ViewInfo.UserID; |
|
| 492 |
save.page_no = Convert.ToInt32(tlcurrentPage.Text); |
|
| 473 |
SaveCommand.Instance.Project_No = App.ViewInfo.ProjectNO; |
|
| 474 |
SaveCommand.Instance.document_id = App.ViewInfo.DocumentItemID; |
|
| 475 |
SaveCommand.Instance.user_id = App.ViewInfo.UserID; |
|
| 476 |
SaveCommand.Instance.page_no = Convert.ToInt32(tlcurrentPage.Text); |
|
| 493 | 477 |
|
| 494 | 478 |
try |
| 495 | 479 |
{
|
| 496 |
menu.ChangeCommentReact();
|
|
| 497 |
if (menu.PreviewUserMarkupInfoItem != null) //신규 코멘트인지(MarkupInfo가 없는 경우)
|
|
| 480 |
List<IKCOM.MarkupInfoItem> MySelectItem = new List<IKCOM.MarkupInfoItem>();
|
|
| 481 |
foreach (var item in menu.gridViewMarkup.SelectedItems)
|
|
| 498 | 482 |
{
|
| 499 |
if (menu.gridViewMarkup.SelectedItems.FirstOrDefault() != null) //복수 페이지 혹은 저장한 경우
|
|
| 483 |
if ((item as IKCOM.MarkupInfoItem).UserID == App.ViewInfo.UserID)
|
|
| 500 | 484 |
{
|
| 501 |
foreach(var item in MySelectItem) |
|
| 502 |
{
|
|
| 503 |
save.MarkupSave(item, save.page_no); |
|
| 504 |
} |
|
| 505 |
//save.MarkupSave(menu.gridViewMarkup.SelectedItems.FirstOrDefault() as IKCOM.MarkupInfoItem); |
|
| 506 |
} |
|
| 507 |
else //단일 페이지인 경우 |
|
| 508 |
{
|
|
| 509 |
//menu.ChangeCommentReact(); |
|
| 510 |
foreach (var item in MySelectItem) |
|
| 511 |
{
|
|
| 512 |
save.MarkupSave(item, save.page_no); |
|
| 513 |
} |
|
| 514 |
//save.MarkupSave(menu.gridViewMarkup.SelectedItems.FirstOrDefault() as IKCOM.MarkupInfoItem); |
|
| 485 |
MySelectItem.Add(item as IKCOM.MarkupInfoItem); |
|
| 515 | 486 |
} |
| 516 | 487 |
} |
| 517 |
else //기존 코멘트에 작업하는 경우 |
|
| 518 |
{
|
|
| 519 |
if (menu.gridViewMarkup.SelectedItems.FirstOrDefault() != null) |
|
| 520 |
{
|
|
| 521 |
foreach (var item in MySelectItem) |
|
| 522 |
{
|
|
| 523 |
save.MarkupSave(item, save.page_no); |
|
| 524 |
} |
|
| 525 |
//save.MarkupSave(menu.gridViewMarkup.SelectedItems.FirstOrDefault() as IKCOM.MarkupInfoItem); |
|
| 526 |
} |
|
| 527 |
} |
|
| 528 |
save.PageAngleSave(App.ViewInfo.ProjectNO, ViewerDataModel.Instance.RotationDocs); |
|
| 529 | 488 |
|
| 489 |
menu.ChangeCommentReact(); |
|
| 490 |
SaveCommand.Instance.Execute(MySelectItem, SaveCommand.Instance.page_no); |
|
| 491 |
SaveCommand.Instance.PageAngleSave(App.ViewInfo.ProjectNO, ViewerDataModel.Instance.RotationDocs); |
|
| 530 | 492 |
} |
| 531 | 493 |
catch (Exception ex) |
| 532 | 494 |
{
|
| ... | ... | |
| 2823 | 2785 |
if (parse != "") |
| 2824 | 2786 |
{
|
| 2825 | 2787 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty); |
| 2826 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
|
| 2788 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.SaveCommand.shortGuid();
|
|
| 2827 | 2789 |
|
| 2828 | 2790 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| 2829 | 2791 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| ... | ... | |
| 2885 | 2847 |
|
| 2886 | 2848 |
string temppath = System.IO.Path.GetTempPath(); |
| 2887 | 2849 |
//string filename = KCOM.Events.Save.shortCommentKey(); |
| 2888 |
string filename = KCOM.Events.Save.shortFileKey(); |
|
| 2850 |
string filename = KCOM.Events.SaveCommand.shortFileKey();
|
|
| 2889 | 2851 |
|
| 2890 | 2852 |
System.Drawing.Image clipboardImage = System.Windows.Forms.Clipboard.GetImage(); |
| 2891 | 2853 |
clipboardImage.Save(temppath + "\\" + filename); |
| ... | ... | |
| 2969 | 2931 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 2970 | 2932 |
|
| 2971 | 2933 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 2972 |
currentControl.CommentID = Events.Save.shortGuid(); |
|
| 2934 |
currentControl.CommentID = Events.SaveCommand.shortGuid();
|
|
| 2973 | 2935 |
|
| 2974 | 2936 |
currentControl.ApplyTemplate(); |
| 2975 | 2937 |
currentControl.SetImage(); |
| KCOM/Events/Save.cs | ||
|---|---|---|
| 1 |
using IKCOM; |
|
| 2 |
using KCOM.Common; |
|
| 3 |
using KCOMDataModel.Common; |
|
| 4 |
using KCOMDataModel.DataModel; |
|
| 5 |
using MarkupToPDF.Common; |
|
| 6 |
using MarkupToPDF.Controls.Parsing; |
|
| 7 |
using System; |
|
| 8 |
using System.Collections.Generic; |
|
| 9 |
using System.Linq; |
|
| 10 |
using System.Text; |
|
| 11 |
using System.Windows.Controls; |
|
| 12 |
|
|
| 13 |
namespace KCOM.Events |
|
| 14 |
{
|
|
| 15 |
public class Save |
|
| 16 |
{
|
|
| 17 |
#region Properties |
|
| 18 |
|
|
| 19 |
public ViewInfo _ViewInfo; |
|
| 20 |
public string Project_No |
|
| 21 |
{
|
|
| 22 |
get; |
|
| 23 |
set; |
|
| 24 |
} |
|
| 25 |
public string document_id |
|
| 26 |
{
|
|
| 27 |
get; |
|
| 28 |
set; |
|
| 29 |
} |
|
| 30 |
|
|
| 31 |
public string user_id |
|
| 32 |
{
|
|
| 33 |
get; |
|
| 34 |
set; |
|
| 35 |
} |
|
| 36 |
|
|
| 37 |
public int page_no |
|
| 38 |
{
|
|
| 39 |
get; |
|
| 40 |
set; |
|
| 41 |
} |
|
| 42 |
#endregion |
|
| 43 |
|
|
| 44 |
|
|
| 45 |
|
|
| 46 |
//GUID생성(최민수 사원 수정) //조장원 대리 다시 변경 |
|
| 47 |
public static string shortGuid() |
|
| 48 |
{
|
|
| 49 |
byte[] bytes = new byte[16]; |
|
| 50 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
|
| 51 |
{
|
|
| 52 |
provider.GetBytes(bytes); |
|
| 53 |
} |
|
| 54 |
|
|
| 55 |
var guid = new Guid(bytes); |
|
| 56 |
|
|
| 57 |
return Convert.ToBase64String(guid.ToByteArray()) |
|
| 58 |
.Substring(0, 10) |
|
| 59 |
.Replace("/", "")
|
|
| 60 |
.Replace("+", "") + DateTime.UtcNow.Ticks.ToString("x");
|
|
| 61 |
} |
|
| 62 |
|
|
| 63 |
//조장원 네자리 |
|
| 64 |
public static string shortCommentKey() |
|
| 65 |
{
|
|
| 66 |
byte[] bytes = new byte[3]; |
|
| 67 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
|
| 68 |
{
|
|
| 69 |
provider.GetBytes(bytes); |
|
| 70 |
} |
|
| 71 |
|
|
| 72 |
return Convert.ToBase64String(bytes); |
|
| 73 |
} |
|
| 74 |
|
|
| 75 |
//강인구 추가 |
|
| 76 |
public static string shortFileKey() |
|
| 77 |
{
|
|
| 78 |
//byte[] bytes = new byte[3]; |
|
| 79 |
//using (var provider = System.IO.Path.GetRandomFileName()) |
|
| 80 |
//{
|
|
| 81 |
// provider.GetBytes(bytes); |
|
| 82 |
//} |
|
| 83 |
|
|
| 84 |
return System.IO.Path.GetRandomFileName(); |
|
| 85 |
} |
|
| 86 |
|
|
| 87 |
public void MarkupConsolidate() |
|
| 88 |
{
|
|
| 89 |
|
|
| 90 |
} |
|
| 91 |
|
|
| 92 |
//마크업 저장하기 |
|
| 93 |
public void MarkupSave(MarkupInfoItem UserState, int iPageNo) |
|
| 94 |
{
|
|
| 95 |
try |
|
| 96 |
{
|
|
| 97 |
List<MARKUP_DATA> ml_markupdata = new List<MARKUP_DATA>(); |
|
| 98 |
|
|
| 99 |
///ViewerDataModel.Instance.MarkupList_USER.Where(d => d.MarkupInfoID == UserState.MarkupInfoID).ToList().GroupBy(p => p.ID).Select(g => g.First()).ToList().ForEach(value => |
|
| 100 |
ViewerDataModel.Instance.MarkupControls_USER.Where(d => d.MarkupInfoID == UserState.MarkupInfoID).ToList().GroupBy(p => p.CommentID).Select(g => g.First()).ToList().ForEach(value => |
|
| 101 |
{
|
|
| 102 |
ml_markupdata.Add(value.GetMarkupData(App.ViewInfo.UserID, iPageNo, UserState.MarkupVersionID)); |
|
| 103 |
}); |
|
| 104 |
|
|
| 105 |
Logger.sendReqLog("GetMarkupDataListperPage: ", UserState + "," + Project_No + "," + document_id + "," + user_id + "," + ml_markupdata, 1);
|
|
| 106 |
Logger.sendResLog("GetMarkupDataListperPage", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, ml_markupdata).ToString(), 1);
|
|
| 107 |
TempFile.Remove(); //임시파일삭제 |
|
| 108 |
} |
|
| 109 |
catch (Exception) |
|
| 110 |
{
|
|
| 111 |
throw; |
|
| 112 |
} |
|
| 113 |
} |
|
| 114 |
|
|
| 115 |
public void SymbolSave(string Name, string Url, string Data) |
|
| 116 |
{
|
|
| 117 |
try |
|
| 118 |
{
|
|
| 119 |
SYMBOL_PRIVATE symbol_private = new SYMBOL_PRIVATE |
|
| 120 |
{
|
|
| 121 |
ID = shortGuid(), |
|
| 122 |
MEMBER_USER_ID = App.ViewInfo.UserID, |
|
| 123 |
NAME = Name, |
|
| 124 |
IMAGE_URL = Url, |
|
| 125 |
DATA = Data |
|
| 126 |
}; |
|
| 127 |
|
|
| 128 |
Logger.sendReqLog("SaveSymbolAsync: ", symbol_private.ID + "," + symbol_private.MEMBER_USER_ID + "," + symbol_private.NAME + "," + symbol_private.IMAGE_URL + "," + symbol_private.DATA, 1);
|
|
| 129 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolAsync(symbol_private); |
|
| 130 |
} |
|
| 131 |
catch(Exception) |
|
| 132 |
{
|
|
| 133 |
throw; |
|
| 134 |
} |
|
| 135 |
} |
|
| 136 |
public void SymbolSave_Public(string Name, string Url, string Data, string Department) |
|
| 137 |
{
|
|
| 138 |
try |
|
| 139 |
{
|
|
| 140 |
SYMBOL_PUBLIC symbol_public = new SYMBOL_PUBLIC |
|
| 141 |
{
|
|
| 142 |
ID = shortGuid(), |
|
| 143 |
DEPARTMENT = Department, |
|
| 144 |
NAME = Name, |
|
| 145 |
IMAGE_URL = Url, |
|
| 146 |
DATA = Data |
|
| 147 |
}; |
|
| 148 |
|
|
| 149 |
Logger.sendReqLog("AddPublicSymbol: ", symbol_public.ID + "," + symbol_public.DEPARTMENT + "," + symbol_public.NAME + "," + symbol_public.IMAGE_URL + "," + symbol_public.DATA, 1);
|
|
| 150 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddPublicSymbol(symbol_public); |
|
| 151 |
} |
|
| 152 |
catch (Exception) |
|
| 153 |
{
|
|
| 154 |
throw; |
|
| 155 |
} |
|
| 156 |
} |
|
| 157 |
public void PageAngleSave(string project_no, List<DOCPAGE> _mldocpage) |
|
| 158 |
{
|
|
| 159 |
try |
|
| 160 |
{
|
|
| 161 |
|
|
| 162 |
Logger.sendReqLog("SavePageAngle: ", project_no + "," + _mldocpage, 1);
|
|
| 163 |
Logger.sendResLog("SavePageAngle", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SavePageAngle(project_no, _mldocpage).ToString(), 1);
|
|
| 164 |
Common.ViewerDataModel.Instance.RotationDocs.Clear(); |
|
| 165 |
} |
|
| 166 |
catch (Exception) |
|
| 167 |
{
|
|
| 168 |
throw; |
|
| 169 |
} |
|
| 170 |
} |
|
| 171 |
} |
|
| 172 |
} |
|
| KCOM/Events/SaveCommand.cs | ||
|---|---|---|
| 1 |
using IKCOM; |
|
| 2 |
using KCOM.Common; |
|
| 3 |
using KCOMDataModel.Common; |
|
| 4 |
using KCOMDataModel.DataModel; |
|
| 5 |
using MarkupToPDF.Common; |
|
| 6 |
using MarkupToPDF.Controls.Parsing; |
|
| 7 |
using System; |
|
| 8 |
using System.Collections.Generic; |
|
| 9 |
using System.Linq; |
|
| 10 |
using System.Text; |
|
| 11 |
using System.Windows.Controls; |
|
| 12 |
|
|
| 13 |
namespace KCOM.Events |
|
| 14 |
{
|
|
| 15 |
public class SaveCommand |
|
| 16 |
{
|
|
| 17 |
private static readonly SaveCommand _instance = new SaveCommand(); |
|
| 18 |
|
|
| 19 |
// Explicit static constructor to tell C# compiler |
|
| 20 |
// not to mark type as beforefieldinit |
|
| 21 |
static SaveCommand() |
|
| 22 |
{
|
|
| 23 |
} |
|
| 24 |
|
|
| 25 |
private SaveCommand() |
|
| 26 |
{
|
|
| 27 |
} |
|
| 28 |
|
|
| 29 |
public static SaveCommand Instance |
|
| 30 |
{
|
|
| 31 |
get |
|
| 32 |
{
|
|
| 33 |
return _instance; |
|
| 34 |
} |
|
| 35 |
} |
|
| 36 |
|
|
| 37 |
#region Properties |
|
| 38 |
|
|
| 39 |
public ViewInfo _ViewInfo; |
|
| 40 |
public string Project_No |
|
| 41 |
{
|
|
| 42 |
get; |
|
| 43 |
set; |
|
| 44 |
} |
|
| 45 |
public string document_id |
|
| 46 |
{
|
|
| 47 |
get; |
|
| 48 |
set; |
|
| 49 |
} |
|
| 50 |
|
|
| 51 |
public string user_id |
|
| 52 |
{
|
|
| 53 |
get; |
|
| 54 |
set; |
|
| 55 |
} |
|
| 56 |
|
|
| 57 |
public int page_no |
|
| 58 |
{
|
|
| 59 |
get; |
|
| 60 |
set; |
|
| 61 |
} |
|
| 62 |
#endregion |
|
| 63 |
|
|
| 64 |
//GUID생성(최민수 사원 수정) //조장원 대리 다시 변경 |
|
| 65 |
public static string shortGuid() |
|
| 66 |
{
|
|
| 67 |
byte[] bytes = new byte[16]; |
|
| 68 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
|
| 69 |
{
|
|
| 70 |
provider.GetBytes(bytes); |
|
| 71 |
} |
|
| 72 |
|
|
| 73 |
var guid = new Guid(bytes); |
|
| 74 |
|
|
| 75 |
return Convert.ToBase64String(guid.ToByteArray()) |
|
| 76 |
.Substring(0, 10) |
|
| 77 |
.Replace("/", "")
|
|
| 78 |
.Replace("+", "") + DateTime.UtcNow.Ticks.ToString("x");
|
|
| 79 |
} |
|
| 80 |
|
|
| 81 |
//조장원 네자리 |
|
| 82 |
public static string shortCommentKey() |
|
| 83 |
{
|
|
| 84 |
byte[] bytes = new byte[3]; |
|
| 85 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
|
| 86 |
{
|
|
| 87 |
provider.GetBytes(bytes); |
|
| 88 |
} |
|
| 89 |
|
|
| 90 |
return Convert.ToBase64String(bytes); |
|
| 91 |
} |
|
| 92 |
|
|
| 93 |
//강인구 추가 |
|
| 94 |
public static string shortFileKey() |
|
| 95 |
{
|
|
| 96 |
//byte[] bytes = new byte[3]; |
|
| 97 |
//using (var provider = System.IO.Path.GetRandomFileName()) |
|
| 98 |
//{
|
|
| 99 |
// provider.GetBytes(bytes); |
|
| 100 |
//} |
|
| 101 |
|
|
| 102 |
return System.IO.Path.GetRandomFileName(); |
|
| 103 |
} |
|
| 104 |
|
|
| 105 |
public void MarkupConsolidate() |
|
| 106 |
{
|
|
| 107 |
|
|
| 108 |
} |
|
| 109 |
|
|
| 110 |
/// <summary> |
|
| 111 |
/// save comments related to given markup information |
|
| 112 |
/// </summary> |
|
| 113 |
/// <param name="UserState"></param> |
|
| 114 |
/// <param name="iPageNo"></param> |
|
| 115 |
public void Execute(ICollection<MarkupInfoItem> UserStates, int iPageNo) |
|
| 116 |
{
|
|
| 117 |
try |
|
| 118 |
{
|
|
| 119 |
foreach (var UserState in UserStates) |
|
| 120 |
{
|
|
| 121 |
List<MARKUP_DATA> markupdata = new List<MARKUP_DATA>(); |
|
| 122 |
ViewerDataModel.Instance.MarkupControls_USER.Where(d => d.MarkupInfoID == UserState.MarkupInfoID).ToList().GroupBy(p => p.CommentID).Select(g => g.First()).ToList().ForEach(value => |
|
| 123 |
{
|
|
| 124 |
markupdata.Add(value.GetMarkupData(App.ViewInfo.UserID, iPageNo, UserState.MarkupVersionID)); |
|
| 125 |
}); |
|
| 126 |
|
|
| 127 |
Logger.sendReqLog("GetMarkupDataListperPage: ", UserState + "," + Project_No + "," + document_id + "," + user_id + "," + markupdata, 1);
|
|
| 128 |
Logger.sendResLog("GetMarkupDataListperPage", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveMarkupData(UserState, Project_No, document_id, user_id, markupdata).ToString(), 1);
|
|
| 129 |
} |
|
| 130 |
TempFile.Remove(); //임시파일삭제 |
|
| 131 |
} |
|
| 132 |
catch (Exception) |
|
| 133 |
{
|
|
| 134 |
throw; |
|
| 135 |
} |
|
| 136 |
} |
|
| 137 |
|
|
| 138 |
public void SymbolSave(string Name, string Url, string Data) |
|
| 139 |
{
|
|
| 140 |
try |
|
| 141 |
{
|
|
| 142 |
SYMBOL_PRIVATE symbol_private = new SYMBOL_PRIVATE |
|
| 143 |
{
|
|
| 144 |
ID = shortGuid(), |
|
| 145 |
MEMBER_USER_ID = App.ViewInfo.UserID, |
|
| 146 |
NAME = Name, |
|
| 147 |
IMAGE_URL = Url, |
|
| 148 |
DATA = Data |
|
| 149 |
}; |
|
| 150 |
|
|
| 151 |
Logger.sendReqLog("SaveSymbolAsync: ", symbol_private.ID + "," + symbol_private.MEMBER_USER_ID + "," + symbol_private.NAME + "," + symbol_private.IMAGE_URL + "," + symbol_private.DATA, 1);
|
|
| 152 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolAsync(symbol_private); |
|
| 153 |
} |
|
| 154 |
catch(Exception) |
|
| 155 |
{
|
|
| 156 |
throw; |
|
| 157 |
} |
|
| 158 |
} |
|
| 159 |
public void SymbolSave_Public(string Name, string Url, string Data, string Department) |
|
| 160 |
{
|
|
| 161 |
try |
|
| 162 |
{
|
|
| 163 |
SYMBOL_PUBLIC symbol_public = new SYMBOL_PUBLIC |
|
| 164 |
{
|
|
| 165 |
ID = shortGuid(), |
|
| 166 |
DEPARTMENT = Department, |
|
| 167 |
NAME = Name, |
|
| 168 |
IMAGE_URL = Url, |
|
| 169 |
DATA = Data |
|
| 170 |
}; |
|
| 171 |
|
|
| 172 |
Logger.sendReqLog("AddPublicSymbol: ", symbol_public.ID + "," + symbol_public.DEPARTMENT + "," + symbol_public.NAME + "," + symbol_public.IMAGE_URL + "," + symbol_public.DATA, 1);
|
|
| 173 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddPublicSymbol(symbol_public); |
|
| 174 |
} |
|
| 175 |
catch (Exception) |
|
| 176 |
{
|
|
| 177 |
throw; |
|
| 178 |
} |
|
| 179 |
} |
|
| 180 |
public void PageAngleSave(string project_no, List<DOCPAGE> _mldocpage) |
|
| 181 |
{
|
|
| 182 |
try |
|
| 183 |
{
|
|
| 184 |
|
|
| 185 |
Logger.sendReqLog("SavePageAngle: ", project_no + "," + _mldocpage, 1);
|
|
| 186 |
Logger.sendResLog("SavePageAngle", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SavePageAngle(project_no, _mldocpage).ToString(), 1);
|
|
| 187 |
Common.ViewerDataModel.Instance.RotationDocs.Clear(); |
|
| 188 |
} |
|
| 189 |
catch (Exception) |
|
| 190 |
{
|
|
| 191 |
throw; |
|
| 192 |
} |
|
| 193 |
} |
|
| 194 |
} |
|
| 195 |
} |
|
| KCOM/KCOM.csproj | ||
|---|---|---|
| 320 | 320 |
<Compile Include="Controls\TeighaD3DImage.cs" /> |
| 321 | 321 |
<Compile Include="Controls\TeighaD3DImageResult.cs" /> |
| 322 | 322 |
<Compile Include="Events\DeleteCommand.cs" /> |
| 323 |
<Compile Include="Events\SaveCommand.cs" /> |
|
| 323 | 324 |
<Compile Include="IAbstractDatabase.cs" /> |
| 324 | 325 |
<Compile Include="Logger.cs" /> |
| 325 | 326 |
<Compile Include="Messenger\ConversationView.xaml.cs"> |
| ... | ... | |
| 518 | 519 |
<Compile Include="Events\Load.cs" /> |
| 519 | 520 |
<Compile Include="Events\Move.cs" /> |
| 520 | 521 |
<Compile Include="Events\Property\EventProperty.cs" /> |
| 521 |
<Compile Include="Events\Save.cs" /> |
|
| 522 | 522 |
<Compile Include="RegexCollection.cs" /> |
| 523 | 523 |
<Compile Include="Services\BaseServices.cs" /> |
| 524 | 524 |
<Compile Include="Views\MainMenu.xaml.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>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQyIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments> |
| KCOM/MainWindow.xaml.cs | ||
|---|---|---|
| 550 | 550 |
var unkownControl = JsonSerializerHelper.JsonDeserialize<S_BaseControl>(controldata); //복호화작업 |
| 551 | 551 |
ViewerDataModel.Instance.IsPressCtrl = false; |
| 552 | 552 |
|
| 553 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
|
| 553 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.SaveCommand.shortGuid();
|
|
| 554 | 554 |
if (data2.Length >= 2) |
| 555 | 555 |
{
|
| 556 | 556 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = data2[1]; |
| ... | ... | |
| 599 | 599 |
|
| 600 | 600 |
string temppath = System.IO.Path.GetTempPath(); |
| 601 | 601 |
//string filename = KCOM.Events.Save.shortCommentKey(); |
| 602 |
string filename = KCOM.Events.Save.shortFileKey(); |
|
| 602 |
string filename = KCOM.Events.SaveCommand.shortFileKey();
|
|
| 603 | 603 |
|
| 604 | 604 |
System.Drawing.Image clipboardImage = System.Windows.Forms.Clipboard.GetImage(); |
| 605 | 605 |
clipboardImage.Save(temppath + "\\" + filename); |
| ... | ... | |
| 667 | 667 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 668 | 668 |
|
| 669 | 669 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 670 |
currentControl.CommentID = Events.Save.shortGuid(); |
|
| 670 |
currentControl.CommentID = Events.SaveCommand.shortGuid();
|
|
| 671 | 671 |
|
| 672 | 672 |
currentControl.ApplyTemplate(); |
| 673 | 673 |
currentControl.SetImage(); |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 241 | 241 |
//var currentUser = e.Result.Where(data => data.UserID == "H2014410").FirstOrDefault(); |
| 242 | 242 |
if (currentUser == null) |
| 243 | 243 |
{
|
| 244 |
var infoId = Events.Save.shortGuid(); |
|
| 244 |
var infoId = Events.SaveCommand.shortGuid();
|
|
| 245 | 245 |
PreviewUserMarkupInfoItem = new MarkupInfoItem |
| 246 | 246 |
{
|
| 247 | 247 |
CreateTime = DateTime.Now, |
| ... | ... | |
| 253 | 253 |
Description = "", |
| 254 | 254 |
MarkupInfoID = infoId, |
| 255 | 255 |
MarkupList = null, |
| 256 |
MarkupVersionID = Events.Save.shortGuid(), |
|
| 256 |
MarkupVersionID = Events.SaveCommand.shortGuid(),
|
|
| 257 | 257 |
Consolidate = 0, |
| 258 | 258 |
PartConsolidate = 0, |
| 259 | 259 |
userDelete = true, |
| ... | ... | |
| 288 | 288 |
// UserName = userData.NAME + "(임시저장)", |
| 289 | 289 |
// PageCount = 1, |
| 290 | 290 |
// Description = "", |
| 291 |
// MarkupInfoID = Events.Save.shortGuid(), |
|
| 291 |
// MarkupInfoID = Events.SaveCommand.shortGuid(),
|
|
| 292 | 292 |
// MarkupList = null, |
| 293 |
// MarkupVersionID = Events.Save.shortGuid(), |
|
| 293 |
// MarkupVersionID = Events.SaveCommand.shortGuid(),
|
|
| 294 | 294 |
// Consolidate = 0, |
| 295 | 295 |
// PartConsolidate = 0, |
| 296 | 296 |
// userDelete = true, |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 329 | 329 |
{
|
| 330 | 330 |
if (gridViewMarkup.Items.Cast<MarkupInfoItem>().ToList().Where(d => d.UserID == App.ViewInfo.UserID).Count() == 0) |
| 331 | 331 |
{
|
| 332 |
var infoId = Events.Save.shortGuid(); |
|
| 332 |
var infoId = Events.SaveCommand.shortGuid();
|
|
| 333 | 333 |
PreviewUserMarkupInfoItem = new MarkupInfoItem |
| 334 | 334 |
{
|
| 335 | 335 |
CreateTime = DateTime.Now, |
| ... | ... | |
| 342 | 342 |
Description = "", |
| 343 | 343 |
MarkupInfoID = infoId, |
| 344 | 344 |
MarkupList = null, |
| 345 |
MarkupVersionID = Events.Save.shortGuid(), |
|
| 345 |
MarkupVersionID = Events.SaveCommand.shortGuid(),
|
|
| 346 | 346 |
Consolidate = 0, |
| 347 | 347 |
PartConsolidate = 0, |
| 348 | 348 |
userDelete = true, |
| ... | ... | |
| 591 | 591 |
{
|
| 592 | 592 |
if ((InnerItem.DrawingData as PolygonControl).CommentID == null) |
| 593 | 593 |
{
|
| 594 |
(InnerItem.DrawingData as PolygonControl).CommentID = KCOM.Events.Save.shortGuid(); |
|
| 594 |
(InnerItem.DrawingData as PolygonControl).CommentID = KCOM.Events.SaveCommand.shortGuid();
|
|
| 595 | 595 |
} |
| 596 | 596 |
} |
| 597 | 597 |
|
| ... | ... | |
| 3487 | 3487 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 3488 | 3488 |
|
| 3489 | 3489 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 3490 |
currentControl.CommentID = Events.Save.shortGuid(); |
|
| 3490 |
currentControl.CommentID = Events.SaveCommand.shortGuid();
|
|
| 3491 | 3491 |
currentControl.SymbolID = id; |
| 3492 | 3492 |
currentControl.GroupID = group_id; |
| 3493 | 3493 |
currentControl.ApplyTemplate(); |
| ... | ... | |
| 3913 | 3913 |
ControlType = ControlType.Coordinate |
| 3914 | 3914 |
}; |
| 3915 | 3915 |
|
| 3916 |
currentControl.CommentID = Save.shortGuid(); |
|
| 3916 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 3917 | 3917 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3918 | 3918 |
currentControl.IsNew = true; |
| 3919 | 3919 |
|
| ... | ... | |
| 3950 | 3950 |
ControlType = ControlType.InsideWhite |
| 3951 | 3951 |
}; |
| 3952 | 3952 |
|
| 3953 |
currentControl.CommentID = Save.shortGuid(); |
|
| 3953 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 3954 | 3954 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3955 | 3955 |
currentControl.IsNew = true; |
| 3956 | 3956 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3985 | 3985 |
ControlType = ControlType.OverlapWhite |
| 3986 | 3986 |
}; |
| 3987 | 3987 |
|
| 3988 |
currentControl.CommentID = Save.shortGuid(); |
|
| 3988 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 3989 | 3989 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3990 | 3990 |
currentControl.IsNew = true; |
| 3991 | 3991 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4020 | 4020 |
ControlType = ControlType.ClipWhite |
| 4021 | 4021 |
}; |
| 4022 | 4022 |
|
| 4023 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4023 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4024 | 4024 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4025 | 4025 |
currentControl.IsNew = true; |
| 4026 | 4026 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4059 | 4059 |
ControlType = ControlType.Rectangle |
| 4060 | 4060 |
}; |
| 4061 | 4061 |
|
| 4062 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4062 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4063 | 4063 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4064 | 4064 |
currentControl.IsNew = true; |
| 4065 | 4065 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4099 | 4099 |
}; |
| 4100 | 4100 |
|
| 4101 | 4101 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4102 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4102 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4103 | 4103 |
currentControl.IsNew = true; |
| 4104 | 4104 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4105 | 4105 |
} |
| ... | ... | |
| 4134 | 4134 |
}; |
| 4135 | 4135 |
|
| 4136 | 4136 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4137 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4137 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4138 | 4138 |
currentControl.IsNew = true; |
| 4139 | 4139 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4140 | 4140 |
} |
| ... | ... | |
| 4178 | 4178 |
}; |
| 4179 | 4179 |
|
| 4180 | 4180 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4181 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4181 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4182 | 4182 |
currentControl.IsNew = true; |
| 4183 | 4183 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4184 | 4184 |
} |
| ... | ... | |
| 4214 | 4214 |
}; |
| 4215 | 4215 |
|
| 4216 | 4216 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4217 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4217 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4218 | 4218 |
currentControl.IsNew = true; |
| 4219 | 4219 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4220 | 4220 |
this.MainAngle.Visibility = Visibility.Visible; |
| ... | ... | |
| 4251 | 4251 |
}; |
| 4252 | 4252 |
|
| 4253 | 4253 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4254 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4254 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4255 | 4255 |
currentControl.IsNew = true; |
| 4256 | 4256 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4257 | 4257 |
this.MainAngle.Visibility = Visibility.Visible; |
| ... | ... | |
| 4288 | 4288 |
}; |
| 4289 | 4289 |
|
| 4290 | 4290 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4291 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4291 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4292 | 4292 |
currentControl.IsNew = true; |
| 4293 | 4293 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4294 | 4294 |
this.MainAngle.Visibility = Visibility.Visible; |
| ... | ... | |
| 4324 | 4324 |
Background = new SolidColorBrush(Colors.Black) |
| 4325 | 4325 |
}; |
| 4326 | 4326 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4327 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4327 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4328 | 4328 |
currentControl.IsNew = true; |
| 4329 | 4329 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4330 | 4330 |
this.MainAngle.Visibility = Visibility.Visible; |
| ... | ... | |
| 4359 | 4359 |
Background = new SolidColorBrush(Colors.Black) |
| 4360 | 4360 |
}; |
| 4361 | 4361 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4362 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4362 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4363 | 4363 |
currentControl.IsNew = true; |
| 4364 | 4364 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4365 | 4365 |
this.MainAngle.Visibility = Visibility.Visible; |
| ... | ... | |
| 4414 | 4414 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 4415 | 4415 |
//{
|
| 4416 | 4416 |
var polygonControl = (currentControl as PolygonControl); |
| 4417 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4417 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4418 | 4418 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4419 | 4419 |
currentControl.IsNew = true; |
| 4420 | 4420 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4454 | 4454 |
{
|
| 4455 | 4455 |
Background = new SolidColorBrush(Colors.Black) |
| 4456 | 4456 |
}; |
| 4457 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4457 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4458 | 4458 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4459 | 4459 |
currentControl.IsNew = true; |
| 4460 | 4460 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4499 | 4499 |
{
|
| 4500 | 4500 |
Background = new SolidColorBrush(Colors.Black) |
| 4501 | 4501 |
}; |
| 4502 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4502 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4503 | 4503 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4504 | 4504 |
currentControl.IsNew = true; |
| 4505 | 4505 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4561 | 4561 |
StartPoint = new Point(canvasDrawingMouseDownPoint.X, canvasDrawingMouseDownPoint.Y), |
| 4562 | 4562 |
Background = new SolidColorBrush(Colors.Black) |
| 4563 | 4563 |
}; |
| 4564 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4564 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4565 | 4565 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4566 | 4566 |
currentControl.IsNew = true; |
| 4567 | 4567 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4618 | 4618 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 4619 | 4619 |
//{
|
| 4620 | 4620 |
var polygonControl = (currentControl as CloudControl); |
| 4621 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4621 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4622 | 4622 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4623 | 4623 |
currentControl.IsNew = true; |
| 4624 | 4624 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4688 | 4688 |
}; |
| 4689 | 4689 |
|
| 4690 | 4690 |
|
| 4691 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4691 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4692 | 4692 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4693 | 4693 |
currentControl.IsNew = true; |
| 4694 | 4694 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4737 | 4737 |
{
|
| 4738 | 4738 |
Background = new SolidColorBrush(Colors.Black) |
| 4739 | 4739 |
}; |
| 4740 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4740 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4741 | 4741 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4742 | 4742 |
currentControl.IsNew = true; |
| 4743 | 4743 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4760 | 4760 |
ControlType = controlType |
| 4761 | 4761 |
}; |
| 4762 | 4762 |
(currentControl as TextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 4763 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4763 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4764 | 4764 |
currentControl.IsNew = true; |
| 4765 | 4765 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4766 | 4766 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4793 | 4793 |
|
| 4794 | 4794 |
(currentControl as TextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 4795 | 4795 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4796 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4796 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4797 | 4797 |
currentControl.IsNew = true; |
| 4798 | 4798 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4799 | 4799 |
currentControl.SetValue(Canvas.ZIndexProperty, 3); |
| ... | ... | |
| 4824 | 4824 |
}; |
| 4825 | 4825 |
|
| 4826 | 4826 |
(currentControl as TextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 4827 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4827 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4828 | 4828 |
currentControl.IsNew = true; |
| 4829 | 4829 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4830 | 4830 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4869 | 4869 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 4870 | 4870 |
//{
|
| 4871 | 4871 |
currentControl = new ArrowTextControl(); |
| 4872 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4872 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4873 | 4873 |
currentControl.IsNew = true; |
| 4874 | 4874 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4875 | 4875 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4916 | 4916 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 4917 | 4917 |
//{
|
| 4918 | 4918 |
currentControl = new ArrowTextControl(); |
| 4919 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4919 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4920 | 4920 |
currentControl.IsNew = true; |
| 4921 | 4921 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4922 | 4922 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4963 | 4963 |
{
|
| 4964 | 4964 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect |
| 4965 | 4965 |
}; |
| 4966 |
currentControl.CommentID = Save.shortGuid(); |
|
| 4966 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 4967 | 4967 |
currentControl.IsNew = true; |
| 4968 | 4968 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4969 | 4969 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 5013 | 5013 |
{
|
| 5014 | 5014 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect |
| 5015 | 5015 |
}; |
| 5016 |
currentControl.CommentID = Save.shortGuid(); |
|
| 5016 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 5017 | 5017 |
currentControl.IsNew = true; |
| 5018 | 5018 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 5019 | 5019 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 5067 | 5067 |
{
|
| 5068 | 5068 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud |
| 5069 | 5069 |
}; |
| 5070 |
currentControl.CommentID = Save.shortGuid(); |
|
| 5070 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 5071 | 5071 |
currentControl.IsNew = true; |
| 5072 | 5072 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 5073 | 5073 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 5114 | 5114 |
{
|
| 5115 | 5115 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Cloud |
| 5116 | 5116 |
}; |
| 5117 |
currentControl.CommentID = Save.shortGuid(); |
|
| 5117 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 5118 | 5118 |
currentControl.IsNew = true; |
| 5119 | 5119 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 5120 | 5120 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 5190 | 5190 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 5191 | 5191 |
//{
|
| 5192 | 5192 |
var polygonControl = (currentControl as PolygonControl); |
| 5193 |
currentControl.CommentID = Save.shortGuid(); |
|
| 5193 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 5194 | 5194 |
currentControl.IsNew = true; |
| 5195 | 5195 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 5196 | 5196 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 5249 | 5249 |
ControlType = ControlType.Sign |
| 5250 | 5250 |
}; |
| 5251 | 5251 |
|
| 5252 |
currentControl.CommentID = Save.shortGuid(); |
|
| 5252 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 5253 | 5253 |
currentControl.IsNew = true; |
| 5254 | 5254 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 5255 | 5255 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 5296 | 5296 |
}; |
| 5297 | 5297 |
|
| 5298 | 5298 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 5299 |
currentControl.CommentID = Save.shortGuid(); |
|
| 5299 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 5300 | 5300 |
currentControl.IsNew = true; |
| 5301 | 5301 |
(currentControl as RectangleControl).DashSize = ViewerDataModel.Instance.DashSize; |
| 5302 | 5302 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 5334 | 5334 |
|
| 5335 | 5335 |
currentControl.IsNew = true; |
| 5336 | 5336 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 5337 |
currentControl.CommentID = Save.shortGuid(); |
|
| 5337 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 5338 | 5338 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 5339 | 5339 |
|
| 5340 | 5340 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| ... | ... | |
| 5375 | 5375 |
|
| 5376 | 5376 |
currentControl.IsNew = true; |
| 5377 | 5377 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 5378 |
currentControl.CommentID = Save.shortGuid(); |
|
| 5378 |
currentControl.CommentID = SaveCommand.shortGuid();
|
|
| 5379 | 5379 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 5380 | 5380 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 5381 | 5381 |
(currentControl as SymControlN).Angle -= rotate.Angle; |
| ... | ... | |
| 6193 | 6193 |
if (symbolpng == true || symbolsvg == true) |
| 6194 | 6194 |
{
|
| 6195 | 6195 |
kr.co.devdoftech.cloud.FileUpload fileUploader = new kr.co.devdoftech.cloud.FileUpload(); |
| 6196 |
string guid = Save.shortGuid(); |
|
| 6196 |
string guid = SaveCommand.shortGuid();
|
|
| 6197 | 6197 |
|
| 6198 | 6198 |
fileUploader.RunAsync(App.ViewInfo.ProjectNO, _DocItem.DOCUMENT_NO, App.ViewInfo.UserID, guid + ".png", Img_byte); |
| 6199 | 6199 |
//Check_Uri.UriCheck(); |
| ... | ... | |
| 6305 | 6305 |
{
|
| 6306 | 6306 |
SYMBOL_PRIVATE symbol_private = new SYMBOL_PRIVATE |
| 6307 | 6307 |
{
|
| 6308 |
ID = Events.Save.shortGuid(), |
|
| 6308 |
ID = Events.SaveCommand.shortGuid(),
|
|
| 6309 | 6309 |
MEMBER_USER_ID = App.ViewInfo.UserID, |
| 6310 | 6310 |
NAME = Name, |
| 6311 | 6311 |
IMAGE_URL = Url, |
| ... | ... | |
| 6328 | 6328 |
{
|
| 6329 | 6329 |
SYMBOL_PUBLIC symbol_public = new SYMBOL_PUBLIC |
| 6330 | 6330 |
{
|
| 6331 |
ID = Events.Save.shortGuid(), |
|
| 6331 |
ID = Events.SaveCommand.shortGuid(),
|
|
| 6332 | 6332 |
DEPARTMENT = Department, |
| 6333 | 6333 |
NAME = Name, |
| 6334 | 6334 |
IMAGE_URL = Url, |
| ... | ... | |
| 6410 | 6410 |
{
|
| 6411 | 6411 |
try |
| 6412 | 6412 |
{
|
| 6413 |
Save save = new Save(); |
|
| 6414 | 6413 |
if (args.PromptResult != null) |
| 6415 | 6414 |
{
|
| 6416 | 6415 |
if (args.DialogResult.Value) |
| ... | ... | |
| 6424 | 6423 |
byte[] Img_byte = fs.ToArray(); |
| 6425 | 6424 |
|
| 6426 | 6425 |
kr.co.devdoftech.cloud.FileUpload fileUploader = new kr.co.devdoftech.cloud.FileUpload(); |
| 6427 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, _DocItem.DOCUMENT_NO, App.ViewInfo.UserID, Save.shortGuid() + ".png", Img_byte); |
|
| 6426 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, _DocItem.DOCUMENT_NO, App.ViewInfo.UserID, SaveCommand.shortGuid() + ".png", Img_byte);
|
|
| 6428 | 6427 |
Check_Uri.UriCheck(filename); |
| 6429 | 6428 |
if (symbolPanel_Instance.RadTab.SelectedIndex == 0) |
| 6430 | 6429 |
{
|
| 6431 |
save.SymbolSave(args.PromptResult, filename, data);
|
|
| 6430 |
SaveCommand.Instance.SymbolSave(args.PromptResult, filename, data);
|
|
| 6432 | 6431 |
} |
| 6433 | 6432 |
else |
| 6434 | 6433 |
{
|
| 6435 |
save.SymbolSave_Public(args.PromptResult, filename, data, ViewerDataModel.Instance.SystemMain.dzMainMenu.userData.DEPARTMENT);
|
|
| 6434 |
SaveCommand.Instance.SymbolSave_Public(args.PromptResult, filename, data, ViewerDataModel.Instance.SystemMain.dzMainMenu.userData.DEPARTMENT);
|
|
| 6436 | 6435 |
} |
| 6437 | 6436 |
DataBind(); |
| 6438 | 6437 |
} |
| ... | ... | |
| 6661 | 6660 |
{
|
| 6662 | 6661 |
check_ = new KCOMDataModel.DataModel.CHECK_LIST |
| 6663 | 6662 |
{
|
| 6664 |
ID = Save.shortGuid(), |
|
| 6663 |
ID = SaveCommand.shortGuid(),
|
|
| 6665 | 6664 |
USER_ID = App.ViewInfo.UserID, |
| 6666 | 6665 |
IMAGE_URL = Result, |
| 6667 | 6666 |
IMAGE_ANCHOR = x + "," + y + "," + width + "," + height, |
| ... | ... | |
| 7038 | 7037 |
if (item.PageNumber == pageNavigator.CurrentPage.PageNumber) |
| 7039 | 7038 |
{
|
| 7040 | 7039 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", |
| 7041 |
items.MarkupInfoID, Save.shortGuid()); |
|
| 7040 |
items.MarkupInfoID, SaveCommand.shortGuid());
|
|
| 7042 | 7041 |
} |
| 7043 | 7042 |
} |
| 7044 | 7043 |
} |
| ... | ... | |
| 7107 | 7106 |
pc.EndPoint = inkPointSet[inkPointSet.Count - 1]; |
| 7108 | 7107 |
pc.PointSet = inkPointSet; |
| 7109 | 7108 |
pc.LineSize = 3; |
| 7110 |
pc.CommentID = Save.shortGuid(); |
|
| 7109 |
pc.CommentID = SaveCommand.shortGuid();
|
|
| 7111 | 7110 |
pc.StrokeColor = new SolidColorBrush(Colors.Red); |
| 7112 | 7111 |
ViewerDataModel.Instance.MarkupControls_USER.Add(pc); |
| 7113 | 7112 |
///pc.SetPolyPath(); |
| ... | ... | |
| 7272 | 7271 |
if (parse != "") |
| 7273 | 7272 |
{
|
| 7274 | 7273 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty); |
| 7275 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
|
| 7274 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.SaveCommand.shortGuid();
|
|
| 7276 | 7275 |
|
| 7277 | 7276 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| 7278 | 7277 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
내보내기 Unified diff
