개정판 b643fcca
- angle event 수정
- select에서 shift키 이벤트 안됨
Change-Id: I17decc4b6ab1f91e7b6ae18751acf74811e5d7a7
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 1755 | 1755 |
// instanceMain.IsSwingMode = true; |
| 1756 | 1756 |
//} |
| 1757 | 1757 |
|
| 1758 |
#region 다른 컨트롤 버튼 선택 해제 |
|
| 1759 |
System.Reactive.Linq.Observable2.FromPropertyChangedPattern(Common.ViewerDataModel.Instance, temp => temp.SelectedControl).Subscribe(ControlState => |
|
| 1760 |
{
|
|
| 1761 |
if (ControlState == null) |
|
| 1762 |
{
|
|
| 1763 |
instanceToggle.IsChecked = false; |
|
| 1764 |
HiddenControlHide(); |
|
| 1765 |
} |
|
| 1766 |
}); |
|
| 1767 |
#endregion |
|
| 1758 |
//#region 다른 컨트롤 버튼 선택 해제
|
|
| 1759 |
//System.Reactive.Linq.Observable2.FromPropertyChangedPattern(Common.ViewerDataModel.Instance, temp => temp.SelectedControl).Subscribe(ControlState =>
|
|
| 1760 |
//{
|
|
| 1761 |
// if (ControlState == null)
|
|
| 1762 |
// {
|
|
| 1763 |
// instanceToggle.IsChecked = false;
|
|
| 1764 |
// HiddenControlHide();
|
|
| 1765 |
// }
|
|
| 1766 |
//});
|
|
| 1767 |
//#endregion
|
|
| 1768 | 1768 |
|
| 1769 | 1769 |
Release_ToggleButton(sender); //-> 해당 컨트롤을 제외한 모든 컨트롤에 대해 해제 처리 |
| 1770 | 1770 |
|
| ... | ... | |
| 1789 | 1789 |
} |
| 1790 | 1790 |
|
| 1791 | 1791 |
|
| 1792 |
System.Reactive.Linq.Observable2.FromPropertyChangedPattern(Common.ViewerDataModel.Instance, temp => temp.AngleVisibility).Subscribe(isSee => |
|
| 1793 |
{
|
|
| 1794 |
if (instanceToggle.CommandParameter.ToString() == "ChainLine") |
|
| 1795 |
{
|
|
| 1792 |
//System.Reactive.Linq.Observable2.FromPropertyChangedPattern(Common.ViewerDataModel.Instance, temp => temp.AngleVisibility).Subscribe(isSee =>
|
|
| 1793 |
//{
|
|
| 1794 |
// if (instanceToggle.CommandParameter.ToString() == "ChainLine")
|
|
| 1795 |
// {
|
|
| 1796 | 1796 |
|
| 1797 |
} |
|
| 1798 |
else |
|
| 1799 |
{
|
|
| 1800 |
System.Diagnostics.Debug.WriteLine(" instanceMain.dzMainMenu.MainAngle.Visibility " + isSee);
|
|
| 1797 |
// } |
|
| 1798 |
// else |
|
| 1799 |
// {
|
|
| 1800 |
// System.Diagnostics.Debug.WriteLine(" instanceMain.dzMainMenu.MainAngle.Visibility " + isSee);
|
|
| 1801 |
|
|
| 1802 |
// if (instanceMain.dzMainMenu.MainAngle.Visibility != isSee) |
|
| 1803 |
// {
|
|
| 1804 |
// instanceMain.dzMainMenu.MainAngle.Visibility = isSee; |
|
| 1805 |
// } |
|
| 1806 |
// } |
|
| 1807 |
// //System.Reactive.Linq.Observable2.FromPropertyChangedPattern(Common.ViewerDataModel.Instance, temp => temp.AngleValue).Subscribe(p => |
|
| 1808 |
// //{
|
|
| 1809 |
// // instanceMain.dzMainMenu.MainAngle.AngleValue = p; |
|
| 1810 |
// //}); |
|
| 1811 |
//}); |
|
| 1801 | 1812 |
|
| 1802 |
if (instanceMain.dzMainMenu.MainAngle.Visibility != isSee) |
|
| 1803 |
{
|
|
| 1804 |
instanceMain.dzMainMenu.MainAngle.Visibility = isSee; |
|
| 1805 |
} |
|
| 1806 |
} |
|
| 1807 |
//System.Reactive.Linq.Observable2.FromPropertyChangedPattern(Common.ViewerDataModel.Instance, temp => temp.AngleValue).Subscribe(p => |
|
| 1808 |
//{
|
|
| 1809 |
// instanceMain.dzMainMenu.MainAngle.AngleValue = p; |
|
| 1810 |
//}); |
|
| 1811 |
}); |
|
| 1812 | 1813 |
instanceMain.dzMainMenu.mouseHandlingMode = IKCOM.MouseHandlingMode.Drawing; |
| 1813 | 1814 |
|
| 1814 | 1815 |
instanceMain.dzMainMenu.inkDrawingCanvas.IsEnabled = false; |
내보내기 Unified diff
