개정판 24678e06
issue #000: Add Commons.cs file
Change-Id: I14ae2a26673890b4be08a1c989faf570629ad3d1
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.SaveCommand.shortGuid();
|
|
332 |
var infoId = Commons.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.SaveCommand.shortGuid(),
|
|
345 |
MarkupVersionID = Commons.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.SaveCommand.shortGuid();
|
|
594 |
(InnerItem.DrawingData as PolygonControl).CommentID = Commons.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.SaveCommand.shortGuid();
|
|
3490 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
3916 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
3953 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
3988 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4023 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4062 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4102 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4137 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4181 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4217 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4254 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4291 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4327 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4362 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4417 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4457 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4502 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4564 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4621 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4691 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4740 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4763 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4796 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4827 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4872 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4919 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
4966 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
5016 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
5070 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
5117 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
5193 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
5252 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
5299 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
5337 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
5378 |
currentControl.CommentID = Commons.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 = SaveCommand.shortGuid();
|
|
6196 |
string guid = Commons.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.SaveCommand.shortGuid(),
|
|
6308 |
ID = Commons.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.SaveCommand.shortGuid(),
|
|
6331 |
ID = Commons.shortGuid(),
|
|
6332 | 6332 |
DEPARTMENT = Department, |
6333 | 6333 |
NAME = Name, |
6334 | 6334 |
IMAGE_URL = Url, |
... | ... | |
6423 | 6423 |
byte[] Img_byte = fs.ToArray(); |
6424 | 6424 |
|
6425 | 6425 |
kr.co.devdoftech.cloud.FileUpload fileUploader = new kr.co.devdoftech.cloud.FileUpload(); |
6426 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, _DocItem.DOCUMENT_NO, App.ViewInfo.UserID, SaveCommand.shortGuid() + ".png", Img_byte);
|
|
6426 |
filename = fileUploader.Run(App.ViewInfo.ProjectNO, _DocItem.DOCUMENT_NO, App.ViewInfo.UserID, Commons.shortGuid() + ".png", Img_byte);
|
|
6427 | 6427 |
Check_Uri.UriCheck(filename); |
6428 | 6428 |
if (symbolPanel_Instance.RadTab.SelectedIndex == 0) |
6429 | 6429 |
{ |
... | ... | |
6660 | 6660 |
{ |
6661 | 6661 |
check_ = new KCOMDataModel.DataModel.CHECK_LIST |
6662 | 6662 |
{ |
6663 |
ID = SaveCommand.shortGuid(),
|
|
6663 |
ID = Commons.shortGuid(),
|
|
6664 | 6664 |
USER_ID = App.ViewInfo.UserID, |
6665 | 6665 |
IMAGE_URL = Result, |
6666 | 6666 |
IMAGE_ANCHOR = x + "," + y + "," + width + "," + height, |
... | ... | |
7037 | 7037 |
if (item.PageNumber == pageNavigator.CurrentPage.PageNumber) |
7038 | 7038 |
{ |
7039 | 7039 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", |
7040 |
items.MarkupInfoID, SaveCommand.shortGuid());
|
|
7040 |
items.MarkupInfoID, Commons.shortGuid());
|
|
7041 | 7041 |
} |
7042 | 7042 |
} |
7043 | 7043 |
} |
... | ... | |
7106 | 7106 |
pc.EndPoint = inkPointSet[inkPointSet.Count - 1]; |
7107 | 7107 |
pc.PointSet = inkPointSet; |
7108 | 7108 |
pc.LineSize = 3; |
7109 |
pc.CommentID = SaveCommand.shortGuid();
|
|
7109 |
pc.CommentID = Commons.shortGuid();
|
|
7110 | 7110 |
pc.StrokeColor = new SolidColorBrush(Colors.Red); |
7111 | 7111 |
ViewerDataModel.Instance.MarkupControls_USER.Add(pc); |
7112 | 7112 |
///pc.SetPolyPath(); |
... | ... | |
7271 | 7271 |
if (parse != "") |
7272 | 7272 |
{ |
7273 | 7273 |
System.Windows.Controls.Control item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, parse, ViewerDataModel.Instance.MarkupControls_USER, string.Empty, string.Empty); |
7274 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.SaveCommand.shortGuid();
|
|
7274 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Commons.shortGuid();
|
|
7275 | 7275 |
|
7276 | 7276 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
7277 | 7277 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
내보내기 Unified diff