개정판 c8e9b3e4
issue #757 Symbol 수량 집계 관리, markup_data table 열 추가
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 169 | 169 |
{
|
| 170 | 170 |
if (this.dzMainMenu.SelectLayer.Children.Count > 0) |
| 171 | 171 |
{
|
| 172 |
string MarkupData = ""; |
|
| 172 |
string MarkupData = "";
|
|
| 173 | 173 |
|
| 174 | 174 |
foreach (var item in this.dzMainMenu.SelectLayer.Children) |
| 175 | 175 |
{
|
| 176 |
string id = ""; |
|
| 176 | 177 |
if (item.GetType().Name == "AdornerFinal") |
| 177 | 178 |
{
|
| 178 | 179 |
foreach (var InnerItem in (item as Controls.AdornerFinal).MemberSet.Cast<Controls.AdornerMember>()) |
| 179 |
|
|
| 180 |
{
|
|
| 180 |
{
|
|
| 181 | 181 |
if (!ViewerDataModel.Instance.MarkupControls.Contains(InnerItem.DrawingData)) |
| 182 | 182 |
{
|
| 183 | 183 |
markupReturn = layer.MarkupToString(InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo, App.ViewInfo.UserID); |
| 184 |
MarkupData += "|OR|" + markupReturn.ConvertData; |
|
| 184 |
|
|
| 185 |
var Item_ = ViewerDataModel.Instance.MarkupList_USER.Where(d => d.ID == (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault(); |
|
| 186 |
if (Item_ != null) |
|
| 187 |
{
|
|
| 188 |
id = "|SymbolID|" + ViewerDataModel.Instance.MarkupList_USER.Where |
|
| 189 |
(d => d.ID == (InnerItem.DrawingData as MarkupToPDF.Common.CommentUserInfo).CommentID).FirstOrDefault().Symbol_ID; |
|
| 190 |
} |
|
| 191 |
else |
|
| 192 |
{
|
|
| 193 |
if (InnerItem.Symbol_ID != null) |
|
| 194 |
{
|
|
| 195 |
id = "|SymbolID|" + InnerItem.Symbol_ID; |
|
| 196 |
|
|
| 197 |
} |
|
| 198 |
else |
|
| 199 |
{
|
|
| 200 |
id = ""; |
|
| 201 |
} |
|
| 202 |
} |
|
| 203 |
MarkupData += "|OR|" + markupReturn.ConvertData + id; |
|
| 185 | 204 |
} |
| 186 | 205 |
} |
| 187 | 206 |
Clipboard.SetText(MarkupData); |
| ... | ... | |
| 237 | 256 |
List<MarkupToPDF.Common.CommentUserInfo> adornerSet = new List<MarkupToPDF.Common.CommentUserInfo>(); |
| 238 | 257 |
|
| 239 | 258 |
string[] delimiterChars = { "|OR|" };
|
| 259 |
string[] delimiterChars2 = { "|OR|", "|SymbolID|" };
|
|
| 240 | 260 |
string[] data = Clipboard.GetText().Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries); |
| 241 | 261 |
|
| 242 | 262 |
this.dzMainMenu.ReleaseAdorner(); |
| ... | ... | |
| 256 | 276 |
{
|
| 257 | 277 |
ViewerDataModel.Instance.UndoDataList.Remove(i); |
| 258 | 278 |
}); |
| 259 |
|
|
| 279 |
|
|
| 260 | 280 |
foreach (string parse in data) |
| 261 |
{
|
|
| 281 |
{
|
|
| 262 | 282 |
if(parse != "") |
| 263 | 283 |
{
|
| 264 |
System.Windows.Controls.Control item = layer.markupParse_Paste(parse, ViewerDataModel.Instance.MarkupControls_USER);
|
|
| 265 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid();
|
|
| 284 |
string[] data2 = new string[2];
|
|
| 285 |
data2 = parse.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
|
|
| 266 | 286 |
|
| 287 |
System.Windows.Controls.Control item = layer.markupParse_Paste(data2[0], ViewerDataModel.Instance.MarkupControls_USER); |
|
| 288 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
|
| 289 |
if(data2.Length >= 2) |
|
| 290 |
{
|
|
| 291 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = data2[1]; |
|
| 292 |
} |
|
| 267 | 293 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| 268 | 294 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
| 269 | 295 |
|
| ... | ... | |
| 275 | 301 |
multi_Undo_Data = dzMainMenu.Control_Style(item as MarkupToPDF.Common.CommentUserInfo); |
| 276 | 302 |
|
| 277 | 303 |
UndoData.Markup_List.Add(multi_Undo_Data); |
| 278 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData); |
|
| 304 |
ViewerDataModel.Instance.UndoDataList.Add(UndoData);
|
|
| 279 | 305 |
} |
| 280 | 306 |
} |
| 281 | 307 |
Controls.AdornerFinal final = new Controls.AdornerFinal(adornerSet); |
내보내기 Unified diff
