개정판 036650a0
issue #999: Add serialize method to all of controls
Change-Id: I74e404885e8cd107b48ad1921e768137ed14a3da
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 38 | 38 |
using System.Runtime.InteropServices; |
| 39 | 39 |
using System.Windows.Media.Effects; |
| 40 | 40 |
using MarkupToPDF.Controls.Cad; |
| 41 |
using MarkupToPDF.Controls.Parsing; |
|
| 41 | 42 |
|
| 42 | 43 |
namespace KCOM.Views |
| 43 | 44 |
{
|
| ... | ... | |
| 437 | 438 |
{
|
| 438 | 439 |
foreach (var control in ViewerDataModel.Instance.MarkupControls_USER) |
| 439 | 440 |
{
|
| 440 |
var root = layerControl.MarkupToString(control, App.ViewInfo.UserID);
|
|
| 441 |
var root = MarkupParser.MarkupToString(control, App.ViewInfo.UserID);
|
|
| 441 | 442 |
|
| 442 | 443 |
var existItem = ViewerDataModel.Instance.MarkupList_USER.Where(data => data.ID == root.CommentID).FirstOrDefault(); |
| 443 | 444 |
if (existItem != null) |
| ... | ... | |
| 643 | 644 |
{
|
| 644 | 645 |
foreach (var control in ViewerDataModel.Instance.MarkupControls_USER) |
| 645 | 646 |
{
|
| 646 |
var root = layerControl.MarkupToString(control, App.ViewInfo.UserID);
|
|
| 647 |
var root = MarkupParser.MarkupToString(control, App.ViewInfo.UserID);
|
|
| 647 | 648 |
|
| 648 | 649 |
var existItem = ViewerDataModel.Instance.MarkupList_USER.Where(data => data.ID == root.CommentID).FirstOrDefault(); |
| 649 | 650 |
if (existItem != null) //신규 추가 된 코멘트 |
| ... | ... | |
| 6137 | 6138 |
|
| 6138 | 6139 |
private void Create_Symbol(object sender, RoutedEventArgs e) |
| 6139 | 6140 |
{
|
| 6140 |
MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.LayerControl.MarkupReturn(); |
|
| 6141 | 6141 |
MarkupToPDF.Controls.Parsing.LayerControl layer = new MarkupToPDF.Controls.Parsing.LayerControl(); |
| 6142 | 6142 |
|
| 6143 | 6143 |
if (SelectLayer.Children.Count < 1) //선택된 것이 없으면 |
| ... | ... | |
| 6158 | 6158 |
{
|
| 6159 | 6159 |
if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData)) |
| 6160 | 6160 |
{
|
| 6161 |
markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
|
|
| 6161 |
var markupReturn = MarkupParser.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID);
|
|
| 6162 | 6162 |
MarkupData += markupReturn.ConvertData; |
| 6163 | 6163 |
} |
| 6164 | 6164 |
} |
내보내기 Unified diff
