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