개정판 944be2fa
issue #926: 최초 로딩시 페이지번호 1페이지가 나오도록 수정. rotating 시 오류 수정.
Change-Id: I86e9ae0552f1ce3d4e24403edb7503d11a487125
| KCOM/Controls/Sample.xaml.cs | ||
|---|---|---|
| 228 | 228 |
PageNumber = thumbitem.PageNumber |
| 229 | 229 |
}); |
| 230 | 230 |
ImgListbox.SelectedItem = thumbitem; |
| 231 |
|
|
| 231 |
this.CurrentPage = thumbitem; |
|
| 232 | 232 |
} |
| 233 | 233 |
else |
| 234 | 234 |
{
|
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 239 | 239 |
Revision = _DocItem.REVISION, |
| 240 | 240 |
}; |
| 241 | 241 |
var instanceMain = this.ParentOfType<MainWindow>(); |
| 242 |
instanceMain.dzTopMenu.tlcurrentPage.Text = _DocInfo.PAGE_COUNT.ToString(); |
|
| 243 |
instanceMain.dzTopMenu.tlcurrentPage_readonly.Text = _DocInfo.PAGE_COUNT.ToString(); |
|
| 242 |
string firstpage = "1"; |
|
| 243 |
string lastpage = _DocInfo.PAGE_COUNT.ToString(); |
|
| 244 |
instanceMain.dzTopMenu.tlcurrentPage.Text = firstpage; |
|
| 245 |
instanceMain.dzTopMenu.tlcurrentPage_readonly.Text = lastpage; |
|
| 244 | 246 |
string apptitle = string.Format("MARKUS(ver.{2}) - {0}(Rev.{1})", _DocItem.DOCUMENT_NO, _DocItem.REVISION, System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString());
|
| 245 | 247 |
instanceMain.TitleText.Text = apptitle; |
| 246 | 248 |
instanceMain.Title = apptitle; |
| ... | ... | |
| 251 | 253 |
//ViewerDataModel.Instance.SystemMain.dzMainMenu.TempLoad(); |
| 252 | 254 |
|
| 253 | 255 |
Logger.sendReqLog("GetVPRevisionHistoryAsync", CurrentDoc.ProjectNo + "," + CurrentDoc.Document_NO + "," + CurrentDoc.Document_Id, 1);
|
| 254 |
BaseClient.GetVPRevisionHistoryAsync(CurrentDoc.ProjectNo, CurrentDoc.Document_NO, CurrentDoc.Document_Id); |
|
| 256 |
BaseClient.GetVPRevisionHistoryAsync(CurrentDoc.ProjectNo, CurrentDoc.Document_NO, CurrentDoc.Document_Id);
|
|
| 255 | 257 |
} |
| 256 | 258 |
|
| 257 | 259 |
/// <summary> |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 545 | 545 |
var pageinfo = this.CurrentDoc.docInfo.DOCPAGE.Where(p => p.PAGE_NUMBER == e.CurrentPage.PAGE_NUMBER).FirstOrDefault(); |
| 546 | 546 |
drawingPannelRotate(pageinfo.PAGE_ANGLE); |
| 547 | 547 |
|
| 548 |
SetCommentPages(true); |
|
| 548 |
SetCommentPages(true);
|
|
| 549 | 549 |
} |
| 550 | 550 |
|
| 551 | 551 |
/// <summary> |
| ... | ... | |
| 611 | 611 |
ViewerDataModel.Instance.ImageViewWidth = defaultBitmapImage.PixelWidth; |
| 612 | 612 |
ViewerDataModel.Instance.ImageViewHeight = defaultBitmapImage.PixelHeight; |
| 613 | 613 |
mainPanel.UpdateLayout(); |
| 614 |
this.pageNavigator.ChangePage(ViewerDataModel.Instance.PageNumber);
|
|
| 614 |
this.pageNavigator.ChangePage(e.PageNumber); |
|
| 615 | 615 |
|
| 616 | 616 |
//image dispose |
| 617 | 617 |
defaultBitmapImage = null; |
내보내기 Unified diff
