프로젝트

일반

사용자정보

개정판 b2d0f316

IDb2d0f316125ad5439e7530cf5ec796805b5d1dd4
상위 ff2f8d1d
하위 5c3caba6

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

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

Change-Id: I9130a93cfdb2d079f28258f3d669a6f532695f89

차이점 보기:

MarkupToPDF/Controls/Text/TextControl.cs
102 102
                TextStyle = item.TextStyle;
103 103
                TextWeight = item.TextWeight;
104 104
                UnderLine = item.UnderLine;
105
                Memo = item.Memo;
106
                ZIndex = item.ZIndex;
105 107
            }
106 108
        }
107 109

  
......
1245 1247
        /// <returns></returns>
1246 1248
        public override string Serialize()
1247 1249
        {
1248
            using (S_TextControl STemp = new S_TextControl())
1250
            using (S_TextControl ctrl = new S_TextControl())
1249 1251
            {
1250
                STemp.TransformPoint = "0|0";
1251
                STemp.SizeSet = String.Format("{0}|{1}", this.LineSize.Left.ToString(), this.TextSize.ToString());
1252
                STemp.Text = this.Text;
1253
                STemp.UserID = this.UserID;
1254
                STemp.FontColor = this.StrokeColor.Color.ToString();
1255
                //STemp.FontColor = "#FFFFFF00";
1252
                ctrl.TransformPoint = "0|0";
1253
                ctrl.SizeSet = String.Format("{0}|{1}", this.LineSize.Left.ToString(), this.TextSize.ToString());
1254
                ctrl.Text = this.Text;
1255
                ctrl.UserID = this.UserID;
1256
                ctrl.FontColor = this.StrokeColor.Color.ToString();
1257
                //ctrl.FontColor = "#FFFFFF00";
1256 1258

  
1257 1259
                if (this.StartPoint == new Point())
1258
                    STemp.StartPoint = new Point(this.CanvasX, this.CanvasY);
1260
                    ctrl.StartPoint = new Point(this.CanvasX, this.CanvasY);
1259 1261
                else
1260
                    STemp.StartPoint = this.StartPoint;
1261

  
1262
                STemp.EndPoint = this.EndPoint;
1263
                STemp.Opac = this.Opacity;
1264
                STemp.PointSet = this.PointSet;
1265
                STemp.Angle = this.CommentAngle;
1266
                STemp.paintMethod = this.ControlType_No;
1267
                STemp.BoxW = this.BoxWidth;
1268
                STemp.BoxH = this.BoxHeight;
1269
                STemp.isHighLight = this.IsHighLight;
1270
                STemp.Name = this.GetType().Name.ToString();
1271
                STemp.fontConfig = new List<string>()
1262
                    ctrl.StartPoint = this.StartPoint;
1263

  
1264
                ctrl.EndPoint = this.EndPoint;
1265
                ctrl.Opac = this.Opacity;
1266
                ctrl.PointSet = this.PointSet;
1267
                ctrl.Angle = this.CommentAngle;
1268
                ctrl.paintMethod = this.ControlType_No;
1269
                ctrl.BoxW = this.BoxWidth;
1270
                ctrl.BoxH = this.BoxHeight;
1271
                ctrl.isHighLight = this.IsHighLight;
1272
                ctrl.Name = this.GetType().Name.ToString();
1273
                ctrl.fontConfig = new List<string>()
1272 1274
                            {
1273 1275
                                this.TextFamily.FontName(),
1274 1276
                                this.TextStyle.ToString(),
1275 1277
                                this.TextWeight.ToString(),
1276 1278
                            };
1277
                STemp.ArcLength = this.ArcLength;
1279
                ctrl.ArcLength = this.ArcLength;
1278 1280

  
1279 1281

  
1280 1282
                if (this.UnderLine != null)
1281 1283
                {
1282
                    STemp.fontConfig.Add("true");
1284
                    ctrl.fontConfig.Add("true");
1283 1285
                }
1284 1286

  
1285 1287
                ///강인구 추가(2017.11.02)
1286 1288
                ///Memo 추가
1287
                STemp.Memo = this.Memo;
1289
                ctrl.Memo = this.Memo;
1288 1290

  
1289
                return "|DZ|" + JsonSerializerHelper.CompressString((STemp.JsonSerialize()));
1291
                ctrl.ZIndex = this.ZIndex;
1292

  
1293
                return "|DZ|" + JsonSerializerHelper.CompressString((ctrl.JsonSerialize()));
1290 1294
            }
1291 1295
        }
1292 1296

  
......
1324 1328
                    //인구 추가(2018.04.17)
1325 1329
                    TextStyle = StringToFont.ConFontStyle(s.fontConfig[1]),
1326 1330
                    TextWeight = StringToFont.ConFontWeight(s.fontConfig[2]),
1327
                    ArcLength = s.ArcLength
1331
                    ArcLength = s.ArcLength,
1332
                    Memo = s.Memo,
1333
                    ZIndex = s.ZIndex
1328 1334
                };
1329 1335

  
1330 1336
                if (s.fontConfig.Count() == 4)

내보내기 Unified diff

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