개정판 497bbe52
issue #932: 회전된 페이지의 Previous의 뒷 배경이 회전되어 나오는 현상 수정
Change-Id: Iae876fe5e920f327c31f9571eea09775a3934716
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1944 | 1944 |
ViewerDataModel.Instance.Angle = rotate.Angle; |
| 1945 | 1945 |
} |
| 1946 | 1946 |
|
| 1947 |
private void syncPannelRotate(double angle) |
|
| 1948 |
{
|
|
| 1949 |
//Logger.sendCheckLog("pageNavigator_PageChanging_drawingPannelRotate Setting", 1);
|
|
| 1950 |
rotate.Angle = angle; |
|
| 1951 |
var rotationNum = Math.Abs((rotate.Angle / 90)); |
|
| 1952 |
|
|
| 1953 |
if (angle == 90 || angle == 270) |
|
| 1954 |
{
|
|
| 1955 |
double emptySize = zoomAndPanCanvas2.Width; |
|
| 1956 |
zoomAndPanCanvas2.Width = zoomAndPanCanvas2.Height; |
|
| 1957 |
zoomAndPanCanvas2.Height = emptySize; |
|
| 1958 |
} |
|
| 1959 |
if (angle == 0) |
|
| 1960 |
{
|
|
| 1961 |
translate2.X = 0; |
|
| 1962 |
translate2.Y = 0; |
|
| 1963 |
} |
|
| 1964 |
else if (angle == 90) |
|
| 1965 |
{
|
|
| 1966 |
translate2.X = zoomAndPanCanvas2.Width; |
|
| 1967 |
translate2.Y = 0; |
|
| 1968 |
} |
|
| 1969 |
else if (angle == 180) |
|
| 1970 |
{
|
|
| 1971 |
translate2.X = zoomAndPanCanvas2.Width; |
|
| 1972 |
translate2.Y = zoomAndPanCanvas2.Height; |
|
| 1973 |
} |
|
| 1974 |
else |
|
| 1975 |
{
|
|
| 1976 |
translate2.X = 0; |
|
| 1977 |
translate2.Y = zoomAndPanCanvas2.Height; |
|
| 1978 |
} |
|
| 1979 |
|
|
| 1980 |
zoomAndPanControl2.RotationAngle = rotate.Angle; |
|
| 1981 |
} |
|
| 1982 |
|
|
| 1947 | 1983 |
public void PlaceImageSymbol(string id, long group_id, int SelectedIndex, Point canvasZoomPanningMouseDownPoint) |
| 1948 | 1984 |
{
|
| 1949 | 1985 |
string Data_ = ""; |
| ... | ... | |
| 4331 | 4367 |
|
| 4332 | 4368 |
Sync_Offset_Point = new Point(zoomAndPanControl.ContentOffsetX, zoomAndPanControl.ContentOffsetY); |
| 4333 | 4369 |
|
| 4334 |
var defaultBitmapImage_Compare = new BitmapImage(new Uri(uri));
|
|
| 4335 |
|
|
| 4336 |
ViewerDataModel.Instance.ImageViewPath_C = defaultBitmapImage_Compare;
|
|
| 4337 |
ViewerDataModel.Instance.ImageViewWidth_C = defaultBitmapImage_Compare.PixelWidth;
|
|
| 4338 |
ViewerDataModel.Instance.ImageViewHeight_C = defaultBitmapImage_Compare.PixelHeight;
|
|
| 4370 |
var defaultBitmapImage_Compare = new BitmapImage(); |
|
| 4371 |
defaultBitmapImage_Compare.BeginInit(); |
|
| 4372 |
defaultBitmapImage_Compare.CacheOption = BitmapCacheOption.OnLoad;
|
|
| 4373 |
defaultBitmapImage_Compare.UriSource = new Uri(uri);
|
|
| 4374 |
defaultBitmapImage_Compare.EndInit();
|
|
| 4339 | 4375 |
|
| 4340 | 4376 |
if (defaultBitmapImage_Compare.IsDownloading) |
| 4341 | 4377 |
{
|
| 4342 | 4378 |
defaultBitmapImage_Compare.DownloadCompleted += (ex, arg) => |
| 4343 | 4379 |
{
|
| 4380 |
defaultBitmapImage_Compare.Freeze(); |
|
| 4344 | 4381 |
ViewerDataModel.Instance.ImageViewPath_C = defaultBitmapImage_Compare; |
| 4345 | 4382 |
ViewerDataModel.Instance.ImageViewWidth_C = defaultBitmapImage_Compare.PixelWidth; |
| 4346 | 4383 |
ViewerDataModel.Instance.ImageViewHeight_C = defaultBitmapImage_Compare.PixelHeight; |
| 4384 |
zoomAndPanCanvas2.Width = defaultBitmapImage_Compare.PixelWidth; |
|
| 4385 |
zoomAndPanCanvas2.Height = defaultBitmapImage_Compare.PixelHeight; |
|
| 4347 | 4386 |
}; |
| 4348 |
} |
|
| 4349 |
|
|
| 4350 |
zoomAndPanCanvas2.Width = Convert.ToDouble(Common.ViewerDataModel.Instance.ContentWidth); |
|
| 4351 |
zoomAndPanCanvas2.Height = Convert.ToDouble(Common.ViewerDataModel.Instance.ContentHeight); |
|
| 4352 |
zoomAndPanControl2.RotationAngle = zoomAndPanControl.RotationAngle; |
|
| 4387 |
} |
|
| 4353 | 4388 |
zoomAndPanControl2.ApplyTemplate(); |
| 4354 | 4389 |
zoomAndPanControl2.UpdateLayout(); |
| 4355 |
|
|
| 4390 |
//syncPannelRotate(zoomAndPanControl.RotationAngle); |
|
| 4356 | 4391 |
if (Sync_Offset_Point != new Point(zoomAndPanControl.ContentOffsetX, zoomAndPanControl.ContentOffsetY)) |
| 4357 | 4392 |
{
|
| 4358 | 4393 |
zoomAndPanControl.ContentOffsetX = Sync_Offset_Point.X; |
내보내기 Unified diff
