개정판 661b7416
issue #999: Add FromString to all of controls
Change-Id: I64093e34a5f9e8d367cbed769ff4db8d7472cb7a
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 900 | 900 |
ViewerDataModel.Instance.current_page_commentcnt = ViewerDataModel.Instance.MarkupList_USER.Where(data => data.PageNumber == pageNavigator.CurrentPage.PageNumber && data.MarkupInfoID == item.MarkupInfoID).ToList().Count; |
| 901 | 901 |
ViewerDataModel.Instance.MarkupList_USER.Where(data => data.PageNumber == pageNavigator.CurrentPage.PageNumber && data.MarkupInfoID == item.MarkupInfoID).ToList().ForEach(delegate (MarkupItemEx markupitem) |
| 902 | 902 |
{
|
| 903 |
layerControl.markupParseEx(markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "", item.MarkupInfoID, markupitem.ID); |
|
| 903 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, item.DisplayColor, "", |
|
| 904 |
item.MarkupInfoID, markupitem.ID); |
|
| 904 | 905 |
}); |
| 905 | 906 |
|
| 906 | 907 |
} |
| ... | ... | |
| 908 | 909 |
{
|
| 909 | 910 |
ViewerDataModel.Instance.MarkupList_Pre.Where(data => data.PageNumber == pageNavigator.CurrentPage.PageNumber && data.MarkupInfoID == item.MarkupInfoID).ToList().ForEach(delegate (MarkupItemEx markupitem) |
| 910 | 911 |
{
|
| 911 |
layerControl.markupParse(markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 912 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 912 | 913 |
}); |
| 913 | 914 |
} |
| 914 | 915 |
} |
| ... | ... | |
| 927 | 928 |
{
|
| 928 | 929 |
item.MarkupList.Where(pageItem => pageItem.PageNumber == BalancePoint).ToList().ForEach(delegate (MarkupItem markupitem) |
| 929 | 930 |
{
|
| 930 |
layerControl.markupParse(markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 931 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 931 | 932 |
}); |
| 932 | 933 |
} |
| 933 |
|
|
| 934 | 934 |
} |
| 935 | 935 |
|
| 936 | 936 |
var instanceMain = this.ParentOfType<MainWindow>(); |
| ... | ... | |
| 969 | 969 |
} |
| 970 | 970 |
|
| 971 | 971 |
//Control |
| 972 |
item = layerControl.TempMarkupParseEx(tempLoadData[k].ConvertData, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", tempLoadData[k].MarkupInfoID, tempLoadData[k].CommentID);
|
|
| 972 |
item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, tempLoadData[k].ConvertData, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", tempLoadData[k].MarkupInfoID, tempLoadData[k].CommentID);
|
|
| 973 | 973 |
|
| 974 | 974 |
UndoData = new Undo_data() |
| 975 | 975 |
{
|
| ... | ... | |
| 995 | 995 |
} |
| 996 | 996 |
|
| 997 | 997 |
//Control |
| 998 |
item = layerControl.TempMarkupParseEx(tempLoadData[k].ConvertData, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", tempLoadData[k].MarkupInfoID, tempLoadData[k].CommentID);
|
|
| 998 |
item = MarkupParser.ParseEx(App.ViewInfo.ProjectNO, tempLoadData[k].ConvertData, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", tempLoadData[k].MarkupInfoID, tempLoadData[k].CommentID);
|
|
| 999 | 999 |
|
| 1000 | 1000 |
UndoData = new Undo_data() |
| 1001 | 1001 |
{
|
| ... | ... | |
| 2121 | 2121 |
ViewerDataModel.Instance.AngleValue = MathSet.returnAngleString(control.StartPoint, ref tempPoint, false); |
| 2122 | 2122 |
} |
| 2123 | 2123 |
|
| 2124 |
control.SetPolyPath(); |
|
| 2124 |
///control.SetPolyPath();
|
|
| 2125 | 2125 |
|
| 2126 | 2126 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 2127 | 2127 |
} |
| ... | ... | |
| 2583 | 2583 |
control.PointSet.RemoveAt(control.PointSet.Count - 1); |
| 2584 | 2584 |
control.PointSet.Add(currentCanvasDrawingMouseMovePoint); |
| 2585 | 2585 |
control.Paint = ViewerDataModel.Instance.paintSet; |
| 2586 |
control.SetPolyPath(); |
|
| 2586 |
///control.SetPolyPath();
|
|
| 2587 | 2587 |
//강인구 추가 |
| 2588 | 2588 |
control.DashSize = ViewerDataModel.Instance.DashSize; |
| 2589 | 2589 |
control.Paint = ViewerDataModel.Instance.paintSet; |
| ... | ... | |
| 2604 | 2604 |
|
| 2605 | 2605 |
if (control.StartPoint != control.EndPoint && control.SignImage == null) |
| 2606 | 2606 |
{
|
| 2607 |
GetUserSign getUser = new GetUserSign(); |
|
| 2608 |
var _sign = getUser.GetSign(App.ViewInfo.UserID, App.ViewInfo.ProjectNO); |
|
| 2607 |
var _sign = GetUserSign.GetSign(App.ViewInfo.UserID, App.ViewInfo.ProjectNO); |
|
| 2609 | 2608 |
byte[] imageBytes = System.Convert.FromBase64String(_sign); |
| 2610 | 2609 |
System.IO.MemoryStream stream = new System.IO.MemoryStream(); |
| 2611 | 2610 |
stream.Write(imageBytes, 0, imageBytes.Length); |
| ... | ... | |
| 5165 | 5164 |
control.LineSize = ViewerDataModel.Instance.LineSize; |
| 5166 | 5165 |
control.PointSet.Add(firstPoint); |
| 5167 | 5166 |
|
| 5168 |
control.SetPolyPath(); |
|
| 5167 |
///control.SetPolyPath();
|
|
| 5169 | 5168 |
|
| 5170 | 5169 |
control.ApplyOverViewData(); |
| 5171 | 5170 |
|
| ... | ... | |
| 5206 | 5205 |
{
|
| 5207 | 5206 |
//if (IsDrawingEnable(canvasZoomPanningMouseDownPoint)) |
| 5208 | 5207 |
//{
|
| 5209 |
GetUserSign getUser = new GetUserSign(); |
|
| 5210 |
var _sign = getUser.GetSign(App.ViewInfo.UserID, App.ViewInfo.ProjectNO); |
|
| 5208 |
var _sign = GetUserSign.GetSign(App.ViewInfo.UserID, App.ViewInfo.ProjectNO); |
|
| 5211 | 5209 |
|
| 5212 | 5210 |
if (_sign == null) |
| 5213 | 5211 |
{
|
| ... | ... | |
| 5891 | 5889 |
{
|
| 5892 | 5890 |
item.MarkupList.Where(pageItem => pageItem.PageNumber == ViewerDataModel.Instance.PageNumber).ToList().ForEach(delegate (MarkupItem markupitem) |
| 5893 | 5891 |
{
|
| 5894 |
layerControl.markupParse(markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 5892 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, markupitem.Data, Common.ViewerDataModel.Instance.MarkupControls_Sync, item.DisplayColor, "", item.MarkupInfoID);
|
|
| 5895 | 5893 |
}); |
| 5896 | 5894 |
} |
| 5897 | 5895 |
|
| ... | ... | |
| 7035 | 7033 |
{
|
| 7036 | 7034 |
if (item.PageNumber == pageNavigator.CurrentPage.PageNumber) |
| 7037 | 7035 |
{
|
| 7038 |
layerControl.markupParseEx(item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", items.MarkupInfoID, Save.shortGuid()); |
|
| 7036 |
MarkupParser.ParseEx(App.ViewInfo.ProjectNO, item.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, "#FFFF0000", "", |
|
| 7037 |
items.MarkupInfoID, Save.shortGuid()); |
|
| 7039 | 7038 |
} |
| 7040 | 7039 |
} |
| 7041 | 7040 |
} |
| ... | ... | |
| 7107 | 7106 |
pc.CommentID = Save.shortGuid(); |
| 7108 | 7107 |
pc.StrokeColor = new SolidColorBrush(Colors.Red); |
| 7109 | 7108 |
ViewerDataModel.Instance.MarkupControls_USER.Add(pc); |
| 7110 |
pc.SetPolyPath(); |
|
| 7109 |
///pc.SetPolyPath();
|
|
| 7111 | 7110 |
|
| 7112 | 7111 |
ViewerDataModel.Instance.UndoDataList.Where(data => data.IsUndo == true).ToList().ForEach(i => |
| 7113 | 7112 |
{
|
내보내기 Unified diff
