개정판 f513c215
issue #923: add CreateCommand and change thumb's opacity when mouse is enter or leave
Change-Id: I1e4b2ac57ca876e4681b14f02c1567abb265391e
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 23 | 23 |
|
| 24 | 24 |
namespace KCOM.Controls |
| 25 | 25 |
{
|
| 26 |
public class MyThumb : Thumb |
|
| 27 |
{
|
|
| 28 |
public MyThumb() |
|
| 29 |
{
|
|
| 30 |
this.Opacity = 0.6; |
|
| 31 |
this.MouseEnter += MyThumb_MouseEnter; |
|
| 32 |
this.MouseLeave += MyThumb_MouseLeave; |
|
| 33 |
} |
|
| 34 |
|
|
| 35 |
/// <summary> |
|
| 36 |
/// </summary> |
|
| 37 |
/// <param name="sender"></param> |
|
| 38 |
/// <param name="e"></param> |
|
| 39 |
private void MyThumb_MouseLeave(object sender, MouseEventArgs e) |
|
| 40 |
{
|
|
| 41 |
this.Opacity = 0.6; |
|
| 42 |
} |
|
| 43 |
|
|
| 44 |
/// <summary> |
|
| 45 |
/// |
|
| 46 |
/// </summary> |
|
| 47 |
/// <param name="sender"></param> |
|
| 48 |
/// <param name="e"></param> |
|
| 49 |
private void MyThumb_MouseEnter(object sender, MouseEventArgs e) |
|
| 50 |
{
|
|
| 51 |
this.Opacity = 1.0; |
|
| 52 |
} |
|
| 53 |
} |
|
| 54 |
|
|
| 26 | 55 |
/// <summary> |
| 27 | 56 |
/// Interaction logic for AdornerFinal.xaml |
| 28 | 57 |
/// </summary> |
| ... | ... | |
| 31 | 60 |
public UIElement DrawingData { get; set; }
|
| 32 | 61 |
public ControlType Drawingtype { get; set; }
|
| 33 | 62 |
public double DrawingAngle { get; set; }
|
| 34 |
public List<Thumb> ThumbList { get; set; }
|
|
| 63 |
public List<MyThumb> ThumbList { get; set; }
|
|
| 35 | 64 |
public string Symbol_ID { get; set; }
|
| 36 | 65 |
public long Group_ID { get; set; }
|
| 37 | 66 |
} |
| ... | ... | |
| 190 | 219 |
{
|
| 191 | 220 |
#region 컨트롤 조건 |
| 192 | 221 |
case "LineControl": //Angle추가 안했음 |
| 193 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 222 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 194 | 223 |
break; |
| 195 | 224 |
case "ImgControl": //Angle추가 안했음 |
| 196 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 225 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 197 | 226 |
//AdornerBorder.RenderTransformOrigin = new Point(0.5, 0.5); |
| 198 | 227 |
//DragThumb.RenderTransformOrigin = new Point(0.5, 0.5); |
| 199 | 228 |
AngleValue = (member as ImgControl).Angle; |
| 200 | 229 |
break; |
| 201 | 230 |
//case "SymControl": //Angle추가 안했음 |
| 202 |
// this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = MarkupType.Viewbox, ThumbList = new List<Thumb>() });
|
|
| 231 |
// this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = MarkupType.Viewbox, ThumbList = new List<MyThumb>() });
|
|
| 203 | 232 |
// AngleValue = (member as SymControl).Angle; |
| 204 | 233 |
// //ViewBoxRotate(member); |
| 205 | 234 |
// break; |
| 206 | 235 |
//case "SymControlN": //Angle추가 안했음 |
| 207 |
// this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = MarkupType.Viewbox, ThumbList = new List<Thumb>() });
|
|
| 236 |
// this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = MarkupType.Viewbox, ThumbList = new List<MyThumb>() });
|
|
| 208 | 237 |
// AngleValue = (member as SymControlN).Angle; |
| 209 | 238 |
// //ViewBoxRotate(member); |
| 210 | 239 |
// break; |
| 211 | 240 |
case "PolygonControl": //Angle추가 안했음 |
| 212 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 241 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 213 | 242 |
break; |
| 214 | 243 |
case "ArrowControl": |
| 215 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 244 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 216 | 245 |
break; |
| 217 | 246 |
case "ArrowTextControl": |
| 218 | 247 |
this.Members.Add(new AdornerMember |
| 219 | 248 |
{
|
| 220 | 249 |
DrawingData = member, |
| 221 | 250 |
Drawingtype = ControlType.ArrowTextControl, |
| 222 |
ThumbList = new List<Thumb>(), |
|
| 251 |
ThumbList = new List<MyThumb>(),
|
|
| 223 | 252 |
Symbol_ID = member.SymbolID, |
| 224 | 253 |
Group_ID = member.GroupID, |
| 225 | 254 |
}); |
| ... | ... | |
| 237 | 266 |
}); |
| 238 | 267 |
break; |
| 239 | 268 |
case "ArcControl": |
| 240 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 269 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 241 | 270 |
break; |
| 242 | 271 |
case "ArrowArcControl": |
| 243 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 272 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 244 | 273 |
break; |
| 245 | 274 |
case "ArrowControl_Multi": |
| 246 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 275 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 247 | 276 |
break; |
| 248 | 277 |
case "RectangleControl": |
| 249 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 278 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 250 | 279 |
break; |
| 251 | 280 |
case "DateControl": |
| 252 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 281 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 253 | 282 |
AngleValue = (member as DateControl).Angle; |
| 254 | 283 |
break; |
| 255 | 284 |
case "TriControl": |
| 256 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 285 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 257 | 286 |
break; |
| 258 | 287 |
case "CircleControl": |
| 259 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 288 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 260 | 289 |
break; |
| 261 | 290 |
case "CloudControl": |
| 262 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 291 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 263 | 292 |
break; |
| 264 | 293 |
case "RectCloudControl": |
| 265 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 294 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 266 | 295 |
break; |
| 267 | 296 |
case "SignControl": |
| 268 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 297 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 269 | 298 |
AngleValue = (member as SignControl).Angle; |
| 270 | 299 |
break; |
| 271 | 300 |
|
| 272 | 301 |
case "SymControl": |
| 273 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 302 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 274 | 303 |
AngleValue = (member as SymControl).Angle; |
| 275 | 304 |
break; |
| 276 | 305 |
case "SymControlN": |
| 277 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 306 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 278 | 307 |
AngleValue = (member as SymControlN).Angle; |
| 279 | 308 |
break; |
| 280 | 309 |
case "InkControl": //Angle추가 안했음 |
| 281 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 310 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 282 | 311 |
break; |
| 283 | 312 |
case "TextControl": |
| 284 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 313 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 285 | 314 |
RectangleGeometry Data = new RectangleGeometry |
| 286 | 315 |
{
|
| 287 | 316 |
Rect = new Rect() |
| ... | ... | |
| 336 | 365 |
}); |
| 337 | 366 |
break; |
| 338 | 367 |
case "InsideWhiteControl": |
| 339 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.InsideWhite, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 368 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.InsideWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 340 | 369 |
break; |
| 341 | 370 |
case "OverlapWhiteControl": |
| 342 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.OverlapWhite, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 371 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.OverlapWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 343 | 372 |
break; |
| 344 | 373 |
case "ClipWhiteControl": |
| 345 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ClipWhite, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 374 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ClipWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 346 | 375 |
break; |
| 347 | 376 |
case "CoordinateControl": |
| 348 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Coordinate, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 377 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Coordinate, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 349 | 378 |
break; |
| 350 | 379 |
default: |
| 351 | 380 |
break; |
| ... | ... | |
| 383 | 412 |
{
|
| 384 | 413 |
#region 컨트롤 조건 |
| 385 | 414 |
case "LineControl": |
| 386 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 415 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.SingleLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 387 | 416 |
break; |
| 388 | 417 |
case "ImgControl": |
| 389 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 418 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ImgControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 390 | 419 |
break; |
| 391 | 420 |
case "ArrowControl": |
| 392 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 421 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 393 | 422 |
break; |
| 394 | 423 |
case "PolygonControl": |
| 395 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 424 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 396 | 425 |
break; |
| 397 | 426 |
case "ArrowTextControl": |
| 398 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowTextControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 427 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowTextControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 399 | 428 |
(member as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 400 | 429 |
break; |
| 401 | 430 |
case "ArcControl": |
| 402 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 431 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 403 | 432 |
break; |
| 404 | 433 |
case "ArrowArcControl": |
| 405 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 434 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArcArrow, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 406 | 435 |
break; |
| 407 | 436 |
case "DateControl": |
| 408 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 437 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Date, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 409 | 438 |
break; |
| 410 | 439 |
case "ArrowControl_Multi": |
| 411 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 440 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ArrowMultiLine, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 412 | 441 |
break; |
| 413 | 442 |
case "RectangleControl": |
| 414 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 443 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Rectangle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 415 | 444 |
break; |
| 416 | 445 |
case "TriControl": |
| 417 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 446 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 418 | 447 |
break; |
| 419 | 448 |
case "CircleControl": |
| 420 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 449 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 421 | 450 |
break; |
| 422 | 451 |
case "CloudControl": |
| 423 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 452 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.PolygonCloud, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 424 | 453 |
break; |
| 425 | 454 |
case "RectCloudControl": |
| 426 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 455 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 427 | 456 |
break; |
| 428 | 457 |
case "SignControl": |
| 429 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 458 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 430 | 459 |
break; |
| 431 | 460 |
case "SymControl": |
| 432 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 461 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Symbol, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 433 | 462 |
break; |
| 434 | 463 |
case "SymControlN": |
| 435 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 464 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Stamp, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 436 | 465 |
break; |
| 437 | 466 |
case "InkControl": |
| 438 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 467 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Ink, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 439 | 468 |
break; |
| 440 | 469 |
case "TextControl": |
| 441 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 470 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.TextControl, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 442 | 471 |
Observable.FromEventPattern(((TextControl)member), "PropertyChanged").Subscribe(a => |
| 443 | 472 |
{
|
| 444 | 473 |
BorderUpdate(); |
| ... | ... | |
| 458 | 487 |
}); |
| 459 | 488 |
break; |
| 460 | 489 |
case "InsideWhiteControl": |
| 461 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.InsideWhite, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 490 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.InsideWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 462 | 491 |
break; |
| 463 | 492 |
case "OverlapWhiteControl": |
| 464 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.OverlapWhite, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 493 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.OverlapWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 465 | 494 |
break; |
| 466 | 495 |
case "ClipWhiteControl": |
| 467 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ClipWhite, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 496 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.ClipWhite, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 468 | 497 |
break; |
| 469 | 498 |
case "CoordinateControl": |
| 470 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Coordinate, ThumbList = new List<Thumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 499 |
this.Members.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Coordinate, ThumbList = new List<MyThumb>(), Symbol_ID = member.SymbolID, Group_ID = member.GroupID });
|
|
| 471 | 500 |
break; |
| 472 | 501 |
default: |
| 473 | 502 |
break; |
| ... | ... | |
| 670 | 699 |
} |
| 671 | 700 |
this.ContainerContent.Children.Clear(); |
| 672 | 701 |
} |
| 702 |
|
|
| 673 | 703 |
/// <summary> |
| 674 | 704 |
/// 각 포인트들을 등록합니다. |
| 675 | 705 |
/// </summary> |
| ... | ... | |
| 696 | 726 |
} |
| 697 | 727 |
for (int i = 0; i < list.Count(); i++) |
| 698 | 728 |
{
|
| 699 |
Thumb tm = new Thumb
|
|
| 729 |
MyThumb tm = new MyThumb
|
|
| 700 | 730 |
{
|
| 701 | 731 |
Style = (Style)this.LayoutRoot.Resources["ThumbResizeStyle"], |
| 702 | 732 |
}; |
| ... | ... | |
| 1454 | 1484 |
ps.Add(new Point(Canvas.GetLeft(temp.Base_TextBox), Canvas.GetTop(temp.Base_TextBox) + temp.BoxHeight / 2)); //좌단 |
| 1455 | 1485 |
ps.Add(new Point(Canvas.GetLeft(temp.Base_TextBox) + temp.BoxWidth, Canvas.GetTop(temp.Base_TextBox) + temp.BoxHeight / 2)); //우단 |
| 1456 | 1486 |
|
| 1457 |
|
|
| 1458 |
|
|
| 1459 | 1487 |
if (temp.isFixed) |
| 1460 | 1488 |
{
|
| 1461 | 1489 |
var endP = MathSet.getNearPoint(ps, temp.MidPoint); |
| ... | ... | |
| 1492 | 1520 |
} |
| 1493 | 1521 |
} |
| 1494 | 1522 |
} |
| 1495 |
//} |
|
| 1496 | 1523 |
} |
| 1497 | 1524 |
|
| 1498 | 1525 |
public void Set_Rotate() |
| 1499 | 1526 |
{
|
| 1500 |
|
|
| 1501 | 1527 |
double dDeltaAngle = 0; |
| 1502 | 1528 |
List<Point> AllPointSet = new List<Point>(); |
| 1503 | 1529 |
Point CenterPoint = new Point(); |
| 1504 | 1530 |
|
| 1505 |
|
|
| 1506 | 1531 |
if (AngleValue >= 360) |
| 1507 | 1532 |
{
|
| 1508 | 1533 |
AngleValue -= 360; |
내보내기 Unified diff
