개정판 d5e3aa15
issue #813 Angle 변경에 따른 무한 루프 수정
Angle 출력 오류 수정
Change-Id: I239d7712613119fdc1dc4e6853de98d9a3e3a60f
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 1756 | 1756 |
|
| 1757 | 1757 |
System.Reactive.Linq.Observable2.FromPropertyChangedPattern(Common.ViewerDataModel.Instance, temp => temp.AngleVisibility).Subscribe(isSee => |
| 1758 | 1758 |
{
|
| 1759 |
instanceMain.dzMainMenu.MainAngle.Visibility = isSee; |
|
| 1760 |
System.Reactive.Linq.Observable2.FromPropertyChangedPattern(Common.ViewerDataModel.Instance, temp => temp.AngleValue).Subscribe(p => |
|
| 1759 |
if (instanceMain.dzMainMenu.MainAngle.Visibility != isSee) |
|
| 1761 | 1760 |
{
|
| 1762 |
instanceMain.dzMainMenu.MainAngle.AngleValue = p; |
|
| 1763 |
}); |
|
| 1761 |
instanceMain.dzMainMenu.MainAngle.Visibility = isSee; |
|
| 1762 |
} |
|
| 1763 |
//System.Reactive.Linq.Observable2.FromPropertyChangedPattern(Common.ViewerDataModel.Instance, temp => temp.AngleValue).Subscribe(p => |
|
| 1764 |
//{
|
|
| 1765 |
// instanceMain.dzMainMenu.MainAngle.AngleValue = p; |
|
| 1766 |
//}); |
|
| 1764 | 1767 |
}); |
| 1765 | 1768 |
instanceMain.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Drawing; |
| 1766 | 1769 |
|
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1682 | 1682 |
private void zoomAndPanControl_MouseUp(object sender, MouseButtonEventArgs e) |
| 1683 | 1683 |
{
|
| 1684 | 1684 |
IsDrawing = false; |
| 1685 |
|
|
| 1685 |
|
|
| 1686 | 1686 |
if (mouseHandlingMode != MouseHandlingMode.None) |
| 1687 | 1687 |
{
|
| 1688 | 1688 |
if (mouseHandlingMode == MouseHandlingMode.Drawing) |
| ... | ... | |
| 1711 | 1711 |
} |
| 1712 | 1712 |
else if (mouseHandlingMode == MouseHandlingMode.Selecting && e.ChangedButton == MouseButton.Left || mouseHandlingMode == MouseHandlingMode.Capture && e.ChangedButton == MouseButton.Left || mouseHandlingMode == MouseHandlingMode.DragZoom && e.ChangedButton == MouseButton.Left) |
| 1713 | 1713 |
{
|
| 1714 |
ViewerDataModel.Instance.AngleVisibility = Visibility.Collapsed; |
|
| 1715 |
|
|
| 1714 | 1716 |
if (isLeftMouseButtonDownOnWindow) |
| 1715 | 1717 |
{
|
| 1716 | 1718 |
bool wasDragSelectionApplied = false; |
| MarkupToPDF/Controls/Common/MathSet.cs | ||
|---|---|---|
| 438 | 438 |
angle = approxAngle; |
| 439 | 439 |
} |
| 440 | 440 |
|
| 441 |
if (angle < 0) |
|
| 442 |
{
|
|
| 443 |
angle = angle + 360; |
|
| 444 |
} |
|
| 445 |
|
|
| 441 | 446 |
return angle; |
| 442 | 447 |
} |
| 443 | 448 |
|
| MarkupToPDF/Controls/Line/ArcControl.cs | ||
|---|---|---|
| 542 | 542 |
this.MidPoint = new Point(0, 0); |
| 543 | 543 |
|
| 544 | 544 |
Point tmp = this.EndPoint; |
| 545 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, true);
|
|
| 545 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, bShiftKeyPressed);
|
|
| 546 | 546 |
|
| 547 | 547 |
if (bAxisLocked || bShiftKeyPressed) |
| 548 | 548 |
{
|
| MarkupToPDF/Controls/Line/ArrowArcControl.cs | ||
|---|---|---|
| 485 | 485 |
this.EndPoint = pt; |
| 486 | 486 |
|
| 487 | 487 |
Point tmp = this.EndPoint; |
| 488 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, true);
|
|
| 488 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, bShiftKeyPressed);
|
|
| 489 | 489 |
|
| 490 | 490 |
if (bAxisLocked || bShiftKeyPressed) |
| 491 | 491 |
{
|
| MarkupToPDF/Controls/Line/ArrowControl_Multi.cs | ||
|---|---|---|
| 362 | 362 |
if (this.MiddlePoint == new Point(0, 0)) |
| 363 | 363 |
{
|
| 364 | 364 |
Point tmp = this.EndPoint; |
| 365 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, true);
|
|
| 365 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, bShiftKeyPressed);
|
|
| 366 | 366 |
|
| 367 | 367 |
if (bAxisLocked || bShiftKeyPressed) |
| 368 | 368 |
{
|
| ... | ... | |
| 372 | 372 |
else |
| 373 | 373 |
{
|
| 374 | 374 |
Point tmp = this.EndPoint; |
| 375 |
Angle = MathSet.returnAngle(this.MiddlePoint, ref tmp, true);
|
|
| 375 |
Angle = MathSet.returnAngle(this.MiddlePoint, ref tmp, bShiftKeyPressed);
|
|
| 376 | 376 |
|
| 377 | 377 |
if (bAxisLocked || bShiftKeyPressed) |
| 378 | 378 |
{
|
| MarkupToPDF/Controls/Line/LineControl.cs | ||
|---|---|---|
| 509 | 509 |
this.EndPoint = pt; |
| 510 | 510 |
|
| 511 | 511 |
Point tmp = this.EndPoint; |
| 512 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, true);
|
|
| 512 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, bShiftKeyPressed);
|
|
| 513 | 513 |
|
| 514 | 514 |
if (bAxisLocked || bShiftKeyPressed) |
| 515 | 515 |
{
|
| MarkupToPDF/Controls/Polygon/CloudControl.cs | ||
|---|---|---|
| 827 | 827 |
|
| 828 | 828 |
if (bAxisLocked || bShiftKeyPressed) |
| 829 | 829 |
{
|
| 830 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, true);
|
|
| 830 |
Angle = MathSet.returnAngle(this.StartPoint, ref tmp, bShiftKeyPressed);
|
|
| 831 | 831 |
} |
| 832 | 832 |
|
| 833 | 833 |
this.PointSet.Add(tmp); |
| MarkupToPDF/Controls/Polygon/PolygonControl.cs | ||
|---|---|---|
| 496 | 496 |
|
| 497 | 497 |
if (bAxisLocked || bShiftKeyPressed) |
| 498 | 498 |
{
|
| 499 |
Angle = MathSet.returnAngle(this.PointSet[this.PointSet.Count - 1], ref tmp, true);
|
|
| 499 |
Angle = MathSet.returnAngle(this.PointSet[this.PointSet.Count - 1], ref tmp, bShiftKeyPressed);
|
|
| 500 | 500 |
} |
| 501 | 501 |
|
| 502 | 502 |
this.PointSet.Add(tmp); |
| MarkupToPDF/Controls/Text/ArrowTextControl.cs | ||
|---|---|---|
| 1606 | 1606 |
this.EndPoint = pt; |
| 1607 | 1607 |
|
| 1608 | 1608 |
Point tempPoint = this.EndPoint; |
| 1609 |
Angle = MathSet.returnAngle(this.StartPoint, ref tempPoint, true);
|
|
| 1609 |
Angle = MathSet.returnAngle(this.StartPoint, ref tempPoint, bShiftKeyPressed);
|
|
| 1610 | 1610 |
|
| 1611 | 1611 |
if (bAxisLocked || bShiftKeyPressed) |
| 1612 | 1612 |
{
|
내보내기 Unified diff
