개정판 b2d0f316
Feature: 선택한 객체를 앞으로(+)/뒤로(-) 보내기 기능 추가
Change-Id: I9130a93cfdb2d079f28258f3d669a6f532695f89
MarkupToPDF/Controls/Line/LineControl.cs | ||
---|---|---|
70 | 70 |
this.StrokeColor = item.StrokeColor; |
71 | 71 |
this.UserID = item.UserID; |
72 | 72 |
this.LineSize = item.LineSize; |
73 |
this.ZIndex = item.ZIndex; |
|
73 | 74 |
} |
74 | 75 |
} |
75 | 76 |
|
... | ... | |
610 | 611 |
/// <returns></returns> |
611 | 612 |
public override string Serialize() |
612 | 613 |
{ |
613 |
using (S_LineControl STemp = new S_LineControl())
|
|
614 |
using (S_LineControl ctrl = new S_LineControl())
|
|
614 | 615 |
{ |
615 |
STemp.TransformPoint = "0|0";
|
|
616 |
STemp.PointSet = this.PointSet;
|
|
617 |
STemp.SizeSet = String.Format("{0}", this.LineSize);
|
|
618 |
STemp.LineStyleSet = this.LineStyleSet;
|
|
619 |
//STemp.StrokeColor = "#FF00FF00";
|
|
620 |
STemp.StrokeColor = this.StrokeColor.Color.ToString();
|
|
621 |
STemp.StartPoint = this.StartPoint;
|
|
622 |
STemp.EndPoint = this.EndPoint;
|
|
623 |
STemp.UserID = this.UserID;
|
|
624 |
STemp.Opac = this.Opacity;
|
|
625 |
STemp.DashSize = this.DashSize;
|
|
626 |
STemp.Interval = this.Interval;
|
|
627 |
STemp.DimSize = this.DimSize;
|
|
628 |
STemp.Name = this.GetType().Name.ToString();
|
|
616 |
ctrl.TransformPoint = "0|0";
|
|
617 |
ctrl.PointSet = this.PointSet;
|
|
618 |
ctrl.SizeSet = String.Format("{0}", this.LineSize);
|
|
619 |
ctrl.LineStyleSet = this.LineStyleSet;
|
|
620 |
//ctrl.StrokeColor = "#FF00FF00";
|
|
621 |
ctrl.StrokeColor = this.StrokeColor.Color.ToString();
|
|
622 |
ctrl.StartPoint = this.StartPoint;
|
|
623 |
ctrl.EndPoint = this.EndPoint;
|
|
624 |
ctrl.UserID = this.UserID;
|
|
625 |
ctrl.Opac = this.Opacity;
|
|
626 |
ctrl.DashSize = this.DashSize;
|
|
627 |
ctrl.Interval = this.Interval;
|
|
628 |
ctrl.DimSize = this.DimSize;
|
|
629 |
ctrl.Name = this.GetType().Name.ToString();
|
|
629 | 630 |
|
630 | 631 |
///강인구 추가(2017.11.02) |
631 | 632 |
///Memo 추가 |
632 |
STemp.Memo = this.Memo;
|
|
633 |
ctrl.Memo = this.Memo;
|
|
633 | 634 |
|
634 |
return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize())); |
|
635 |
ctrl.ZIndex = this.ZIndex; |
|
636 |
|
|
637 |
return "|DZ|" + JsonSerializerHelper.CompressString((ctrl.JsonSerialize())); |
|
635 | 638 |
} |
636 | 639 |
} |
637 | 640 |
|
... | ... | |
643 | 646 |
public static LineControl FromString(string str, SolidColorBrush brush, string sProjectNo) |
644 | 647 |
{ |
645 | 648 |
LineControl instance = null; |
646 |
using (S_LineControl s = JsonSerializerHelper.JsonDeserialize<S_LineControl>(str))
|
|
649 |
using (S_LineControl ctrl = JsonSerializerHelper.JsonDeserialize<S_LineControl>(str))
|
|
647 | 650 |
{ |
648 |
string[] data2 = s.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
|
|
651 |
string[] data2 = ctrl.SizeSet.Split(delimiterChars2, StringSplitOptions.RemoveEmptyEntries);
|
|
649 | 652 |
instance = new LineControl() |
650 | 653 |
{ |
651 |
LineStyleSet = s.LineStyleSet,
|
|
652 |
StartPoint = s.StartPoint,
|
|
653 |
DimSize = s.DimSize,
|
|
654 |
EndPoint = s.EndPoint,
|
|
655 |
DashSize = s.DashSize,
|
|
656 |
Interval = s.Interval,
|
|
657 |
PointSet = s.PointSet,
|
|
658 |
Opacity = s.Opac,
|
|
654 |
LineStyleSet = ctrl.LineStyleSet,
|
|
655 |
StartPoint = ctrl.StartPoint,
|
|
656 |
DimSize = ctrl.DimSize,
|
|
657 |
EndPoint = ctrl.EndPoint,
|
|
658 |
DashSize = ctrl.DashSize,
|
|
659 |
Interval = ctrl.Interval,
|
|
660 |
PointSet = ctrl.PointSet,
|
|
661 |
Opacity = ctrl.Opac,
|
|
659 | 662 |
StrokeColor = brush, |
660 |
UserID = s.UserID,
|
|
663 |
UserID = ctrl.UserID,
|
|
661 | 664 |
LineSize = Convert.ToDouble(data2.First()), |
665 |
ZIndex = ctrl.ZIndex |
|
662 | 666 |
}; |
663 | 667 |
} |
664 | 668 |
|
내보내기 Unified diff