프로젝트

일반

사용자정보

개정판 992a98b4

ID992a98b41d05f5b432e804b9de8af6bcfb3f8170
상위 eb2b9248
하위 32e95118

KangIngu 이(가) 약 7년 전에 추가함

효성 테스트내용 오류 수정 및 Search, Favorite 추가

차이점 보기:

IKCOM/Interface.cs
92 92
        public string Description { get; set; }
93 93
        public string DisplayColor { get; set; }
94 94
        public DateTime CreateTime { get; set; }
95
        public DateTime UpdateTime { get; set; }
95 96
        public int Consolidate { get; set; }
96 97
        public bool userDelete { get; set; }
97 98
        public List<MarkupItem> MarkupList { get; set; }
......
164 165
        UPLOAD = 4,
165 166
        CONVERT = 5,
166 167
    }
168

  
169
    public enum FAVORITE_FLAG
170
    {
171
        [System.ComponentModel.Description("#FF275EFC")] //ARGB 순
172
        ALL,
173
        [System.ComponentModel.Description("#FF275EFF")] //ARGB 순
174
        TeamShare,
175
        [System.ComponentModel.Description("#FF72B21B")]
176
        Personal,
177
        //[Description("#FFCC330D")]
178
        //VeryHigh,
179
    }
167 180
}
KCOM/App.xaml.cs
78 78
                    };
79 79
                    ParameterMode = true;
80 80
                }
81
                //GetQueryStringParameters();
82
                _binding = new BasicHttpBinding(BasicHttpSecurityMode.TransportCredentialOnly);
81

  
82
                //App.ViewInfo.CreateFinalPDFPermission = false;
83
                //App.ViewInfo.NewCommentPermission = false;
84

  
85
               //GetQueryStringParameters();
86
               _binding = new BasicHttpBinding(BasicHttpSecurityMode.TransportCredentialOnly);
83 87
                _binding.MaxBufferSize = 2147483647;
84 88
                _binding.MaxReceivedMessageSize = 2147483647;
85 89
                _binding.OpenTimeout = new TimeSpan(0, 1, 0);
......
92 96
                //테스트
93 97
                //_EndPoint = new EndpointAddress(@"http://localhost:13009/ServiceDeepView.svc");
94 98
                //운영
99

  
100
#if DEBUG
101
                _EndPoint = new EndpointAddress(@"http://localhost:13009/ServiceDeepView.svc");
102
                //_EndPoint = new EndpointAddress(@"http://10.11.252.3/MARKUS/ServiceDeepView.svc"); //효성
103
                
104
#else
95 105
                _EndPoint = new EndpointAddress(@"http://cloud.devdoftech.co.kr:5978/ServiceDeepView.svc");
106
#endif
107

  
96 108
                //Telerik.Windows.Controls.VisualStudio2013Palette.LoadPreset(Telerik.Windows.Controls.VisualStudio2013Palette.ColorVariation.Dark);
97 109
                base.OnStartup(e);
98 110
            }
KCOM/Common/ViewerDataModel.cs
1 1
using KCOM.Messenger;
2
using KCOMDataModel.DataModel;
2 3
//using Leadtools;
3 4
using MarkupToPDF.Common;
4 5
using System;
......
38 39
        private ObservableCollection<IKCOM.MarkupInfoItem> markupInfoList = new ObservableCollection<IKCOM.MarkupInfoItem>();
39 40
        private ObservableCollection<IKCOM.MarkupInfoItem> markupInfoRevList = new ObservableCollection<IKCOM.MarkupInfoItem>();
40 41

  
42
        public List<FAVORITE_DOC> FavoriteSelctedSet = new List<FAVORITE_DOC>();
43
        public List<FAVORITE_DOC> FavoriteSet = new List<FAVORITE_DOC>();
41 44

  
42
        
43 45
        //_markupInfoList
44 46

  
45 47
        private StrokeCollection markupPens = new StrokeCollection();
......
106 108
            }
107 109
        }
108 110

  
109

  
110

  
111 111
        private List<IKCOM.MarkupItemEx> _MarkupList_USER { get; set; }
112 112
        public List<IKCOM.MarkupItemEx> MarkupList_USER
113 113
        {
......
149 149

  
150 150
        }
151 151

  
152
        private System.IO.FileInfo _searchPDF { get; set; }
153
        public System.IO.FileInfo searchPDF
154
        {
155
            get
156
            {
157
                return _searchPDF;
158
            }
159
            set
160
            {
161
                _searchPDF = value;
162
                OnPropertyChanged("searchPDF");
163
            }
164
        }
165

  
152 166

  
153 167
        /// <summary>
154 168
        /// 현재 상단 메뉴에서 선택된 컨트롤
KCOM/Connected Services/ServiceDeepView/Reference.cs
1 1
//------------------------------------------------------------------------------
2 2
// <auto-generated>
3
//     This code was generated by a tool.
4
//     Runtime Version:4.0.30319.42000
3
//     이 코드는 도구를 사용하여 생성되었습니다.
4
//     런타임 버전:4.0.30319.42000
5 5
//
6
//     Changes to this file may cause incorrect behavior and will be lost if
7
//     the code is regenerated.
6
//     파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면
7
//     이러한 변경 내용이 손실됩니다.
8 8
// </auto-generated>
9 9
//------------------------------------------------------------------------------
10 10

  
......
15 15
    
16 16
    [System.Diagnostics.DebuggerStepThroughAttribute()]
17 17
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
18
    [System.Runtime.Serialization.DataContractAttribute(Name="FinalPDFResult", Namespace="http://schemas.datacontract.org/2004/07/IFinalPDF")]
19
    [System.SerializableAttribute()]
20
    public partial struct FinalPDFResult : System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
21
        
22
        [System.NonSerializedAttribute()]
23
        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
24
        
25
        private int CurrentPageField;
26
        
27
        private string ExceptionField;
28
        
29
        private string FinalIDField;
30
        
31
        private string ProjectNoField;
32
        
33
        private KCOM.ServiceDeepView.FinalStatus StatusField;
34
        
35
        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
36
            get {
37
                return this.extensionDataField;
38
            }
39
            set {
40
                this.extensionDataField = value;
41
            }
42
        }
43
        
44
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
45
        public int CurrentPage {
46
            get {
47
                return this.CurrentPageField;
48
            }
49
            set {
50
                if ((this.CurrentPageField.Equals(value) != true)) {
51
                    this.CurrentPageField = value;
52
                    this.RaisePropertyChanged("CurrentPage");
53
                }
54
            }
55
        }
56
        
57
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
58
        public string Exception {
59
            get {
60
                return this.ExceptionField;
61
            }
62
            set {
63
                if ((object.ReferenceEquals(this.ExceptionField, value) != true)) {
64
                    this.ExceptionField = value;
65
                    this.RaisePropertyChanged("Exception");
66
                }
67
            }
68
        }
69
        
70
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
71
        public string FinalID {
72
            get {
73
                return this.FinalIDField;
74
            }
75
            set {
76
                if ((object.ReferenceEquals(this.FinalIDField, value) != true)) {
77
                    this.FinalIDField = value;
78
                    this.RaisePropertyChanged("FinalID");
79
                }
80
            }
81
        }
82
        
83
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
84
        public string ProjectNo {
85
            get {
86
                return this.ProjectNoField;
87
            }
88
            set {
89
                if ((object.ReferenceEquals(this.ProjectNoField, value) != true)) {
90
                    this.ProjectNoField = value;
91
                    this.RaisePropertyChanged("ProjectNo");
92
                }
93
            }
94
        }
95
        
96
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
97
        public KCOM.ServiceDeepView.FinalStatus Status {
98
            get {
99
                return this.StatusField;
100
            }
101
            set {
102
                if ((this.StatusField.Equals(value) != true)) {
103
                    this.StatusField = value;
104
                    this.RaisePropertyChanged("Status");
105
                }
106
            }
107
        }
108
        
109
        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
110
        
111
        void RaisePropertyChanged(string propertyName) {
112
            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
113
            if ((propertyChanged != null)) {
114
                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
115
            }
116
        }
117
    }
118
    
119
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
120
    [System.Runtime.Serialization.DataContractAttribute(Name="FinalStatus", Namespace="http://schemas.datacontract.org/2004/07/IFinalPDF")]
121
    public enum FinalStatus : int {
122
        
123
        [System.Runtime.Serialization.EnumMemberAttribute()]
124
        Insert = 0,
125
        
126
        [System.Runtime.Serialization.EnumMemberAttribute()]
127
        Wait = 1,
128
        
129
        [System.Runtime.Serialization.EnumMemberAttribute()]
130
        Create = 2,
131
        
132
        [System.Runtime.Serialization.EnumMemberAttribute()]
133
        PdfStamp = 3,
134
        
135
        [System.Runtime.Serialization.EnumMemberAttribute()]
136
        Success = 4,
137
        
138
        [System.Runtime.Serialization.EnumMemberAttribute()]
139
        Error = 5,
140
    }
141
    
142
    [System.Diagnostics.DebuggerStepThroughAttribute()]
143
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
144 18
    [System.Runtime.Serialization.DataContractAttribute(Name="StructuralObject", Namespace="http://schemas.datacontract.org/2004/07/System.Data.Objects.DataClasses", IsReference=true)]
145 19
    [System.SerializableAttribute()]
146 20
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityObject))]
21
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCINFO))]
147 22
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCPAGE))]
148 23
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.MARKUP_INFO))]
149 24
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.MARKUP_INFO_VERSION))]
150 25
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.MARKUP_DATA))]
151 26
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCUMENT_ITEM))]
152
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCINFO))]
27
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.FAVORITE_DOC))]
153 28
    public partial class StructuralObject : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
154 29
        
155 30
        [System.NonSerializedAttribute()]
......
179 54
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
180 55
    [System.Runtime.Serialization.DataContractAttribute(Name="EntityObject", Namespace="http://schemas.datacontract.org/2004/07/System.Data.Objects.DataClasses", IsReference=true)]
181 56
    [System.SerializableAttribute()]
57
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCINFO))]
182 58
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCPAGE))]
183 59
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.MARKUP_INFO))]
184 60
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.MARKUP_INFO_VERSION))]
185 61
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.MARKUP_DATA))]
186 62
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCUMENT_ITEM))]
187
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCINFO))]
63
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.FAVORITE_DOC))]
188 64
    public partial class EntityObject : KCOM.ServiceDeepView.StructuralObject {
189 65
        
190 66
        [System.Runtime.Serialization.OptionalFieldAttribute()]
......
285 161
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
286 162
    [System.Runtime.Serialization.DataContractAttribute(Name="EntityKeyMember", Namespace="http://schemas.datacontract.org/2004/07/System.Data")]
287 163
    [System.SerializableAttribute()]
164
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.FinalPDFResult))]
165
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.FinalStatus))]
288 166
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityObject))]
289 167
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.StructuralObject))]
290 168
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfDOCINFOitJtO6kG))]
......
292 170
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.RelatedEnd))]
293 171
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfMARKUP_INFO_VERSIONitJtO6kG))]
294 172
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityReferenceOfMARKUP_INFOitJtO6kG))]
173
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.KCOM_SystemInfo))]
174
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.KCOM_BasicParam))]
175
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.VPRevision>))]
176
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.VPRevision))]
177
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.MarkupInfoItem>))]
178
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.MarkupInfoItem))]
179
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.MarkupItem>))]
180
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.MarkupItem))]
181
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.FAVORITE_FLAG))]
295 182
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.EntityKey))]
296 183
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOM.ServiceDeepView.EntityKeyMember>))]
297
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.FinalPDFResult))]
298
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOM.ServiceDeepView.FinalStatus))]
299 184
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<System.Windows.Rect>))]
300 185
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Windows.Rect))]
186
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
187
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOMDataModel.DataModel.FAVORITE_DOC>))]
188
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.FAVORITE_DOC))]
301 189
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCINFO))]
302 190
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOMDataModel.DataModel.DOCPAGE>))]
303 191
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCPAGE))]
......
308 196
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<KCOMDataModel.DataModel.MARKUP_DATA>))]
309 197
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.MARKUP_DATA))]
310 198
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(KCOMDataModel.DataModel.DOCUMENT_ITEM))]
311
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<string>))]
312
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.KCOM_SystemInfo))]
313
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.KCOM_BasicParam))]
314
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.VPRevision>))]
315
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.VPRevision))]
316
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.MarkupInfoItem>))]
317
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.MarkupInfoItem))]
318
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(System.Collections.Generic.List<IKCOM.MarkupItem>))]
319
    [System.Runtime.Serialization.KnownTypeAttribute(typeof(IKCOM.MarkupItem))]
320 199
    public partial class EntityKeyMember : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
321 200
        
322 201
        [System.NonSerializedAttribute()]
......
376 255
    
377 256
    [System.Diagnostics.DebuggerStepThroughAttribute()]
378 257
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
258
    [System.Runtime.Serialization.DataContractAttribute(Name="FinalPDFResult", Namespace="http://schemas.datacontract.org/2004/07/IFinalPDF")]
259
    [System.SerializableAttribute()]
260
    public partial struct FinalPDFResult : System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
261
        
262
        [System.NonSerializedAttribute()]
263
        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
264
        
265
        private int CurrentPageField;
266
        
267
        private string ExceptionField;
268
        
269
        private string FinalIDField;
270
        
271
        private string ProjectNoField;
272
        
273
        private KCOM.ServiceDeepView.FinalStatus StatusField;
274
        
275
        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
276
            get {
277
                return this.extensionDataField;
278
            }
279
            set {
280
                this.extensionDataField = value;
281
            }
282
        }
283
        
284
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
285
        public int CurrentPage {
286
            get {
287
                return this.CurrentPageField;
288
            }
289
            set {
290
                if ((this.CurrentPageField.Equals(value) != true)) {
291
                    this.CurrentPageField = value;
292
                    this.RaisePropertyChanged("CurrentPage");
293
                }
294
            }
295
        }
296
        
297
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
298
        public string Exception {
299
            get {
300
                return this.ExceptionField;
301
            }
302
            set {
303
                if ((object.ReferenceEquals(this.ExceptionField, value) != true)) {
304
                    this.ExceptionField = value;
305
                    this.RaisePropertyChanged("Exception");
306
                }
307
            }
308
        }
309
        
310
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
311
        public string FinalID {
312
            get {
313
                return this.FinalIDField;
314
            }
315
            set {
316
                if ((object.ReferenceEquals(this.FinalIDField, value) != true)) {
317
                    this.FinalIDField = value;
318
                    this.RaisePropertyChanged("FinalID");
319
                }
320
            }
321
        }
322
        
323
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
324
        public string ProjectNo {
325
            get {
326
                return this.ProjectNoField;
327
            }
328
            set {
329
                if ((object.ReferenceEquals(this.ProjectNoField, value) != true)) {
330
                    this.ProjectNoField = value;
331
                    this.RaisePropertyChanged("ProjectNo");
332
                }
333
            }
334
        }
335
        
336
        [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)]
337
        public KCOM.ServiceDeepView.FinalStatus Status {
338
            get {
339
                return this.StatusField;
340
            }
341
            set {
342
                if ((this.StatusField.Equals(value) != true)) {
343
                    this.StatusField = value;
344
                    this.RaisePropertyChanged("Status");
345
                }
346
            }
347
        }
348
        
349
        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
350
        
351
        void RaisePropertyChanged(string propertyName) {
352
            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
353
            if ((propertyChanged != null)) {
354
                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
355
            }
356
        }
357
    }
358
    
359
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
360
    [System.Runtime.Serialization.DataContractAttribute(Name="FinalStatus", Namespace="http://schemas.datacontract.org/2004/07/IFinalPDF")]
361
    public enum FinalStatus : int {
362
        
363
        [System.Runtime.Serialization.EnumMemberAttribute()]
364
        Insert = 0,
365
        
366
        [System.Runtime.Serialization.EnumMemberAttribute()]
367
        Wait = 1,
368
        
369
        [System.Runtime.Serialization.EnumMemberAttribute()]
370
        Create = 2,
371
        
372
        [System.Runtime.Serialization.EnumMemberAttribute()]
373
        PdfStamp = 3,
374
        
375
        [System.Runtime.Serialization.EnumMemberAttribute()]
376
        Success = 4,
377
        
378
        [System.Runtime.Serialization.EnumMemberAttribute()]
379
        Error = 5,
380
    }
381
    
382
    [System.Diagnostics.DebuggerStepThroughAttribute()]
383
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
379 384
    [System.Runtime.Serialization.DataContractAttribute(Name="EntityReferenceOfDOCINFOitJtO6kG", Namespace="http://schemas.datacontract.org/2004/07/System.Data.Objects.DataClasses")]
380 385
    [System.SerializableAttribute()]
381 386
    public partial class EntityReferenceOfDOCINFOitJtO6kG : KCOM.ServiceDeepView.EntityReference {
......
466 471
        
467 472
        IKCOM.KCOM_SystemInfo EndGetSystemData(System.IAsyncResult result);
468 473
        
474
        [System.ServiceModel.OperationContractAttribute(Action="urn:ServiceDeepView/GetFavoriteVP", ReplyAction="urn:ServiceDeepView/GetFavoriteVPResponse")]
475
        System.Collections.Generic.List<KCOMDataModel.DataModel.FAVORITE_DOC> GetFavoriteVP(string PrjNo, string userID, string sharepointItemID);
476
        
477
        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="urn:ServiceDeepView/GetFavoriteVP", ReplyAction="urn:ServiceDeepView/GetFavoriteVPResponse")]
478
        System.IAsyncResult BeginGetFavoriteVP(string PrjNo, string userID, string sharepointItemID, System.AsyncCallback callback, object asyncState);
479
        
480
        System.Collections.Generic.List<KCOMDataModel.DataModel.FAVORITE_DOC> EndGetFavoriteVP(System.IAsyncResult result);
481
        
482
        [System.ServiceModel.OperationContractAttribute(Action="urn:ServiceDeepView/EditFavoriteVP", ReplyAction="urn:ServiceDeepView/EditFavoriteVPResponse")]
483
        bool EditFavoriteVP(string prjNo, string userID, string docID, int state, string description);
484
        
485
        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="urn:ServiceDeepView/EditFavoriteVP", ReplyAction="urn:ServiceDeepView/EditFavoriteVPResponse")]
486
        System.IAsyncResult BeginEditFavoriteVP(string prjNo, string userID, string docID, int state, string description, System.AsyncCallback callback, object asyncState);
487
        
488
        bool EndEditFavoriteVP(System.IAsyncResult result);
489
        
490
        [System.ServiceModel.OperationContractAttribute(Action="urn:ServiceDeepView/DelFavoriteVP", ReplyAction="urn:ServiceDeepView/DelFavoriteVPResponse")]
491
        bool DelFavoriteVP(string prjNo, string userID, int SavePageNo, string docID);
492
        
493
        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="urn:ServiceDeepView/DelFavoriteVP", ReplyAction="urn:ServiceDeepView/DelFavoriteVPResponse")]
494
        System.IAsyncResult BeginDelFavoriteVP(string prjNo, string userID, int SavePageNo, string docID, System.AsyncCallback callback, object asyncState);
495
        
496
        bool EndDelFavoriteVP(System.IAsyncResult result);
497
        
469 498
        [System.ServiceModel.OperationContractAttribute(Action="urn:ServiceDeepView/GetCompareRect", ReplyAction="urn:ServiceDeepView/GetCompareRectResponse")]
470 499
        System.Collections.Generic.List<System.Windows.Rect> GetCompareRect(string projectNo, string originDocItem_ID, string targetDocItem_ID, string originPageNo, string targetPageNo);
471 500
        
......
553 582
        System.IAsyncResult BeginDeleteMarkup(string ProjectNo, string MarkupInfoID, System.AsyncCallback callback, object asyncState);
554 583
        
555 584
        bool EndDeleteMarkup(System.IAsyncResult result);
585
        
586
        [System.ServiceModel.OperationContractAttribute(Action="urn:ServiceDeepView/SetFavoriteVP", ReplyAction="urn:ServiceDeepView/SetFavoriteVPResponse")]
587
        bool SetFavoriteVP(string prjNo, string userID, string groupNo, string docNo, string rev, int SavePageNo, string documentItemID, string VPDescription, IKCOM.FAVORITE_FLAG flag);
588
        
589
        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="urn:ServiceDeepView/SetFavoriteVP", ReplyAction="urn:ServiceDeepView/SetFavoriteVPResponse")]
590
        System.IAsyncResult BeginSetFavoriteVP(string prjNo, string userID, string groupNo, string docNo, string rev, int SavePageNo, string documentItemID, string VPDescription, IKCOM.FAVORITE_FLAG flag, System.AsyncCallback callback, object asyncState);
591
        
592
        bool EndSetFavoriteVP(System.IAsyncResult result);
556 593
    }
557 594
    
558 595
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
......
580 617
    
581 618
    [System.Diagnostics.DebuggerStepThroughAttribute()]
582 619
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
620
    public partial class GetFavoriteVPCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
621
        
622
        private object[] results;
623
        
624
        public GetFavoriteVPCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
625
                base(exception, cancelled, userState) {
626
            this.results = results;
627
        }
628
        
629
        public System.Collections.Generic.List<KCOMDataModel.DataModel.FAVORITE_DOC> Result {
630
            get {
631
                base.RaiseExceptionIfNecessary();
632
                return ((System.Collections.Generic.List<KCOMDataModel.DataModel.FAVORITE_DOC>)(this.results[0]));
633
            }
634
        }
635
    }
636
    
637
    [System.Diagnostics.DebuggerStepThroughAttribute()]
638
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
639
    public partial class EditFavoriteVPCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
640
        
641
        private object[] results;
642
        
643
        public EditFavoriteVPCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
644
                base(exception, cancelled, userState) {
645
            this.results = results;
646
        }
647
        
648
        public bool Result {
649
            get {
650
                base.RaiseExceptionIfNecessary();
651
                return ((bool)(this.results[0]));
652
            }
653
        }
654
    }
655
    
656
    [System.Diagnostics.DebuggerStepThroughAttribute()]
657
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
658
    public partial class DelFavoriteVPCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
659
        
660
        private object[] results;
661
        
662
        public DelFavoriteVPCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
663
                base(exception, cancelled, userState) {
664
            this.results = results;
665
        }
666
        
667
        public bool Result {
668
            get {
669
                base.RaiseExceptionIfNecessary();
670
                return ((bool)(this.results[0]));
671
            }
672
        }
673
    }
674
    
675
    [System.Diagnostics.DebuggerStepThroughAttribute()]
676
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
583 677
    public partial class GetCompareRectCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
584 678
        
585 679
        private object[] results;
......
789 883
    
790 884
    [System.Diagnostics.DebuggerStepThroughAttribute()]
791 885
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
886
    public partial class SetFavoriteVPCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
887
        
888
        private object[] results;
889
        
890
        public SetFavoriteVPCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
891
                base(exception, cancelled, userState) {
892
            this.results = results;
893
        }
894
        
895
        public bool Result {
896
            get {
897
                base.RaiseExceptionIfNecessary();
898
                return ((bool)(this.results[0]));
899
            }
900
        }
901
    }
902
    
903
    [System.Diagnostics.DebuggerStepThroughAttribute()]
904
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
792 905
    public partial class ServiceDeepViewClient : System.ServiceModel.ClientBase<KCOM.ServiceDeepView.ServiceDeepView>, KCOM.ServiceDeepView.ServiceDeepView {
793 906
        
794 907
        private BeginOperationDelegate onBeginGetSystemDataDelegate;
......
797 910
        
798 911
        private System.Threading.SendOrPostCallback onGetSystemDataCompletedDelegate;
799 912
        
913
        private BeginOperationDelegate onBeginGetFavoriteVPDelegate;
914
        
915
        private EndOperationDelegate onEndGetFavoriteVPDelegate;
916
        
917
        private System.Threading.SendOrPostCallback onGetFavoriteVPCompletedDelegate;
918
        
919
        private BeginOperationDelegate onBeginEditFavoriteVPDelegate;
920
        
921
        private EndOperationDelegate onEndEditFavoriteVPDelegate;
922
        
923
        private System.Threading.SendOrPostCallback onEditFavoriteVPCompletedDelegate;
924
        
925
        private BeginOperationDelegate onBeginDelFavoriteVPDelegate;
926
        
927
        private EndOperationDelegate onEndDelFavoriteVPDelegate;
928
        
929
        private System.Threading.SendOrPostCallback onDelFavoriteVPCompletedDelegate;
930
        
800 931
        private BeginOperationDelegate onBeginGetCompareRectDelegate;
801 932
        
802 933
        private EndOperationDelegate onEndGetCompareRectDelegate;
......
863 994
        
864 995
        private System.Threading.SendOrPostCallback onDeleteMarkupCompletedDelegate;
865 996
        
997
        private BeginOperationDelegate onBeginSetFavoriteVPDelegate;
998
        
999
        private EndOperationDelegate onEndSetFavoriteVPDelegate;
1000
        
1001
        private System.Threading.SendOrPostCallback onSetFavoriteVPCompletedDelegate;
1002
        
866 1003
        public ServiceDeepViewClient() {
867 1004
        }
868 1005
        
......
884 1021
        
885 1022
        public event System.EventHandler<GetSystemDataCompletedEventArgs> GetSystemDataCompleted;
886 1023
        
1024
        public event System.EventHandler<GetFavoriteVPCompletedEventArgs> GetFavoriteVPCompleted;
1025
        
1026
        public event System.EventHandler<EditFavoriteVPCompletedEventArgs> EditFavoriteVPCompleted;
1027
        
1028
        public event System.EventHandler<DelFavoriteVPCompletedEventArgs> DelFavoriteVPCompleted;
1029
        
887 1030
        public event System.EventHandler<GetCompareRectCompletedEventArgs> GetCompareRectCompleted;
888 1031
        
889 1032
        public event System.EventHandler<SetFinalPDFCompletedEventArgs> SetFinalPDFCompleted;
......
906 1049
        
907 1050
        public event System.EventHandler<DeleteMarkupCompletedEventArgs> DeleteMarkupCompleted;
908 1051
        
1052
        public event System.EventHandler<SetFavoriteVPCompletedEventArgs> SetFavoriteVPCompleted;
1053
        
909 1054
        public IKCOM.KCOM_SystemInfo GetSystemData() {
910 1055
            return base.Channel.GetSystemData();
911 1056
        }
......
954 1099
            base.InvokeAsync(this.onBeginGetSystemDataDelegate, null, this.onEndGetSystemDataDelegate, this.onGetSystemDataCompletedDelegate, userState);
955 1100
        }
956 1101
        
1102
        public System.Collections.Generic.List<KCOMDataModel.DataModel.FAVORITE_DOC> GetFavoriteVP(string PrjNo, string userID, string sharepointItemID) {
1103
            return base.Channel.GetFavoriteVP(PrjNo, userID, sharepointItemID);
1104
        }
1105
        
1106
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
1107
        public System.IAsyncResult BeginGetFavoriteVP(string PrjNo, string userID, string sharepointItemID, System.AsyncCallback callback, object asyncState) {
1108
            return base.Channel.BeginGetFavoriteVP(PrjNo, userID, sharepointItemID, callback, asyncState);
1109
        }
1110
        
1111
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
1112
        public System.Collections.Generic.List<KCOMDataModel.DataModel.FAVORITE_DOC> EndGetFavoriteVP(System.IAsyncResult result) {
1113
            return base.Channel.EndGetFavoriteVP(result);
1114
        }
1115
        
1116
        private System.IAsyncResult OnBeginGetFavoriteVP(object[] inValues, System.AsyncCallback callback, object asyncState) {
1117
            string PrjNo = ((string)(inValues[0]));
1118
            string userID = ((string)(inValues[1]));
1119
            string sharepointItemID = ((string)(inValues[2]));
1120
            return this.BeginGetFavoriteVP(PrjNo, userID, sharepointItemID, callback, asyncState);
1121
        }
1122
        
1123
        private object[] OnEndGetFavoriteVP(System.IAsyncResult result) {
1124
            System.Collections.Generic.List<KCOMDataModel.DataModel.FAVORITE_DOC> retVal = this.EndGetFavoriteVP(result);
1125
            return new object[] {
1126
                    retVal};
1127
        }
1128
        
1129
        private void OnGetFavoriteVPCompleted(object state) {
1130
            if ((this.GetFavoriteVPCompleted != null)) {
1131
                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
1132
                this.GetFavoriteVPCompleted(this, new GetFavoriteVPCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
1133
            }
1134
        }
1135
        
1136
        public void GetFavoriteVPAsync(string PrjNo, string userID, string sharepointItemID) {
1137
            this.GetFavoriteVPAsync(PrjNo, userID, sharepointItemID, null);
1138
        }
1139
        
1140
        public void GetFavoriteVPAsync(string PrjNo, string userID, string sharepointItemID, object userState) {
1141
            if ((this.onBeginGetFavoriteVPDelegate == null)) {
1142
                this.onBeginGetFavoriteVPDelegate = new BeginOperationDelegate(this.OnBeginGetFavoriteVP);
1143
            }
1144
            if ((this.onEndGetFavoriteVPDelegate == null)) {
1145
                this.onEndGetFavoriteVPDelegate = new EndOperationDelegate(this.OnEndGetFavoriteVP);
1146
            }
1147
            if ((this.onGetFavoriteVPCompletedDelegate == null)) {
1148
                this.onGetFavoriteVPCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetFavoriteVPCompleted);
1149
            }
1150
            base.InvokeAsync(this.onBeginGetFavoriteVPDelegate, new object[] {
1151
                        PrjNo,
1152
                        userID,
1153
                        sharepointItemID}, this.onEndGetFavoriteVPDelegate, this.onGetFavoriteVPCompletedDelegate, userState);
1154
        }
1155
        
1156
        public bool EditFavoriteVP(string prjNo, string userID, string docID, int state, string description) {
1157
            return base.Channel.EditFavoriteVP(prjNo, userID, docID, state, description);
1158
        }
1159
        
1160
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
1161
        public System.IAsyncResult BeginEditFavoriteVP(string prjNo, string userID, string docID, int state, string description, System.AsyncCallback callback, object asyncState) {
1162
            return base.Channel.BeginEditFavoriteVP(prjNo, userID, docID, state, description, callback, asyncState);
1163
        }
1164
        
1165
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
1166
        public bool EndEditFavoriteVP(System.IAsyncResult result) {
1167
            return base.Channel.EndEditFavoriteVP(result);
1168
        }
1169
        
1170
        private System.IAsyncResult OnBeginEditFavoriteVP(object[] inValues, System.AsyncCallback callback, object asyncState) {
1171
            string prjNo = ((string)(inValues[0]));
1172
            string userID = ((string)(inValues[1]));
1173
            string docID = ((string)(inValues[2]));
1174
            int state = ((int)(inValues[3]));
1175
            string description = ((string)(inValues[4]));
1176
            return this.BeginEditFavoriteVP(prjNo, userID, docID, state, description, callback, asyncState);
1177
        }
1178
        
1179
        private object[] OnEndEditFavoriteVP(System.IAsyncResult result) {
1180
            bool retVal = this.EndEditFavoriteVP(result);
1181
            return new object[] {
1182
                    retVal};
1183
        }
1184
        
1185
        private void OnEditFavoriteVPCompleted(object state) {
1186
            if ((this.EditFavoriteVPCompleted != null)) {
1187
                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
1188
                this.EditFavoriteVPCompleted(this, new EditFavoriteVPCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
1189
            }
1190
        }
1191
        
1192
        public void EditFavoriteVPAsync(string prjNo, string userID, string docID, int state, string description) {
1193
            this.EditFavoriteVPAsync(prjNo, userID, docID, state, description, null);
1194
        }
1195
        
1196
        public void EditFavoriteVPAsync(string prjNo, string userID, string docID, int state, string description, object userState) {
1197
            if ((this.onBeginEditFavoriteVPDelegate == null)) {
1198
                this.onBeginEditFavoriteVPDelegate = new BeginOperationDelegate(this.OnBeginEditFavoriteVP);
1199
            }
1200
            if ((this.onEndEditFavoriteVPDelegate == null)) {
1201
                this.onEndEditFavoriteVPDelegate = new EndOperationDelegate(this.OnEndEditFavoriteVP);
1202
            }
1203
            if ((this.onEditFavoriteVPCompletedDelegate == null)) {
1204
                this.onEditFavoriteVPCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnEditFavoriteVPCompleted);
1205
            }
1206
            base.InvokeAsync(this.onBeginEditFavoriteVPDelegate, new object[] {
1207
                        prjNo,
1208
                        userID,
1209
                        docID,
1210
                        state,
1211
                        description}, this.onEndEditFavoriteVPDelegate, this.onEditFavoriteVPCompletedDelegate, userState);
1212
        }
1213
        
1214
        public bool DelFavoriteVP(string prjNo, string userID, int SavePageNo, string docID) {
1215
            return base.Channel.DelFavoriteVP(prjNo, userID, SavePageNo, docID);
1216
        }
1217
        
1218
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
1219
        public System.IAsyncResult BeginDelFavoriteVP(string prjNo, string userID, int SavePageNo, string docID, System.AsyncCallback callback, object asyncState) {
1220
            return base.Channel.BeginDelFavoriteVP(prjNo, userID, SavePageNo, docID, callback, asyncState);
1221
        }
1222
        
1223
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
1224
        public bool EndDelFavoriteVP(System.IAsyncResult result) {
1225
            return base.Channel.EndDelFavoriteVP(result);
1226
        }
1227
        
1228
        private System.IAsyncResult OnBeginDelFavoriteVP(object[] inValues, System.AsyncCallback callback, object asyncState) {
1229
            string prjNo = ((string)(inValues[0]));
1230
            string userID = ((string)(inValues[1]));
1231
            int SavePageNo = ((int)(inValues[2]));
1232
            string docID = ((string)(inValues[3]));
1233
            return this.BeginDelFavoriteVP(prjNo, userID, SavePageNo, docID, callback, asyncState);
1234
        }
1235
        
1236
        private object[] OnEndDelFavoriteVP(System.IAsyncResult result) {
1237
            bool retVal = this.EndDelFavoriteVP(result);
1238
            return new object[] {
1239
                    retVal};
1240
        }
1241
        
1242
        private void OnDelFavoriteVPCompleted(object state) {
1243
            if ((this.DelFavoriteVPCompleted != null)) {
1244
                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
1245
                this.DelFavoriteVPCompleted(this, new DelFavoriteVPCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
1246
            }
1247
        }
1248
        
1249
        public void DelFavoriteVPAsync(string prjNo, string userID, int SavePageNo, string docID) {
1250
            this.DelFavoriteVPAsync(prjNo, userID, SavePageNo, docID, null);
1251
        }
1252
        
1253
        public void DelFavoriteVPAsync(string prjNo, string userID, int SavePageNo, string docID, object userState) {
1254
            if ((this.onBeginDelFavoriteVPDelegate == null)) {
1255
                this.onBeginDelFavoriteVPDelegate = new BeginOperationDelegate(this.OnBeginDelFavoriteVP);
1256
            }
1257
            if ((this.onEndDelFavoriteVPDelegate == null)) {
1258
                this.onEndDelFavoriteVPDelegate = new EndOperationDelegate(this.OnEndDelFavoriteVP);
1259
            }
1260
            if ((this.onDelFavoriteVPCompletedDelegate == null)) {
1261
                this.onDelFavoriteVPCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnDelFavoriteVPCompleted);
1262
            }
1263
            base.InvokeAsync(this.onBeginDelFavoriteVPDelegate, new object[] {
1264
                        prjNo,
1265
                        userID,
1266
                        SavePageNo,
1267
                        docID}, this.onEndDelFavoriteVPDelegate, this.onDelFavoriteVPCompletedDelegate, userState);
1268
        }
1269
        
957 1270
        public System.Collections.Generic.List<System.Windows.Rect> GetCompareRect(string projectNo, string originDocItem_ID, string targetDocItem_ID, string originPageNo, string targetPageNo) {
958 1271
            return base.Channel.GetCompareRect(projectNo, originDocItem_ID, targetDocItem_ID, originPageNo, targetPageNo);
959 1272
        }
......
1529 1842
                        ProjectNo,
1530 1843
                        MarkupInfoID}, this.onEndDeleteMarkupDelegate, this.onDeleteMarkupCompletedDelegate, userState);
1531 1844
        }
1845
        
1846
        public bool SetFavoriteVP(string prjNo, string userID, string groupNo, string docNo, string rev, int SavePageNo, string documentItemID, string VPDescription, IKCOM.FAVORITE_FLAG flag) {
1847
            return base.Channel.SetFavoriteVP(prjNo, userID, groupNo, docNo, rev, SavePageNo, documentItemID, VPDescription, flag);
1848
        }
1849
        
1850
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
1851
        public System.IAsyncResult BeginSetFavoriteVP(string prjNo, string userID, string groupNo, string docNo, string rev, int SavePageNo, string documentItemID, string VPDescription, IKCOM.FAVORITE_FLAG flag, System.AsyncCallback callback, object asyncState) {
1852
            return base.Channel.BeginSetFavoriteVP(prjNo, userID, groupNo, docNo, rev, SavePageNo, documentItemID, VPDescription, flag, callback, asyncState);
1853
        }
1854
        
1855
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
1856
        public bool EndSetFavoriteVP(System.IAsyncResult result) {
1857
            return base.Channel.EndSetFavoriteVP(result);
1858
        }
1859
        
1860
        private System.IAsyncResult OnBeginSetFavoriteVP(object[] inValues, System.AsyncCallback callback, object asyncState) {
1861
            string prjNo = ((string)(inValues[0]));
1862
            string userID = ((string)(inValues[1]));
1863
            string groupNo = ((string)(inValues[2]));
1864
            string docNo = ((string)(inValues[3]));
1865
            string rev = ((string)(inValues[4]));
1866
            int SavePageNo = ((int)(inValues[5]));
1867
            string documentItemID = ((string)(inValues[6]));
1868
            string VPDescription = ((string)(inValues[7]));
1869
            IKCOM.FAVORITE_FLAG flag = ((IKCOM.FAVORITE_FLAG)(inValues[8]));
1870
            return this.BeginSetFavoriteVP(prjNo, userID, groupNo, docNo, rev, SavePageNo, documentItemID, VPDescription, flag, callback, asyncState);
1871
        }
1872
        
1873
        private object[] OnEndSetFavoriteVP(System.IAsyncResult result) {
1874
            bool retVal = this.EndSetFavoriteVP(result);
1875
            return new object[] {
1876
                    retVal};
1877
        }
1878
        
1879
        private void OnSetFavoriteVPCompleted(object state) {
1880
            if ((this.SetFavoriteVPCompleted != null)) {
1881
                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
1882
                this.SetFavoriteVPCompleted(this, new SetFavoriteVPCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
1883
            }
1884
        }
1885
        
1886
        public void SetFavoriteVPAsync(string prjNo, string userID, string groupNo, string docNo, string rev, int SavePageNo, string documentItemID, string VPDescription, IKCOM.FAVORITE_FLAG flag) {
1887
            this.SetFavoriteVPAsync(prjNo, userID, groupNo, docNo, rev, SavePageNo, documentItemID, VPDescription, flag, null);
1888
        }
1889
        
1890
        public void SetFavoriteVPAsync(string prjNo, string userID, string groupNo, string docNo, string rev, int SavePageNo, string documentItemID, string VPDescription, IKCOM.FAVORITE_FLAG flag, object userState) {
1891
            if ((this.onBeginSetFavoriteVPDelegate == null)) {
1892
                this.onBeginSetFavoriteVPDelegate = new BeginOperationDelegate(this.OnBeginSetFavoriteVP);
1893
            }
1894
            if ((this.onEndSetFavoriteVPDelegate == null)) {
1895
                this.onEndSetFavoriteVPDelegate = new EndOperationDelegate(this.OnEndSetFavoriteVP);
1896
            }
1897
            if ((this.onSetFavoriteVPCompletedDelegate == null)) {
1898
                this.onSetFavoriteVPCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSetFavoriteVPCompleted);
1899
            }
1900
            base.InvokeAsync(this.onBeginSetFavoriteVPDelegate, new object[] {
1901
                        prjNo,
1902
                        userID,
1903
                        groupNo,
1904
                        docNo,
1905
                        rev,
1906
                        SavePageNo,
1907
                        documentItemID,
1908
                        VPDescription,
1909
                        flag}, this.onEndSetFavoriteVPDelegate, this.onSetFavoriteVPCompletedDelegate, userState);
1910
        }
1532 1911
    }
1533 1912
}
KCOM/Controls/AdornerFinal.xaml
154 154
        <Canvas x:Name="ContainerContent" Background="Transparent" Canvas.ZIndex="82">
155 155
            <Thumb x:Name="DragThumb" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"  BorderThickness="1"  Opacity="1"
156 156
                   DragStarted="drag_DragStarted" DragCompleted="drag_DragCompleted" Loaded="DragThumb_Loaded"  MouseDoubleClick="DragThumb_MouseDoubleClick"
157
                   DragDelta="DragThumb_DragDelta" Canvas.ZIndex="81" Style="{StaticResource ThumbMoveStyle}" RenderTransformOrigin="0.5,0.5">
157
                   DragDelta="DragThumb_DragDelta" Canvas.ZIndex="81" Style="{StaticResource ThumbMoveStyle}" RenderTransformOrigin="0,0">
158 158
                <Thumb.RenderTransform>
159 159
                    <TransformGroup>
160 160
                        <!--<CompositeTransform x:Name="trRotate"/>-->
......
163 163
                </Thumb.RenderTransform>
164 164
            </Thumb>
165 165
        </Canvas>
166
        <Grid x:Name="AdornerBorder" Background="Transparent" RenderTransformOrigin="0.5,0.5" Canvas.ZIndex="80">
166
        <Grid x:Name="AdornerBorder" Background="Transparent" RenderTransformOrigin="0,0" Canvas.ZIndex="80">
167 167
            <Grid.RowDefinitions>
168 168
                <RowDefinition Height="0"/>
169 169
                <RowDefinition/>
KCOM/Controls/AdornerFinal.xaml.cs
48 48
        public Thumb mainDragThumb { get; set; }
49 49

  
50 50
        public Point reSizePoint { get; set; }
51
        private Point rotatePoint { get; set; } /// 2018.05.09 added by humkyung
51 52
        #endregion
52 53
        #region 생성자
53 54
        private void RadDropDownButton_Loaded(object sender, RoutedEventArgs e)
......
101 102
            SetAdornerMember(objectData as CommentUserInfo);
102 103
            this.Focus();
103 104
        }
104
        public AdornerFinal(List<CommentUserInfo> objectData)  : this()
105
        public AdornerFinal(List<CommentUserInfo> objectData) : this()
105 106
        {
106 107
            InitializeComponent();
107 108
            foreach (var item in objectData)
......
202 203
                    break;
203 204
                case "TriControl":
204 205
                    MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Triangle, ThumbList = new List<Thumb>() });
205
                        break;
206
                    break;
206 207
                case "CircleControl":
207 208
                    MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Circle, ThumbList = new List<Thumb>() });
208 209
                    break;
......
365 366
                    case "RectCloudControl":
366 367
                        MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.RectCloud, ThumbList = new List<Thumb>() });
367 368
                        break;
368
                        //강인구 추가
369
                    //강인구 추가
369 370
                    case "SignControl":
370 371
                        MemberSet.Add(new AdornerMember { DrawingData = member, Drawingtype = ControlType.Sign, ThumbList = new List<Thumb>() });
371 372
                        break;
......
427 428
            AdornerBorder.MinWidth = 10;
428 429
            AdornerBorder.MinHeight = 10;
429 430

  
430
            double minX = 10000;
431
            double minY = 10000;
432
            double maxX = 0;
433
            double maxY = 0;
431
            double minX = double.MaxValue;
432
            double minY = double.MaxValue;
433
            double maxX = double.MinValue;
434
            double maxY = double.MinValue;
434 435

  
435 436
            if (MemberSet.Count == 1)
436 437
            {
......
465 466
                        textControlWidth = ((currentControl as TextControl).Base_TextBox.ActualWidth);
466 467
                        textControlHeight = ((currentControl as TextControl).Base_TextBox.ActualHeight);
467 468
                    }
468
                    if ((currentControl as TextControl).LineSize.Left == 0)
469
                    {
470
                        if (TextCompensation)
471
                        {
472 469

  
473
                            textControlWidth += 1;
474
                            textControlHeight += 1;
475
                        }
476
                        else
477
                        {
478
                            textControlWidth += 3;
479
                            textControlHeight += 3;
480
                        }
481
                    }
482
                    else
483
                    {
484
                        if (TextCompensation)
485
                        {
470
                    //Border 사이즈 불필요
486 471

  
487
                            textControlWidth += 1;
488
                            textControlHeight += 1;
489
                        }
490
                        else
491
                        {
492
                            textControlWidth += 8;
493
                            textControlHeight += 8;
494
                        }
472
                    //if ((currentControl as TextControl).LineSize.Left == 0)
473
                    //{
474
                    //    if (TextCompensation)
475
                    //    {
476

  
477
                    //        textControlWidth += 1;
478
                    //        textControlHeight += 1;
479
                    //    }
480
                    //    else
481
                    //    {
482
                    //        textControlWidth += 3;
483
                    //        textControlHeight += 3;
484
                    //    }
485
                    //}
486
                    //else
487
                    //{
488
                    //    if (TextCompensation)
489
                    //    {
490

  
491
                    //        textControlWidth += 1;
492
                    //        textControlHeight += 1;
493
                    //    }
494
                    //    else
495
                    //    {
496
                    //        textControlWidth += 8;
497
                    //        textControlHeight += 8;
498
                    //    }
499
                    //}
495 500

  
496
                    }
497 501
                    if ((currentControl as TextControl).EndPoint.X < minX)
498 502
                    {
499 503
                        minX = (currentControl as TextControl).EndPoint.X;
......
692 696
                    {
693 697
                        var temp = (MemberSet.First() as AdornerMember).DrawingData as ArrowTextControl;
694 698

  
695
                      
699

  
696 700
                        switch (Math.Abs(temp.Angle).ToString())
697 701
                        {
698 702
                            case "90":
......
1044 1048

  
1045 1049
                                DynamicThumbUpdate(control);
1046 1050
                                BorderUpdate();
1047
                                
1051

  
1048 1052
                                //if (control.DrawingData.GetType().Name == "ArrowTextControl")
1049 1053
                                //{
1050 1054
                                //    Thumb tm = control.ThumbList.Last();
......
1089 1093
                            }
1090 1094
                            break;
1091 1095
                        #endregion
1092
						//강인구 추가
1096
                        //강인구 추가
1093 1097
                        #region Sign
1094 1098
                        case ControlType.Sign:
1095 1099
                            if (nearPoint.Equals(AllControl.PointSet[i]))
......
1316 1320
                else
1317 1321
                    IsTextAngle = false;
1318 1322

  
1319
                System.Diagnostics.Debug.WriteLine("X축 : " + e.GetPosition(this).X + "LastRotateVerticalValue : " + LastRotateVerticalValue);
1323
                //System.Diagnostics.Debug.WriteLine("X축 : " + e.GetPosition(this).X + "LastRotateVerticalValue : " + LastRotateVerticalValue);
1320 1324
                LastRotateVerticalValue = e.GetPosition(this).X;
1321 1325
            }
1322 1326
            else
1323 1327
            {
1324
                System.Diagnostics.Debug.WriteLine("e.GetPosition(this).X : " + e.GetPosition(this).X);
1325
                System.Diagnostics.Debug.WriteLine("LastRotateHorizontalValue: " + LastRotateHorizontalValue);
1328
                //System.Diagnostics.Debug.WriteLine("e.GetPosition(this).X : " + e.GetPosition(this).X);
1329
                //System.Diagnostics.Debug.WriteLine("LastRotateHorizontalValue: " + LastRotateHorizontalValue);
1326 1330

  
1327 1331
                if (e.GetPosition(this).X > LastRotateHorizontalValue)
1328 1332
                {
......
1391 1395
                        (item.DrawingData as TextControl).StartPoint =
1392 1396
                        new Point(Canvas.GetLeft((item.DrawingData as TextControl)) + e.HorizontalChange / 5, Canvas.GetTop((item.DrawingData as TextControl)) + e.VerticalChange / 5);
1393 1397
                        (item.DrawingData as TextControl).EndPoint = (item.DrawingData as TextControl).StartPoint;
1398

  
1399
                        (item.DrawingData as TextControl).CanvasX = (item.DrawingData as TextControl).StartPoint.X;
1400
                        (item.DrawingData as TextControl).CanvasY = (item.DrawingData as TextControl).StartPoint.Y;
1394 1401
                    }
1395 1402
                    #endregion
1396 1403
                    #region 날짜
......
1415 1422
                        temp.DrawingCloud();
1416 1423
                    }
1417 1424
                    #endregion
1418
                    //#region 심볼
1425
                    #region 심볼
1419 1426
                    //if (item.Drawingtype == MarkupType.Viewbox)
1420 1427
                    //{
1421 1428
                    //    DynamicThumbUpdate(e, item);
1422 1429
                    //    BorderUpdate();
1423 1430
                    //}
1424
                    //#endregion
1425
                    //#region 폴리곤확장
1431
                    #endregion
1432
                    #region 폴리곤확장
1426 1433
                    //if (item.Drawingtype == MarkupType.PolygonEx)
1427 1434
                    //{
1428 1435
                    //    Point px = new Point(e.HorizontalChange, e.VerticalChange);
......
1455 1462
                    //    //}
1456 1463
                    //    //(item.DrawingData as IPath).updateControl();
1457 1464
                    //}
1458
                    //#endregion
1465
                    #endregion
1459 1466
                    #region 폴리곤
1460 1467
                    if (item.Drawingtype == ControlType.PolygonControl)
1461 1468
                    {
......
2122 2129
        /// <param name="e"></param>
2123 2130
        public void rotate_DragDelta(object sender, DragDeltaEventArgs e)
2124 2131
        {
2125
            //DragThumb.Cursor = Cursors.SizeAll;
2126
            //System.Windows.Resources.StreamResourceInfo info = Application.GetResourceStream(new Uri("/KCOM;component/Resources/Images/AdornerImage/sync.cur", UriKind.Relative));
2127
            //rotateTop.Cursor = new System.Windows.Input.Cursor(info.Stream);
2128

  
2129
            //rotateTop.Cursor = new System.Windows.Input.Cursor("../sync.cur");
2130

  
2131
            //if(e.VerticalChange > 10)
2132
            //{
2133
            //    System.Diagnostics.Debug.WriteLine("Width" + ((e.Source as Thumb).Parent as Grid).Width);
2134
            //    System.Diagnostics.Debug.WriteLine("e.HorizontalChange : " + e.HorizontalChange);
2135
            //}
2136 2132

  
2137 2133
            MoveRotate(e);
2138 2134
        }
......
2143 2139
        double SetWidth = 0;
2144 2140
        bool RotateFlag = false;
2145 2141

  
2142
        /// <summary>
2143
        /// <history>humkyung 2018.05.09 upgrade rotate shape peformance</history>
2144
        /// </summary>
2145
        /// <param name="e"></param>
2146 2146
        public void MoveRotate(DragDeltaEventArgs e)
2147 2147
        {
2148 2148
            double dDeltaAngle = 0;
......
2194 2194
            #endregion
2195 2195

  
2196 2196
            //강인구 수정
2197
            AngleValue = AngleValue + dDeltaAngle;
2198

  
2199
            if ((MemberSet.First() as AdornerMember).DrawingData.GetType().Name != "TextControl")
2200
            {
2201
                SetWidth = (((e.Source as Thumb).Parent as Grid).Width - LastWidthValue) / 2;
2202

  
2203

  
2204
                //System.Diagnostics.Debug.WriteLine("Width" + ((e.Source as Thumb).Parent as Grid).Width);
2205
                //System.Diagnostics.Debug.WriteLine("e.HorizontalChange : " + e.HorizontalChange);
2206
                //System.Diagnostics.Debug.WriteLine("e.VerticalChange : " + e.VerticalChange);
2207
                //System.Diagnostics.Debug.WriteLine("");
2208

  
2209
                //((e.Source as Thumb).Parent as Grid).Width
2210

  
2211
                if (Math.Abs(e.HorizontalChange) > Math.Abs(e.VerticalChange))
2212
                {
2213
                    //System.Diagnostics.Debug.WriteLine("e.HorizontalChange : " + e.HorizontalChange);
2214
                    //System.Diagnostics.Debug.WriteLine("e.VerticalChange : " + e.VerticalChange);
2215

  
2216
                    //if (LastRotateHorizontalValue < e.HorizontalChange)
2217
                    //if (LastRotateHorizontalValue < e.HorizontalChange + SetWidth)
2218
                    //if (LastRotateHorizontalValue + LastRotateVerticalValue < e.HorizontalChange + e.VerticalChange)
2219
                    if(RotateFlag)
2220
                    {
2221
                        dDeltaAngle = 5;
2222
                        AngleValue = AngleValue + dDeltaAngle;
2223
                    }
2224
                    else
2225
                    {
2226
                        dDeltaAngle = -5;
2227
                        AngleValue = AngleValue + dDeltaAngle;
2228
                    }
2229
                }
2230
            }
2231
            else
2232
            {
2233
                if (IsTextAngle || RotateFlag)
2234
                {
2235
                    AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle + 5;
2236
                    //AngleValue = AngleValue + 2;
2237
                }
2238
                else
2239
                {
2240
                    AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle - 5;
2241
                    //AngleValue = AngleValue - 2;
2242
                }
2243
            }
2244

  
2245
            //LastRotateHorizontalValue = e.HorizontalChange;
2246
            //LastRotateVerticalValue = e.VerticalChange;
2247
            //LastWidthValue = ((e.Source as Thumb).Parent as Grid).Width;
2248

  
2249
            //Set_Rotate();
2250

  
2251
            if (AngleValue >= 360)
2252
            {
2253
                AngleValue -= 360;
2254
                dDeltaAngle -= 360;
2255
            }
2256
            else if (AngleValue <= -360)
2257
            {
2258
                AngleValue += 360;
2259
                dDeltaAngle += 360;
2260
            }
2197
            //AngleValue = AngleValue + dDeltaAngle;
2261 2198
            #endregion
2262 2199

  
2263 2200
            #region 센터 포인트 구하기 (그룹핑)
......
2265 2202
            {
2266 2203
                if (item.DrawingData.GetType().Name == "TextControl")
2267 2204
                {
2205
                    //if (AngleValue == 0)
2206
                    //{
2207
                    //    AngleValue = (item.DrawingData as TextControl).Angle;
2208
                    //}
2209
                    //double X = Canvas.GetLeft((item.DrawingData as TextControl));
2210
                    //double Y = Canvas.GetTop((item.DrawingData as TextControl));
2211
                    //AllPointSet.Add(new Point(X,Y));
2212
                    if (AngleValue == 0)
2213
                    {
2214
                        AngleValue = (item.DrawingData as TextControl).Angle;
2215
                    }
2216
                    double X = Canvas.GetLeft((item.DrawingData as TextControl));
2217
                    double Y = Canvas.GetTop((item.DrawingData as TextControl));
2218
                    AllPointSet.Add(new Point(X, Y));
2268 2219
                }
2269 2220
                else
2270 2221
                {
......
2276 2227
            }
2277 2228
            #endregion
2278 2229
            CenterPoint = MathSet.FindCentroid(AllPointSet);
2230
            Point pt = Mouse.GetPosition(this);
2231

  
2232

  
2233

  
2234

  
2235
            //if ((MemberSet.First() as AdornerMember).DrawingData.GetType().Name != "TextControl")
2236
            //{
2237
            Point vec1 = new Point(this.rotatePoint.X - CenterPoint.X, this.rotatePoint.Y - CenterPoint.Y);
2238
            Point vec2 = new Point(pt.X - CenterPoint.X, pt.Y - CenterPoint.Y);
2239
            dDeltaAngle = (MathSet.getAngleBetweenVectors(vec1, vec2));
2240

  
2241
            System.Diagnostics.Debug.WriteLine("vec1 : " + vec1.X + "/" + vec1.Y);
2242
            System.Diagnostics.Debug.WriteLine("vec2 : " + vec2.X + "/" + vec2.Y);
2243
            System.Diagnostics.Debug.WriteLine("dDeltaAngle : " + dDeltaAngle);
2244

  
2245
            //}
2246
            //else
2247
            //{
2248
            //if (IsTextAngle || RotateFlag)
2249
            //{
2250
            //    AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle + 5;
2251
            //}
2252
            //else
2253
            //{
2254
            //    AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle - 5;
2255
            //}
2256
            //}
2257

  
2258
            AngleValue += dDeltaAngle;
2259
            if (AngleValue > 360) AngleValue -= 360;
2260
            if (AngleValue < 0) AngleValue += 360;
2261
            this.rotatePoint = pt;  /// save rotatePoint
2279 2262

  
2280 2263
            Dispatcher.BeginInvoke((Action)(() =>
2281 2264
            {
......
2290 2273
                        Canvas.SetLeft(thumb, value.X);
2291 2274
                        Canvas.SetTop(thumb, value.Y);
2292 2275

  
2293
                        if (item.DrawingData.GetType().Name == "ArrowTextControl" && thumb == item.ThumbList.Last())
2276
                        /*if (item.DrawingData.GetType().Name == "ArrowTextControl" && thumb == item.ThumbList.Last())
2294 2277
                        {
2295 2278
                            Canvas.SetLeft(thumb, Canvas.GetLeft((item.DrawingData as ArrowTextControl).Base_TextBox));
2296 2279
                            Canvas.SetTop(thumb, Canvas.GetTop((item.DrawingData as ArrowTextControl).Base_TextBox));
......
2353 2336
                                //Canvas.SetLeft((MemberSet.First() as AdornerMember).ThumbList[1], tempP.X);
2354 2337
                                //Canvas.SetTop((MemberSet.First() as AdornerMember).ThumbList[1], tempP.Y);
2355 2338
                            }
2356
                        }
2339
                        }*/
2357 2340
                    }
2358 2341

  
2359 2342
                    for (int i = 0; i < (item.DrawingData as IPath).PointSet.Count(); i++)
......
2361 2344
                        (item.DrawingData as IPath).PointSet[i] = MathSet.RotateAbout(CenterPoint, (item.DrawingData as IPath).PointSet[i], dDeltaAngle);
2362 2345
                    }
2363 2346
                }
2364
                #region 컨트롤 업데이트
2347
                #region 보더 업데이트
2365 2348
                foreach (var item in MemberSet)
2366 2349
                {
2367 2350
                    switch (item.Drawingtype)
......
2394 2377
                            //    CenterY = middle.Y + ((member as TextControl) as FrameworkElement).ActualHeight /2,
2395 2378
                            //};
2396 2379

  
2397
                            DragThumb.RenderTransformOrigin = new Point(0.0, 0.0);
2380

  
2381
                            DragThumb.RenderTransformOrigin = new Point(0, 0);
2398 2382
                            DragThumb.RenderTransform = new RotateTransform()
2399 2383
                            {
2400 2384
                                Angle = (item.DrawingData as TextControl).Angle,
......
2402 2386
                                //CenterY = middle.Y,
2403 2387
                            };
2404 2388

  
2405
                            AdornerBorder.RenderTransformOrigin = new Point(0.0, 0.0);
2389
                            AdornerBorder.RenderTransformOrigin = new Point(0, 0);
2406 2390
                            AdornerBorder.RenderTransform = new RotateTransform()
2407 2391
                            {
2408 2392
                                Angle = (item.DrawingData as TextControl).Angle,
......
2527 2511

  
2528 2512
        private void rotate_DragStarted(object sender, DragStartedEventArgs e)
2529 2513
        {
2530
            //System.Windows.Forms.Cursor.Position = new System.Drawing.Point(System.Windows.Forms.Cursor.Position.X - 150, System.Windows.Forms.Cursor.Position.Y - 150);
2514
            ////System.Windows.Forms.Cursor.Position = new System.Drawing.Point(System.Windows.Forms.Cursor.Position.X - 150, System.Windows.Forms.Cursor.Position.Y - 150);
2515
            //this.rotatePoint = Mouse.GetPosition(this); /// 2018.05.09 added by humkyung
2516
            //rotateTop.Cursor = Cursors.SizeAll;
2517

  
2518
            ////CustomCursor.SetCursorTemplate(rotateTop, this.Resources["AnimatedCursor"] as DataTemplate);
2519
            ////rotateTop.Cursor = Cursors.None;
2520

  
2521
            ////if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().PointSet != null)
2522
            ////{
2523
            ////    return;
2524
            ////}
2531 2525

  
2526
            this.rotatePoint = Mouse.GetPosition(this); /// 2018.05.09 added by humkyung
2532 2527
            rotateTop.Cursor = Cursors.SizeAll;
2533 2528

  
2534
            //CustomCursor.SetCursorTemplate(rotateTop, this.Resources["AnimatedCursor"] as DataTemplate);
2535
            //rotateTop.Cursor = Cursors.None;
2529
            /// get angle from text controls' angle if only text control exists - 2018.05.10 added by humkyung
2530
            if ((1 == MemberSet.Count) && (MemberSet.First() as AdornerMember).DrawingData.GetType().Name == "TextControl")
2531
            {
2532
                this.AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle;
2533
            }
2534
            /// up to here
2535

  
2536

  
2536 2537

  
2537
            //if (ViewerDataModel.Instance.UndoDataList.LastOrDefault().PointSet != null)
2538
            //{
2539
            //    return;
2540
            //}
2541 2538
            if (ViewerDataModel.Instance.UndoDataList == null)
2542 2539
            {
2543 2540
                return;
......
2616 2613
                multi_Undo_Data.PointSet = new List<Point>();
2617 2614
                p_set = new List<Point>();
2618 2615

  
2619
                if(control.DrawingData as TextControl != null)
2616
                if (control.DrawingData as TextControl != null)
2620 2617
                {
2621 2618
                    multi_Undo_Data.PointSet.Add((control.DrawingData as TextControl).StartPoint);
2622 2619
                    multi_Undo_Data.PointSet.Add((control.DrawingData as TextControl).EndPoint);
......
2823 2820
                            Canvas.SetTop((MemberSet.First() as AdornerMember).ThumbList[1], tempP.Y);
2824 2821
                        }
2825 2822

  
2826
                        
2823

  
2827 2824
                        BorderUpdate();
2828
                        
2825

  
2829 2826
                    };
2830 2827
                }
2831 2828
                else if ((MemberSet.First() as AdornerMember).DrawingData.GetType().Name == "DateControl")
......
2929 2926
            if ((MemberSet.First() as AdornerMember).DrawingData.GetType().Name == "TextControl" || (MemberSet.First() as AdornerMember).DrawingData.GetType().Name == "ArrowTextControl")
2930 2927
            {
2931 2928
                DragThumb.Visibility = Visibility.Collapsed;
2932
            }   
2929
            }
2933 2930
        }
2934 2931

  
2935 2932
        //private void testText_Loaded(object sender, RoutedEventArgs e)
KCOM/Controls/PageNavigator.xaml.cs
23 23
    /// </summary>
24 24
    public partial class PageNavigator : UserControl, INotifyPropertyChanged
25 25
    {
26
        public List<FAVORITE_DOC> _FavoriteSet { get; set; }
26 27
        public event PropertyChangedEventHandler PropertyChanged;
27 28
        public PageNavigator()
28 29
        {
KCOM/Controls/Sample.xaml
447 447
                    <Border BorderThickness="0,0,0,1" BorderBrush="#e6e6e6" Background="#f5f5f5">
448 448
                        <StackPanel>
449 449
                            <RadioButton Content="All Pages" IsChecked="True" telerik:StyleManager.Theme="Office2013" FontSize="10" Margin="5,3" x:Name="rdoAllPages"/>
450
                            <RadioButton Content="Favorited Pages"  FontSize="10" Margin="5,3" x:Name="rdoFavoritePages"/>
450
                            <RadioButton Content="Favorited Pages"  FontSize="10" Margin="5,3" x:Name="rdoFavoritePages" Checked="rdoFavoritePages_Checked"/>
451 451
                            <Grid Margin="4.5,0">
452 452
                                <telerik:RadExpander Name="expCommentPages"
453 453
                                                 Padding="2" 
KCOM/Controls/Sample.xaml.cs
18 18
    /// </summary>
19 19
    public partial class Sample : UserControl, INotifyPropertyChanged
20 20
    {
21
        public List<FAVORITE_DOC> _FavoriteSet { get; set; }
21 22
        public event PropertyChangedEventHandler PropertyChanged;
22 23
        public Sample()
23 24
        {
......
95 96

  
96 97
        void rdoFavoritePages_Checked(object sender, RoutedEventArgs e)
97 98
        {
98
            //if (rdoFavoritePages.IsChecked == true)
99
            //    expCommentPages.IsExpanded = false;
100

  
101
            //if (_FavoriteSet.Count > 0)
102
            //{
103
            //    SetCommentPages_Favorite(); //수정    
104
            //}
105
            //else
106
            //{
107
            //    rdoAllPages.IsChecked = true;
108
            //    rdoFavoritePages.IsChecked = false;
109
            //}
99
            if (rdoFavoritePages.IsChecked == true)
100
                expCommentPages.IsExpanded = false;
101

  
102
            _FavoriteSet = _FavoriteSet == null ? new List<FAVORITE_DOC>() : _FavoriteSet; 
103
            if (_FavoriteSet.Count > 0)
104
            {
105
                SetCommentPages_Favorite(); //수정    
106
            }
107
            else
108
            {
109
                rdoAllPages.IsChecked = true;
110
                rdoFavoritePages.IsChecked = false;
111
            }
112
        }
113

  
114
        private void SetCommentPages_Favorite()
115
        {
116
            ThumbnailSet();
117
            //_UsersCommentPagesList
118
            //var result = (from A in _UsersCommentPagesList
119
            //              from B in _FavoriteSet
120
            //              where A.PageNumber.Contains(B.PageNo)
121
            //              select A).ToList();
122
            //_UsersCommentPagesList = result;
123

  
124
            SetCommentPages();
... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

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