프로젝트

일반

사용자정보

개정판 90e7968d

ID90e7968da9d5053a78b4cb08170ebddef4a62fad
상위 6c8c6f91
하위 beb36e17, 9322ec12

이지연이(가) 5년 이상 전에 추가함

issue #000: daelim source compare 중

Change-Id: I010a1b75dae4b786e1c2a51a34c923eafd384667

차이점 보기:

KCOM.sln
26 26
EndProject
27 27
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmartUpdate", "SmartUpdate\SmartUpdate.csproj", "{EA12FDC9-575E-471B-A691-3C31D03EA24C}"
28 28
EndProject
29
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AsyncImage", "AsyncImage\AsyncImage.csproj", "{DFCDA2B9-2096-4866-8DDD-1DE27823E74E}"
30
EndProject
29 31
Global
30 32
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
31 33
		Debug|Any CPU = Debug|Any CPU
......
114 116
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|Any CPU.Build.0 = Release|Any CPU
115 117
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x64.ActiveCfg = Release|Any CPU
116 118
		{EA12FDC9-575E-471B-A691-3C31D03EA24C}.Release|x64.Build.0 = Release|Any CPU
119
		{DFCDA2B9-2096-4866-8DDD-1DE27823E74E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
120
		{DFCDA2B9-2096-4866-8DDD-1DE27823E74E}.Debug|Any CPU.Build.0 = Debug|Any CPU
121
		{DFCDA2B9-2096-4866-8DDD-1DE27823E74E}.Debug|x64.ActiveCfg = Debug|Any CPU
122
		{DFCDA2B9-2096-4866-8DDD-1DE27823E74E}.Debug|x64.Build.0 = Debug|Any CPU
123
		{DFCDA2B9-2096-4866-8DDD-1DE27823E74E}.Release|Any CPU.ActiveCfg = Release|Any CPU
124
		{DFCDA2B9-2096-4866-8DDD-1DE27823E74E}.Release|Any CPU.Build.0 = Release|Any CPU
125
		{DFCDA2B9-2096-4866-8DDD-1DE27823E74E}.Release|x64.ActiveCfg = Release|Any CPU
126
		{DFCDA2B9-2096-4866-8DDD-1DE27823E74E}.Release|x64.Build.0 = Release|Any CPU
117 127
	EndGlobalSection
118 128
	GlobalSection(SolutionProperties) = preSolution
119 129
		HideSolutionNode = FALSE
KCOM/Common/Converter/SvgConverter.cs
9 9
{
10 10
    class SvgConverter
11 11
    {
12
        public DOCUMENT_ITEM _DocItem;
12
        //public DOCUMENT_ITEM _DocItem;
13 13

  
14 14
        public void SvgConvert(string fileurl, string guid, string DOCUMENT_NO)
15 15
        {
KCOM/Connected Services/ServiceDeepView/Reference.cs
601 601
        
602 602
        KCOMDataModel.DataModel.DOCUMENT_ITEM EndGetDocumentItemInfo(System.IAsyncResult result);
603 603
        
604
        [System.ServiceModel.OperationContractAttribute(Action="urn:ServiceDeepView/GetMarkupInfoItemsColorChange", ReplyAction="urn:ServiceDeepView/GetMarkupInfoItemsColorChangeResponse")]
605
        System.Collections.Generic.List<IKCOM.MarkupInfoItem> GetMarkupInfoItemsColorChange(string ProjectNo, string DocInfoId, string Value, string USER_ID);
606
        
607
        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="urn:ServiceDeepView/GetMarkupInfoItemsColorChange", ReplyAction="urn:ServiceDeepView/GetMarkupInfoItemsColorChangeResponse")]
608
        System.IAsyncResult BeginGetMarkupInfoItemsColorChange(string ProjectNo, string DocInfoId, string Value, string USER_ID, System.AsyncCallback callback, object asyncState);
609
        
610
        System.Collections.Generic.List<IKCOM.MarkupInfoItem> EndGetMarkupInfoItemsColorChange(System.IAsyncResult result);
611
        
612 604
        [System.ServiceModel.OperationContractAttribute(Action="urn:ServiceDeepView/GetMarkupInfoItems", ReplyAction="urn:ServiceDeepView/GetMarkupInfoItemsResponse")]
613 605
        System.Collections.Generic.List<IKCOM.MarkupInfoItem> GetMarkupInfoItems(string ProjectNo, string DocInfoId);
614 606
        
......
1220 1212
    
1221 1213
    [System.Diagnostics.DebuggerStepThroughAttribute()]
1222 1214
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
1223
    public partial class GetMarkupInfoItemsColorChangeCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
1224
        
1225
        private object[] results;
1226
        
1227
        public GetMarkupInfoItemsColorChangeCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
1228
                base(exception, cancelled, userState) {
1229
            this.results = results;
1230
        }
1231
        
1232
        public System.Collections.Generic.List<IKCOM.MarkupInfoItem> Result {
1233
            get {
1234
                base.RaiseExceptionIfNecessary();
1235
                return ((System.Collections.Generic.List<IKCOM.MarkupInfoItem>)(this.results[0]));
1236
            }
1237
        }
1238
    }
1239
    
1240
    [System.Diagnostics.DebuggerStepThroughAttribute()]
1241
    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
1242 1215
    public partial class GetMarkupInfoItemsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
1243 1216
        
1244 1217
        private object[] results;
......
2206 2179
        
2207 2180
        private System.Threading.SendOrPostCallback onGetDocumentItemInfoCompletedDelegate;
2208 2181
        
2209
        private BeginOperationDelegate onBeginGetMarkupInfoItemsColorChangeDelegate;
2210
        
2211
        private EndOperationDelegate onEndGetMarkupInfoItemsColorChangeDelegate;
2212
        
2213
        private System.Threading.SendOrPostCallback onGetMarkupInfoItemsColorChangeCompletedDelegate;
2214
        
2215 2182
        private BeginOperationDelegate onBeginGetMarkupInfoItemsDelegate;
2216 2183
        
2217 2184
        private EndOperationDelegate onEndGetMarkupInfoItemsDelegate;
......
2537 2504
        
2538 2505
        public event System.EventHandler<GetDocumentItemInfoCompletedEventArgs> GetDocumentItemInfoCompleted;
2539 2506
        
2540
        public event System.EventHandler<GetMarkupInfoItemsColorChangeCompletedEventArgs> GetMarkupInfoItemsColorChangeCompleted;
2541
        
2542 2507
        public event System.EventHandler<GetMarkupInfoItemsCompletedEventArgs> GetMarkupInfoItemsCompleted;
2543 2508
        
2544 2509
        public event System.EventHandler<GetSyncMarkupInfoItemsCompletedEventArgs> GetSyncMarkupInfoItemsCompleted;
......
3271 3236
                        param}, this.onEndGetDocumentItemInfoDelegate, this.onGetDocumentItemInfoCompletedDelegate, userState);
3272 3237
        }
3273 3238
        
3274
        public System.Collections.Generic.List<IKCOM.MarkupInfoItem> GetMarkupInfoItemsColorChange(string ProjectNo, string DocInfoId, string Value, string USER_ID) {
3275
            return base.Channel.GetMarkupInfoItemsColorChange(ProjectNo, DocInfoId, Value, USER_ID);
3276
        }
3277
        
3278
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
3279
        public System.IAsyncResult BeginGetMarkupInfoItemsColorChange(string ProjectNo, string DocInfoId, string Value, string USER_ID, System.AsyncCallback callback, object asyncState) {
3280
            return base.Channel.BeginGetMarkupInfoItemsColorChange(ProjectNo, DocInfoId, Value, USER_ID, callback, asyncState);
3281
        }
3282
        
3283
        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
3284
        public System.Collections.Generic.List<IKCOM.MarkupInfoItem> EndGetMarkupInfoItemsColorChange(System.IAsyncResult result) {
3285
            return base.Channel.EndGetMarkupInfoItemsColorChange(result);
3286
        }
3287
        
3288
        private System.IAsyncResult OnBeginGetMarkupInfoItemsColorChange(object[] inValues, System.AsyncCallback callback, object asyncState) {
3289
            string ProjectNo = ((string)(inValues[0]));
3290
            string DocInfoId = ((string)(inValues[1]));
3291
            string Value = ((string)(inValues[2]));
3292
            string USER_ID = ((string)(inValues[3]));
3293
            return this.BeginGetMarkupInfoItemsColorChange(ProjectNo, DocInfoId, Value, USER_ID, callback, asyncState);
3294
        }
3295
        
3296
        private object[] OnEndGetMarkupInfoItemsColorChange(System.IAsyncResult result) {
3297
            System.Collections.Generic.List<IKCOM.MarkupInfoItem> retVal = this.EndGetMarkupInfoItemsColorChange(result);
3298
            return new object[] {
3299
                    retVal};
3300
        }
3301
        
3302
        private void OnGetMarkupInfoItemsColorChangeCompleted(object state) {
3303
            if ((this.GetMarkupInfoItemsColorChangeCompleted != null)) {
3304
                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
3305
                this.GetMarkupInfoItemsColorChangeCompleted(this, new GetMarkupInfoItemsColorChangeCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
3306
            }
3307
        }
3308
        
3309
        public void GetMarkupInfoItemsColorChangeAsync(string ProjectNo, string DocInfoId, string Value, string USER_ID) {
3310
            this.GetMarkupInfoItemsColorChangeAsync(ProjectNo, DocInfoId, Value, USER_ID, null);
3311
        }
3312
        
3313
        public void GetMarkupInfoItemsColorChangeAsync(string ProjectNo, string DocInfoId, string Value, string USER_ID, object userState) {
3314
            if ((this.onBeginGetMarkupInfoItemsColorChangeDelegate == null)) {
3315
                this.onBeginGetMarkupInfoItemsColorChangeDelegate = new BeginOperationDelegate(this.OnBeginGetMarkupInfoItemsColorChange);
3316
            }
3317
            if ((this.onEndGetMarkupInfoItemsColorChangeDelegate == null)) {
3318
                this.onEndGetMarkupInfoItemsColorChangeDelegate = new EndOperationDelegate(this.OnEndGetMarkupInfoItemsColorChange);
3319
            }
3320
            if ((this.onGetMarkupInfoItemsColorChangeCompletedDelegate == null)) {
3321
                this.onGetMarkupInfoItemsColorChangeCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnGetMarkupInfoItemsColorChangeCompleted);
3322
            }
3323
            base.InvokeAsync(this.onBeginGetMarkupInfoItemsColorChangeDelegate, new object[] {
3324
                        ProjectNo,
3325
                        DocInfoId,
3326
                        Value,
3327
                        USER_ID}, this.onEndGetMarkupInfoItemsColorChangeDelegate, this.onGetMarkupInfoItemsColorChangeCompletedDelegate, userState);
3328
        }
3329
        
3330 3239
        public System.Collections.Generic.List<IKCOM.MarkupInfoItem> GetMarkupInfoItems(string ProjectNo, string DocInfoId) {
3331 3240
            return base.Channel.GetMarkupInfoItems(ProjectNo, DocInfoId);
3332 3241
        }
KCOM/Connected Services/ServiceDeepView/ServiceDeepView.wsdl
85 85
  <wsdl:message name="ServiceDeepView_GetDocumentItemInfo_OutputMessage">
86 86
    <wsdl:part name="parameters" element="GetDocumentItemInfoResponse" />
87 87
  </wsdl:message>
88
  <wsdl:message name="ServiceDeepView_GetMarkupInfoItemsColorChange_InputMessage">
89
    <wsdl:part name="parameters" element="GetMarkupInfoItemsColorChange" />
90
  </wsdl:message>
91
  <wsdl:message name="ServiceDeepView_GetMarkupInfoItemsColorChange_OutputMessage">
92
    <wsdl:part name="parameters" element="GetMarkupInfoItemsColorChangeResponse" />
93
  </wsdl:message>
94 88
  <wsdl:message name="ServiceDeepView_GetMarkupInfoItems_InputMessage">
95 89
    <wsdl:part name="parameters" element="GetMarkupInfoItems" />
96 90
  </wsdl:message>
......
422 416
      <wsdl:input wsaw:Action="urn:ServiceDeepView/GetDocumentItemInfo" message="ServiceDeepView_GetDocumentItemInfo_InputMessage" />
423 417
      <wsdl:output wsaw:Action="urn:ServiceDeepView/GetDocumentItemInfoResponse" message="ServiceDeepView_GetDocumentItemInfo_OutputMessage" />
424 418
    </wsdl:operation>
425
    <wsdl:operation name="GetMarkupInfoItemsColorChange">
426
      <wsdl:input wsaw:Action="urn:ServiceDeepView/GetMarkupInfoItemsColorChange" message="ServiceDeepView_GetMarkupInfoItemsColorChange_InputMessage" />
427
      <wsdl:output wsaw:Action="urn:ServiceDeepView/GetMarkupInfoItemsColorChangeResponse" message="ServiceDeepView_GetMarkupInfoItemsColorChange_OutputMessage" />
428
    </wsdl:operation>
429 419
    <wsdl:operation name="GetMarkupInfoItems">
430 420
      <wsdl:input wsaw:Action="urn:ServiceDeepView/GetMarkupInfoItems" message="ServiceDeepView_GetMarkupInfoItems_InputMessage" />
431 421
      <wsdl:output wsaw:Action="urn:ServiceDeepView/GetMarkupInfoItemsResponse" message="ServiceDeepView_GetMarkupInfoItems_OutputMessage" />
KCOM/Connected Services/ServiceDeepView/ServiceDeepView1.wsdl
112 112
        <soap:body use="literal" />
113 113
      </wsdl:output>
114 114
    </wsdl:operation>
115
    <wsdl:operation name="GetMarkupInfoItemsColorChange">
116
      <soap:operation soapAction="urn:ServiceDeepView/GetMarkupInfoItemsColorChange" style="document" />
117
      <wsdl:input>
118
        <soap:body use="literal" />
119
      </wsdl:input>
120
      <wsdl:output>
121
        <soap:body use="literal" />
122
      </wsdl:output>
123
    </wsdl:operation>
124 115
    <wsdl:operation name="GetMarkupInfoItems">
125 116
      <soap:operation soapAction="urn:ServiceDeepView/GetMarkupInfoItems" style="document" />
126 117
      <wsdl:input>
KCOM/Connected Services/ServiceDeepView/ServiceDeepView6.xsd
191 191
      </xs:sequence>
192 192
    </xs:complexType>
193 193
  </xs:element>
194
  <xs:element name="GetMarkupInfoItemsColorChange">
195
    <xs:complexType>
196
      <xs:sequence>
197
        <xs:element minOccurs="0" name="ProjectNo" nillable="true" type="xs:string" />
198
        <xs:element minOccurs="0" name="DocInfoId" nillable="true" type="xs:string" />
199
        <xs:element minOccurs="0" name="Value" nillable="true" type="xs:string" />
200
        <xs:element minOccurs="0" name="USER_ID" nillable="true" type="xs:string" />
201
      </xs:sequence>
202
    </xs:complexType>
203
  </xs:element>
204
  <xs:element name="GetMarkupInfoItemsColorChangeResponse">
205
    <xs:complexType>
206
      <xs:sequence>
207
        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="GetMarkupInfoItemsColorChangeResult" nillable="true" type="q12:ArrayOfMarkupInfoItem" />
208
      </xs:sequence>
209
    </xs:complexType>
210
  </xs:element>
211 194
  <xs:element name="GetMarkupInfoItems">
212 195
    <xs:complexType>
213 196
      <xs:sequence>
......
219 202
  <xs:element name="GetMarkupInfoItemsResponse">
220 203
    <xs:complexType>
221 204
      <xs:sequence>
222
        <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="GetMarkupInfoItemsResult" nillable="true" type="q13:ArrayOfMarkupInfoItem" />
205
        <xs:element xmlns:q12="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="GetMarkupInfoItemsResult" nillable="true" type="q12:ArrayOfMarkupInfoItem" />
223 206
      </xs:sequence>
224 207
    </xs:complexType>
225 208
  </xs:element>
......
235 218
  <xs:element name="GetSyncMarkupInfoItemsResponse">
236 219
    <xs:complexType>
237 220
      <xs:sequence>
238
        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="GetSyncMarkupInfoItemsResult" nillable="true" type="q14:ArrayOfMarkupInfoItem" />
221
        <xs:element xmlns:q13="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="GetSyncMarkupInfoItemsResult" nillable="true" type="q13:ArrayOfMarkupInfoItem" />
239 222
      </xs:sequence>
240 223
    </xs:complexType>
241 224
  </xs:element>
......
250 233
  <xs:element name="GetUserDataResponse">
251 234
    <xs:complexType>
252 235
      <xs:sequence>
253
        <xs:element xmlns:q15="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetUserDataResult" nillable="true" type="q15:ArrayOfMEMBER" />
236
        <xs:element xmlns:q14="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetUserDataResult" nillable="true" type="q14:ArrayOfMEMBER" />
254 237
      </xs:sequence>
255 238
    </xs:complexType>
256 239
  </xs:element>
......
264 247
  <xs:element name="GetDeptDataResponse">
265 248
    <xs:complexType>
266 249
      <xs:sequence>
267
        <xs:element xmlns:q16="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="GetDeptDataResult" nillable="true" type="q16:ArrayOfstring" />
250
        <xs:element xmlns:q15="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="GetDeptDataResult" nillable="true" type="q15:ArrayOfstring" />
268 251
      </xs:sequence>
269 252
    </xs:complexType>
270 253
  </xs:element>
......
294 277
        <xs:element minOccurs="0" name="SavePageNo" type="xs:int" />
295 278
        <xs:element minOccurs="0" name="documentItemID" nillable="true" type="xs:string" />
296 279
        <xs:element minOccurs="0" name="VPDescription" nillable="true" type="xs:string" />
297
        <xs:element xmlns:q17="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="flag" type="q17:FAVORITE_FLAG" />
280
        <xs:element xmlns:q16="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="flag" type="q16:FAVORITE_FLAG" />
298 281
      </xs:sequence>
299 282
    </xs:complexType>
300 283
  </xs:element>
......
308 291
  <xs:element name="SaveMarkupData">
309 292
    <xs:complexType>
310 293
      <xs:sequence>
311
        <xs:element xmlns:q18="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="UserState" nillable="true" type="q18:MarkupInfoItem" />
294
        <xs:element xmlns:q17="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="UserState" nillable="true" type="q17:MarkupInfoItem" />
312 295
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
313 296
        <xs:element minOccurs="0" name="doc_id" nillable="true" type="xs:string" />
314 297
        <xs:element minOccurs="0" name="user_id" nillable="true" type="xs:string" />
315
        <xs:element xmlns:q19="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="mlmarkup_data" nillable="true" type="q19:ArrayOfMARKUP_DATA" />
298
        <xs:element xmlns:q18="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="mlmarkup_data" nillable="true" type="q18:ArrayOfMARKUP_DATA" />
316 299
      </xs:sequence>
317 300
    </xs:complexType>
318 301
  </xs:element>
......
326 309
  <xs:element name="AddMarkupDataGroup">
327 310
    <xs:complexType>
328 311
      <xs:sequence>
329
        <xs:element xmlns:q20="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="mARKUP_DATA_GROUP" nillable="true" type="q20:MARKUP_DATA_GROUP" />
312
        <xs:element xmlns:q19="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="mARKUP_DATA_GROUP" nillable="true" type="q19:MARKUP_DATA_GROUP" />
330 313
        <xs:element minOccurs="0" name="ProjectNo" nillable="true" type="xs:string" />
331 314
      </xs:sequence>
332 315
    </xs:complexType>
......
372 355
  <xs:element name="SaveSymbol">
373 356
    <xs:complexType>
374 357
      <xs:sequence>
375
        <xs:element xmlns:q21="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="symbol_private" nillable="true" type="q21:SYMBOL_PRIVATE" />
358
        <xs:element xmlns:q20="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="symbol_private" nillable="true" type="q20:SYMBOL_PRIVATE" />
376 359
      </xs:sequence>
377 360
    </xs:complexType>
378 361
  </xs:element>
......
386 369
  <xs:element name="AddPublicSymbol">
387 370
    <xs:complexType>
388 371
      <xs:sequence>
389
        <xs:element xmlns:q22="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="symbol" nillable="true" type="q22:SYMBOL_PUBLIC" />
372
        <xs:element xmlns:q21="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="symbol" nillable="true" type="q21:SYMBOL_PUBLIC" />
390 373
      </xs:sequence>
391 374
    </xs:complexType>
392 375
  </xs:element>
......
432 415
    <xs:complexType>
433 416
      <xs:sequence>
434 417
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
435
        <xs:element xmlns:q23="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="Check_History" nillable="true" type="q23:CHECK_LIST_HISTORY" />
418
        <xs:element xmlns:q22="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="Check_History" nillable="true" type="q22:CHECK_LIST_HISTORY" />
436 419
      </xs:sequence>
437 420
    </xs:complexType>
438 421
  </xs:element>
......
448 431
      <xs:sequence>
449 432
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
450 433
        <xs:element minOccurs="0" name="rev" nillable="true" type="xs:string" />
451
        <xs:element xmlns:q24="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="Check_History" nillable="true" type="q24:CHECK_LIST_HISTORY" />
434
        <xs:element xmlns:q23="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="Check_History" nillable="true" type="q23:CHECK_LIST_HISTORY" />
452 435
      </xs:sequence>
453 436
    </xs:complexType>
454 437
  </xs:element>
......
464 447
      <xs:sequence>
465 448
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
466 449
        <xs:element minOccurs="0" name="_id" nillable="true" type="xs:string" />
467
        <xs:element xmlns:q25="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="Check_value" nillable="true" type="q25:CHECK_LIST" />
450
        <xs:element xmlns:q24="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="Check_value" nillable="true" type="q24:CHECK_LIST" />
468 451
      </xs:sequence>
469 452
    </xs:complexType>
470 453
  </xs:element>
......
479 462
    <xs:complexType>
480 463
      <xs:sequence>
481 464
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
482
        <xs:element xmlns:q26="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="Check_value" nillable="true" type="q26:CHECK_LIST" />
465
        <xs:element xmlns:q25="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="Check_value" nillable="true" type="q25:CHECK_LIST" />
483 466
      </xs:sequence>
484 467
    </xs:complexType>
485 468
  </xs:element>
......
501 484
  <xs:element name="GetCheckListResponse">
502 485
    <xs:complexType>
503 486
      <xs:sequence>
504
        <xs:element xmlns:q27="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetCheckListResult" nillable="true" type="q27:CHECK_LIST" />
487
        <xs:element xmlns:q26="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetCheckListResult" nillable="true" type="q26:CHECK_LIST" />
505 488
      </xs:sequence>
506 489
    </xs:complexType>
507 490
  </xs:element>
......
517 500
  <xs:element name="GetUserCheckListResponse">
518 501
    <xs:complexType>
519 502
      <xs:sequence>
520
        <xs:element xmlns:q28="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetUserCheckListResult" nillable="true" type="q28:ArrayOfCHECK_LIST" />
503
        <xs:element xmlns:q27="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetUserCheckListResult" nillable="true" type="q27:ArrayOfCHECK_LIST" />
521 504
      </xs:sequence>
522 505
    </xs:complexType>
523 506
  </xs:element>
......
532 515
  <xs:element name="GetCheckListHistoryResponse">
533 516
    <xs:complexType>
534 517
      <xs:sequence>
535
        <xs:element xmlns:q29="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetCheckListHistoryResult" nillable="true" type="q29:ArrayOfCHECK_LIST_HISTORY" />
518
        <xs:element xmlns:q28="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetCheckListHistoryResult" nillable="true" type="q28:ArrayOfCHECK_LIST_HISTORY" />
536 519
      </xs:sequence>
537 520
    </xs:complexType>
538 521
  </xs:element>
......
548 531
  <xs:element name="GetCheckListHistoryFirstOrDefaultResponse">
549 532
    <xs:complexType>
550 533
      <xs:sequence>
551
        <xs:element xmlns:q30="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetCheckListHistoryFirstOrDefaultResult" nillable="true" type="q30:CHECK_LIST_HISTORY" />
534
        <xs:element xmlns:q29="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetCheckListHistoryFirstOrDefaultResult" nillable="true" type="q29:CHECK_LIST_HISTORY" />
552 535
      </xs:sequence>
553 536
    </xs:complexType>
554 537
  </xs:element>
......
556 539
    <xs:complexType>
557 540
      <xs:sequence>
558 541
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
559
        <xs:element xmlns:q31="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="_mldocpage" nillable="true" type="q31:ArrayOfDOCPAGE" />
542
        <xs:element xmlns:q30="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="_mldocpage" nillable="true" type="q30:ArrayOfDOCPAGE" />
560 543
      </xs:sequence>
561 544
    </xs:complexType>
562 545
  </xs:element>
......
578 561
  <xs:element name="GetMarkupInfoResponse">
579 562
    <xs:complexType>
580 563
      <xs:sequence>
581
        <xs:element xmlns:q32="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMarkupInfoResult" nillable="true" type="q32:MARKUP_INFO" />
564
        <xs:element xmlns:q31="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMarkupInfoResult" nillable="true" type="q31:MARKUP_INFO" />
582 565
      </xs:sequence>
583 566
    </xs:complexType>
584 567
  </xs:element>
......
594 577
  <xs:element name="GetMarkupDataListperPageResponse">
595 578
    <xs:complexType>
596 579
      <xs:sequence>
597
        <xs:element xmlns:q33="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="GetMarkupDataListperPageResult" nillable="true" type="q33:ArrayOfstring" />
580
        <xs:element xmlns:q32="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="GetMarkupDataListperPageResult" nillable="true" type="q32:ArrayOfstring" />
598 581
      </xs:sequence>
599 582
    </xs:complexType>
600 583
  </xs:element>
......
602 585
    <xs:complexType>
603 586
      <xs:sequence>
604 587
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
605
        <xs:element xmlns:q34="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q34:MARKUP_INFO" />
588
        <xs:element xmlns:q33="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q33:MARKUP_INFO" />
606 589
      </xs:sequence>
607 590
    </xs:complexType>
608 591
  </xs:element>
......
617 600
    <xs:complexType>
618 601
      <xs:sequence>
619 602
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
620
        <xs:element xmlns:q35="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q35:MARKUP_INFO_VERSION" />
603
        <xs:element xmlns:q34="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q34:MARKUP_INFO_VERSION" />
621 604
      </xs:sequence>
622 605
    </xs:complexType>
623 606
  </xs:element>
......
632 615
    <xs:complexType>
633 616
      <xs:sequence>
634 617
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
635
        <xs:element xmlns:q36="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q36:MARKUP_DATA" />
618
        <xs:element xmlns:q35="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q35:MARKUP_DATA" />
636 619
      </xs:sequence>
637 620
    </xs:complexType>
638 621
  </xs:element>
......
663 646
      <xs:sequence>
664 647
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
665 648
        <xs:element minOccurs="0" name="_id" nillable="true" type="xs:string" />
666
        <xs:element xmlns:q37="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q37:MARKUP_INFO" />
649
        <xs:element xmlns:q36="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q36:MARKUP_INFO" />
667 650
      </xs:sequence>
668 651
    </xs:complexType>
669 652
  </xs:element>
......
685 668
  <xs:element name="GetMarkupDataListResponse">
686 669
    <xs:complexType>
687 670
      <xs:sequence>
688
        <xs:element xmlns:q38="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMarkupDataListResult" nillable="true" type="q38:ArrayOfMARKUP_DATA" />
671
        <xs:element xmlns:q37="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMarkupDataListResult" nillable="true" type="q37:ArrayOfMARKUP_DATA" />
689 672
      </xs:sequence>
690 673
    </xs:complexType>
691 674
  </xs:element>
......
695 678
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
696 679
        <xs:element minOccurs="0" name="_user_id" nillable="true" type="xs:string" />
697 680
        <xs:element minOccurs="0" name="_doc_id" nillable="true" type="xs:string" />
698
        <xs:element xmlns:q39="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q39:ArrayOfMarkupInfoItem" />
681
        <xs:element xmlns:q38="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q38:ArrayOfMarkupInfoItem" />
699 682
      </xs:sequence>
700 683
    </xs:complexType>
701 684
  </xs:element>
......
712 695
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
713 696
        <xs:element minOccurs="0" name="_user_id" nillable="true" type="xs:string" />
714 697
        <xs:element minOccurs="0" name="_doc_id" nillable="true" type="xs:string" />
715
        <xs:element xmlns:q40="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q40:ArrayOfMarkupInfoItem" />
698
        <xs:element xmlns:q39="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q39:ArrayOfMarkupInfoItem" />
716 699
        <xs:element minOccurs="0" name="ProjectNo" nillable="true" type="xs:string" />
717 700
        <xs:element minOccurs="0" name="DocInfoID" nillable="true" type="xs:string" />
718 701
        <xs:element minOccurs="0" name="CreateUserID" nillable="true" type="xs:string" />
......
722 705
  <xs:element name="ConsolidateMergedPDFResponse">
723 706
    <xs:complexType>
724 707
      <xs:sequence>
725
        <xs:element xmlns:q41="http://schemas.datacontract.org/2004/07/IFinalPDF" minOccurs="0" name="ConsolidateMergedPDFResult" type="q41:FinalPDFResult" />
708
        <xs:element xmlns:q40="http://schemas.datacontract.org/2004/07/IFinalPDF" minOccurs="0" name="ConsolidateMergedPDFResult" type="q40:FinalPDFResult" />
726 709
      </xs:sequence>
727 710
    </xs:complexType>
728 711
  </xs:element>
......
732 715
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
733 716
        <xs:element minOccurs="0" name="_user_id" nillable="true" type="xs:string" />
734 717
        <xs:element minOccurs="0" name="_doc_id" nillable="true" type="xs:string" />
735
        <xs:element xmlns:q42="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q42:ArrayOfMarkupInfoItem" />
718
        <xs:element xmlns:q41="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="markupInfoItems" nillable="true" type="q41:ArrayOfMarkupInfoItem" />
736 719
      </xs:sequence>
737 720
    </xs:complexType>
738 721
  </xs:element>
......
754 737
  <xs:element name="GetMemberResponse">
755 738
    <xs:complexType>
756 739
      <xs:sequence>
757
        <xs:element xmlns:q43="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMemberResult" nillable="true" type="q43:MEMBER" />
740
        <xs:element xmlns:q42="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMemberResult" nillable="true" type="q42:MEMBER" />
758 741
      </xs:sequence>
759 742
    </xs:complexType>
760 743
  </xs:element>
......
768 751
  <xs:element name="GetSymbolListResponse">
769 752
    <xs:complexType>
770 753
      <xs:sequence>
771
        <xs:element xmlns:q44="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetSymbolListResult" nillable="true" type="q44:ArrayOfSYMBOL_PRIVATE" />
754
        <xs:element xmlns:q43="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetSymbolListResult" nillable="true" type="q43:ArrayOfSYMBOL_PRIVATE" />
772 755
      </xs:sequence>
773 756
    </xs:complexType>
774 757
  </xs:element>
......
780 763
  <xs:element name="GetPublicSymbolDeptListResponse">
781 764
    <xs:complexType>
782 765
      <xs:sequence>
783
        <xs:element xmlns:q45="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="GetPublicSymbolDeptListResult" nillable="true" type="q45:ArrayOfstring" />
766
        <xs:element xmlns:q44="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="GetPublicSymbolDeptListResult" nillable="true" type="q44:ArrayOfstring" />
784 767
      </xs:sequence>
785 768
    </xs:complexType>
786 769
  </xs:element>
......
794 777
  <xs:element name="GetPublicSymbolListResponse">
795 778
    <xs:complexType>
796 779
      <xs:sequence>
797
        <xs:element xmlns:q46="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetPublicSymbolListResult" nillable="true" type="q46:ArrayOfSYMBOL_PUBLIC" />
780
        <xs:element xmlns:q45="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetPublicSymbolListResult" nillable="true" type="q45:ArrayOfSYMBOL_PUBLIC" />
798 781
      </xs:sequence>
799 782
    </xs:complexType>
800 783
  </xs:element>
......
869 852
  <xs:element name="GetPreRevSelectResponse">
870 853
    <xs:complexType>
871 854
      <xs:sequence>
872
        <xs:element xmlns:q47="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetPreRevSelectResult" nillable="true" type="q47:ArrayOfDOCUMENT_ITEM" />
855
        <xs:element xmlns:q46="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetPreRevSelectResult" nillable="true" type="q46:ArrayOfDOCUMENT_ITEM" />
873 856
      </xs:sequence>
874 857
    </xs:complexType>
875 858
  </xs:element>
......
884 867
  <xs:element name="GetDocInfoOneSelectResponse">
885 868
    <xs:complexType>
886 869
      <xs:sequence>
887
        <xs:element xmlns:q48="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetDocInfoOneSelectResult" nillable="true" type="q48:DOCINFO" />
870
        <xs:element xmlns:q47="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetDocInfoOneSelectResult" nillable="true" type="q47:DOCINFO" />
888 871
      </xs:sequence>
889 872
    </xs:complexType>
890 873
  </xs:element>
......
893 876
      <xs:sequence>
894 877
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
895 878
        <xs:element minOccurs="0" name="doc_id" nillable="true" type="xs:string" />
896
        <xs:element xmlns:q49="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="_markupInfoList" nillable="true" type="q49:ArrayOfMarkupInfoItem" />
879
        <xs:element xmlns:q48="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="_markupInfoList" nillable="true" type="q48:ArrayOfMarkupInfoItem" />
897 880
      </xs:sequence>
898 881
    </xs:complexType>
899 882
  </xs:element>
900 883
  <xs:element name="GetPrintDocItemListResponse">
901 884
    <xs:complexType>
902 885
      <xs:sequence>
903
        <xs:element xmlns:q50="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="GetPrintDocItemListResult" nillable="true" type="q50:ArrayOfMarkupInfoItem" />
886
        <xs:element xmlns:q49="http://schemas.datacontract.org/2004/07/IKCOM" minOccurs="0" name="GetPrintDocItemListResult" nillable="true" type="q49:ArrayOfMarkupInfoItem" />
904 887
      </xs:sequence>
905 888
    </xs:complexType>
906 889
  </xs:element>
......
908 891
    <xs:complexType>
909 892
      <xs:sequence>
910 893
        <xs:element minOccurs="0" name="project_no" nillable="true" type="xs:string" />
911
        <xs:element xmlns:q51="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q51:TALK" />
894
        <xs:element xmlns:q50="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="value" nillable="true" type="q50:TALK" />
912 895
      </xs:sequence>
913 896
    </xs:complexType>
914 897
  </xs:element>
......
930 913
  <xs:element name="GetMessageResponse">
931 914
    <xs:complexType>
932 915
      <xs:sequence>
933
        <xs:element xmlns:q52="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMessageResult" nillable="true" type="q52:ArrayOfTALK" />
916
        <xs:element xmlns:q51="http://schemas.datacontract.org/2004/07/KCOMDataModel.DataModel" minOccurs="0" name="GetMessageResult" nillable="true" type="q51:ArrayOfTALK" />
934 917
      </xs:sequence>
935 918
    </xs:complexType>
936 919
  </xs:element>
KCOM/Controls/CheckList.xaml.cs
68 68
        public string STATUS_DESC { get; set; }
69 69
        public string REPLY { get; set; }
70 70
        public DateTime CREATE_TIME { get; set; }
71
    }
71
    } 
72 72
    #endregion
73 73

  
74 74
    /// <summary>
......
98 98
            this.Loaded += CheckList_Loaded;
99 99
            this.KeyDown += new KeyEventHandler(KeyEventDownAction);
100 100
            this.AddHandler(Image.MouseLeftButtonDownEvent, new MouseButtonEventHandler(mousedownOnImage), true);
101

  
101
            
102 102
        }
103 103
        #endregion
104 104

  
......
249 249
                    ViewerDataModel.Instance.SystemMain.dzMainMenu.BalanceMode.IsChecked = false;
250 250
                }
251 251
            }
252
            catch (Exception ex)
252
            catch(Exception ex)
253 253
            {
254 254
                Logger.sendResLog("SyncInit", ex.Message, 0);
255 255
            }
256

  
256
            
257 257
        }
258 258

  
259 259
        private void DialogMessage_Alert(string Msg)
......
621 621
                Logger.sendResLog("Resize", ex.Message, 0);
622 622
                return null;
623 623
            }
624
            
624 625

  
625

  
626

  
626
            
627 627
        }
628 628

  
629 629
        private static void ReleaseExcelObject(object obj)
......
662 662
            this.tb.ItemsSource = Lists;
663 663
            History_Set();
664 664
        }
665

  
665
        
666 666
        private void RadGridView_Loaded(object sender, RoutedEventArgs e)
667 667
        {
668 668
            DataBind();
......
683 683
                Common.ViewerDataModel.Instance.Capture_Opacity = 0.5;
684 684
                (Application.Current.MainWindow as MainWindow).dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Capture;
685 685
            }
686
            catch (Exception ex)
686
            catch(Exception ex)
687 687
            {
688 688
                Logger.sendResLog("Checklist Addevent", ex.Message, 0);
689 689
            }
690

  
690
            
691 691
        }
692 692

  
693 693
        private void SaveEvent(object sender, RoutedEventArgs e)
......
845 845
            {
846 846
                Logger.sendResLog("Checklist SaveEvent", ex.Message, 0);
847 847
            }
848

  
848
                       
849 849
        }
850 850

  
851 851
        private void CheckListEvent(object sender, RoutedEventArgs e)
......
953 953
                    }
954 954
                }
955 955
            }
956
            catch (Exception ex)
956
            catch(Exception ex)
957 957
            {
958 958
                Logger.sendResLog("tb_IsVisibleChanged", ex.Message, 0);
959 959
            }
960

  
960
            
961 961
        }
962 962

  
963 963
        private void Radio_Open_Checked(object sender, RoutedEventArgs e)
......
986 986
                    }
987 987
                }
988 988
            }
989
            catch (Exception ex)
989
            catch(Exception ex)
990 990
            {
991 991
                Logger.sendResLog("Radio_Open_Checked", ex.Message, 0);
992 992
            }
993

  
993
            
994 994
        }
995 995

  
996 996
        private void Radio_Close_Checked(object sender, RoutedEventArgs e)
......
1035 1035
                    ((((e.OriginalSource as RadioButton).Parent as StackPanel).Parent as GridViewCell).ParentRow.Item as Customer)._STATUS = "Close";
1036 1036
                }
1037 1037
            }
1038
            catch (Exception ex)
1038
            catch(Exception ex)
1039 1039
            {
1040 1040
                Logger.sendResLog("Radio_Close_Checked", ex.Message, 0);
1041 1041
            }
1042

  
1042
            
1043 1043
        }
1044 1044

  
1045 1045
        private void CheckPop_Closed(object sender, WindowClosedEventArgs e)
......
1070 1070
                    }
1071 1071
                }
1072 1072
            }
1073
            catch (Exception ex)
1073
            catch(Exception ex)
1074 1074
            {
1075 1075
                Logger.sendResLog("CheckPop_Closed", ex.Message, 0);
1076 1076
            }
1077

  
1077
            
1078 1078

  
1079 1079
        }
1080 1080

  
......
1085 1085
                (e.Source as RadioButton).Foreground = Brushes.Black;
1086 1086
                (e.Source as RadioButton).FontWeight = FontWeights.Normal;
1087 1087
            }
1088
            catch (Exception ex)
1088
            catch(Exception ex)
1089 1089
            {
1090 1090
                Logger.sendResLog("Radio_Unchecked", ex.Message, 0);
1091 1091
            }
1092

  
1092
            
1093 1093
        }
1094 1094

  
1095 1095
        private void mousedownOnImage(object sender, MouseButtonEventArgs args)
......
1157 1157
                    CheckPop.Show();
1158 1158
                }
1159 1159
            }
1160
            catch (Exception ex)
1160
            catch(Exception ex)
1161 1161
            {
1162 1162
                Logger.sendResLog("mousedownOnImage", ex.Message, 0);
1163 1163
            }
1164

  
1164
            
1165 1165

  
1166 1166
        }
1167 1167

  
......
1201 1201
            {
1202 1202
                Logger.sendResLog("SyncEvent", ex.Message, 0);
1203 1203
            }
1204

  
1204
            
1205 1205
        }
1206 1206

  
1207 1207
        #endregion
KCOM/Controls/Sample.xaml
437 437
        <!--<TextBlock Text="Sort By:"  Foreground="{DynamicResource KCOMColor_MarkerBrush}"/>-->
438 438
        <telerik:RadTabControl BorderThickness="0" telerik:StyleManager.Theme="Office2016"  HeaderBackground="#f5f5f5" FontSize="10" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
439 439
                               ScrollViewer.HorizontalScrollBarVisibility ="Disabled" SelectedIndex="0" >
440
            
440

  
441 441
            <telerik:RadTabItem Header="Thumbnail"  HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="10">
442 442
                <Grid>
443 443
                    <Grid.RowDefinitions>
......
479 479
                                        SelectedIndex="0"
480 480
                                        ScrollViewer.HorizontalScrollBarVisibility="Disabled"
481 481
                                        ScrollViewer.VerticalScrollBarVisibility="Auto"
482
                                        ScrollViewer.CanContentScroll="False"            
482
                                        ScrollViewer.CanContentScroll="False"
483 483
                                        ScrollViewer.IsDeferredScrollingEnabled="False"
484 484
                                        SelectionChanged="ImgListbox_SelectionChanged"
485
                                        telerik:StyleManager.Theme="Office2016" 
486
                                        >
485
                                        telerik:StyleManager.Theme="Office2016" >
487 486
                        <telerik:RadListBox.ItemsPanel>
488 487
                            <ItemsPanelTemplate>
489
                                <VirtualizingStackPanel  />
488
                                <VirtualizingStackPanel/>
490 489
                            </ItemsPanelTemplate>
491 490
                        </telerik:RadListBox.ItemsPanel>
492 491
                        <!--<telerik:RadListBox.ItemTemplate>
......
507 506
                </Grid>
508 507

  
509 508
            </telerik:RadTabItem>
510
            
509

  
511 510
            <telerik:RadTabItem Header="Markup List"  HeaderForeground="{DynamicResource KCOMColor_MarkerBrush}" FontSize="10" >
512 511
                <Grid HorizontalAlignment="Stretch">
513 512
                    <Grid.ColumnDefinitions>
......
542 541
                                                  ClearSelectionButtonVisibility="Visible" ClearSelectionButtonContent="Show All" SelectionChanged="commentPage_SelectionChanged"/>
543 542

  
544 543
                        </Grid>
545
                        
544

  
546 545
                    </Border>
547 546
                    <Border Grid.Row="1" Background="#f5f5f5" >
548 547
                        <StackPanel>
......
553 552
                                        <ColumnDefinition Width="3*"/>
554 553
                                    </Grid.ColumnDefinitions>
555 554
                                    <TextBox  Background="#FFF3F3F3" BorderThickness="0.5" VerticalContentAlignment="Center" x:Name="tbSearch"/>
556
                                    
555

  
557 556
                                    <Border Background="#FF1258B6" CornerRadius="5" Grid.Column="1" Padding="5" Margin="10">
558 557
                                        <Button Background="Transparent" Foreground="White" Content="Search" BorderThickness="0" x:Name="btnSearch" Click="btnSearch_Click"/>
559 558
                                    </Border>
......
615 614
                                                        <TextBlock Text=" Page"/>
616 615
                                                    </StackPanel>
617 616
                                                </StackPanel>
618
                                                
617

  
619 618
                                                <Border Background="#FF1258B6" CornerRadius="5" Grid.Column="2" Padding="5" Margin="10">
620 619
                                                    <telerik:RadButton Background="Transparent" Foreground="White" Content="Move" BorderThickness="0" Click="RadButton_Click" CommandParameter="{Binding}"/>
621 620
                                                </Border>
KCOM/Controls/Sample.xaml.cs
26 26
            //InitializeComponent();            
27 27
            this.Loaded += Sample_Loaded;
28 28
            //_Initialize = true;
29
            
29

  
30 30
            //lstSelectComment.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(lstSelectComment_SelectionChanged);
31 31
            //ImgListbox.MouseDoubleClick += ImgListbox_MouseDoubleClick;
32 32
        }
......
41 41

  
42 42
            _Initialize = true;
43 43
            lstSelectComment.SelectionChanged += new System.Windows.Controls.SelectionChangedEventHandler(lstSelectComment_SelectionChanged);
44
            
44

  
45 45
        }
46 46

  
47 47
        //private void ImgListbox_MouseDoubleClick(object sender, MouseButtonEventArgs e)
......
117 117
            if (rdoFavoritePages.IsChecked == true)
118 118
                expCommentPages.IsExpanded = false;
119 119

  
120
            _FavoriteSet = _FavoriteSet == null ? new List<FAVORITE_DOC>() : _FavoriteSet; 
120
            _FavoriteSet = _FavoriteSet == null ? new List<FAVORITE_DOC>() : _FavoriteSet;
121 121
            if (_FavoriteSet.Count > 0)
122 122
            {
123 123
                SetCommentPages_Favorite(); //수정    
......
131 131

  
132 132
        private void SetCommentPages_Favorite()
133 133
        {
134
            ThumbnailSet();
135
            //_UsersCommentPagesList
136
            //var result = (from A in _UsersCommentPagesList
137
            //              from B in _FavoriteSet
138
            //              where A.PageNumber.Contains(B.PageNo)
139
            //              select A).ToList();
140
            //_UsersCommentPagesList = result;
141

  
134
            ThumbnailSet();            
142 135
            SetCommentPages();
143

  
144 136
        }
145 137

  
146 138
        void expCommentPages_PreviewCollapsed(object sender, Telerik.Windows.RadRoutedEventArgs e)
......
189 181
        /// <param name="_pageNumber"></param>
190 182
        public void GotoPage(int _pageNumber)
191 183
        {
192
            int _PageNo = -1;
193
            if (int.TryParse(_pageNumber.ToString(), out _PageNo))
184
            try
194 185
            {
195
                var _page = _thumbnailItems.Where(item => item.PageNumber == _PageNo);
196
                if (_page.Count() > 0)
186
                int _PageNo = -1;
187
                if (int.TryParse(_pageNumber.ToString(), out _PageNo))
197 188
                {
198
                    ThumbnailItem _item = _page.First();
199
                    setPageChange(_item);
200
                    this.ImgListbox.SelectedIndex = _pageNumber - 1;
201
                    this.ImgListbox.ScrollIntoView(_pageNumber - 1);
189
                    var _page = _thumbnailItems.Where(item => item.PageNumber == _PageNo);
190
                    if (_page.Count() > 0)
191
                    {
192
                        ThumbnailItem _item = _page.First();
193
                        setPageChange(_item);
194
                        this.ImgListbox.SelectedIndex = _pageNumber - 1;
195
                        this.ImgListbox.ScrollIntoView(_pageNumber - 1);
196
                    }
202 197
                }
203 198
            }
204
        }      
199
            catch(Exception ex)
200
            {
201
                Logger.sendResLog("GotoPage", ex.Message, 0);
202
            }
203
            
204
        }
205 205

  
206 206
        public void setPageChange(ThumbnailItem thumbnailItem)
207 207
        {
......
250 250
            if (thumbnailItem != null)
251 251
            {
252 252
                if (PageChanging != null)
253
                {   
254
                    this.CurrentPage = _NextPage;
253
                {
254
                   this.CurrentPage = _NextPage;
255 255
                    _NextPage = thumbnailItem;
256 256
                    PageChanging(this, new PageChangeEventArgs
257 257
                    {
......
266 266

  
267 267
                    if (rotationNum > 0) // 1, 2, 3
268 268
                    {
269
                        for(int i = 0; i < rotationNum; i++)
269
                        for (int i = 0; i < rotationNum; i++)
270 270
                        {
271 271
                            drawingPannelRotate(true);
272 272
                        }
273 273
                    }
274
                    else if(rotationNum < 0)// -1, -2, -3
274
                    else if (rotationNum < 0)// -1, -2, -3
275 275
                    {
276 276
                        for (int i = 0; i < -rotationNum; i++)
277 277
                        {
278 278
                            drawingPannelRotate(false);
279 279
                        }
280
                    }                    
280
                    }
281 281
                }
282 282
            }
283 283
        }
284
     
284

  
285 285
        public void drawingPannelRotate(bool Flag)
286 286
        {
287 287
            var instanceMain = this.ParentOfType<MainWindow>();
......
315 315
                instanceMain.dzMainMenu.zoomAndPanCanvas.Width = instanceMain.dzMainMenu.zoomAndPanCanvas.Height;
316 316
                instanceMain.dzMainMenu.zoomAndPanCanvas.Height = emptySize;
317 317
            }
318
        
318

  
319 319
            if (instanceMain.dzMainMenu.rotate.Angle == 0)
320 320
            {
321 321
                instanceMain.dzMainMenu.translate.X = 0;
......
395 395
                var _DocPages = _PageList.Where(p => p.PAGE_NUMBER == thumbitem.PageNumber);
396 396

  
397 397
                if (_DocPages.Count() > 0)
398
                {   
398
                {
399 399
                    var _page = _DocPages.First();
400 400

  
401 401
                    PageChanged(this, new PageChangeEventArgs
......
506 506
            }
507 507
            //this.ImgListbox.ItemsSource = null;
508 508
            Logger.sendCheckLog("SetCommentList_ImgListbox 설정", 1);
509
            this.ImgListbox.ItemsSource = this._thumbnailItems;
510
            var template = this.ImgListbox.ItemTemplate;
511
            this.ImgListbox.ItemTemplate = null;
512
            this.ImgListbox.ItemTemplate = template;
513
            Logger.sendCheckLog("SetCommentList_ImgListbox UpdateLayout", 1);
514
            this.ImgListbox.UpdateLayout();
509

  
510
       
511
                this.ImgListbox.ItemsSource = this._thumbnailItems;
512
                var template = this.ImgListbox.ItemTemplate;
513
                this.ImgListbox.ItemTemplate = null;
514
                this.ImgListbox.ItemTemplate = template;
515
               //Logger.sendCheckLog("SetCommentList_ImgListbox UpdateLayout_Start", 1);
516
                //this.ImgListbox.UpdateLayout();
517
                //Logger.sendCheckLog("SetCommentList_ImgListbox UpdateLayout_End", 1);
518
           
515 519
        }
516 520

  
517 521
        private void ThumbnailSet()
......
574 578
                }
575 579

  
576 580

  
577
                if(_addFlag)
581
                if (_addFlag)
578 582
                {
579 583
                    this._thumbnailItems.Add(new ThumbnailItem
580 584
                    {
......
661 665
                GotoPage(selectItem.PageNumber);
662 666
                MarkupToPDF.Controls.Parsing.LayerControl control = new MarkupToPDF.Controls.Parsing.LayerControl();
663 667
                var result = control.markupParse_GetBaseControl(selectItem.Data);
664
                Rect rect = new Rect(new Point(result.StartPoint.X-100, result.StartPoint.Y-100), new Point(result.EndPoint.X + 100, result.EndPoint.Y + 100));             
668
                Rect rect = new Rect(new Point(result.StartPoint.X - 100, result.StartPoint.Y - 100), new Point(result.EndPoint.X + 100, result.EndPoint.Y + 100));
665 669
                this.ParentOfType<KCOM.Views.MainMenu>().zoomAndPanControl.ZoomTo(rect);
666 670
                //bool isGO = false;
667 671

  
......
715 719
                    });
716 720
                    gogogo.ItemsSource = null;
717 721
                    gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
718
                    
719
                }                
722

  
723
                }
720 724
            }
721 725
            else
722 726
            {
......
740 744

  
741 745
                });
742 746
                gogogo.ItemsSource = null;
743
                gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList(); 
747
                gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
744 748
            }
745 749
        }
746 750

  
......
767 771
            }
768 772
            set
769 773
            {
770
               
774

  
771 775
                _MarkupInfoSmallList = value;
772 776
                RaisePropertyChanged("MarkupInfoSmallList");
773 777
            }
......
904 908
                }
905 909
            }
906 910
        }
907
        public void MarkupListReload()
908
        {
909
            ViewerDataModel.Instance._markupInfoList.ToList().ForEach(d =>
910
            {
911
                if (d.MarkupList != null)
912
                {
913
                    d.MarkupList.ForEach(b =>
914
                    {
915
                        MarkupInfoSmallList.Add(new MarkupInfoItemSmall
916
                        {
917
                            Id = b.ID,
918
                            Data = b.Data,
919
                            Data_Type = b.Data_Type,
920
                            PageNumber = b.PageNumber,
921
                            UserID = d.UserID,
922
                            UserName = d.UserName,
923
                        });
924
                    });
925
                }
926
            });
927
            gogogo.ItemsSource = null;
928
            gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
929 911

  
930
            commentPage.ItemsSource = MarkupInfoSmallList.Select(d => d.PageNumber).Distinct().OrderBy(d => d).ToList();
931
            commentType.ItemsSource = MarkupInfoSmallList.Select(d => d.Data_Type).Distinct().OrderBy(d => d).ToList();
932
        }
933 912
        private void gogogo_Loaded(object sender, RoutedEventArgs e)
934 913
        {
935 914
            if (MarkupInfoSmallList.Count == 0)
......
955 934
                gogogo.ItemsSource = null;
956 935
                gogogo.ItemsSource = MarkupInfoSmallList.OrderBy(d => d.PageNumber).ToList();
957 936

  
958
                commentPage.ItemsSource = MarkupInfoSmallList.Select(d => d.PageNumber).Distinct().OrderBy(d=>d).ToList();
937
                commentPage.ItemsSource = MarkupInfoSmallList.Select(d => d.PageNumber).Distinct().OrderBy(d => d).ToList();
959 938
                commentType.ItemsSource = MarkupInfoSmallList.Select(d => d.Data_Type).Distinct().OrderBy(d => d).ToList();
960 939
            }
961 940
        }
......
964 943
        {
965 944
            gogogo.ItemsSource = null;
966 945
            tbSearch.Text = string.Empty;
967
            if (e.AddedItems.Count >0)
946
            if (e.AddedItems.Count > 0)
968 947
            {
969
                
948

  
970 949
                gogogo.ItemsSource = MarkupInfoSmallList.Where(d => d.Data_Type == Convert.ToInt32(e.AddedItems[0])).ToList();
971 950
            }
972 951
            else
......
1002 981
            var sel_page = commentPage.SelectedItem;
1003 982
            List<MarkupInfoItemSmall> small_list = new List<MarkupInfoItemSmall>();
1004 983
            List<MarkupInfoItemSmall> list = MarkupInfoSmallList;
1005
            if(sel_page !=null)
984
            if (sel_page != null)
1006 985
            {
1007 986
                list = list.Where(d => d.PageNumber == Convert.ToInt32(sel_page)).ToList();
1008 987
            }
1009
            if(sel_type !=null)
988
            if (sel_type != null)
1010 989
            {
1011 990
                list = list.Where(d => d.Data_Type == Convert.ToInt32(sel_type)).ToList();
1012 991
            }
......
1017 996
            foreach (var item in list)
1018 997
            {
1019 998
                var data = MarkupToPDF.Serialize.Core.JsonSerializerHelper.UnCompressString(item.Data.ToString());
1020
                
999

  
1021 1000
                switch (Enum.Parse(typeof(MarkupToPDF.Controls.Common.ControlType), item.Data_Type.ToString()))
1022
                {                    
1001
                {
1023 1002
                    case MarkupToPDF.Controls.Common.ControlType.TextControl:
1024 1003
                    case MarkupToPDF.Controls.Common.ControlType.TextBorder:
1025 1004
                    case MarkupToPDF.Controls.Common.ControlType.TextCloud:
1026 1005
                        {
1027 1006
                            MarkupToPDF.Serialize.S_Control.S_TextControl instance = MarkupToPDF.Serialize.Core.JsonSerializerHelper.JsonDeserialize<MarkupToPDF.Serialize.S_Control.S_TextControl>(data);
1028 1007
                            if (instance.Text.Contains(search_str))
1029
                            {                                
1008
                            {
1030 1009
                                small_list.Add(item);
1031 1010
                            }
1032 1011
                        }
......
1045 1024
                            }
1046 1025
                        }
1047 1026
                        break;
1048
                    
1027

  
1049 1028
                }
1050
                
1029

  
1051 1030
            }
1052
            
1031

  
1053 1032
            gogogo.ItemsSource = null;
1054 1033
            gogogo.ItemsSource = small_list.OrderBy(d => d.PageNumber).ToList();
1055 1034
            tbSearch.Text = string.Empty;
1056 1035
        }
1057
        
1058 1036
    }
1059 1037
}
KCOM/Events/Implementation/TopMenuEvent.cs
245 245
            }
246 246
            catch (Exception)
247 247
            {
248
                return "#FFFFFFFF";
248
                return "#FFFFFF";
249 249
            }
250 250
        }
251 251

  
KCOM/Messenger/ConversationView.xaml.cs
121 121
                    {
122 122
                        Common.ViewerDataModel.Instance.PageNumber = 1;
123 123
                    }
124
                    Common.ViewerDataModel.Instance.k_talkMessageSet.Clear();
124
                    //Common.ViewerDataModel.Instance.k_talkMessageSet.Clear();
125 125
                    KCOMDataModel.DataModel.TALK message = new KCOMDataModel.DataModel.TALK
126 126
                    {
127 127
                        TEXT = args.PromptResult,
KCOM/Views/MainMenu.xaml
58 58
        <converter:TeamConsolidateStringConverter x:Key="TeamConsoliStringConverter" />
59 59
        <converter:ConsolidationStringConverter x:Key="ConsoliStringConverter" />
60 60
        <converter:BoolToVisibleConverter x:Key="BoolToVisibleConverter" />
61
        <converter:PreviewerVisibleConverter x:Key="previewerVisibleConverter"/>        
61
        <converter:PreviewerVisibleConverter x:Key="previewerVisibleConverter"/>
62 62
    </UserControl.Resources>
63
    
64
    <Grid Background="{DynamicResource KCOMColor_MainBrush}">        
63
    <Grid Background="{DynamicResource KCOMColor_MainBrush}">
65 64
        <!--<Grid.ColumnDefinitions>
66 65
            <ColumnDefinition Width="Auto"/>
67 66
            <ColumnDefinition Width="*"/>
......
109 108
                                <Popup Name="floatingTip" AllowsTransparency="True" Placement="Relative" PlacementTarget="{Binding ElementName=rect}">
110 109
                                    <TextBlock x:Name="txtBatch" Foreground="Red" FontSize="20" Text="Mark Control을 그립니다."/>
111 110
                                </Popup>
112
                                
113 111
                                <telerik:RadBusyIndicator x:Name="busyIndicator" IsBusy="False" BusyContent="Saving...">
114 112
                                <ZoomAndPan:ZoomAndPanControl x:Name="zoomAndPanControl"
115 113
                                                              MouseWheel="zoomAndPanControl_MouseWheel"
......
124 122
                                                              ConstrainedContentViewportWidth="{Binding ContentViewportWidth, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
125 123
                                                              ConstrainedContentViewportHeight="{Binding ContentViewportHeight, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
126 124
                                                              Background="LightGray">
127
                                    <Canvas x:Name="zoomAndPanCanvas" Opacity="1" Background="White">                                            
128
                                            <Canvas x:Name="drawingRotateCanvas"
125
                                    <Canvas x:Name="zoomAndPanCanvas" Opacity="1" Background="White">
126

  
127
                                        <Canvas x:Name="drawingRotateCanvas"
129 128
                                                        Panel.ZIndex="1"
130 129
                                                        Background="{Binding BackgroundImage, Mode=OneWay, Source={x:Static common:ViewerDataModel.Instance}}">
131 130
                                            <Canvas.RenderTransform>
......
791 790
                        </telerik:RadGridView>
792 791
                    </telerik:RadPane>
793 792
                </telerik:RadPaneGroup>
794
                <telerik:RadPaneGroup telerik:StyleManager.Theme="Office2016" telerik:ProportionalStackPanel.RelativeSize="60, 100">
793
                <telerik:RadPaneGroup telerik:StyleManager.Theme="Office2016" telerik:ProportionalStackPanel.RelativeSize="100, 100">
795 794
                    <telerik:RadPane Header="Document History"  CanFloat="False" CanUserClose="False"  ContextMenuTemplate="{x:Null}" telerik:StyleManager.Theme="Office2016"  x:Name="historyPane">
796 795
                        <Grid>
797 796
                            <telerik:RadGridView telerik:StyleManager.Theme="Office2013" ShowGroupPanel="False" ShowGroupFooters="False" AutoExpandGroups="False"  x:Name="gridViewHistory"
KCOM/Views/MainMenu.xaml.cs
232 232
        }
233 233

  
234 234
        #endregion
235
                
235

  
236 236
        public MainMenu()
237 237
        {
238 238
            //InitializeComponent();    
239
            this.Loaded += MainMenu_Loaded;            
239
            this.Loaded += MainMenu_Loaded;
240 240
        }
241 241

  
242 242
        public class TempDt
......
250 250
        }
251 251

  
252 252
        List<TempDt> tempDtList = new List<TempDt>();
253
            
253

  
254 254
        private void SetCursor()
255 255
        {
256 256
            this.Cursor = cursor;
......
290 290
                {
291 291
                    return true;
292 292
                }
293
            }               
293
            }
294 294

  
295 295
            return false;
296 296
        }
297 297

  
298
       
298

  
299 299
        public void DeleteItem(MarkupInfoItem item)
300 300
        {
301 301
            if (PreviewUserMarkupInfoItem != null && item.Consolidate == 1 && item.AvoidConsolidate == 0)
......
371 371
        private static Timer timer;
372 372
        private int InitInterval = KCOM.Properties.Settings.Default.InitInterval;
373 373
        private void MainMenu_Loaded(object sender, RoutedEventArgs e)
374
        {     
374
        {
375 375
            InitializeComponent();
376

  
377
            //System.Diagnostics.Debug.WriteLine("MainMenu() : " + sw.ElapsedMilliseconds.ToString() + "ms");
378 376
            
377
            //System.Diagnostics.Debug.WriteLine("MainMenu() : " + sw.ElapsedMilliseconds.ToString() + "ms");
378

  
379 379
            if (App.ParameterMode)
380 380
            {
381 381
                this.pageNavigator.PageChanging += pageNavigator_PageChanging;
......
389 389
                da.RepeatBehavior = System.Windows.Media.Animation.RepeatBehavior.Forever;
390 390

  
391 391
                if (!App.ViewInfo.CreateFinalPDFPermission && !App.ViewInfo.NewCommentPermission)
392
                {                    
392
                {
393 393
                    this.SymbolPane.Visibility = Visibility.Collapsed;
394 394
                    this.FavoritePane.Visibility = Visibility.Collapsed;
395 395
                    this.drawingRotateCanvas.IsHitTestVisible = false;
396
                }                
396
                }
397 397
            }
398
            timer = new Timer(timercallback, null, 0, InitInterval * 60000); 
398
            timer = new Timer(timercallback, null, 0, InitInterval * 60000);
399 399
        }
400 400

  
401 401
        private void timercallback(Object o)
......
405 405
            TempFileAdd();
406 406
            sw.Stop();
407 407

  
408
            Dispatcher.Invoke(DispatcherPriority.Normal, new Action(delegate
408
            Dispatcher.InvokeAsync(new Action(delegate
409 409
            {
410 410
               if (this.ParentOfType<MainWindow>().dzTopMenu.cbAutoSave.IsChecked == true) //Auto Save Checked?
411 411
                {
......
413 413
                }
414 414
            }));
415 415

  
416
            GC.Collect();
416
            ////GC.Collect();
417 417
        }
418 418

  
419 419
        void TempFileAdd()
......
513 513

  
514 514
        public void TempLoad()
515 515
        {
516
            if ((System.IO.File.Exists(FilePath)) == true) 
516
            if ((System.IO.File.Exists(FilePath)) == true)
517 517
            {
518 518
                XmlDocument xdoc = new XmlDocument();
519
                xdoc.Load(FilePath);               
520
                XmlNodeList nodes = xdoc.SelectNodes("/Root/CommentID"); 
519
                xdoc.Load(FilePath);
520
                XmlNodeList nodes = xdoc.SelectNodes("/Root/CommentID");
521 521
                int PageNumber = 0;
522
                if (nodes.Count > 0) 
522
                if (nodes.Count > 0)
523 523
                {
524 524
                    if (MessageBox.Show("저장하지 못한 데이터가 있습니다. 불러오시겠습니까?", "MARKUS", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
525 525
                    {
......
530 530
                            string DATA_TYPE = node.SelectSingleNode("DATA_TYPE").InnerText;
531 531
                            string MarkupInfoID = node.SelectSingleNode("MarkupInfoID").InnerText;
532 532
                            int IsUpdate = Convert.ToInt32(node.SelectSingleNode("IsUpdate").InnerText);
533
                            PageNumber = Convert.ToInt32(node.SelectSingleNode("PageNumber").InnerText);                           
534
                            
533
                            PageNumber = Convert.ToInt32(node.SelectSingleNode("PageNumber").InnerText);
534

  
535 535
                            tempLoadData.Add(new TempLoadData()
536 536
                            {
537 537
                                PageNumber = PageNumber,
......
560 560
                {
561 561
                    temp.Remove();
562 562
                }
563
            }          
563
            }
564 564
        }
565
    
565

  
566 566

  
567 567
        public void ReleaseAdorner()
568 568
        {
569
            Logger.sendCheckLog("pageNavigator_PageChanging_ReleaseAdorner", 1);
570
            if (SelectLayer.Children.Count > 0)
569
            try
571 570
            {
572
                foreach (var item in SelectLayer.Children)
571
                Logger.sendCheckLog("pageNavigator_PageChanging_ReleaseAdorner", 1);
572
                if (SelectLayer.Children.Count > 0)
573 573
                {
574
                    if (item.GetType().Name == "AdornerFinal")
574
                    foreach (var item in SelectLayer.Children)
575 575
                    {
576
                        (item as AdornerFinal).unRegister();
577

  
578
                        foreach (var InnerItem in (item as AdornerFinal).MemberSet.Cast<AdornerMember>())
576
                        if (item.GetType().Name == "AdornerFinal")
579 577
                        {
580
                            if (!ViewerDataModel.Instance.MarkupControls_USER.Contains(InnerItem.DrawingData))
578
                            (item as AdornerFinal).unRegister();
579

  
580
                            foreach (var InnerItem in (item as AdornerFinal).MemberSet.Cast<AdornerMember>())
581 581
                            {
582
                                if (InnerItem.DrawingData.GetType().Name == "PolygonControl")
582
                                if (!ViewerDataModel.Instance.MarkupControls_USER.Contains(InnerItem.DrawingData))
583 583
                                {
584
                                    if ((InnerItem.DrawingData as PolygonControl).CommentID == null)
584
                                    if (InnerItem.DrawingData.GetType().Name == "PolygonControl")
585 585
                                    {
586
                                        (InnerItem.DrawingData as PolygonControl).CommentID = KCOM.Events.Save.shortGuid();
586
                                        if ((InnerItem.DrawingData as PolygonControl).CommentID == null)
587
                                        {
588
                                            (InnerItem.DrawingData as PolygonControl).CommentID = KCOM.Events.Save.shortGuid();
589
                                        }
587 590
                                    }
588
                                }
589 591

  
590
                                ViewerDataModel.Instance.MarkupControls_USER.Add(InnerItem.DrawingData as CommentUserInfo);
592
                                    ViewerDataModel.Instance.MarkupControls_USER.Add(InnerItem.DrawingData as CommentUserInfo);
593
                                }
591 594
                            }
592 595
                        }
593 596
                    }
597
                    SelectLayer.Children.Clear();
594 598
                }
595
                SelectLayer.Children.Clear();
596 599
            }
600
            catch (Exception ex)
601
            {
602
                Logger.sendResLog("ReleaseAdorner", ex.ToString(), 0);
603
            }            
597 604
        }
598 605

  
599 606
        public List<CommentUserInfo> AddAdorner()
......
637 644
                foreach (var control in ViewerDataModel.Instance.MarkupControls_USER)
638 645
                {
639 646
                    var root = layerControl.MarkupToString(control, App.ViewInfo.UserID);
640
                   
647

  
641 648
                    var existItem = ViewerDataModel.Instance.MarkupList_USER.Where(data => data.ID == root.CommentID).FirstOrDefault();
642 649
                    if (existItem != null) //신규 추가 된 코멘트
643 650
                    {
......
673 680
                                ComingNewBieEnd = false;
674 681
                            }
675 682
                        }
676
                    }                    
683
                    }
677 684
                }
678 685
            }
679 686

  
......
706 713
            }
707 714
            Logger.sendCheckLog("pageNavigator_PageChanging_UndoDataListClear", 1);
708 715
            ViewerDataModel.Instance.UndoDataList.Clear();
709
            
716

  
710 717
            InkControl_Convert();
711 718

  
712 719
            ReleaseAdorner();
......
754 761
            defaultBitmapImage.EndInit();
755 762

  
756 763
            ViewerDataModel.Instance.ImageViewPath = null;
757
            Logger.sendCheckLog("pageNavigator_PageChanging_GC.Collect()", 1);
758 764
            GC.Collect();
759 765

  
760

  
761 766
            Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage Downloading", 1);
762 767
            if (defaultBitmapImage.IsDownloading)
763 768
            {
764 769
                Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage IsDownloading", 1);
765 770
                defaultBitmapImage.DownloadCompleted += (ex, arg) =>
766 771
                {
767
                    Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage DownloadCompleted_Start", 1);
768 772
                    defaultBitmapImage.Freeze();
769 773
                    mainPanel.UpdateLayout();
770
                    GC.Collect();                    
774
                    GC.Collect();
771 775
                    ViewerDataModel.Instance.ImageViewPath = defaultBitmapImage;
772 776
                    ViewerDataModel.Instance.ImageViewWidth = defaultBitmapImage.PixelWidth;
773 777
                    ViewerDataModel.Instance.ImageViewHeight = defaultBitmapImage.PixelHeight;
774
                    Logger.sendCheckLog("pageNavigator_PageChanging_BitmapImage DownloadCompleted_End", 1);
775 778
                };
776 779
            }
777 780

  
778
            Logger.sendCheckLog("pageNavigator_PageChanging_zoomAndPanCanvas Page Setting", 1);
779 781
            zoomAndPanCanvas.Width = Convert.ToDouble(e.CurrentPage.PAGE_WIDTH);
780 782
            zoomAndPanCanvas.Height = Convert.ToDouble(e.CurrentPage.PAGE_HEIGHT);
781 783

  
......
785 787
            inkBoard.Width = zoomAndPanCanvas.Width;
786 788
            inkBoard.Height = zoomAndPanCanvas.Height;
787 789

  
788
           
790

  
789 791

  
790 792
            if (!testPanel2.IsHidden)
791 793
            {
......
861 863
                            ViewerDataModel.Instance.ImageViewPath_C = defaultBitmapImage_Compare;
862 864
                            ViewerDataModel.Instance.ImageViewWidth_C = defaultBitmapImage_Compare.PixelWidth;
863 865
                            ViewerDataModel.Instance.ImageViewHeight_C = defaultBitmapImage_Compare.PixelHeight;
864
                            
866

  
865 867
                            zoomAndPanCanvas2.Width = defaultBitmapImage_Compare.PixelWidth;
866 868
                            zoomAndPanCanvas2.Height = defaultBitmapImage_Compare.PixelHeight;
867 869

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

내보내기 Unified diff

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