개정판 b74a9c91
macro기능 추가
Change-Id: I6e80960cf3ebf71f316f9d18cd890e90c827c40b
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 1664 | 1664 |
|
| 1665 | 1665 |
private void zoomAndPanControl_MouseMove(object sender, MouseEventArgs e) |
| 1666 | 1666 |
{
|
| 1667 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch") |
|
| 1667 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch" |
|
| 1668 |
|| Common.ViewerDataModel.Instance.SelectedControl == "MACRO") |
|
| 1669 |
//if(this.txtBatch.Visibility == Visibility.Visible) |
|
| 1668 | 1670 |
{
|
| 1669 | 1671 |
if (!floatingTip.IsOpen) { floatingTip.IsOpen = true; }
|
| 1670 | 1672 |
|
| ... | ... | |
| 3742 | 3744 |
currentControl = null; |
| 3743 | 3745 |
|
| 3744 | 3746 |
if (Common.ViewerDataModel.Instance.SelectedControl == "Batch") |
| 3745 |
{
|
|
| 3747 |
{
|
|
| 3746 | 3748 |
controlType = ControlType.None; |
| 3747 | 3749 |
IsSwingMode = false; |
| 3748 | 3750 |
Common.ViewerDataModel.Instance.SelectedControl = ""; |
| ... | ... | |
| 3888 | 3890 |
} |
| 3889 | 3891 |
|
| 3890 | 3892 |
CreateCommand.Instance.Execute(currentControl); |
| 3891 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3893 |
try |
|
| 3894 |
{
|
|
| 3895 |
ViewerDataModel.Instance.MarkupControls_USER.Add(currentControl); |
|
| 3896 |
} |
|
| 3897 |
catch (Exception ex) |
|
| 3898 |
{
|
|
| 3899 |
System.Diagnostics.Debug.WriteLine(ex.ToString()); |
|
| 3900 |
} |
|
| 3892 | 3901 |
|
| 3893 | 3902 |
(currentControl as ArrowTextControl).Base_TextBox.IsHitTestVisible = false; |
| 3894 | 3903 |
(currentControl as ArrowTextControl).EnableEditing = false; |
| ... | ... | |
| 4407 | 4416 |
break; |
| 4408 | 4417 |
} |
| 4409 | 4418 |
|
| 4419 |
|
|
| 4410 | 4420 |
if (currentControl is ArrowTextControl) |
| 4411 | 4421 |
{
|
| 4412 | 4422 |
(currentControl as ArrowTextControl).EditEnded += (snd, evt) => |
| ... | ... | |
| 4420 | 4430 |
}; |
| 4421 | 4431 |
|
| 4422 | 4432 |
} |
| 4433 |
|
|
| 4434 |
if (Common.ViewerDataModel.Instance.IsMacroCommand) |
|
| 4435 |
{
|
|
| 4436 |
if (currentControl == null && mouseHandlingMode == MouseHandlingMode.Drawing) |
|
| 4437 |
{
|
|
| 4438 |
MacroHelper.MacroAction(); |
|
| 4439 |
} |
|
| 4440 |
//if (currentControl.ControlType) |
|
| 4441 |
//txtBatch.Text = "Draw a TextBox"; |
|
| 4442 |
//controlType = ControlType.ArrowTextBorderControl; |
|
| 4443 |
} |
|
| 4444 |
|
|
| 4423 | 4445 |
//if (currentControl != null) |
| 4424 | 4446 |
//{
|
| 4425 | 4447 |
// currentControl.PageAngle = pageNavigator.CurrentPage.Angle; |
| ... | ... | |
| 4427 | 4449 |
} |
| 4428 | 4450 |
if (mouseHandlingMode != MouseHandlingMode.None && e.LeftButton == MouseButtonState.Pressed) |
| 4429 | 4451 |
{
|
| 4452 |
// MACRO 버튼클릭하여 CLOUD RECT 그린 후 |
|
| 4453 |
|
|
| 4454 |
|
|
| 4430 | 4455 |
if (mouseHandlingMode == MouseHandlingMode.Adorner && SelectLayer.Children.Count > 0) |
| 4431 | 4456 |
{
|
| 4432 | 4457 |
bool mouseOff = false; |
내보내기 Unified diff
