프로젝트

일반

사용자정보

개정판 b2d0f316

IDb2d0f316125ad5439e7530cf5ec796805b5d1dd4
상위 ff2f8d1d
하위 5c3caba6

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

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

Change-Id: I9130a93cfdb2d079f28258f3d669a6f532695f89

차이점 보기:

MarkupToPDF/Controls/Shape/CircleControl.cs
44 44
                this.StrokeColor = CircleCtrl.StrokeColor;
45 45
                this.UserID = CircleCtrl.UserID;
46 46
                this.Memo = CircleCtrl.Memo;
47
                this.ZIndex = CircleCtrl.ZIndex;
47 48
            }
48 49
        }
49 50

  
......
600 601
        /// <returns></returns>
601 602
        public override string Serialize()
602 603
        {
603
            using (S_CircleControl STemp = new S_CircleControl())
604
            using (S_CircleControl ctrl = new S_CircleControl())
604 605
            {
605
                STemp.TransformPoint = "0|0";
606
                STemp.SizeSet = String.Format("{0}", this.LineSize);
607
                STemp.PaintState = this.Paint;
608
                //STemp.StrokeColor = "#FF00FF00";
609
                STemp.StrokeColor = this.StrokeColor.Color.ToString();
606
                ctrl.TransformPoint = "0|0";
607
                ctrl.SizeSet = String.Format("{0}", this.LineSize);
608
                ctrl.PaintState = this.Paint;
609
                //ctrl.StrokeColor = "#FF00FF00";
610
                ctrl.StrokeColor = this.StrokeColor.Color.ToString();
610 611
                if (this.FillColor != null)
611 612
                {
612
                    STemp.FillColor = this.FillColor.Color.ToString();
613
                    ctrl.FillColor = this.FillColor.Color.ToString();
613 614
                }
614
                STemp.StartPoint = this.StartPoint;
615
                STemp.UserID = this.UserID;
616
                STemp.EndPoint = this.EndPoint;
617
                STemp.TRP = this.TopRightPoint;
618
                STemp.LBP = this.LeftBottomPoint;
619
                STemp.Opac = this.Opacity;
620
                STemp.Angle = this.CommentAngle;
621
                STemp.PointSet = this.PointSet;
622
                STemp.DashSize = this.DashSize;
623
                STemp.Name = this.GetType().Name.ToString();
615
                ctrl.StartPoint = this.StartPoint;
616
                ctrl.UserID = this.UserID;
617
                ctrl.EndPoint = this.EndPoint;
618
                ctrl.TRP = this.TopRightPoint;
619
                ctrl.LBP = this.LeftBottomPoint;
620
                ctrl.Opac = this.Opacity;
621
                ctrl.Angle = this.CommentAngle;
622
                ctrl.PointSet = this.PointSet;
623
                ctrl.DashSize = this.DashSize;
624
                ctrl.Name = this.GetType().Name.ToString();
624 625
                ///강인구 추가(2017.11.02)
625 626
                ///Memo 추가
626
                STemp.Memo = this.Memo;
627
                ctrl.Memo = this.Memo;
627 628

  
628
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
629
                ctrl.ZIndex = this.ZIndex;
630

  
631
                return "|DZ|" + JsonSerializerHelper.CompressString((ctrl.JsonSerialize()));
629 632
            };
630 633
        }
631 634

  
......
653 656
                    PointSet = s.PointSet,
654 657
                    StrokeColor = brush,
655 658
                    UserID = s.UserID,
656
                    Memo = s.Memo
659
                    Memo = s.Memo,
660
                    ZIndex = s.ZIndex
657 661
                };
658 662
            }
659 663
        }

내보내기 Unified diff

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