개정판 8614f701
웹서비스 수정
Change-Id: I51b1075b9858c65550c757f79c4eb13fc600cda6
.gitignore | ||
---|---|---|
270 | 270 |
*.pyc |
271 | 271 |
/MarkusPDF Library/LibraryTest/MarkusPDFUnitTest/TestOutput |
272 | 272 |
/MarkusPDF Library.egg |
273 |
/Setup |
KCOM/App.xaml.cs | ||
---|---|---|
260 | 260 |
} |
261 | 261 |
catch (Exception ex) |
262 | 262 |
{ |
263 |
Console.WriteLine(ex.InnerException.ToString()); |
|
263 |
Console.WriteLine(ex.InnerException?.ToString());
|
|
264 | 264 |
} |
265 | 265 |
finally |
266 | 266 |
{ |
267 |
#if RELEASE |
|
267 | 268 |
Environment.Exit(0); |
269 |
#endif |
|
268 | 270 |
} |
269 | 271 |
} |
270 | 272 |
|
KCOM/Views/MainMenu.xaml.cs | ||
---|---|---|
534 | 534 |
uri = String.Format(CommonLib.Common.GetConfigString("subServerImageWebPath", "URL", "", App.isExternal), _ViewInfo.ProjectNO, _ViewInfo.DocumentItemID, e.PageNumber); |
535 | 535 |
} |
536 | 536 |
|
537 |
var pageWidth = Convert.ToDouble(e.CurrentPage.PAGE_WIDTH); |
|
538 |
var pageHeight = Convert.ToDouble(e.CurrentPage.PAGE_HEIGHT); |
|
539 |
|
|
537 | 540 |
var defaultBitmapImage = new BitmapImage(); |
538 | 541 |
defaultBitmapImage.BeginInit(); |
539 | 542 |
defaultBitmapImage.CreateOptions = BitmapCreateOptions.IgnoreImageCache; |
540 | 543 |
defaultBitmapImage.CacheOption = BitmapCacheOption.OnLoad; |
541 | 544 |
defaultBitmapImage.UriSource = new Uri(uri); |
542 |
defaultBitmapImage.DecodePixelWidth = Int32.Parse(e.CurrentPage.PAGE_WIDTH);
|
|
543 |
defaultBitmapImage.DecodePixelHeight = Int32.Parse(e.CurrentPage.PAGE_HEIGHT);
|
|
545 |
defaultBitmapImage.DecodePixelWidth = Convert.ToInt32(pageWidth * zoomAndPanControl.ContentScale);
|
|
546 |
defaultBitmapImage.DecodePixelHeight = Convert.ToInt32(pageHeight * zoomAndPanControl.ContentScale);
|
|
544 | 547 |
defaultBitmapImage.EndInit(); |
545 | 548 |
|
546 | 549 |
ViewerDataModel.Instance.ImageViewPath = null; |
... | ... | |
552 | 555 |
{ |
553 | 556 |
defaultBitmapImage.Freeze(); |
554 | 557 |
ViewerDataModel.Instance.ImageViewPath = defaultBitmapImage; |
555 |
ViewerDataModel.Instance.ImageViewWidth = defaultBitmapImage.PixelWidth;
|
|
556 |
ViewerDataModel.Instance.ImageViewHeight = defaultBitmapImage.PixelHeight;
|
|
558 |
ViewerDataModel.Instance.ImageViewWidth = pageWidth;
|
|
559 |
ViewerDataModel.Instance.ImageViewHeight = pageHeight;
|
|
557 | 560 |
mainPanel.UpdateLayout(); |
558 | 561 |
this.pageNavigator.ChangePage(e.PageNumber); |
559 | 562 |
|
내보내기 Unified diff