From ec6e09ced1eeb32bb613478cec8beb7d8c2c3d37 Mon Sep 17 00:00:00 2001
From: fengjiayi <12821976+ning_xi@user.noreply.gitee.com>
Date: Tue, 10 Sep 2024 11:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E7=94=BB=E5=B8=83?=
=?UTF-8?q?=E5=B9=B3=E7=A7=BB=E3=80=81=E7=BC=A9=E6=94=BE=E3=80=81=E6=94=B9?=
=?UTF-8?q?=E5=8F=98=E5=B0=BA=E5=AF=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
WorkBench/MainWindow.xaml | 43 ++---
WorkBench/MainWindow.xaml.cs | 147 ++++++++----------
WorkBench/Node/View/ActionRegionControl.xaml | 8 -
.../Node/View/ActionRegionControl.xaml.cs | 33 ----
.../Node/View/ConditionRegionControl.xaml | 9 --
.../Node/View/ConditionRegionControl.xaml.cs | 30 ----
6 files changed, 92 insertions(+), 178 deletions(-)
diff --git a/WorkBench/MainWindow.xaml b/WorkBench/MainWindow.xaml
index a1cbed8..d8eced8 100644
--- a/WorkBench/MainWindow.xaml
+++ b/WorkBench/MainWindow.xaml
@@ -87,14 +87,11 @@
-
-
+ x:Name="FlowChartStackPanel"
+ ClipToBounds="True">
-->
-
+ Canvas.Top="0"/>-->
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
diff --git a/WorkBench/MainWindow.xaml.cs b/WorkBench/MainWindow.xaml.cs
index f6d156c..e79dbac 100644
--- a/WorkBench/MainWindow.xaml.cs
+++ b/WorkBench/MainWindow.xaml.cs
@@ -221,9 +221,11 @@ namespace Serein.WorkBench
var logTextWriter = new LogTextWriter(WriteLog);
Console.SetOut(logTextWriter);
- //transform = new TranslateTransform();
- //FlowChartCanvas.RenderTransform = transform;
+ UIInit();
+ }
+ private void UIInit()
+ {
canvasTransformGroup = new TransformGroup();
scaleTransform = new ScaleTransform();
translateTransform = new TranslateTransform();
@@ -232,6 +234,7 @@ namespace Serein.WorkBench
canvasTransformGroup.Children.Add(translateTransform);
FlowChartCanvas.RenderTransform = canvasTransformGroup;
+
FlowChartCanvas.RenderTransformOrigin = new Point(0.5, 0.5);
}
@@ -1164,9 +1167,6 @@ namespace Serein.WorkBench
((UIElement)sender).CaptureMouse(); // 捕获鼠标
}
-
-
-
///
/// 控件的鼠标移动事件，根据鼠标拖动更新控件的位置。
///
@@ -1203,6 +1203,7 @@ namespace Serein.WorkBench
}
}
+
///
/// 调整FlowChartCanvas的尺寸，确保显示所有控件。
///
@@ -1284,7 +1285,9 @@ namespace Serein.WorkBench
///
- /// FlowChartCanvas中移动时处理，用于实时更新连接线的终点位置。
+ /// 鼠标在画布移动。
+ /// 连接状态下，实时更新连接线的终点位置。
+ /// 移动画布状态下，移动画布。
///
private void FlowChartCanvas_MouseMove(object sender, MouseEventArgs e)
{
@@ -1667,33 +1670,13 @@ namespace Serein.WorkBench
if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
{
- if (e.Delta < 0 && scaleTransform.ScaleX < 0.4) return;
- if (e.Delta > 0 && scaleTransform.ScaleX > 3.0) return;
+ if (e.Delta < 0 && scaleTransform.ScaleX < 0.2) return;
+ if (e.Delta > 0 && scaleTransform.ScaleX > 2.0) return;
double scale = e.Delta > 0 ? 0.1 : -0.1;
+
+
scaleTransform.ScaleX += scale;
scaleTransform.ScaleY += scale;
- //AdjustCanvasSize();
-
-
- //double zoomFactor = e.Delta > 0 ? 1.1 : 0.9;
-
- //// 获取鼠标相对于Canvas的位置
- //Point mousePosition = e.GetPosition(this);
-
- //// 计算缩放后的Canvas中心位置
- //double absoluteX = mousePosition.X * scaleTransform.ScaleX;
- //double absoluteY = mousePosition.Y * scaleTransform.ScaleY;
-
- //// 应用缩放
- //scaleTransform.ScaleX *= zoomFactor;
- //scaleTransform.ScaleY *= zoomFactor;
-
- //// 平移，使缩放中心保持在鼠标光标处
- //translateTransform.X = mousePosition.X - absoluteX * zoomFactor;
- //translateTransform.Y = mousePosition.Y - absoluteY * zoomFactor;
-
- //// 调整画布大小，使其始终占据整个容器
- //AdjustCanvasSizeToContainer();
}
}
@@ -1795,84 +1778,92 @@ namespace Serein.WorkBench
#region 动态调整区域大小
- private void Thumb_DragDelta_TopLeft(object sender, DragDeltaEventArgs e)
- {
- // 从左上角调整大小
- double newWidth = Math.Max(FlowChartCanvas.ActualWidth - e.HorizontalChange, 0);
- double newHeight = Math.Max(FlowChartCanvas.ActualHeight - e.VerticalChange, 0);
+ //private void Thumb_DragDelta_TopLeft(object sender, DragDeltaEventArgs e)
+ //{
+ // // 从左上角调整大小
+ // double newWidth = Math.Max(FlowChartCanvas.ActualWidth - e.HorizontalChange, 0);
+ // double newHeight = Math.Max(FlowChartCanvas.ActualHeight - e.VerticalChange, 0);
- FlowChartCanvas.Width = newWidth;
- FlowChartCanvas.Height = newHeight;
+ // FlowChartCanvas.Width = newWidth;
+ // FlowChartCanvas.Height = newHeight;
- Canvas.SetLeft(FlowChartCanvas, Canvas.GetLeft(FlowChartCanvas) + e.HorizontalChange);
- Canvas.SetTop(FlowChartCanvas, Canvas.GetTop(FlowChartCanvas) + e.VerticalChange);
- }
+ // Canvas.SetLeft(FlowChartCanvas, Canvas.GetLeft(FlowChartCanvas) + e.HorizontalChange);
+ // Canvas.SetTop(FlowChartCanvas, Canvas.GetTop(FlowChartCanvas) + e.VerticalChange);
+ //}
- private void Thumb_DragDelta_TopRight(object sender, DragDeltaEventArgs e)
- {
- // 从右上角调整大小
- double newWidth = Math.Max(FlowChartCanvas.ActualWidth + e.HorizontalChange, 0);
- double newHeight = Math.Max(FlowChartCanvas.ActualHeight - e.VerticalChange, 0);
+ //private void Thumb_DragDelta_TopRight(object sender, DragDeltaEventArgs e)
+ //{
+ // // 从右上角调整大小
+ // double newWidth = Math.Max(FlowChartCanvas.ActualWidth + e.HorizontalChange, 0);
+ // double newHeight = Math.Max(FlowChartCanvas.ActualHeight - e.VerticalChange, 0);
- FlowChartCanvas.Width = newWidth;
- FlowChartCanvas.Height = newHeight;
+ // FlowChartCanvas.Width = newWidth;
+ // FlowChartCanvas.Height = newHeight;
- Canvas.SetTop(FlowChartCanvas, Canvas.GetTop(FlowChartCanvas) + e.VerticalChange);
- }
+ // Canvas.SetTop(FlowChartCanvas, Canvas.GetTop(FlowChartCanvas) + e.VerticalChange);
+ //}
- private void Thumb_DragDelta_BottomLeft(object sender, DragDeltaEventArgs e)
- {
- // 从左下角调整大小
- double newWidth = Math.Max(FlowChartCanvas.ActualWidth - e.HorizontalChange, 0);
- double newHeight = Math.Max(FlowChartCanvas.ActualHeight + e.VerticalChange, 0);
+ //private void Thumb_DragDelta_BottomLeft(object sender, DragDeltaEventArgs e)
+ //{
+ // // 从左下角调整大小
+ // double newWidth = Math.Max(FlowChartCanvas.ActualWidth - e.HorizontalChange, 0);
+ // double newHeight = Math.Max(FlowChartCanvas.ActualHeight + e.VerticalChange, 0);
- FlowChartCanvas.Width = newWidth;
- FlowChartCanvas.Height = newHeight;
+ // FlowChartCanvas.Width = newWidth;
+ // FlowChartCanvas.Height = newHeight;
- Canvas.SetLeft(FlowChartCanvas, Canvas.GetLeft(FlowChartCanvas) + e.HorizontalChange);
- }
+ // Canvas.SetLeft(FlowChartCanvas, Canvas.GetLeft(FlowChartCanvas) + e.HorizontalChange);
+ //}
private void Thumb_DragDelta_BottomRight(object sender, DragDeltaEventArgs e)
{
// 从右下角调整大小
- double newWidth = Math.Max(FlowChartCanvas.ActualWidth + e.HorizontalChange, 0);
- double newHeight = Math.Max(FlowChartCanvas.ActualHeight + e.VerticalChange, 0);
+ double newWidth = Math.Max(FlowChartCanvas.ActualWidth + e.HorizontalChange * scaleTransform.ScaleX, 0);
+ double newHeight = Math.Max(FlowChartCanvas.ActualHeight + e.VerticalChange * scaleTransform.ScaleY, 0);
+
+
+
+ newWidth = newWidth < 400 ? 400 : newWidth;
+ newHeight = newHeight < 400 ? 400 : newHeight;
FlowChartCanvas.Width = newWidth;
FlowChartCanvas.Height = newHeight;
+
+
}
- private void Thumb_DragDelta_Left(object sender, DragDeltaEventArgs e)
- {
- // 从左侧调整大小
- double newWidth = Math.Max(FlowChartCanvas.ActualWidth - e.HorizontalChange, 0);
+ //private void Thumb_DragDelta_Left(object sender, DragDeltaEventArgs e)
+ //{
+ // // 从左侧调整大小
+ // double newWidth = Math.Max(FlowChartCanvas.ActualWidth - e.HorizontalChange, 0);
- FlowChartCanvas.Width = newWidth;
- Canvas.SetLeft(FlowChartCanvas, Canvas.GetLeft(FlowChartCanvas) + e.HorizontalChange);
- }
+ // FlowChartCanvas.Width = newWidth;
+ // Canvas.SetLeft(FlowChartCanvas, Canvas.GetLeft(FlowChartCanvas) + e.HorizontalChange);
+ //}
private void Thumb_DragDelta_Right(object sender, DragDeltaEventArgs e)
{
//从右侧调整大小
- double newWidth = Math.Max(FlowChartCanvas.ActualWidth + e.HorizontalChange, 0);
+ double newWidth = Math.Max(FlowChartCanvas.ActualWidth + e.HorizontalChange * scaleTransform.ScaleX, 0);
+ newWidth = newWidth < 400 ? 400 : newWidth;
FlowChartCanvas.Width = newWidth;
}
- private void Thumb_DragDelta_Top(object sender, DragDeltaEventArgs e)
- {
- // 从顶部调整大小
- double newHeight = Math.Max(FlowChartCanvas.ActualHeight - e.VerticalChange, 0);
-
- FlowChartCanvas.Height = newHeight;
- Canvas.SetTop(FlowChartCanvas, Canvas.GetTop(FlowChartCanvas) + e.VerticalChange);
- }
+ //private void Thumb_DragDelta_Top(object sender, DragDeltaEventArgs e)
+ //{
+ // // 从顶部调整大小
+ // double newHeight = Math.Max(FlowChartCanvas.ActualHeight - e.VerticalChange, 0);
+
+ // FlowChartCanvas.Height = newHeight;
+ // Canvas.SetTop(FlowChartCanvas, Canvas.GetTop(FlowChartCanvas) + e.VerticalChange);
+ //}
private void Thumb_DragDelta_Bottom(object sender, DragDeltaEventArgs e)
{
// 从底部调整大小
- double newHeight = Math.Max(FlowChartCanvas.ActualHeight + e.VerticalChange, 0);
-
+ double newHeight = Math.Max(FlowChartCanvas.ActualHeight + e.VerticalChange * scaleTransform.ScaleY, 0);
+ newHeight = newHeight < 400 ? 400 : newHeight;
FlowChartCanvas.Height = newHeight;
}
diff --git a/WorkBench/Node/View/ActionRegionControl.xaml b/WorkBench/Node/View/ActionRegionControl.xaml
index 6e2021b..9040307 100644
--- a/WorkBench/Node/View/ActionRegionControl.xaml
+++ b/WorkBench/Node/View/ActionRegionControl.xaml
@@ -16,14 +16,6 @@
-
-
-
-
diff --git a/WorkBench/Node/View/ActionRegionControl.xaml.cs b/WorkBench/Node/View/ActionRegionControl.xaml.cs
index d6528d1..f0b0e6e 100644
--- a/WorkBench/Node/View/ActionRegionControl.xaml.cs
+++ b/WorkBench/Node/View/ActionRegionControl.xaml.cs
@@ -16,7 +16,6 @@ namespace Serein.WorkBench.Node.View
private new readonly CompositeActionNode Node;
public ActionRegionControl() : base()
-
{
InitializeComponent();
}
@@ -27,38 +26,6 @@ namespace Serein.WorkBench.Node.View
base.Name = "动作组合节点";
}
- #region 动态调整区域大小
- private void ResizeTop_DragDelta(object sender, DragDeltaEventArgs e)
- {
- double oldHeight = Height;
- double newHeight = Math.Max(MinHeight, oldHeight - e.VerticalChange);
- Height = newHeight;
- Canvas.SetTop(this, Canvas.GetTop(this) + (oldHeight - newHeight));
- }
-
- private void ResizeBottom_DragDelta(object sender, DragDeltaEventArgs e)
- {
- double newHeight = Math.Max(MinHeight, Height + e.VerticalChange);
- Height = newHeight;
- }
-
- private void ResizeLeft_DragDelta(object sender, DragDeltaEventArgs e)
- {
- double oldWidth = Width;
- double newWidth = Math.Max(MinWidth, oldWidth - e.HorizontalChange);
- Width = newWidth;
- Canvas.SetLeft(this, Canvas.GetLeft(this) + (oldWidth - newWidth));
- }
-
- private void ResizeRight_DragDelta(object sender, DragDeltaEventArgs e)
- {
- double newWidth = Math.Max(MinWidth, Width + e.HorizontalChange);
- Width = newWidth;
- }
-
-#endregion
-
-
public void AddAction(NodeControlBase node, bool isTask = false)
{
/*TextBlock actionText = new TextBlock
diff --git a/WorkBench/Node/View/ConditionRegionControl.xaml b/WorkBench/Node/View/ConditionRegionControl.xaml
index 5d13f71..6ec977f 100644
--- a/WorkBench/Node/View/ConditionRegionControl.xaml
+++ b/WorkBench/Node/View/ConditionRegionControl.xaml
@@ -20,14 +20,5 @@
-
-
-
-
-
diff --git a/WorkBench/Node/View/ConditionRegionControl.xaml.cs b/WorkBench/Node/View/ConditionRegionControl.xaml.cs
index 351c4fd..416cb0c 100644
--- a/WorkBench/Node/View/ConditionRegionControl.xaml.cs
+++ b/WorkBench/Node/View/ConditionRegionControl.xaml.cs
@@ -23,36 +23,6 @@ namespace Serein.WorkBench.Node.View
InitializeComponent();
}
- #region 动态调整区域大小
- private void ResizeTop_DragDelta(object sender, DragDeltaEventArgs e)
- {
- double oldHeight = Height;
- double newHeight = Math.Max(MinHeight, oldHeight - e.VerticalChange);
- Height = newHeight;
- Canvas.SetTop(this, Canvas.GetTop(this) + (oldHeight - newHeight));
- }
-
- private void ResizeBottom_DragDelta(object sender, DragDeltaEventArgs e)
- {
- double newHeight = Math.Max(MinHeight, Height + e.VerticalChange);
- Height = newHeight;
- }
-
- private void ResizeLeft_DragDelta(object sender, DragDeltaEventArgs e)
- {
- double oldWidth = Width;
- double newWidth = Math.Max(MinWidth, oldWidth - e.HorizontalChange);
- Width = newWidth;
- Canvas.SetLeft(this, Canvas.GetLeft(this) + (oldWidth - newWidth));
- }
-
- private void ResizeRight_DragDelta(object sender, DragDeltaEventArgs e)
- {
- double newWidth = Math.Max(MinWidth, Width + e.HorizontalChange);
- Width = newWidth;
- }
-
- #endregion
///