개정판 4cb62752
Revert "markus 성능개선"
This reverts commit 0cda2a885008c0503d20d124631932685c72d462.
Reason for revert: <INSERT REASONING HERE>
Change-Id: Idf219ace4fcd6122b2557f5022c8457e5ef61d68
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 239 | 239 |
/// </summary> |
| 240 | 240 |
/// <param name="sender"></param> |
| 241 | 241 |
/// <param name="e"></param> |
| 242 |
private async void BaseClient_GetDocInfoCompleted(object sender, GetDocInfoCompletedEventArgs e)
|
|
| 242 |
private void BaseClient_GetDocInfoCompleted(object sender, GetDocInfoCompletedEventArgs e) |
|
| 243 | 243 |
{
|
| 244 | 244 |
Logger.sendResLog("GetDocInfoCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
| 245 | 245 |
|
| ... | ... | |
| 278 | 278 |
string apptitle = string.Format("MARKUS(ver.{2}) - {0}(Rev.{1})", _DocItem.DOCUMENT_NO, _DocItem.REVISION, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
| 279 | 279 |
instanceMain.TitleText.Text = apptitle; |
| 280 | 280 |
instanceMain.Title = apptitle; |
| 281 |
|
|
| 282 |
#region 페이지 이미지를 로컬에 저장 |
|
| 283 |
string tempStoragePath = System.IO.Path.Combine(System.IO.Path.GetTempPath(),"MARKUS", System.IO.Path.GetRandomFileName()); |
|
| 284 |
|
|
| 285 |
//.Replace("jpg", "png")을 붙이는 이유는 MainUrl에 확장명이 jpg로 설정한 경우가 있기 때문
|
|
| 286 |
|
|
| 287 |
#endregion |
|
| 288 |
App.PageStorage = new PageManager.PageStorage(MainUrl.Replace("jpg", "png"), tempStoragePath, _DocInfo.PAGE_COUNT);
|
|
| 289 |
|
|
| 290 | 281 |
this.pageNavigator.SetPageNavi(CurrentDoc.docInfo.DOCPAGE.ToList(), MainUrl); |
| 291 | 282 |
|
| 292 | 283 |
ViewerDataModel.Instance.MarkupControls_USER.Clear(); |
| ... | ... | |
| 295 | 286 |
|
| 296 | 287 |
#region 단어 검색용 파일 다운로드 |
| 297 | 288 |
|
| 298 |
await DownloadOriginalFileAsync();
|
|
| 299 |
|
|
| 289 |
var task = DownloadOriginalFileAsync();
|
|
| 290 |
task.ConfigureAwait(false); |
|
| 300 | 291 |
|
| 301 | 292 |
#endregion |
| 302 | 293 |
|
| ... | ... | |
| 500 | 491 |
|
| 501 | 492 |
if (resultA.Count() >= 2) |
| 502 | 493 |
{
|
| 503 |
// 동일한 사용자 데이터가 두개 이상 선택됩니다. Consolidation을 선택할까요? |
|
| 504 | 494 |
RadWindow.Confirm(new DialogParameters |
| 505 | 495 |
{
|
| 506 | 496 |
Owner = Application.Current.MainWindow, |
| 507 |
Header = "Info",
|
|
| 508 |
Content = "Selected more than two identical user data. Do you want to select consolidation?",
|
|
| 497 |
Header = "안내",
|
|
| 498 |
Content = "동일한 사용자 데이터가 두개 이상 선택됩니다. Consolidation을 선택할까요?",
|
|
| 509 | 499 |
Closed = new EventHandler<WindowClosedEventArgs>((sen, ea) => |
| 510 | 500 |
{
|
| 511 | 501 |
if (e.AddedItems.Count() == 1) |
내보내기 Unified diff
