개정판 43e1d368
issue #0000 코드 정리
Change-Id: I7c8ba4ef6d78a7e4f51b72f226507cddac722939
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1777 | 1777 |
if (controlType != ControlType.PenControl) |
| 1778 | 1778 |
{
|
| 1779 | 1779 |
currentControl.OnCreatingMouseMove(currentCanvasDrawingMouseMovePoint, ViewerDataModel.Instance.IsAxisLock || ViewerDataModel.Instance.IsPressShift); |
| 1780 |
ViewerDataModel.Instance.IsMarkupUpdate = true; |
|
| 1780 | 1781 |
} |
| 1781 | 1782 |
|
| 1782 | 1783 |
#endregion // 모든 컨트롤의 공통기능 제어 |
| ... | ... | |
| 4433 | 4434 |
StartPoint = new Point(CanvasDrawingMouseDownPoint.X, CanvasDrawingMouseDownPoint.Y), |
| 4434 | 4435 |
Background = new SolidColorBrush(Colors.Black), |
| 4435 | 4436 |
STAMP = App.SystemInfo.STAMP, |
| 4437 |
STAMP_Contents = App.SystemInfo.STAMP_CONTENTS, |
|
| 4436 | 4438 |
ControlType = ControlType.Stamp |
| 4437 | 4439 |
}; |
| 4438 | 4440 |
|
| ... | ... | |
| 4639 | 4641 |
SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
| 4640 | 4642 |
// update mylist and gridview |
| 4641 | 4643 |
|
| 4642 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu.ExecuteSaveCommand(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
| 4644 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu.ExecuteSaveCommandAsync(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu);
|
|
| 4643 | 4645 |
//this.ParentOfType<MainWindow>().dzTopMenu._SaveEvent(null, null); |
| 4644 | 4646 |
ViewerDataModel.Instance.IsConsolidate = false; |
| 4645 | 4647 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.UpdateMyMarkupList(); |
| ... | ... | |
| 4708 | 4710 |
} |
| 4709 | 4711 |
else |
| 4710 | 4712 |
{
|
| 4711 |
var isSave = await this.ParentOfType<MainWindow>().dzTopMenu.SaveEventAsync();
|
|
| 4713 |
var isSave = this.ParentOfType<MainWindow>().dzTopMenu.SaveEvent();
|
|
| 4712 | 4714 |
|
| 4713 | 4715 |
if (isSave) |
| 4714 | 4716 |
{
|
| ... | ... | |
| 4776 | 4778 |
// update mylist and gridview |
| 4777 | 4779 |
this.UpdateMyMarkupList(); |
| 4778 | 4780 |
|
| 4779 |
var result = await this.ParentOfType<MainWindow>().dzTopMenu.ExecuteSaveCommand(this); |
|
| 4781 |
var result = await this.ParentOfType<MainWindow>().dzTopMenu.ExecuteSaveCommandAsync(this);
|
|
| 4780 | 4782 |
|
| 4781 | 4783 |
if(!result) |
| 4782 | 4784 |
{
|
내보내기 Unified diff
