프로젝트

일반

사용자정보

개정판 b2d0f316

IDb2d0f316125ad5439e7530cf5ec796805b5d1dd4
상위 ff2f8d1d
하위 5c3caba6

백흠경이(가) 5달 전에 추가함

Feature: 선택한 객체를 앞으로(+)/뒤로(-) 보내기 기능 추가

Change-Id: I9130a93cfdb2d079f28258f3d669a6f532695f89

차이점 보기:

MarkupToPDF/Controls/Shape/RectangleControl.cs
14 14
using MarkupToPDF.Serialize.S_Control;
15 15
using System.Windows.Input;
16 16
using System.Windows.Markup;
17
using System.Runtime.CompilerServices;
17 18

  
18 19
namespace MarkupToPDF.Controls.Shape
19 20
{
......
528 529
                this.PointSet = rectangleControl.PointSet.ConvertAll(x => new System.Windows.Point(x.X, x.Y));
529 530
                this.UserID = rectangleControl.UserID;
530 531
                this.Memo = rectangleControl.Memo;
532
                this.ZIndex = rectangleControl.ZIndex;
531 533
            }
532 534
        }
533 535

  
......
698 700
        /// <returns></returns>
699 701
        public override string Serialize()
700 702
        {
701
            using (S_RectControl STemp = new S_RectControl())
703
            using (S_RectControl ctrl = new S_RectControl())
702 704
            {
703
                STemp.TransformPoint = "0|0";
704
                STemp.SizeSet = String.Format("{0}", this.LineSize);
705
                STemp.PaintState = this.Paint;
706
                STemp.PointSet = this.PointSet;
707
                //STemp.StrokeColor = "#FF00FF00";
708
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
705
                ctrl.TransformPoint = "0|0";
706
                ctrl.SizeSet = String.Format("{0}", this.LineSize);
707
                ctrl.PaintState = this.Paint;
708
                ctrl.PointSet = this.PointSet;
709
                //ctrl.StrokeColor = "#FF00FF00";
710
                ctrl.StrokeColor = this.StrokeColor.Color.ToString();
709 711
                if (this.FillColor != null)
710 712
                {
711
                    STemp.FillColor = this.FillColor.Color.ToString();
713
                    ctrl.FillColor = this.FillColor.Color.ToString();
712 714
                }
713
                STemp.StartPoint = this.StartPoint;
714
                STemp.UserID = this.UserID;
715
                //STemp.Angle = this.a;
716
                STemp.EndPoint = this.EndPoint;
717
                STemp.LB = this.LeftBottomPoint;
718
                STemp.TR = this.TopRightPoint;
719
                STemp.DashSize = this.DashSize;
720
                STemp.Opac = this.Opacity;
721
                STemp.Name = this.GetType().Name.ToString();
715
                ctrl.StartPoint = this.StartPoint;
716
                ctrl.UserID = this.UserID;
717
                //ctrl.Angle = this.a;
718
                ctrl.EndPoint = this.EndPoint;
719
                ctrl.LB = this.LeftBottomPoint;
720
                ctrl.TR = this.TopRightPoint;
721
                ctrl.DashSize = this.DashSize;
722
                ctrl.Opac = this.Opacity;
723
                ctrl.Name = this.GetType().Name.ToString();
722 724
                ///강인구 추가(2017.11.02)
723 725
                ///Memo 추가
724
                STemp.Memo = this.Memo;
726
                ctrl.Memo = this.Memo;
725 727

  
726
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
728
                ctrl.ZIndex = this.ZIndex;
729

  
730
                return "|DZ|" + JsonSerializerHelper.CompressString((ctrl.JsonSerialize()));
727 731
            };
728 732
        }
729 733

  
......
751 755
                    TopRightPoint = s.TR,
752 756
                    PointSet = s.PointSet,
753 757
                    UserID = s.UserID,
754
                    Memo = s.Memo
758
                    Memo = s.Memo,
759
                    ZIndex = s.ZIndex
755 760
                };
756 761
            }
757 762
        }

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)