개정판 5a223b60
Fix: Approval로 등록된 심볼을 배치하지 못하는 오류 수정
- 심볼 배치 후 작업 영역을 클릭하면 MARKUS가 종료되는 오류 수정
Change-Id: I4e5be7f497aae8ba3f385c8efad688a7f82ae492
| 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(); |
내보내기 Unified diff
