개정판 c8e9b3e4
issue #757 Symbol 수량 집계 관리, markup_data table 열 추가
IKCOM/Interface.cs | ||
---|---|---|
139 | 139 |
public string Data { get; set; } |
140 | 140 |
public int Data_Type { get; set; } |
141 | 141 |
public string ParsingMemo { get; set; } |
142 |
|
|
142 |
public string Symbol_ID { get; set; } |
|
143 | 143 |
} |
144 | 144 |
public enum SERVICE_NAME |
145 | 145 |
{ |
KCOM/Controls/AdornerFinal.xaml.cs | ||
---|---|---|
29 | 29 |
public ControlType Drawingtype { get; set; } |
30 | 30 |
public double DrawingAngle { get; set; } |
31 | 31 |
public List<Thumb> ThumbList { get; set; } |
32 |
|
|
32 |
public string Symbol_ID { get; set; } |
|
33 | 33 |
} |
34 | 34 |
public partial class AdornerFinal : UserControl |
35 | 35 |
{ |
... | ... | |
149 | 149 |
{ |
150 | 150 |
#region 컨트롤 조건 |
151 | 151 |
case "LineControl": //Angle추가 안했음 |
152 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<Thumb>() }); |
|
152 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
153 | 153 |
break; |
154 | 154 |
case "ImgControl": //Angle추가 안했음 |
155 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<Thumb>() }); |
|
155 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
156 | 156 |
//AdornerBorder.RenderTransformOrigin = new Point(0.5, 0.5); |
157 | 157 |
//DragThumb.RenderTransformOrigin = new Point(0.5, 0.5); |
158 | 158 |
AngleValue = (member as ImgControl).Angle; |
... | ... | |
168 | 168 |
// //ViewBoxRotate(member); |
169 | 169 |
// break; |
170 | 170 |
case "PolygonControl": //Angle추가 안했음 |
171 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<Thumb>() }); |
|
171 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
172 | 172 |
break; |
173 | 173 |
case "ArrowControl": |
174 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<Thumb>() }); |
|
174 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
175 | 175 |
break; |
176 | 176 |
case "ArrowTextControl": |
177 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowTextControl, ThumbList = new List<Thumb>() }); |
|
177 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowTextControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
178 | 178 |
(member as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
179 | 179 |
|
180 | 180 |
Observable.FromEventPattern(((ArrowTextControl)member).Base_TextBox, "LostFocus").Subscribe(a => |
... | ... | |
189 | 189 |
}); |
190 | 190 |
break; |
191 | 191 |
case "ArcControl": |
192 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<Thumb>() }); |
|
192 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
193 | 193 |
break; |
194 | 194 |
case "ArrowArcControl": |
195 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<Thumb>() }); |
|
195 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
196 | 196 |
break; |
197 | 197 |
case "ArrowControl_Multi": |
198 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<Thumb>() }); |
|
198 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
199 | 199 |
break; |
200 | 200 |
case "RectangleControl": |
201 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<Thumb>() }); |
|
201 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
202 | 202 |
break; |
203 | 203 |
case "DateControl": |
204 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<Thumb>() }); |
|
204 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
205 | 205 |
AngleValue = (member as DateControl).Angle; |
206 | 206 |
break; |
207 | 207 |
case "TriControl": |
208 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<Thumb>() }); |
|
208 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
209 | 209 |
break; |
210 | 210 |
case "CircleControl": |
211 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<Thumb>() }); |
|
211 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
212 | 212 |
break; |
213 | 213 |
case "CloudControl": |
214 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<Thumb>() }); |
|
214 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
215 | 215 |
break; |
216 | 216 |
case "RectCloudControl": |
217 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<Thumb>() }); |
|
217 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
218 | 218 |
break; |
219 |
//강인구 추가 |
|
220 | 219 |
case "SignControl": |
221 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<Thumb>() }); |
|
220 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
222 | 221 |
AngleValue = (member as SignControl).Angle; |
223 | 222 |
break; |
224 |
//강인구 추가 |
|
223 |
|
|
225 | 224 |
case "SymControl": |
226 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<Thumb>() }); |
|
225 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
227 | 226 |
AngleValue = (member as SymControl).Angle; |
228 | 227 |
break; |
229 |
//강인구 추가 |
|
230 | 228 |
case "SymControlN": |
231 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<Thumb>() }); |
|
229 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
232 | 230 |
AngleValue = (member as SymControlN).Angle; |
233 | 231 |
break; |
234 | 232 |
case "InkControl": //Angle추가 안했음 |
235 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<Thumb>() }); |
|
233 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
236 | 234 |
break; |
237 | 235 |
case "TextControl": |
238 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<Thumb>() }); |
|
236 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
239 | 237 |
RectangleGeometry Data = new RectangleGeometry |
240 | 238 |
{ |
241 | 239 |
Rect = new Rect() |
... | ... | |
322 | 320 |
{ |
323 | 321 |
#region 컨트롤 조건 |
324 | 322 |
case "LineControl": |
325 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<Thumb>() }); |
|
323 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
326 | 324 |
break; |
327 | 325 |
case "ImgControl": |
328 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<Thumb>() }); |
|
326 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
329 | 327 |
break; |
330 | 328 |
case "ArrowControl": |
331 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<Thumb>() }); |
|
329 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
332 | 330 |
break; |
333 | 331 |
case "PolygonControl": |
334 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<Thumb>() }); |
|
332 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
335 | 333 |
break; |
336 | 334 |
case "ArrowTextControl": |
337 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowTextControl, ThumbList = new List<Thumb>() }); |
|
335 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowTextControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
338 | 336 |
(member as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
339 | 337 |
break; |
340 | 338 |
case "ArcControl": |
341 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<Thumb>() }); |
|
339 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
342 | 340 |
break; |
343 | 341 |
case "ArrowArcControl": |
344 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<Thumb>() }); |
|
342 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
345 | 343 |
break; |
346 | 344 |
case "DateControl": |
347 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<Thumb>() }); |
|
345 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
348 | 346 |
break; |
349 | 347 |
case "ArrowControl_Multi": |
350 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<Thumb>() }); |
|
348 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
351 | 349 |
break; |
352 | 350 |
case "RectangleControl": |
353 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<Thumb>() }); |
|
351 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
354 | 352 |
break; |
355 | 353 |
case "TriControl": |
356 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<Thumb>() }); |
|
354 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
357 | 355 |
break; |
358 | 356 |
case "CircleControl": |
359 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<Thumb>() }); |
|
357 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
360 | 358 |
break; |
361 | 359 |
case "CloudControl": |
362 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<Thumb>() }); |
|
360 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
363 | 361 |
break; |
364 | 362 |
case "RectCloudControl": |
365 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<Thumb>() }); |
|
363 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
366 | 364 |
break; |
367 | 365 |
case "SignControl": |
368 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<Thumb>() }); |
|
366 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
369 | 367 |
break; |
370 | 368 |
case "SymControl": |
371 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<Thumb>() }); |
|
369 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
372 | 370 |
break; |
373 | 371 |
case "SymControlN": |
374 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<Thumb>() }); |
|
372 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
375 | 373 |
break; |
376 | 374 |
case "InkControl": |
377 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<Thumb>() }); |
|
375 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
378 | 376 |
break; |
379 | 377 |
case "TextControl": |
380 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<Thumb>() }); |
|
378 |
MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID });
|
|
381 | 379 |
Observable.FromEventPattern(((TextControl)member), "PropertyChanged").Subscribe(a => |
382 | 380 |
{ |
383 | 381 |
BorderUpdate(); |
... | ... | |
1560 | 1558 |
{ |
1561 | 1559 |
Angle = (item.DrawingData as TextControl).Angle, |
1562 | 1560 |
}; |
1563 |
|
|
1564 | 1561 |
BorderUpdate(); |
1565 | 1562 |
break; |
1566 | 1563 |
|
KCOM/Controls/Symbol.xaml.cs | ||
---|---|---|
322 | 322 |
string[] delimiterChars = { "|DZ|" }; |
323 | 323 |
string[] data = Data_.Split(delimiterChars, StringSplitOptions.RemoveEmptyEntries); |
324 | 324 |
|
325 |
foreach (string parse in data) |
|
325 |
foreach (string parse in data)
|
|
326 | 326 |
{ |
327 | 327 |
if (parse != "") |
328 | 328 |
{ |
329 | 329 |
System.Windows.Controls.Control item = layer.markupParse_Paste(parse, ViewerDataModel.Instance.MarkupControls_USER); |
330 | 330 |
(item as MarkupToPDF.Common.CommentUserInfo).CommentID = Events.Save.shortGuid(); |
331 |
|
|
331 |
(item as MarkupToPDF.Common.CommentUserInfo).SymbolID = id; |
|
332 | 332 |
ViewerDataModel.Instance.MarkupControls.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
333 | 333 |
ViewerDataModel.Instance.MarkupControls_USER.Remove(item as MarkupToPDF.Common.CommentUserInfo); |
334 |
|
|
334 |
|
|
335 | 335 |
adornerSet.Add(item as MarkupToPDF.Common.CommentUserInfo); |
336 | 336 |
} |
337 | 337 |
} |
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); |
KCOM/Events/Save.cs | ||
---|---|---|
107 | 107 |
DATA = value.Data, |
108 | 108 |
DATA_TYPE = value.Data_Type, |
109 | 109 |
PAGENUMBER = value.PageNumber, |
110 |
MARKUPINFO_VERSION_ID = UserState.MarkupVersionID |
|
110 |
MARKUPINFO_VERSION_ID = UserState.MarkupVersionID, |
|
111 |
SYMBOL_ID = value.Symbol_ID |
|
111 | 112 |
}); |
112 | 113 |
|
113 | 114 |
}); |
KCOM/Services/BaseServices.cs | ||
---|---|---|
212 | 212 |
IsUpdate = false, |
213 | 213 |
MarkupInfoID = d.MarkupInfoID, |
214 | 214 |
PageNumber = p.PageNumber, |
215 |
Symbol_ID = p.Symbol_ID, |
|
215 | 216 |
}); |
216 | 217 |
} |
217 | 218 |
else |
... | ... | |
224 | 225 |
IsUpdate = false, |
225 | 226 |
MarkupInfoID = d.MarkupInfoID, |
226 | 227 |
PageNumber = p.PageNumber, |
228 |
Symbol_ID = p.Symbol_ID, |
|
227 | 229 |
}); |
228 | 230 |
} |
229 | 231 |
//if (p.ID ==App.ViewInfo.UserID) |
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
660 | 660 |
Data_Type = root.DATA_TYPE, |
661 | 661 |
MarkupInfoID = App.Custom_ViewInfoId, |
662 | 662 |
PageNumber = this.pageNavigator.CurrentPage.PageNumber, |
663 |
Symbol_ID = control.SymbolID, |
|
663 | 664 |
}); |
664 | 665 |
} |
665 | 666 |
} |
KCOMDataModel/DataModel/CIModel.Designer.cs | ||
---|---|---|
2240 | 2240 |
public partial class MARKUP_DATA : EntityObject |
2241 | 2241 |
{ |
2242 | 2242 |
#region 팩터리 메서드 |
2243 |
|
|
2243 |
|
|
2244 | 2244 |
/// <summary> |
2245 | 2245 |
/// 새 MARKUP_DATA 개체를 만듭니다. |
2246 | 2246 |
/// </summary> |
... | ... | |
2249 | 2249 |
/// <param name="dATA">DATA 속성의 초기 값입니다.</param> |
2250 | 2250 |
/// <param name="mARKUPINFO_VERSION_ID">MARKUPINFO_VERSION_ID 속성의 초기 값입니다.</param> |
2251 | 2251 |
/// <param name="dATA_TYPE">DATA_TYPE 속성의 초기 값입니다.</param> |
2252 |
public static MARKUP_DATA CreateMARKUP_DATA(global::System.String id, global::System.Int32 pAGENUMBER, global::System.String dATA, global::System.String mARKUPINFO_VERSION_ID, global::System.Int32 dATA_TYPE) |
|
2252 |
/// <param name="sYMBOL_ID">SYMBOL_ID 속성의 초기 값입니다.</param> |
|
2253 |
public static MARKUP_DATA CreateMARKUP_DATA(global::System.String id, global::System.Int32 pAGENUMBER, global::System.String dATA, global::System.String mARKUPINFO_VERSION_ID, global::System.Int32 dATA_TYPE, global::System.String sYMBOL_ID) |
|
2253 | 2254 |
{ |
2254 | 2255 |
MARKUP_DATA mARKUP_DATA = new MARKUP_DATA(); |
2255 | 2256 |
mARKUP_DATA.ID = id; |
... | ... | |
2257 | 2258 |
mARKUP_DATA.DATA = dATA; |
2258 | 2259 |
mARKUP_DATA.MARKUPINFO_VERSION_ID = mARKUPINFO_VERSION_ID; |
2259 | 2260 |
mARKUP_DATA.DATA_TYPE = dATA_TYPE; |
2261 |
mARKUP_DATA.SYMBOL_ID = sYMBOL_ID; |
|
2260 | 2262 |
return mARKUP_DATA; |
2261 | 2263 |
} |
2262 | 2264 |
|
... | ... | |
2386 | 2388 |
private global::System.Int32 _DATA_TYPE; |
2387 | 2389 |
partial void OnDATA_TYPEChanging(global::System.Int32 value); |
2388 | 2390 |
partial void OnDATA_TYPEChanged(); |
2391 |
|
|
2392 |
/// <summary> |
|
2393 |
/// 사용 가능한 메타데이터 설명서가 없습니다. |
|
2394 |
/// </summary> |
|
2395 |
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=true)] |
|
2396 |
[DataMemberAttribute()] |
|
2397 |
public global::System.String SYMBOL_ID |
|
2398 |
{ |
|
2399 |
get |
|
2400 |
{ |
|
2401 |
return _SYMBOL_ID; |
|
2402 |
} |
|
2403 |
set |
|
2404 |
{ |
|
2405 |
OnSYMBOL_IDChanging(value); |
|
2406 |
ReportPropertyChanging("SYMBOL_ID"); |
|
2407 |
_SYMBOL_ID = StructuralObject.SetValidValue(value, true); |
|
2408 |
ReportPropertyChanged("SYMBOL_ID"); |
|
2409 |
OnSYMBOL_IDChanged(); |
|
2410 |
} |
|
2411 |
} |
|
2412 |
private global::System.String _SYMBOL_ID; |
|
2413 |
partial void OnSYMBOL_IDChanging(global::System.String value); |
|
2414 |
partial void OnSYMBOL_IDChanged(); |
|
2389 | 2415 |
|
2390 | 2416 |
#endregion |
2391 | 2417 |
|
... | ... | |
3129 | 3155 |
private global::System.String _COMPANY; |
3130 | 3156 |
partial void OnCOMPANYChanging(global::System.String value); |
3131 | 3157 |
partial void OnCOMPANYChanged(); |
3158 |
|
|
3159 |
/// <summary> |
|
3160 |
/// 사용 가능한 메타데이터 설명서가 없습니다. |
|
3161 |
/// </summary> |
|
3162 |
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=true)] |
|
3163 |
[DataMemberAttribute()] |
|
3164 |
public Nullable<global::System.DateTime> CREATE_DATETIME |
|
3165 |
{ |
|
3166 |
get |
|
3167 |
{ |
|
3168 |
return _CREATE_DATETIME; |
|
3169 |
} |
|
3170 |
set |
|
3171 |
{ |
|
3172 |
OnCREATE_DATETIMEChanging(value); |
|
3173 |
ReportPropertyChanging("CREATE_DATETIME"); |
|
3174 |
_CREATE_DATETIME = StructuralObject.SetValidValue(value); |
|
3175 |
ReportPropertyChanged("CREATE_DATETIME"); |
|
3176 |
OnCREATE_DATETIMEChanged(); |
|
3177 |
} |
|
3178 |
} |
|
3179 |
private Nullable<global::System.DateTime> _CREATE_DATETIME; |
|
3180 |
partial void OnCREATE_DATETIMEChanging(Nullable<global::System.DateTime> value); |
|
3181 |
partial void OnCREATE_DATETIMEChanged(); |
|
3182 |
|
|
3183 |
/// <summary> |
|
3184 |
/// 사용 가능한 메타데이터 설명서가 없습니다. |
|
3185 |
/// </summary> |
|
3186 |
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=true)] |
|
3187 |
[DataMemberAttribute()] |
|
3188 |
public Nullable<global::System.DateTime> MODIFIED_DATETIME |
|
3189 |
{ |
|
3190 |
get |
|
3191 |
{ |
|
3192 |
return _MODIFIED_DATETIME; |
|
3193 |
} |
|
3194 |
set |
|
3195 |
{ |
|
3196 |
OnMODIFIED_DATETIMEChanging(value); |
|
3197 |
ReportPropertyChanging("MODIFIED_DATETIME"); |
|
3198 |
_MODIFIED_DATETIME = StructuralObject.SetValidValue(value); |
|
3199 |
ReportPropertyChanged("MODIFIED_DATETIME"); |
|
3200 |
OnMODIFIED_DATETIMEChanged(); |
|
3201 |
} |
|
3202 |
} |
|
3203 |
private Nullable<global::System.DateTime> _MODIFIED_DATETIME; |
|
3204 |
partial void OnMODIFIED_DATETIMEChanging(Nullable<global::System.DateTime> value); |
|
3205 |
partial void OnMODIFIED_DATETIMEChanged(); |
|
3206 |
|
|
3207 |
/// <summary> |
|
3208 |
/// 사용 가능한 메타데이터 설명서가 없습니다. |
|
3209 |
/// </summary> |
|
3210 |
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=true)] |
|
3211 |
[DataMemberAttribute()] |
|
3212 |
public Nullable<global::System.Int32> ISLICENSE |
|
3213 |
{ |
|
3214 |
get |
|
3215 |
{ |
|
3216 |
return _ISLICENSE; |
|
3217 |
} |
|
3218 |
set |
|
3219 |
{ |
|
3220 |
OnISLICENSEChanging(value); |
|
3221 |
ReportPropertyChanging("ISLICENSE"); |
|
3222 |
_ISLICENSE = StructuralObject.SetValidValue(value); |
|
3223 |
ReportPropertyChanged("ISLICENSE"); |
|
3224 |
OnISLICENSEChanged(); |
|
3225 |
} |
|
3226 |
} |
|
3227 |
private Nullable<global::System.Int32> _ISLICENSE; |
|
3228 |
partial void OnISLICENSEChanging(Nullable<global::System.Int32> value); |
|
3229 |
partial void OnISLICENSEChanged(); |
|
3132 | 3230 |
|
3133 | 3231 |
#endregion |
3134 | 3232 |
|
KCOMDataModel/DataModel/CIModel.edmx | ||
---|---|---|
107 | 107 |
<Property Name="DATA" Type="nvarchar(max)" Nullable="false" /> |
108 | 108 |
<Property Name="MARKUPINFO_VERSION_ID" Type="nvarchar" MaxLength="50" Nullable="false" /> |
109 | 109 |
<Property Name="DATA_TYPE" Type="int" Nullable="false" /> |
110 |
<Property Name="SYMBOL_ID" Type="nvarchar" MaxLength="50" /> |
|
110 | 111 |
</EntityType> |
111 | 112 |
<EntityType Name="MARKUP_INFO"> |
112 | 113 |
<Key> |
... | ... | |
139 | 140 |
<Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" /> |
140 | 141 |
<Property Name="POSITION" Type="nvarchar" MaxLength="50" /> |
141 | 142 |
<Property Name="EMAIL_ADDRESS" Type="nvarchar" MaxLength="50" /> |
142 |
<Property Name="PASSWORD" Type="nvarchar" MaxLength="50" />
|
|
143 |
<Property Name="PASSWORD" Type="nvarchar" MaxLength="64" />
|
|
143 | 144 |
<Property Name="COMPANY" Type="nvarchar" MaxLength="50" /> |
145 |
<Property Name="CREATE_DATETIME" Type="datetime" /> |
|
146 |
<Property Name="MODIFIED_DATETIME" Type="datetime" /> |
|
147 |
<Property Name="ISLICENSE" Type="int" /> |
|
144 | 148 |
</EntityType> |
145 | 149 |
<EntityType Name="SIGN_INFO"> |
146 | 150 |
<Key> |
... | ... | |
352 | 356 |
<Property Name="MARKUPINFO_VERSION_ID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" /> |
353 | 357 |
<Property Name="DATA_TYPE" Type="Int32" Nullable="false" /> |
354 | 358 |
<NavigationProperty Name="MARKUP_INFO_VERSION" Relationship="CIModel.FK_MARKUPINFO_VERSIONMARKUPDATA" FromRole="MARKUP_DATA" ToRole="MARKUP_INFO_VERSION" /> |
359 |
<Property Name="SYMBOL_ID" Type="String" MaxLength="50" FixedLength="false" Unicode="true" /> |
|
355 | 360 |
</EntityType> |
356 | 361 |
<EntityType Name="MARKUP_INFO"> |
357 | 362 |
<Key> |
... | ... | |
449 | 454 |
<Property Name="POSITION" Type="String" MaxLength="50" FixedLength="false" Unicode="true" /> |
450 | 455 |
<Property Name="EMAIL_ADDRESS" Type="String" MaxLength="50" FixedLength="false" Unicode="true" /> |
451 | 456 |
<NavigationProperty Name="SIGN_INFO" Relationship="CIModel.FK_SIGNINFO_MEMBER" FromRole="MEMBER" ToRole="SIGN_INFO" /> |
452 |
<Property Name="PASSWORD" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
|
|
457 |
<Property Name="PASSWORD" Type="String" MaxLength="64" FixedLength="false" Unicode="true" />
|
|
453 | 458 |
<Property Name="COMPANY" Type="String" MaxLength="50" FixedLength="false" Unicode="true" /> |
459 |
<Property Name="CREATE_DATETIME" Type="DateTime" Precision="3" /> |
|
460 |
<Property Name="MODIFIED_DATETIME" Type="DateTime" Precision="3" /> |
|
461 |
<Property Name="ISLICENSE" Type="Int32" /> |
|
454 | 462 |
</EntityType> |
455 | 463 |
<EntityType Name="SIGN_INFO"> |
456 | 464 |
<Key> |
... | ... | |
587 | 595 |
<EntitySetMapping Name="MARKUP_DATA"> |
588 | 596 |
<EntityTypeMapping TypeName="IsTypeOf(CIModel.MARKUP_DATA)"> |
589 | 597 |
<MappingFragment StoreEntitySet="MARKUP_DATA"> |
590 |
<ScalarProperty Name="ID" ColumnName="ID" /> |
|
598 |
<ScalarProperty Name="SYMBOL_ID" ColumnName="SYMBOL_ID" /> |
|
599 |
<ScalarProperty Name="ID" ColumnName="ID" /> |
|
591 | 600 |
<ScalarProperty Name="PAGENUMBER" ColumnName="PAGENUMBER" /> |
592 | 601 |
<ScalarProperty Name="DATA" ColumnName="DATA" /> |
593 | 602 |
<ScalarProperty Name="MARKUPINFO_VERSION_ID" ColumnName="MARKUPINFO_VERSION_ID" /> |
... | ... | |
635 | 644 |
<EntitySetMapping Name="MEMBER"> |
636 | 645 |
<EntityTypeMapping TypeName="CIModel.MEMBER"> |
637 | 646 |
<MappingFragment StoreEntitySet="MEMBER"> |
647 |
<ScalarProperty Name="ISLICENSE" ColumnName="ISLICENSE" /> |
|
648 |
<ScalarProperty Name="MODIFIED_DATETIME" ColumnName="MODIFIED_DATETIME" /> |
|
649 |
<ScalarProperty Name="CREATE_DATETIME" ColumnName="CREATE_DATETIME" /> |
|
638 | 650 |
<ScalarProperty Name="COMPANY" ColumnName="COMPANY" /> |
639 | 651 |
<ScalarProperty Name="PASSWORD" ColumnName="PASSWORD" /> |
640 | 652 |
<ScalarProperty Name="EMAIL_ADDRESS" ColumnName="EMAIL_ADDRESS" /> |
... | ... | |
744 | 756 |
</Options> |
745 | 757 |
<!-- Diagram content (shape and connector positions) --> |
746 | 758 |
<Diagrams> |
747 |
<Diagram DiagramId="56537d79007d413b99bb660a37dd2a9f" Name="Diagram1" ZoomLevel="54">
|
|
759 |
<Diagram DiagramId="56537d79007d413b99bb660a37dd2a9f" Name="Diagram1" ZoomLevel="81">
|
|
748 | 760 |
<EntityTypeShape EntityType="CIModel.DOCUMENT_ITEM" Width="1.5" PointX="5.375" PointY="7.75" /> |
749 | 761 |
<EntityTypeShape EntityType="CIModel.DOCINFO" Width="1.5" PointX="7.375" PointY="10.125" /> |
750 | 762 |
<EntityTypeShape EntityType="CIModel.DOCPAGE" Width="1.5" PointX="9.625" PointY="8.125" /> |
KCOM_API/ServiceDeepView.svc.cs | ||
---|---|---|
556 | 556 |
r.MarkupList = (from markupData in entity.MARKUP_DATA |
557 | 557 |
where markupData.MARKUPINFO_VERSION_ID == r.MarkupVersionID |
558 | 558 |
orderby markupData.PAGENUMBER |
559 |
select new MarkupItem { ID = markupData.ID, PageNumber = markupData.PAGENUMBER, Data = markupData.DATA, Data_Type = markupData.DATA_TYPE }).ToList(); |
|
559 |
select new MarkupItem { ID = markupData.ID, PageNumber = markupData.PAGENUMBER, Data = markupData.DATA, Data_Type = markupData.DATA_TYPE, Symbol_ID = markupData.SYMBOL_ID }).ToList();
|
|
560 | 560 |
}); |
561 | 561 |
|
562 | 562 |
List<PROPERTIES> _ColorsProperties = new List<PROPERTIES>(); |
... | ... | |
655 | 655 |
r.MarkupList = (from markupData in entity.MARKUP_DATA |
656 | 656 |
where markupData.MARKUPINFO_VERSION_ID == r.MarkupVersionID |
657 | 657 |
orderby markupData.PAGENUMBER |
658 |
select new MarkupItem { ID = markupData.ID, PageNumber = markupData.PAGENUMBER, Data = markupData.DATA, Data_Type = markupData.DATA_TYPE }).ToList(); |
|
658 |
select new MarkupItem { ID = markupData.ID, PageNumber = markupData.PAGENUMBER, Data = markupData.DATA, Data_Type = markupData.DATA_TYPE, Symbol_ID = markupData.SYMBOL_ID }).ToList();
|
|
659 | 659 |
}); |
660 | 660 |
|
661 | 661 |
List<PROPERTIES> _ColorsProperties = new List<PROPERTIES>(); |
... | ... | |
1040 | 1040 |
DATA = value.DATA, |
1041 | 1041 |
DATA_TYPE = value.DATA_TYPE, |
1042 | 1042 |
PAGENUMBER = value.PAGENUMBER, |
1043 |
MARKUPINFO_VERSION_ID = markup_info_version.ID |
|
1043 |
MARKUPINFO_VERSION_ID = markup_info_version.ID, |
|
1044 |
SYMBOL_ID = value.SYMBOL_ID |
|
1044 | 1045 |
}); |
1045 | 1046 |
}); |
1046 | 1047 |
Entity.SaveChanges(); |
... | ... | |
1492 | 1493 |
DATA = item.DATA, |
1493 | 1494 |
DATA_TYPE = item.DATA_TYPE, |
1494 | 1495 |
PAGENUMBER = item.PAGENUMBER, |
1495 |
MARKUP_INFO_VERSION = info2 |
|
1496 |
MARKUP_INFO_VERSION = info2, |
|
1497 |
SYMBOL_ID = item.SYMBOL_ID |
|
1496 | 1498 |
}); |
1497 | 1499 |
} |
1498 | 1500 |
Entity.SaveChanges(); |
... | ... | |
1558 | 1560 |
DATA = item.DATA, |
1559 | 1561 |
DATA_TYPE = item.DATA_TYPE, |
1560 | 1562 |
PAGENUMBER = item.PAGENUMBER, |
1561 |
MARKUP_INFO_VERSION = info2 |
|
1563 |
MARKUP_INFO_VERSION = info2, |
|
1564 |
SYMBOL_ID = item.SYMBOL_ID |
|
1562 | 1565 |
}); |
1563 | 1566 |
} |
1564 | 1567 |
Entity.SaveChanges(); |
MarkupToPDF/Common/CommentUserInfo.cs | ||
---|---|---|
18 | 18 |
public bool IsMouseOver { get; set; } |
19 | 19 |
public bool IsNew { get; set; } |
20 | 20 |
public string CommentID { get; set; } |
21 |
public string SymbolID { get; set; } |
|
21 | 22 |
|
22 | 23 |
//public event EventHandler<MyEventArgs> StateChanged; |
23 | 24 |
|
내보내기 Unified diff