개정판 5a223b60
Fix: Approval로 등록된 심볼을 배치하지 못하는 오류 수정
- 심볼 배치 후 작업 영역을 클릭하면 MARKUS가 종료되는 오류 수정
Change-Id: I4e5be7f497aae8ba3f385c8efad688a7f82ae492
| KCOM/Common/Commons.cs | ||
|---|---|---|
| 5 | 5 |
{
|
| 6 | 6 |
public class Commons |
| 7 | 7 |
{
|
| 8 |
|
|
| 9 |
public static string shortGuid() |
|
| 8 |
public static string ShortGuid() |
|
| 10 | 9 |
{
|
| 11 | 10 |
char[] chars = "ABCDEF1234567890".ToCharArray(); |
| 12 | 11 |
byte[] data = new byte[1]; |
| ... | ... | |
| 24 | 23 |
return result.ToString(); |
| 25 | 24 |
} |
| 26 | 25 |
|
| 27 |
|
|
| 28 |
//GUID생성(최민수 사원 수정) //조장원 대리 다시 변경 |
|
| 29 |
public static string shortGuidold() |
|
| 30 |
{
|
|
| 31 |
byte[] bytes = new byte[16]; |
|
| 32 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
|
| 33 |
{
|
|
| 34 |
provider.GetBytes(bytes); |
|
| 35 |
} |
|
| 36 |
|
|
| 37 |
var guid = new Guid(bytes); |
|
| 38 |
|
|
| 39 |
return Convert.ToBase64String(guid.ToByteArray()) |
|
| 40 |
.Substring(0, 10) |
|
| 41 |
.Replace("/", "")
|
|
| 42 |
.Replace("+", "") + DateTime.UtcNow.Ticks.ToString("x");
|
|
| 43 |
} |
|
| 44 |
|
|
| 45 |
//조장원 네자리 |
|
| 46 |
public static string shortCommentKey() |
|
| 47 |
{
|
|
| 48 |
byte[] bytes = new byte[3]; |
|
| 49 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
|
| 50 |
{
|
|
| 51 |
provider.GetBytes(bytes); |
|
| 52 |
} |
|
| 53 |
|
|
| 54 |
return Convert.ToBase64String(bytes); |
|
| 55 |
} |
|
| 56 |
|
|
| 57 | 26 |
//강인구 추가 |
| 58 |
public static string shortFileKey()
|
|
| 27 |
public static string ShortFileKey()
|
|
| 59 | 28 |
{
|
| 60 | 29 |
//byte[] bytes = new byte[3]; |
| 61 | 30 |
//using (var provider = System.IO.Path.GetRandomFileName()) |
| KCOM/Common/SelectionSet.cs | ||
|---|---|---|
| 141 | 141 |
{
|
| 142 | 142 |
if ((InnerItem.DrawingData as PolygonControl).CommentID == null) |
| 143 | 143 |
{
|
| 144 |
(InnerItem.DrawingData as PolygonControl).CommentID = Commons.shortGuid();
|
|
| 144 |
(InnerItem.DrawingData as PolygonControl).CommentID = Commons.ShortGuid();
|
|
| 145 | 145 |
} |
| 146 | 146 |
} |
| 147 | 147 |
|
| ... | ... | |
| 149 | 149 |
#region ZIndex 설정 |
| 150 | 150 |
System.Windows.Controls.Canvas.SetZIndex(control, control.ZIndex); |
| 151 | 151 |
#endregion |
| 152 |
ViewerDataModel.Instance.MarkupControls_USER.Insert(control.Index, control); |
|
| 152 |
if (control.Index >= 0) |
|
| 153 |
{
|
|
| 154 |
ViewerDataModel.Instance.MarkupControls_USER.Insert(control.Index, control); |
|
| 155 |
} |
|
| 156 |
else |
|
| 157 |
{
|
|
| 158 |
ViewerDataModel.Instance.MarkupControls_USER.Add(control); |
|
| 159 |
} |
|
| 153 | 160 |
} |
| 154 | 161 |
} |
| 155 | 162 |
} |
| KCOM/Controls/CheckList.xaml.cs | ||
|---|---|---|
| 686 | 686 |
{
|
| 687 | 687 |
mainWindow.Focus(); |
| 688 | 688 |
|
| 689 |
Common.ViewerDataModel.Instance.CheckList_ID = Commons.shortGuid();
|
|
| 689 |
Common.ViewerDataModel.Instance.CheckList_ID = Commons.ShortGuid();
|
|
| 690 | 690 |
Common.ViewerDataModel.Instance.Capture_Opacity = 0.5; |
| 691 | 691 |
(mainWindow as MainWindow).dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Capture; |
| 692 | 692 |
} |
| ... | ... | |
| 788 | 788 |
{
|
| 789 | 789 |
Check_History = new CHECK_LIST_HISTORY() |
| 790 | 790 |
{
|
| 791 |
ID = Commons.shortGuid(),
|
|
| 791 |
ID = Commons.ShortGuid(),
|
|
| 792 | 792 |
CHECKLIST_ID = Check_ID, |
| 793 | 793 |
REVISION = ViewerDataModel.Instance.SystemMain.dzMainMenu.CurrentDoc.Revision, |
| 794 | 794 |
STATUS = state, |
| KCOM/Controls/PrintControl.xaml.cs | ||
|---|---|---|
| 618 | 618 |
|
| 619 | 619 |
Printimg_List = new Dictionary<int, System.Drawing.Image>(); |
| 620 | 620 |
PrintimgPath_List = new Dictionary<int, string>(); |
| 621 |
TempImageDir = Path.Combine(Path.GetTempPath(), "Markus", Common.Commons.shortGuid());
|
|
| 621 |
TempImageDir = Path.Combine(Path.GetTempPath(), "Markus", Common.Commons.ShortGuid());
|
|
| 622 | 622 |
|
| 623 | 623 |
if (Directory.Exists(TempImageDir)) |
| 624 | 624 |
{
|
| ... | ... | |
| 712 | 712 |
IsExportOrPrint = true; |
| 713 | 713 |
|
| 714 | 714 |
PrintimgPath_List = new Dictionary<int, string>(); |
| 715 |
TempImageDir = Path.Combine(Path.GetTempPath(), "Markus", Common.Commons.shortGuid());
|
|
| 715 |
TempImageDir = Path.Combine(Path.GetTempPath(), "Markus", Common.Commons.ShortGuid());
|
|
| 716 | 716 |
|
| 717 | 717 |
if (Directory.Exists(TempImageDir)) |
| 718 | 718 |
{
|
| KCOM/Controls/Sample.xaml.cs | ||
|---|---|---|
| 190 | 190 |
|
| 191 | 191 |
this.PageCount = PageList.Count(); |
| 192 | 192 |
|
| 193 |
string endpoint = Common.Commons.shortGuid() + "Thumbnail";
|
|
| 193 |
string endpoint = Common.Commons.ShortGuid() + "Thumbnail";
|
|
| 194 | 194 |
|
| 195 | 195 |
IIpc.WcfServer wcfServer = new IIpc.WcfServer(endpoint); |
| 196 | 196 |
wcfServer.IpcThumbnailReceived += WcfServer_IpcThumbnailReceived; |
| KCOM/Controls/Symbol.xaml.cs | ||
|---|---|---|
| 384 | 384 |
byte[] Img_byte = fs.ToArray(); |
| 385 | 385 |
|
| 386 | 386 |
kr.co.devdoftech.cloud.FileUpload fileUploader = App.FileUploader; |
| 387 |
filename = fileUploader.RunSymbol(App.ViewInfo.ProjectNO, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocItem.DOCUMENT_NO, App.ViewInfo.UserID, Commons.shortGuid() + ".png", Img_byte);
|
|
| 387 |
filename = fileUploader.RunSymbol(App.ViewInfo.ProjectNO, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu._DocItem.DOCUMENT_NO, App.ViewInfo.UserID, Commons.ShortGuid() + ".png", Img_byte);
|
|
| 388 | 388 |
Check_Uri.UriCheck(filename); |
| 389 | 389 |
if (RadTab.SelectedIndex == 0) |
| 390 | 390 |
{
|
| ... | ... | |
| 412 | 412 |
{
|
| 413 | 413 |
SYMBOL_PRIVATE symbol_private = new SYMBOL_PRIVATE |
| 414 | 414 |
{
|
| 415 |
ID = Commons.shortGuid(),
|
|
| 415 |
ID = Commons.ShortGuid(),
|
|
| 416 | 416 |
MEMBER_USER_ID = App.ViewInfo.UserID, |
| 417 | 417 |
NAME = Name, |
| 418 | 418 |
IMAGE_URL = Url, |
| ... | ... | |
| 435 | 435 |
{
|
| 436 | 436 |
SYMBOL_PUBLIC symbol_public = new SYMBOL_PUBLIC |
| 437 | 437 |
{
|
| 438 |
ID = Commons.shortGuid(),
|
|
| 438 |
ID = Commons.ShortGuid(),
|
|
| 439 | 439 |
DEPARTMENT = Department, |
| 440 | 440 |
NAME = Name, |
| 441 | 441 |
IMAGE_URL = Url, |
| ... | ... | |
| 501 | 501 |
#endregion |
| 502 | 502 |
|
| 503 | 503 |
public UndoDataGroup UndoDataGroup { get; set; }
|
| 504 |
|
|
| 504 | 505 |
/// <summary> |
| 505 | 506 |
/// place symbol which has given id to original position which is created |
| 506 | 507 |
/// </summary> |
| 507 | 508 |
/// <date>2018.06.14</date> |
| 508 | 509 |
/// <param name="id"></param> |
| 509 |
private async void PlaceSymbol(string id,Point CurrentMousePoint)
|
|
| 510 |
private async Task PlaceSymbol(string id, Point CurrentMousePoint)
|
|
| 510 | 511 |
{
|
| 511 | 512 |
string Data_ = ""; |
| 512 | 513 |
|
| ... | ... | |
| 517 | 518 |
|
| 518 | 519 |
try |
| 519 | 520 |
{
|
| 520 |
//Logger.sendReqLog("GetSymbolData: ", id + "," + RadTab.SelectedIndex, 1);
|
|
| 521 | 521 |
Data_ = mainMenu.BaseClient.GetSymbolData(id, RadTab.SelectedIndex); |
| 522 |
|
|
| 523 |
if (Data_ != null || Data_ != "") |
|
| 524 |
{
|
|
| 525 |
//Logger.sendResLog("GetSymbolData", "TRUE", 1);
|
|
| 526 |
} |
|
| 527 |
else |
|
| 528 |
{
|
|
| 529 |
//Logger.sendResLog("GetSymbolData", "FALSE", 1);
|
|
| 530 |
} |
|
| 531 |
|
|
| 532 |
//MARKUP_DATA_GROUP INSERT |
|
| 533 |
//MARKUP_DATA_GROUP mARKUP_DATA_GROUP = new MARKUP_DATA_GROUP |
|
| 534 |
//{
|
|
| 535 |
// SYMBOL_ID = id,//InnerItem.Symbol_ID |
|
| 536 |
// STATE = 0, |
|
| 537 |
//}; |
|
| 538 |
//long group_id = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMarkupDataGroup(mARKUP_DATA_GROUP, App.ViewInfo.ProjectNO); |
|
| 539 |
////Logger.sendReqLog("AddMarkupDataGroup: ", "", 1);
|
|
| 522 |
if (string.IsNullOrEmpty(Data_)) return; |
|
| 540 | 523 |
|
| 541 | 524 |
if (Data_.Contains("|DZ|"))
|
| 542 | 525 |
{
|
| ... | ... | |
| 553 | 536 |
EventTime = DateTime.Now, |
| 554 | 537 |
MarkupDataColl = new List<UndoData>() |
| 555 | 538 |
}; |
| 556 |
ViewerDataModel.Instance.UndoDataList.Where(data1 => data1.IsUndo == true).ToList().ForEach(i =>
|
|
| 539 |
ViewerDataModel.Instance.UndoDataList.Where(x => x.IsUndo).ToList().ForEach(i =>
|
|
| 557 | 540 |
{
|
| 558 | 541 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
| 559 | 542 |
}); |
| 560 | 543 |
|
| 561 | 544 |
foreach (string parse in data) |
| 562 | 545 |
{
|
| 563 |
if (parse != "")
|
|
| 546 |
if (!string.IsNullOrEmpty(parse))
|
|
| 564 | 547 |
{
|
| 565 | 548 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(),App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, string.Empty, string.Empty, |
| 566 | 549 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
| 567 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid();
|
|
| 550 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.ShortGuid();
|
|
| 568 | 551 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = id; |
| 569 |
//(item as MarkupToPDF.Common.CommentUserInfo).GroupID = group_id; |
|
| 570 |
|
|
| 571 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 572 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
|
| 573 | 552 |
|
| 574 | 553 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
| 575 | 554 |
|
| ... | ... | |
| 596 | 575 |
final.TranslateItems(diff.X, diff.Y); |
| 597 | 576 |
|
| 598 | 577 |
mainMenu.SelectLayer.Children.Add(final); |
| 578 |
|
|
| 579 |
|
|
| 599 | 580 |
//var finalPosition = new Point(Canvas.GetLeft(final), Canvas.GetTop(final)); |
| 600 | 581 |
//Rect rect = new Rect(finalPosition, Point.Add(finalPosition,new Vector(final.Width,final.Height))); |
| 601 | 582 |
|
| ... | ... | |
| 708 | 689 |
ViewerDataModel.Instance.UndoDataList.Add(UndoDataGroup); |
| 709 | 690 |
|
| 710 | 691 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 711 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 692 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 712 | 693 |
currentControl.SymbolID = id; |
| 713 | 694 |
currentControl.GroupID = group_id; |
| 714 | 695 |
currentControl.ApplyTemplate(); |
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 3032 | 3032 |
{
|
| 3033 | 3033 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.BaseAddress,ViewerDataModel.Instance.NewMarkupCancelToken(),App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, string.Empty, string.Empty, |
| 3034 | 3034 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
| 3035 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid();
|
|
| 3035 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.ShortGuid();
|
|
| 3036 | 3036 |
|
| 3037 | 3037 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| 3038 | 3038 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| ... | ... | |
| 3085 | 3085 |
|
| 3086 | 3086 |
string temppath = System.IO.Path.GetTempPath(); |
| 3087 | 3087 |
//string filename = KCOM.Events.Save.shortCommentKey(); |
| 3088 |
string filename = Commons.shortFileKey();
|
|
| 3088 |
string filename = Commons.ShortFileKey();
|
|
| 3089 | 3089 |
|
| 3090 | 3090 |
System.Drawing.Image clipboardImage = System.Windows.Forms.Clipboard.GetImage(); |
| 3091 | 3091 |
clipboardImage.Save(temppath + "\\" + filename); |
| ... | ... | |
| 3159 | 3159 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 3160 | 3160 |
|
| 3161 | 3161 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 3162 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3162 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3163 | 3163 |
|
| 3164 | 3164 |
currentControl.ApplyTemplate(); |
| 3165 | 3165 |
currentControl.SetImage(); |
| KCOM/Events/PasteCommand.cs | ||
|---|---|---|
| 91 | 91 |
|
| 92 | 92 |
var control = (item as MarkupToPDF.Common.CommentUserInfo); |
| 93 | 93 |
|
| 94 |
control.CommentID = Commons.shortGuid();
|
|
| 94 |
control.CommentID = Commons.ShortGuid();
|
|
| 95 | 95 |
control.MarkupInfoID = App.Custom_ViewInfoId; |
| 96 | 96 |
control.IsNew = true; |
| 97 | 97 |
|
| ... | ... | |
| 139 | 139 |
}; |
| 140 | 140 |
|
| 141 | 141 |
string temppath = System.IO.Path.GetTempPath(); |
| 142 |
string filename = Commons.shortFileKey();
|
|
| 142 |
string filename = Commons.ShortFileKey();
|
|
| 143 | 143 |
|
| 144 | 144 |
System.Drawing.Image clipboardImage = System.Windows.Forms.Clipboard.GetImage(); |
| 145 | 145 |
clipboardImage.Save(Path.Combine(temppath, filename)); |
| ... | ... | |
| 215 | 215 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 216 | 216 |
|
| 217 | 217 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 218 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 218 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 219 | 219 |
|
| 220 | 220 |
currentControl.ApplyTemplate(); |
| 221 | 221 |
currentControl.SetImage(); |
| ... | ... | |
| 275 | 275 |
|
| 276 | 276 |
System.Windows.Controls.Control item = await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, data2[0], ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, "#FFFF0000", string.Empty, |
| 277 | 277 |
STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
| 278 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid();
|
|
| 278 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.ShortGuid();
|
|
| 279 | 279 |
if (data2.Length >= 2) |
| 280 | 280 |
{
|
| 281 | 281 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = data2[1]; |
| ... | ... | |
| 322 | 322 |
}; |
| 323 | 323 |
|
| 324 | 324 |
string temppath = System.IO.Path.GetTempPath(); |
| 325 |
string filename = Commons.shortFileKey();
|
|
| 325 |
string filename = Commons.ShortFileKey();
|
|
| 326 | 326 |
|
| 327 | 327 |
System.Drawing.Image clipboardImage = System.Windows.Forms.Clipboard.GetImage(); |
| 328 | 328 |
clipboardImage.Save(Path.Combine(temppath , filename)); |
| ... | ... | |
| 398 | 398 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
| 399 | 399 |
|
| 400 | 400 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 401 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 401 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 402 | 402 |
|
| 403 | 403 |
currentControl.ApplyTemplate(); |
| 404 | 404 |
currentControl.SetImage(); |
| KCOM/Events/SaveCommand.cs | ||
|---|---|---|
| 142 | 142 |
{
|
| 143 | 143 |
SYMBOL_PRIVATE symbol_private = new SYMBOL_PRIVATE |
| 144 | 144 |
{
|
| 145 |
ID = Commons.shortGuid(),
|
|
| 145 |
ID = Commons.ShortGuid(),
|
|
| 146 | 146 |
MEMBER_USER_ID = App.ViewInfo.UserID, |
| 147 | 147 |
NAME = Name, |
| 148 | 148 |
IMAGE_URL = Url, |
| ... | ... | |
| 163 | 163 |
{
|
| 164 | 164 |
SYMBOL_PUBLIC symbol_public = new SYMBOL_PUBLIC |
| 165 | 165 |
{
|
| 166 |
ID = Commons.shortGuid(),
|
|
| 166 |
ID = Commons.ShortGuid(),
|
|
| 167 | 167 |
DEPARTMENT = Department, |
| 168 | 168 |
NAME = Name, |
| 169 | 169 |
IMAGE_URL = Url, |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 481 | 481 |
/// create a new markupinfo to do comments |
| 482 | 482 |
if (App.ViewInfo.NewCommentPermission) |
| 483 | 483 |
{
|
| 484 |
var infoId = Commons.shortGuid();
|
|
| 484 |
var infoId = Commons.ShortGuid();
|
|
| 485 | 485 |
PreviewUserMarkupInfoItem = new MarkupInfoItem |
| 486 | 486 |
{
|
| 487 | 487 |
CreateTime = DateTime.Now, |
| ... | ... | |
| 494 | 494 |
Description = "", |
| 495 | 495 |
MarkupInfoID = infoId, |
| 496 | 496 |
MarkupList = null, |
| 497 |
MarkupVersionID = Commons.shortGuid(),
|
|
| 497 |
MarkupVersionID = Commons.ShortGuid(),
|
|
| 498 | 498 |
Consolidate = 0, |
| 499 | 499 |
PartConsolidate = 0, |
| 500 | 500 |
userDelete = true, |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 444 | 444 |
{
|
| 445 | 445 |
if (!gridViewMarkup.Items.Cast<MarkupInfoItem>().Any(d => d.UserID == App.ViewInfo.UserID)) |
| 446 | 446 |
{
|
| 447 |
var infoId = Commons.shortGuid();
|
|
| 447 |
var infoId = Commons.ShortGuid();
|
|
| 448 | 448 |
PreviewUserMarkupInfoItem = new MarkupInfoItem |
| 449 | 449 |
{
|
| 450 | 450 |
CreateTime = DateTime.Now, |
| ... | ... | |
| 457 | 457 |
Description = "", |
| 458 | 458 |
MarkupInfoID = infoId, |
| 459 | 459 |
MarkupList = null, |
| 460 |
MarkupVersionID = Commons.shortGuid(),
|
|
| 460 |
MarkupVersionID = Commons.ShortGuid(),
|
|
| 461 | 461 |
Consolidate = 0, |
| 462 | 462 |
PartConsolidate = 0, |
| 463 | 463 |
userDelete = true, |
| ... | ... | |
| 588 | 588 |
|
| 589 | 589 |
ViewerDataModel.Instance.OriginalTempFile = instnaceFile; |
| 590 | 590 |
|
| 591 |
string endpoint = Common.Commons.shortGuid() + "file";
|
|
| 591 |
string endpoint = Common.Commons.ShortGuid() + "file";
|
|
| 592 | 592 |
IIpc.WcfServer wcfServer = new IIpc.WcfServer(endpoint); |
| 593 | 593 |
wcfServer.IpcFileDownloadReceived += WcfServer_IpcFileDownloadReceived; |
| 594 | 594 |
wcfServer.Start(); |
| ... | ... | |
| 912 | 912 |
|
| 913 | 913 |
result = new SymControlN |
| 914 | 914 |
{
|
| 915 |
CommentID = Commons.shortGuid(),
|
|
| 915 |
CommentID = Commons.ShortGuid(),
|
|
| 916 | 916 |
MarkupInfoID = markupInfoId, |
| 917 | 917 |
UserID = userId, |
| 918 | 918 |
PointSet = new List<Point> { startPoint, leftBottomPoint, endPoint, topRightPoint },
|
| ... | ... | |
| 950 | 950 |
|
| 951 | 951 |
result = new RectangleControl |
| 952 | 952 |
{
|
| 953 |
CommentID = Commons.shortGuid(),
|
|
| 953 |
CommentID = Commons.ShortGuid(),
|
|
| 954 | 954 |
MarkupInfoID = markupInfoId, |
| 955 | 955 |
LineSize = 5, |
| 956 | 956 |
Paint = MarkupToPDF.Controls.Common.PaintSet.None, |
| ... | ... | |
| 1011 | 1011 |
|
| 1012 | 1012 |
result = new TextControl |
| 1013 | 1013 |
{
|
| 1014 |
CommentID = Commons.shortGuid(),
|
|
| 1014 |
CommentID = Commons.ShortGuid(),
|
|
| 1015 | 1015 |
MarkupInfoID = markupInfoId, |
| 1016 | 1016 |
Text = Text, |
| 1017 | 1017 |
StartPoint = startPoint, |
| ... | ... | |
| 2721 | 2721 |
ViewerDataModel.Instance.UndoDataList.Add(UndoDataGroup); |
| 2722 | 2722 |
|
| 2723 | 2723 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl as MarkupToPDF.Common.CommentUserInfo); |
| 2724 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 2724 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 2725 | 2725 |
currentControl.SymbolID = id; |
| 2726 | 2726 |
currentControl.GroupID = group_id; |
| 2727 | 2727 |
currentControl.ApplyTemplate(); |
| ... | ... | |
| 3128 | 3128 |
ControlType = ControlType.Coordinate |
| 3129 | 3129 |
}; |
| 3130 | 3130 |
|
| 3131 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3131 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3132 | 3132 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3133 | 3133 |
currentControl.IsNew = true; |
| 3134 | 3134 |
|
| ... | ... | |
| 3165 | 3165 |
ControlType = ControlType.InsideWhite |
| 3166 | 3166 |
}; |
| 3167 | 3167 |
|
| 3168 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3168 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3169 | 3169 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3170 | 3170 |
currentControl.IsNew = true; |
| 3171 | 3171 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3201 | 3201 |
ControlType = ControlType.OverlapWhite |
| 3202 | 3202 |
}; |
| 3203 | 3203 |
|
| 3204 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3204 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3205 | 3205 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3206 | 3206 |
currentControl.IsNew = true; |
| 3207 | 3207 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3237 | 3237 |
ControlType = ControlType.ClipWhite |
| 3238 | 3238 |
}; |
| 3239 | 3239 |
|
| 3240 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3240 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3241 | 3241 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3242 | 3242 |
currentControl.IsNew = true; |
| 3243 | 3243 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3273 | 3273 |
ControlType = ControlType.Rectangle |
| 3274 | 3274 |
}; |
| 3275 | 3275 |
|
| 3276 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3276 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3277 | 3277 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3278 | 3278 |
currentControl.IsNew = true; |
| 3279 | 3279 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3312 | 3312 |
}; |
| 3313 | 3313 |
|
| 3314 | 3314 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3315 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3315 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3316 | 3316 |
currentControl.IsNew = true; |
| 3317 | 3317 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3318 | 3318 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
| ... | ... | |
| 3347 | 3347 |
}; |
| 3348 | 3348 |
|
| 3349 | 3349 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3350 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3350 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3351 | 3351 |
currentControl.IsNew = true; |
| 3352 | 3352 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3353 | 3353 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
| ... | ... | |
| 3388 | 3388 |
}; |
| 3389 | 3389 |
|
| 3390 | 3390 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3391 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3391 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3392 | 3392 |
currentControl.IsNew = true; |
| 3393 | 3393 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3394 | 3394 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
| ... | ... | |
| 3426 | 3426 |
}; |
| 3427 | 3427 |
|
| 3428 | 3428 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3429 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3429 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3430 | 3430 |
currentControl.IsNew = true; |
| 3431 | 3431 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3432 | 3432 |
ViewerDataModel.Instance.SetAngleVisible(Visibility.Visible); |
| ... | ... | |
| 3478 | 3478 |
}; |
| 3479 | 3479 |
|
| 3480 | 3480 |
var polygonControl = (currentControl as PolygonControl); |
| 3481 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3481 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3482 | 3482 |
currentControl.IsNew = true; |
| 3483 | 3483 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3484 | 3484 |
polygonControl.StartPoint = CanvasDrawingMouseDownPoint; |
| ... | ... | |
| 3538 | 3538 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 3539 | 3539 |
//{
|
| 3540 | 3540 |
var polygonControl = (currentControl as PolygonControl); |
| 3541 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3541 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3542 | 3542 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3543 | 3543 |
currentControl.IsNew = true; |
| 3544 | 3544 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3577 | 3577 |
StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y), |
| 3578 | 3578 |
Background = new SolidColorBrush(Colors.Black) |
| 3579 | 3579 |
}; |
| 3580 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3580 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3581 | 3581 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3582 | 3582 |
currentControl.IsNew = true; |
| 3583 | 3583 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3621 | 3621 |
StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y), |
| 3622 | 3622 |
Background = new SolidColorBrush(Colors.Black) |
| 3623 | 3623 |
}; |
| 3624 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3624 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3625 | 3625 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3626 | 3626 |
currentControl.IsNew = true; |
| 3627 | 3627 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3682 | 3682 |
StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y), |
| 3683 | 3683 |
Background = new SolidColorBrush(Colors.Black) |
| 3684 | 3684 |
}; |
| 3685 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3685 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3686 | 3686 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3687 | 3687 |
currentControl.IsNew = true; |
| 3688 | 3688 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3738 | 3738 |
}; |
| 3739 | 3739 |
|
| 3740 | 3740 |
var polygonControl = (currentControl as CloudControl); |
| 3741 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3741 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3742 | 3742 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3743 | 3743 |
currentControl.IsNew = true; |
| 3744 | 3744 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3801 | 3801 |
ControlType = ControlType.ImgControl |
| 3802 | 3802 |
}; |
| 3803 | 3803 |
|
| 3804 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3804 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3805 | 3805 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3806 | 3806 |
currentControl.IsNew = true; |
| 3807 | 3807 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3850 | 3850 |
StartPoint = CanvasDrawingMouseDownPoint, |
| 3851 | 3851 |
Background = new SolidColorBrush(Colors.Black) |
| 3852 | 3852 |
}; |
| 3853 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3853 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3854 | 3854 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3855 | 3855 |
currentControl.IsNew = true; |
| 3856 | 3856 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3878 | 3878 |
ControlType = controlType |
| 3879 | 3879 |
}; |
| 3880 | 3880 |
|
| 3881 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3881 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3882 | 3882 |
currentControl.IsNew = true; |
| 3883 | 3883 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3884 | 3884 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 3932 | 3932 |
|
| 3933 | 3933 |
(currentControl as TextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 3934 | 3934 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3935 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3935 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3936 | 3936 |
currentControl.IsNew = true; |
| 3937 | 3937 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 3938 | 3938 |
currentControl.SetValue(Canvas.ZIndexProperty, currentControl.ZIndex); |
| ... | ... | |
| 3983 | 3983 |
}; |
| 3984 | 3984 |
|
| 3985 | 3985 |
(currentControl as TextControl).TextSize = ViewerDataModel.Instance.TextSize; |
| 3986 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 3986 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 3987 | 3987 |
currentControl.IsNew = true; |
| 3988 | 3988 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 3989 | 3989 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4068 | 4068 |
PageAngle = ViewerDataModel.Instance.PageAngle |
| 4069 | 4069 |
}; |
| 4070 | 4070 |
|
| 4071 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4071 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4072 | 4072 |
currentControl.IsNew = true; |
| 4073 | 4073 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4074 | 4074 |
|
| ... | ... | |
| 4130 | 4130 |
ControlType = ControlType.ArrowTransTextControl, |
| 4131 | 4131 |
PageAngle = ViewerDataModel.Instance.PageAngle |
| 4132 | 4132 |
}; |
| 4133 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4133 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4134 | 4134 |
currentControl.IsNew = true; |
| 4135 | 4135 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4136 | 4136 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4180 | 4180 |
ArrowTextStyle = MarkupToPDF.Controls.Text.ArrowTextControl.ArrowTextStyleSet.Rect, |
| 4181 | 4181 |
PageAngle = ViewerDataModel.Instance.PageAngle |
| 4182 | 4182 |
}; |
| 4183 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4183 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4184 | 4184 |
currentControl.IsNew = true; |
| 4185 | 4185 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4186 | 4186 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4233 | 4233 |
PageAngle = ViewerDataModel.Instance.PageAngle |
| 4234 | 4234 |
}; |
| 4235 | 4235 |
|
| 4236 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4236 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4237 | 4237 |
currentControl.IsNew = true; |
| 4238 | 4238 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4239 | 4239 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4289 | 4289 |
PageAngle = ViewerDataModel.Instance.PageAngle, |
| 4290 | 4290 |
ControlType = ControlType.ArrowTextCloudControl |
| 4291 | 4291 |
}; |
| 4292 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4292 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4293 | 4293 |
currentControl.IsNew = true; |
| 4294 | 4294 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4295 | 4295 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4339 | 4339 |
ControlType = ControlType.ArrowTransTextCloudControl, |
| 4340 | 4340 |
PageAngle = ViewerDataModel.Instance.PageAngle |
| 4341 | 4341 |
}; |
| 4342 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4342 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4343 | 4343 |
currentControl.IsNew = true; |
| 4344 | 4344 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4345 | 4345 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4425 | 4425 |
ControlType = ControlType.Sign |
| 4426 | 4426 |
}; |
| 4427 | 4427 |
|
| 4428 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4428 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4429 | 4429 |
currentControl.IsNew = true; |
| 4430 | 4430 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4431 | 4431 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4476 | 4476 |
}; |
| 4477 | 4477 |
|
| 4478 | 4478 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4479 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4479 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4480 | 4480 |
currentControl.IsNew = true; |
| 4481 | 4481 |
(currentControl as RectangleControl).DashSize = ViewerDataModel.Instance.DashSize; |
| 4482 | 4482 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| ... | ... | |
| 4515 | 4515 |
|
| 4516 | 4516 |
currentControl.IsNew = true; |
| 4517 | 4517 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4518 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4518 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4519 | 4519 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4520 | 4520 |
|
| 4521 | 4521 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| ... | ... | |
| 4559 | 4559 |
|
| 4560 | 4560 |
currentControl.IsNew = true; |
| 4561 | 4561 |
currentControl.MarkupInfoID = App.Custom_ViewInfoId; |
| 4562 |
currentControl.CommentID = Commons.shortGuid();
|
|
| 4562 |
currentControl.CommentID = Commons.ShortGuid();
|
|
| 4563 | 4563 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
| 4564 | 4564 |
//20180903 LJY 회전된 방향으로 화면에 출력되지 않는 문제 수정 |
| 4565 | 4565 |
(currentControl as SymControlN).CommentAngle -= rotate.Angle; |
| ... | ... | |
| 5566 | 5566 |
if (symbolpng == true || symbolsvg == true) |
| 5567 | 5567 |
{
|
| 5568 | 5568 |
kr.co.devdoftech.cloud.FileUpload fileUploader = App.FileUploader; |
| 5569 |
string guid = Commons.shortGuid();
|
|
| 5569 |
string guid = Commons.ShortGuid();
|
|
| 5570 | 5570 |
|
| 5571 | 5571 |
fileUploader.RunAsync(App.ViewInfo.ProjectNO, _DocItem.DOCUMENT_NO, App.ViewInfo.UserID, guid + ".png", Img_byte); |
| 5572 | 5572 |
//Check_Uri.UriCheck(); |
| ... | ... | |
| 5678 | 5678 |
{
|
| 5679 | 5679 |
SYMBOL_PRIVATE symbol_private = new SYMBOL_PRIVATE |
| 5680 | 5680 |
{
|
| 5681 |
ID = Commons.shortGuid(),
|
|
| 5681 |
ID = Commons.ShortGuid(),
|
|
| 5682 | 5682 |
MEMBER_USER_ID = App.ViewInfo.UserID, |
| 5683 | 5683 |
NAME = Name, |
| 5684 | 5684 |
IMAGE_URL = Url, |
| ... | ... | |
| 5701 | 5701 |
{
|
| 5702 | 5702 |
SYMBOL_PUBLIC symbol_public = new SYMBOL_PUBLIC |
| 5703 | 5703 |
{
|
| 5704 |
ID = Commons.shortGuid(),
|
|
| 5704 |
ID = Commons.ShortGuid(),
|
|
| 5705 | 5705 |
DEPARTMENT = Department, |
| 5706 | 5706 |
NAME = Name, |
| 5707 | 5707 |
IMAGE_URL = Url, |
| ... | ... | |
| 5796 | 5796 |
byte[] Img_byte = fs.ToArray(); |
| 5797 | 5797 |
|
| 5798 | 5798 |
kr.co.devdoftech.cloud.FileUpload fileUploader = App.FileUploader; |
| 5799 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, _DocItem.DOCUMENT_NO, App.ViewInfo.UserID, Commons.shortGuid() + ".png", Img_byte);
|
|
| 5799 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, _DocItem.DOCUMENT_NO, App.ViewInfo.UserID, Commons.ShortGuid() + ".png", Img_byte);
|
|
| 5800 | 5800 |
Check_Uri.UriCheck(filename); |
| 5801 | 5801 |
if (symbolPanel_Instance.RadTab.SelectedIndex == 0) |
| 5802 | 5802 |
{
|
| ... | ... | |
| 6034 | 6034 |
{
|
| 6035 | 6035 |
check_ = new KCOMDataModel.DataModel.CHECK_LIST |
| 6036 | 6036 |
{
|
| 6037 |
ID = Commons.shortGuid(),
|
|
| 6037 |
ID = Commons.ShortGuid(),
|
|
| 6038 | 6038 |
USER_ID = App.ViewInfo.UserID, |
| 6039 | 6039 |
IMAGE_URL = Result, |
| 6040 | 6040 |
IMAGE_ANCHOR = x + "," + y + "," + width + "," + height, |
| ... | ... | |
| 6118 | 6118 |
if (item.PageNumber == pageNavigator.CurrentPage.PageNumber) |
| 6119 | 6119 |
{
|
| 6120 | 6120 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER,ViewerDataModel.Instance.PageAngle, "#FFFF0000", "", |
| 6121 |
items.MarkupInfoID, Commons.shortGuid(), STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
|
|
| 6121 |
items.MarkupInfoID, Commons.ShortGuid(), STAMP_Contents: App.SystemInfo.STAMP_CONTENTS);
|
|
| 6122 | 6122 |
} |
| 6123 | 6123 |
} |
| 6124 | 6124 |
} |
| ... | ... | |
| 6148 | 6148 |
pc.StartPoint = inkPointSet[0]; |
| 6149 | 6149 |
pc.EndPoint = inkPointSet[inkPointSet.Count - 1]; |
| 6150 | 6150 |
pc.LineSize = 3; |
| 6151 |
pc.CommentID = Commons.shortGuid();
|
|
| 6151 |
pc.CommentID = Commons.ShortGuid();
|
|
| 6152 | 6152 |
pc.StrokeColor = new SolidColorBrush(Colors.Red); |
| 6153 | 6153 |
|
| 6154 | 6154 |
if (pc.PointSet.Count > 0) |
| KCOM_API/MarkusService.svc.cs | ||
|---|---|---|
| 183 | 183 |
string result = false.ToString(); |
| 184 | 184 |
|
| 185 | 185 |
//string _id = GetGuid(0, GuidGenerator.GetUniqueGuid()).ToString(); |
| 186 |
string _id = shortGuid();
|
|
| 186 |
string _id = ShortGuid();
|
|
| 187 | 187 |
string _doc_id = document_Id;// ((UInt32)document_Id.GetHashCode()).ToString(); |
| 188 | 188 |
|
| 189 | 189 |
string sCIConnString = ConfigurationManager.ConnectionStrings["CIConnectionString"].ConnectionString; |
| ... | ... | |
| 321 | 321 |
throw new Exception("Error in Base64Decode: " + e.Message);
|
| 322 | 322 |
} |
| 323 | 323 |
} |
| 324 |
public string shortGuid()
|
|
| 324 |
public string ShortGuid()
|
|
| 325 | 325 |
{
|
| 326 | 326 |
byte[] bytes = new byte[16]; |
| 327 | 327 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
| KCOM_API/ServiceDeepView.svc.cs | ||
|---|---|---|
| 138 | 138 |
//GC.Collect(2); |
| 139 | 139 |
} |
| 140 | 140 |
|
| 141 |
private static string shortGuid()
|
|
| 141 |
private static string ShortGuid()
|
|
| 142 | 142 |
{
|
| 143 | 143 |
byte[] bytes = new byte[16]; |
| 144 | 144 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
| ... | ... | |
| 396 | 396 |
RemFinalPDFObject remObj = null; |
| 397 | 397 |
try |
| 398 | 398 |
{
|
| 399 |
string _finalID = shortGuid();
|
|
| 399 |
string _finalID = ShortGuid();
|
|
| 400 | 400 |
int _DocTotalPages = -1; |
| 401 | 401 |
string docItemId; |
| 402 | 402 |
|
| ... | ... | |
| 1128 | 1128 |
{
|
| 1129 | 1129 |
entity.FAVORITE_DOC.AddObject(new FAVORITE_DOC |
| 1130 | 1130 |
{
|
| 1131 |
ID = shortGuid(),
|
|
| 1131 |
ID = ShortGuid(),
|
|
| 1132 | 1132 |
PROJECT_NO = prjNo, |
| 1133 | 1133 |
DOCUMENT_ID = documentItemID, |
| 1134 | 1134 |
GROUP_NO = groupNo, |
| ... | ... | |
| 2019 | 2019 |
} |
| 2020 | 2020 |
|
| 2021 | 2021 |
KCOMDataModel.DataModel.MARKUP_INFO info = new KCOMDataModel.DataModel.MARKUP_INFO(); |
| 2022 |
info.ID = shortGuid();
|
|
| 2022 |
info.ID = ShortGuid();
|
|
| 2023 | 2023 |
info.CONSOLIDATE = 1; |
| 2024 | 2024 |
info.CREATE_TIME = DateTime.Now; |
| 2025 | 2025 |
info.DOCINFO_ID = _doc_id; |
| ... | ... | |
| 2032 | 2032 |
|
| 2033 | 2033 |
KCOMDataModel.DataModel.MARKUP_INFO_VERSION info2 = new KCOMDataModel.DataModel.MARKUP_INFO_VERSION |
| 2034 | 2034 |
{
|
| 2035 |
ID = shortGuid(),
|
|
| 2035 |
ID = ShortGuid(),
|
|
| 2036 | 2036 |
CREATE_DATE = DateTime.Now, |
| 2037 | 2037 |
MARKUP_INFO = info, |
| 2038 | 2038 |
}; |
| ... | ... | |
| 2041 | 2041 |
{
|
| 2042 | 2042 |
Entity.MARKUP_DATA.AddObject(new KCOMDataModel.DataModel.MARKUP_DATA |
| 2043 | 2043 |
{
|
| 2044 |
ID = shortGuid(),
|
|
| 2044 |
ID = ShortGuid(),
|
|
| 2045 | 2045 |
DATA = item.DATA, |
| 2046 | 2046 |
DATA_TYPE = item.DATA_TYPE, |
| 2047 | 2047 |
PAGENUMBER = item.PAGENUMBER, |
| ... | ... | |
| 2087 | 2087 |
} |
| 2088 | 2088 |
|
| 2089 | 2089 |
KCOMDataModel.DataModel.MARKUP_INFO info = new KCOMDataModel.DataModel.MARKUP_INFO(); |
| 2090 |
info.ID = shortGuid();
|
|
| 2090 |
info.ID = ShortGuid();
|
|
| 2091 | 2091 |
info.CONSOLIDATE = 1; |
| 2092 | 2092 |
info.CREATE_TIME = DateTime.Now; |
| 2093 | 2093 |
info.DOCINFO_ID = _doc_id; |
| ... | ... | |
| 2101 | 2101 |
|
| 2102 | 2102 |
KCOMDataModel.DataModel.MARKUP_INFO_VERSION info2 = new KCOMDataModel.DataModel.MARKUP_INFO_VERSION |
| 2103 | 2103 |
{
|
| 2104 |
ID = shortGuid(),
|
|
| 2104 |
ID = ShortGuid(),
|
|
| 2105 | 2105 |
CREATE_DATE = DateTime.Now, |
| 2106 | 2106 |
MARKUP_INFO = info, |
| 2107 | 2107 |
}; |
| ... | ... | |
| 2111 | 2111 |
{
|
| 2112 | 2112 |
Entity.MARKUP_DATA.AddObject(new KCOMDataModel.DataModel.MARKUP_DATA |
| 2113 | 2113 |
{
|
| 2114 |
ID = shortGuid(),
|
|
| 2114 |
ID = ShortGuid(),
|
|
| 2115 | 2115 |
DATA = item.DATA, |
| 2116 | 2116 |
DATA_TYPE = item.DATA_TYPE, |
| 2117 | 2117 |
PAGENUMBER = item.PAGENUMBER, |
| ... | ... | |
| 2138 | 2138 |
RemFinalPDFObject remObj = null; |
| 2139 | 2139 |
try |
| 2140 | 2140 |
{
|
| 2141 |
string _finalID = shortGuid();
|
|
| 2141 |
string _finalID = ShortGuid();
|
|
| 2142 | 2142 |
int _DocTotalPages = -1; |
| 2143 | 2143 |
string docItemId; |
| 2144 | 2144 |
|
| ... | ... | |
| 2282 | 2282 |
} |
| 2283 | 2283 |
|
| 2284 | 2284 |
KCOMDataModel.DataModel.MARKUP_INFO info = new KCOMDataModel.DataModel.MARKUP_INFO(); |
| 2285 |
info.ID = shortGuid();
|
|
| 2285 |
info.ID = ShortGuid();
|
|
| 2286 | 2286 |
info.PART_CONSOLIDATE = 1; |
| 2287 | 2287 |
info.CREATE_TIME = DateTime.Now; |
| 2288 | 2288 |
info.DOCINFO_ID = _doc_id; |
| ... | ... | |
| 2296 | 2296 |
|
| 2297 | 2297 |
KCOMDataModel.DataModel.MARKUP_INFO_VERSION info2 = new KCOMDataModel.DataModel.MARKUP_INFO_VERSION |
| 2298 | 2298 |
{
|
| 2299 |
ID = shortGuid(),
|
|
| 2299 |
ID = ShortGuid(),
|
|
| 2300 | 2300 |
CREATE_DATE = DateTime.Now, |
| 2301 | 2301 |
MARKUP_INFO = info, |
| 2302 | 2302 |
}; |
| ... | ... | |
| 2306 | 2306 |
{
|
| 2307 | 2307 |
Entity.MARKUP_DATA.AddObject(new KCOMDataModel.DataModel.MARKUP_DATA |
| 2308 | 2308 |
{
|
| 2309 |
ID = shortGuid(),
|
|
| 2309 |
ID = ShortGuid(),
|
|
| 2310 | 2310 |
DATA = item.DATA, |
| 2311 | 2311 |
DATA_TYPE = item.DATA_TYPE, |
| 2312 | 2312 |
PAGENUMBER = item.PAGENUMBER, |
| ... | ... | |
| 2611 | 2611 |
{
|
| 2612 | 2612 |
entity.SIGN_INFO.AddObject(new SIGN_INFO |
| 2613 | 2613 |
{
|
| 2614 |
ID = shortGuid(),
|
|
| 2614 |
ID = ShortGuid(),
|
|
| 2615 | 2615 |
MEMBER_USER_ID = user_id, |
| 2616 | 2616 |
CREATE_DATE = DateTime.Now, |
| 2617 | 2617 |
SIGN_STR = cropImg |
| ... | ... | |
| 2651 | 2651 |
{
|
| 2652 | 2652 |
entity.SIGN_INFO.AddObject(new SIGN_INFO |
| 2653 | 2653 |
{
|
| 2654 |
ID = shortGuid(),
|
|
| 2654 |
ID = ShortGuid(),
|
|
| 2655 | 2655 |
MEMBER_USER_ID = user_id, |
| 2656 | 2656 |
CREATE_DATE = DateTime.Now, |
| 2657 | 2657 |
SIGN_STROKES = strokesData |
| KCOM_API_AutoStamping/AutoStamping.svc.cs | ||
|---|---|---|
| 171 | 171 |
|
| 172 | 172 |
mARKUPINFO = new MARKUP_INFO() |
| 173 | 173 |
{
|
| 174 |
ID = shortGuid(),
|
|
| 174 |
ID = ShortGuid(),
|
|
| 175 | 175 |
DOCINFO_ID = dOCINFO.ID, |
| 176 | 176 |
USER_ID = user_id, |
| 177 | 177 |
CREATE_TIME = DateTime.Now, |
| ... | ... | |
| 186 | 186 |
|
| 187 | 187 |
MARKUP_INFO_VERSION mARKUPINFOVERSION = new MARKUP_INFO_VERSION() |
| 188 | 188 |
{
|
| 189 |
ID = shortGuid(),
|
|
| 189 |
ID = ShortGuid(),
|
|
| 190 | 190 |
MARKUPINFO_ID = mARKUPINFO.ID, |
| 191 | 191 |
CREATE_DATE = DateTime.Now |
| 192 | 192 |
}; |
| ... | ... | |
| 342 | 342 |
|
| 343 | 343 |
mARKUPINFO = new MARKUP_INFO() |
| 344 | 344 |
{
|
| 345 |
ID = shortGuid(),
|
|
| 345 |
ID = ShortGuid(),
|
|
| 346 | 346 |
DOCINFO_ID = dOCINFO.ID, |
| 347 | 347 |
USER_ID = user_id, |
| 348 | 348 |
CREATE_TIME = DateTime.Now, |
| ... | ... | |
| 357 | 357 |
|
| 358 | 358 |
MARKUP_INFO_VERSION mARKUPINFOVERSION = new MARKUP_INFO_VERSION() |
| 359 | 359 |
{
|
| 360 |
ID = shortGuid(),
|
|
| 360 |
ID = ShortGuid(),
|
|
| 361 | 361 |
MARKUPINFO_ID = mARKUPINFO.ID, |
| 362 | 362 |
CREATE_DATE = DateTime.Now |
| 363 | 363 |
}; |
| ... | ... | |
| 407 | 407 |
} |
| 408 | 408 |
} |
| 409 | 409 |
|
| 410 |
private static string shortGuid()
|
|
| 410 |
private static string ShortGuid()
|
|
| 411 | 411 |
{
|
| 412 | 412 |
byte[] bytes = new byte[16]; |
| 413 | 413 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
| ... | ... | |
| 439 | 439 |
|
| 440 | 440 |
result = new SymControlN |
| 441 | 441 |
{
|
| 442 |
CommentID = shortGuid(),
|
|
| 442 |
CommentID = ShortGuid(),
|
|
| 443 | 443 |
MarkupInfoID = markupInfoId, |
| 444 | 444 |
UserID = userId, |
| 445 | 445 |
PointSet = new List<Point> { startPoint, leftBottomPoint, endPoint, topRightPoint },
|
| ... | ... | |
| 479 | 479 |
|
| 480 | 480 |
result = new RectangleControl |
| 481 | 481 |
{
|
| 482 |
CommentID = shortGuid(),
|
|
| 482 |
CommentID = ShortGuid(),
|
|
| 483 | 483 |
MarkupInfoID = markupInfoId, |
| 484 | 484 |
LineSize = 5, |
| 485 | 485 |
Paint = MarkupToPDF.Controls.Common.PaintSet.None, |
| ... | ... | |
| 550 | 550 |
|
| 551 | 551 |
result = new TextControl |
| 552 | 552 |
{
|
| 553 |
CommentID = shortGuid(),
|
|
| 553 |
CommentID = ShortGuid(),
|
|
| 554 | 554 |
MarkupInfoID = markupInfoId, |
| 555 | 555 |
Text = Text, |
| 556 | 556 |
StartPoint = startPoint, |
| ... | ... | |
| 613 | 613 |
RemFinalPDFObject remObj = null; |
| 614 | 614 |
try |
| 615 | 615 |
{
|
| 616 |
string _finalID = shortGuid();
|
|
| 616 |
string _finalID = ShortGuid();
|
|
| 617 | 617 |
int _DocTotalPages = -1; |
| 618 | 618 |
string docItemId; |
| 619 | 619 |
|
| MarkupToPDF/Controls/Etc/SymControl.cs | ||
|---|---|---|
| 381 | 381 |
pathFigure.IsClosed = true; |
| 382 | 382 |
pathGeometry.Figures.Add(pathFigure); |
| 383 | 383 |
this.Base_ViewBox.Width = pathGeometry.Bounds.Width; |
| 384 |
this.Base_ViewBox.Height = pathGeometry.Bounds.Height; ;
|
|
| 384 |
this.Base_ViewBox.Height = pathGeometry.Bounds.Height; |
|
| 385 | 385 |
this.Tag = pathGeometry; |
| 386 | 386 |
|
| 387 | 387 |
Canvas.SetLeft(this, MathSet.RotateAbout(mid, mid, AngleData).X - this.Base_ViewBox.Width / 2); |
| MarkupToPDF/Controls/Parsing/MarkupParse.cs | ||
|---|---|---|
| 51 | 51 |
res.CommentID = Control.CommentID; |
| 52 | 52 |
if (res.CommentID == null) |
| 53 | 53 |
{
|
| 54 |
res.CommentID = shortGuid();
|
|
| 54 |
res.CommentID = ShortGuid();
|
|
| 55 | 55 |
} |
| 56 | 56 |
|
| 57 | 57 |
res.ConvertData = ""; |
| ... | ... | |
| 346 | 346 |
|
| 347 | 347 |
using (System.IO.MemoryStream stream = new System.IO.MemoryStream()) |
| 348 | 348 |
{
|
| 349 |
System.IO.StreamWriter writer = new System.IO.StreamWriter(stream); |
|
| 350 |
xamlData = xamlData.Replace("#FFFF0000", DisplayColor);
|
|
| 351 |
|
|
| 349 |
#region Xaml 텍스트를 수정 |
|
| 350 |
if (!string.IsNullOrEmpty(DisplayColor)) xamlData = xamlData.Replace("#FFFF0000", DisplayColor);
|
|
| 352 | 351 |
if (STAMP_Contents?.Count > 0) |
| 353 | 352 |
{
|
| 354 | 353 |
foreach (var Content in STAMP_Contents) |
| ... | ... | |
| 356 | 355 |
xamlData = xamlData.Replace(Content.Key, System.Security.SecurityElement.Escape(Content.Value)); |
| 357 | 356 |
} |
| 358 | 357 |
} |
| 358 |
#endregion |
|
| 359 | 359 |
|
| 360 |
writer.Write(xamlData); |
|
| 361 |
writer.Flush(); |
|
| 362 |
stream.Position = 0; |
|
| 363 |
|
|
| 364 |
object obj = XamlReader.Load(stream); |
|
| 360 |
object obj = XamlReader.Parse(xamlData); |
|
| 365 | 361 |
SymCtrl.Base_ViewBox.Child = obj as UIElement; |
| 366 | 362 |
SymCtrl.SetViewBox(); |
| 367 | 363 |
} |
| ... | ... | |
| 388 | 384 |
} |
| 389 | 385 |
|
| 390 | 386 |
//GUID생성(최민수 사원 수정) |
| 391 |
private static string shortGuid()
|
|
| 387 |
private static string ShortGuid()
|
|
| 392 | 388 |
{
|
| 393 | 389 |
byte[] bytes = new byte[16]; |
| 394 | 390 |
using (var provider = System.Security.Cryptography.RandomNumberGenerator.Create()) |
내보내기 Unified diff
