개정판 a1142a6b
#00000 Debug에서 DevDoftech/Hyosung를 병행하여 Debug하도록 수정
- Web.config/Web.Debug.config/Web.Debug_DevDoftech.config/Web.Debug_HyoSung.config
- 솔루션 구성을 선택하여 각각 Debug
- Kcom_api에서 사용자 정보를 MS SQL 쿼리로 가져와서 사용하도록 수정( EF의 오류 방지)
Change-Id: I7c64e3f99a18dd29d91036a99604401f24c469d8
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 658 | 658 |
// ViewerDataModel.Instance.ImageViewPath = await ImageSourceHelper.GetDownloadImageAsync(pageUri, pageWidth * contentScale, pageHeight * contentScale); |
| 659 | 659 |
try |
| 660 | 660 |
{
|
| 661 |
System.Diagnostics.Debug.WriteLine(pageUri); |
|
| 662 |
ViewerDataModel.Instance.ImageViewPath = null; |
|
| 663 |
|
|
| 664 |
new System.Net.Http.HttpClient().CancelPendingRequests(); |
|
| 665 |
//await Task.Delay(300); |
|
| 666 |
|
|
| 661 | 667 |
ViewerDataModel.Instance.ImageViewPath = await ImageSourceHelper.GetDownloadImageAsync(pageUri, pageWidth, pageHeight); |
| 662 |
|
|
| 663 | 668 |
} |
| 664 | 669 |
catch (Exception ex) |
| 665 | 670 |
{
|
| ... | ... | |
| 783 | 788 |
/// </summary> |
| 784 | 789 |
/// <param name="sender"></param> |
| 785 | 790 |
/// <param name="e"></param> |
| 786 |
private void PageNavigator_PageChanged(object sender, Sample.PageChangeEventArgs e) |
|
| 791 |
private async void PageNavigator_PageChanged(object sender, Sample.PageChangeEventArgs e)
|
|
| 787 | 792 |
{
|
| 788 |
if (zoomAndPanCanvas2.Width.IsNaN()) |
|
| 789 |
{
|
|
| 790 |
zoomAndPanControl.ZoomTo(new Rect { X = 0, Y = 0, Width = zoomAndPanCanvas.Width, Height = zoomAndPanCanvas.Height });
|
|
| 791 |
} |
|
| 793 |
//if (zoomAndPanCanvas.Width.IsNaN()) |
|
| 794 |
//{
|
|
| 795 |
|
|
| 796 |
await zoomAndPanControl.Dispatcher.InvokeAsync(()=> |
|
| 797 |
zoomAndPanControl.ZoomTo(new Rect { X = 0, Y = 0, Width = zoomAndPanCanvas.Width, Height = zoomAndPanCanvas.Height })
|
|
| 798 |
); |
|
| 799 |
//} |
|
| 792 | 800 |
|
| 793 | 801 |
/// 컨트롤을 새로 생성한다. |
| 794 | 802 |
Common.ViewerDataModel.Instance.MarkupControls_USER.Clear(); //전체 제거 |
| ... | ... | |
| 903 | 911 |
} |
| 904 | 912 |
} |
| 905 | 913 |
|
| 906 |
private void zoomAndPanControl_MouseWheel(object sender, MouseWheelEventArgs e) |
|
| 914 |
private async void zoomAndPanControl_MouseWheel(object sender, MouseWheelEventArgs e)
|
|
| 907 | 915 |
{
|
| 908 | 916 |
var instance = ViewerDataModel.Instance; |
| 909 | 917 |
|
| 910 |
if (instance.IsPressCtrl) |
|
| 918 |
if(instance.IsWheelPageChanage) |
|
| 919 |
{
|
|
| 920 |
return; |
|
| 921 |
} |
|
| 922 |
|
|
| 923 |
if (instance.IsPressCtrl) // && !instance.IsWheelPageChanage) |
|
| 911 | 924 |
{
|
| 925 |
|
|
| 926 |
int changePage = 0; |
|
| 927 |
|
|
| 912 | 928 |
if (e.Delta > 0) |
| 913 | 929 |
{
|
| 914 |
if (0 < instance.ContentOffsetY + instance.ContentViewportHeight)
|
|
| 930 |
if (0 < instance.ContentOffsetY) |
|
| 915 | 931 |
{
|
| 916 | 932 |
Vector dragOffset = new Vector(0, e.Delta); |
| 917 | 933 |
MoveZoomAndPanControl(dragOffset); |
| 918 | 934 |
} |
| 919 | 935 |
//else |
| 920 | 936 |
//{
|
| 921 |
// pageNavigator.GotoPage(Convert.ToInt32(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber) - 1); |
|
| 937 |
// if (instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber > 1) |
|
| 938 |
// {
|
|
| 939 |
// instance.IsWheelPageChanage = true; |
|
| 940 |
// changePage -= 1; |
|
| 941 |
// } |
|
| 922 | 942 |
//} |
| 923 | 943 |
} |
| 924 | 944 |
else if(e.Delta < 0) |
| ... | ... | |
| 930 | 950 |
} |
| 931 | 951 |
//else |
| 932 | 952 |
//{
|
| 933 |
// pageNavigator.GotoPage(Convert.ToInt32(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber) + 1); |
|
| 953 |
// if (instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber < instance.SystemMain.dzMainMenu.pageNavigator.PageCount) |
|
| 954 |
// {
|
|
| 955 |
// instance.IsWheelPageChanage = true; |
|
| 956 |
// changePage += 1; |
|
| 957 |
// } |
|
| 934 | 958 |
//} |
| 935 | 959 |
} |
| 960 |
|
|
| 961 |
//if (changePage != 0) |
|
| 962 |
//{
|
|
| 963 |
// await Task.Factory.StartNew(() => |
|
| 964 |
// {
|
|
| 965 |
// double beforeScale = instance.ContentScale; |
|
| 966 |
|
|
| 967 |
// EventHandler<Sample.PageChangeEventArgs> handler = null; |
|
| 968 |
|
|
| 969 |
// handler = (snd, evt) => |
|
| 970 |
// {
|
|
| 971 |
// /// 최상단으로 이전 zoomScale로 위치한다 |
|
| 972 |
// //Point currentContentMousePoint = e.GetPosition(zoomAndPanCanvas); |
|
| 973 |
// //zoomAndPanControl.ZoomAboutPoint(beforeScale, new Point(currentContentMousePoint.X, 0)); |
|
| 974 |
// instance.IsWheelPageChanage = false; |
|
| 975 |
// pageNavigator.PageChanged -= handler; |
|
| 976 |
// }; |
|
| 977 |
|
|
| 978 |
// pageNavigator.PageChanged += handler; |
|
| 979 |
|
|
| 980 |
// pageNavigator.GotoPage(Convert.ToInt32(instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber) + changePage); |
|
| 981 |
// }); |
|
| 982 |
|
|
| 983 |
|
|
| 984 |
//} |
|
| 936 | 985 |
} |
| 937 | 986 |
else |
| 938 | 987 |
{
|
내보내기 Unified diff
