From 5323358eb074bbcfcf5057c1f2d9d59f5dd2be18 Mon Sep 17 00:00:00 2001 From: DebugST <2212233137@qq.com> Date: Thu, 21 Jan 2021 18:18:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DHUB=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E6=96=AD=E5=BC=80=E9=93=BE=E6=8E=A5BUG=20=E5=B0=86=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=99=A8=E8=BF=9E=E7=BA=BF=E5=9B=BE=E5=B1=82=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E8=87=B3=E8=8A=82=E7=82=B9=E5=9B=BE=E5=B1=82=E5=90=8E?= =?UTF-8?q?=E6=96=B9=20=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86STNode=E9=87=8D?= =?UTF-8?q?=E8=BD=BDADD:(OnSetOptionDotLocation,OnSetOptionTextRectangle,O?= =?UTF-8?q?nEditorLoadCompleted)=20=E5=AF=B9=E4=BF=9D=E5=AD=98=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=BF=9B=E8=A1=8CGZIP=E5=8E=8B=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ST.Library.UI/ST.Library.UI.csproj | 3 +- ST.Library.UI/STNodeEditor/STNode.cs | 149 ++++++++++++------ .../STNodeEditor/STNodeCollection.cs | 11 +- ST.Library.UI/STNodeEditor/STNodeEditor.cs | 139 +++++++++------- ST.Library.UI/STNodeEditor/STNodeOption.cs | 11 +- .../STNodeEditor/STNodeOptionCollection.cs | 7 + WinNodeEditerTest.suo | Bin 70656 -> 75264 bytes .../Demo_Image/STNodeImageInput.cs | 4 +- WinNodeEditerTest/Form1.cs | 2 +- WinNodeEditerTest/Form2.Designer.cs | 96 +++++++++++ WinNodeEditerTest/Form2.cs | 36 +++++ WinNodeEditerTest/Form2.resx | 120 ++++++++++++++ WinNodeEditerTest/NodeNumberAdd.cs | 2 +- WinNodeEditerTest/WinNodeEditerTest.csproj | 9 ++ docs/doc.html | 48 ++++-- 15 files changed, 507 insertions(+), 130 deletions(-) create mode 100755 WinNodeEditerTest/Form2.Designer.cs create mode 100755 WinNodeEditerTest/Form2.cs create mode 100755 WinNodeEditerTest/Form2.resx diff --git a/ST.Library.UI/ST.Library.UI.csproj b/ST.Library.UI/ST.Library.UI.csproj index e915560..f847233 100755 --- a/ST.Library.UI/ST.Library.UI.csproj +++ b/ST.Library.UI/ST.Library.UI.csproj @@ -23,13 +23,14 @@ 4 - none + pdbonly true bin\Release\ TRACE prompt 4 bin\Release\ST.Library.UI.XML + true diff --git a/ST.Library.UI/STNodeEditor/STNode.cs b/ST.Library.UI/STNodeEditor/STNode.cs index 5119534..c9598a7 100755 --- a/ST.Library.UI/STNodeEditor/STNode.cs +++ b/ST.Library.UI/STNodeEditor/STNode.cs @@ -48,10 +48,11 @@ namespace ST.Library.UI internal set { if (value == _Owner) return; if (_Owner != null) { - foreach (STNodeOption op in this._InputOptions) op.DisConnectionAll(); - foreach (STNodeOption op in this._OutputOptions) op.DisConnectionAll(); + foreach (STNodeOption op in this._InputOptions.ToArray()) op.DisConnectionAll(); + foreach (STNodeOption op in this._OutputOptions.ToArray()) op.DisConnectionAll(); } _Owner = value; + this.BuildSize(true, true, false); this.OnOwnerChanged(); } } @@ -368,8 +369,14 @@ namespace ST.Library.UI set { _Tag = value; } } - private bool m_isBuildNodeSize; - private bool m_isBuildMarkSize; + private Guid _Guid; + /// + /// 获取全局唯一标识 + /// + public Guid Guid { + get { return _Guid; } + } + private static Point m_static_pt_init = new Point(10, 10); public STNode(/*string strTitle, int x, int y*/) { @@ -395,6 +402,7 @@ namespace ST.Library.UI m_sf.SetTabStops(0, new float[] { 40 }); m_static_pt_init.X += 10; m_static_pt_init.Y += 10; + this._Guid = Guid.NewGuid(); this.OnCreate(); } @@ -409,30 +417,34 @@ namespace ST.Library.UI /// protected STNodeControl m_ctrl_hover; - public void BuildSize(bool bBuildNode, bool bBuildMark, bool bRedraw) { - m_isBuildNodeSize = bBuildNode; - m_isBuildMarkSize = bBuildMark; - if (bRedraw) { - if (this._Owner != null) this._Owner.Invalidate(); - } - } - - internal void CheckSize(DrawingTools dt) { - if (m_isBuildNodeSize) { - Size sz = this.OnBuildNodeSize(dt); - this._Width = sz.Width; - this._Height = sz.Height; - m_isBuildNodeSize = false; - } - if (m_isBuildMarkSize) { - m_isBuildMarkSize = true; - if (string.IsNullOrEmpty(this._Mark)) return; - this._MarkRectangle = this.OnBuildMarkRectangle(dt); + protected internal void BuildSize(bool bBuildNode, bool bBuildMark, bool bRedraw) { + if (this._Owner == null) return; + Pen p = new Pen(this._BackColor); + SolidBrush sb = new SolidBrush(this._BackColor); + using (Graphics g = this._Owner.CreateGraphics()) { + DrawingTools dt = new DrawingTools() { + Graphics = g, + Pen = p, + SolidBrush = sb + }; + if (bBuildNode) { + Size sz = this.OnBuildNodeSize(dt); + this._Width = sz.Width; + this._Height = sz.Height; + this.SetOptionLocation(); + this.OnResize(new EventArgs()); + } + if (bBuildMark) { + if (string.IsNullOrEmpty(this._Mark)) return; + this._MarkRectangle = this.OnBuildMarkRectangle(dt); + } } + if (bRedraw) this._Owner.Invalidate(); } internal Dictionary OnSaveNode() { Dictionary dic = new Dictionary(); + dic.Add("Guid", this._Guid.ToByteArray()); dic.Add("Left", BitConverter.GetBytes(this._Left)); dic.Add("Top", BitConverter.GetBytes(this._Top)); dic.Add("Mark", string.IsNullOrEmpty(this._Mark) ? new byte[] { 0 } : Encoding.UTF8.GetBytes(this._Mark)); @@ -444,7 +456,11 @@ namespace ST.Library.UI internal virtual byte[] GetSaveData() { List lst = new List(); - byte[] byData = Encoding.UTF8.GetBytes(this.GetType().GUID.ToString()); + Type t = this.GetType(); + byte[] byData = Encoding.UTF8.GetBytes(t.Module.Name); + lst.Add((byte)byData.Length); + lst.AddRange(byData); + byData = Encoding.UTF8.GetBytes(t.GUID.ToString()); lst.Add((byte)byData.Length); lst.AddRange(byData); @@ -552,31 +568,13 @@ namespace ST.Library.UI /// 绘制工具 protected virtual void OnDrawBody(DrawingTools dt) { SolidBrush brush = dt.SolidBrush; - Rectangle rect = new Rectangle(this.Left + 10, this._Top + this._TitleHeight, this._Width - 20, m_nItemHeight); - m_sf.Alignment = StringAlignment.Near; foreach (STNodeOption op in this._InputOptions) { - brush.Color = op.TextColor;// this._ForeColor; - dt.Graphics.DrawString(op.Text, this._Font, brush, rect, m_sf); - op.DotLeft = this.Left - 5; - op.DotTop = rect.Y + 5; - Point pt = this.OnSetOptionLocation(op); - op.DotLeft = pt.X; - op.DotTop = pt.Y; this.OnDrawOptionDot(dt, op); - rect.Y += m_nItemHeight; + this.OnDrawOptionText(dt, op); } - rect.Y = this._Top + this._TitleHeight; - m_sf.Alignment = StringAlignment.Far; foreach (STNodeOption op in this._OutputOptions) { - brush.Color = op.TextColor;// this._ForeColor; - dt.Graphics.DrawString(op.Text, this._Font, brush, rect, m_sf); - op.DotLeft = this.Left + this.Width - 5; - op.DotTop = rect.Y + 5; - Point pt = this.OnSetOptionLocation(op); - op.DotLeft = pt.X; - op.DotTop = pt.Y; this.OnDrawOptionDot(dt, op); - rect.Y += m_nItemHeight; + this.OnDrawOptionText(dt, op); } if (this._Controls.Count != 0) { //绘制子控件 //将坐标原点与节点对齐 @@ -655,12 +653,38 @@ namespace ST.Library.UI } } /// - /// 当计算Option位置时候发生 + /// 绘制选项的文本 + /// + /// 绘制工具 + /// 指定的选项 + protected virtual void OnDrawOptionText(DrawingTools dt, STNodeOption op) { + Graphics g = dt.Graphics; + SolidBrush brush = dt.SolidBrush; + if (op.IsInput) { + m_sf.Alignment = StringAlignment.Near; + } else { + m_sf.Alignment = StringAlignment.Far; + } + brush.Color = op.TextColor; + g.DrawString(op.Text, this.Font, brush, op.TextRectangle, m_sf); + } + /// + /// 当计算Option连线点位置时候发生 /// /// 需要计算的Option + /// 自动计算出的位置 /// 新的位置 - protected virtual Point OnSetOptionLocation(STNodeOption op) { - return new Point(op.DotLeft, op.DotTop); + protected virtual Point OnSetOptionDotLocation(STNodeOption op, Point pt) { + return pt; + } + /// + /// 当计算Option文本区域时候发生 + /// + /// 需要计算的Option + /// 自动计算出的区域 + /// 新的区域 + protected virtual Rectangle OnSetOptionTextRectangle(STNodeOption op, Rectangle rect) { + return rect; } /// /// 计算当前Node所需要的矩形区域 @@ -712,6 +736,7 @@ namespace ST.Library.UI /// /// 保存时候的数据 protected internal virtual void OnLoadNode(Dictionary dic) { + if (dic.ContainsKey("Guid")) this._Guid = new Guid(dic["Guid"]); if (dic.ContainsKey("Left")) this._Left = BitConverter.ToInt32(dic["Left"], 0); if (dic.ContainsKey("Top")) this._Top = BitConverter.ToInt32(dic["Top"], 0); if (dic.ContainsKey("Mark")) { @@ -721,6 +746,12 @@ namespace ST.Library.UI if (dic.ContainsKey("LockOption")) this._LockOption = dic["LockOption"][0] == 1; if (dic.ContainsKey("LockLocation")) this._LockLocation = dic["LockLocation"][0] == 1; } + /// + /// 当编辑器加载完成所有的节点时候发生 + /// + protected internal virtual void OnEditorLoadCompleted() { + + } //[event]===========================[event]==============================[event]============================[event] @@ -821,8 +852,8 @@ namespace ST.Library.UI if (m_ctrl_active != null) m_ctrl_active.OnKeyPress(e); } - protected internal virtual void OnMove(EventArgs e) { } - protected internal virtual void OnResize(EventArgs e) { } + protected internal virtual void OnMove(EventArgs e) { this.SetOptionLocation(); } + protected internal virtual void OnResize(EventArgs e) { this.SetOptionLocation(); } /// @@ -840,6 +871,26 @@ namespace ST.Library.UI #endregion protected + private void SetOptionLocation() { + Rectangle rect = new Rectangle(this.Left + 10, this._Top + this._TitleHeight, this._Width - 20, m_nItemHeight); + foreach (STNodeOption op in this._InputOptions) { + Point pt = this.OnSetOptionDotLocation(op, new Point(this.Left - 5, rect.Y + 5)); + op.TextRectangle = this.OnSetOptionTextRectangle(op, rect); + op.DotLeft = pt.X; + op.DotTop = pt.Y; + rect.Y += m_nItemHeight; + } + rect.Y = this._Top + this._TitleHeight; + m_sf.Alignment = StringAlignment.Far; + foreach (STNodeOption op in this._OutputOptions) { + Point pt = this.OnSetOptionDotLocation(op, new Point(this._Left + this._Width - 5, rect.Y + 5)); + op.TextRectangle = this.OnSetOptionTextRectangle(op, rect); + op.DotLeft = pt.X; + op.DotTop = pt.Y; + rect.Y += m_nItemHeight; + } + } + /// /// 重绘Node /// diff --git a/ST.Library.UI/STNodeEditor/STNodeCollection.cs b/ST.Library.UI/STNodeEditor/STNodeCollection.cs index 18eac67..6d23e01 100755 --- a/ST.Library.UI/STNodeEditor/STNodeCollection.cs +++ b/ST.Library.UI/STNodeEditor/STNodeCollection.cs @@ -27,7 +27,7 @@ namespace ST.Library.UI if (-1 == nIndex) { nIndex = this._Count; node.Owner = m_owner; - node.BuildSize(true, true, false); + //node.BuildSize(true, true, false); m_nodes[this._Count++] = node; m_owner.BuildBounds(); m_owner.OnNodeAdded(new STNodeEditorEventArgs(node)); @@ -87,7 +87,7 @@ namespace ST.Library.UI node.Owner = m_owner; m_nodes[nIndex] = node; this._Count++; - node.BuildSize(true, true,false); + //node.BuildSize(true, true,false); m_owner.Invalidate(); m_owner.BuildBounds(); } @@ -225,5 +225,12 @@ namespace ST.Library.UI IEnumerator IEnumerable.GetEnumerator() { return this.GetEnumerator(); } + + public STNode[] ToArray() { + STNode[] nodes = new STNode[this._Count]; + for (int i = 0; i < nodes.Length; i++) + nodes[i] = m_nodes[i]; + return nodes; + } } } diff --git a/ST.Library.UI/STNodeEditor/STNodeEditor.cs b/ST.Library.UI/STNodeEditor/STNodeEditor.cs index b8b0597..aaed817 100755 --- a/ST.Library.UI/STNodeEditor/STNodeEditor.cs +++ b/ST.Library.UI/STNodeEditor/STNodeEditor.cs @@ -10,6 +10,7 @@ using System.Drawing.Drawing2D; using System.Threading; using System.ComponentModel; using System.Reflection; +using System.IO.Compression; /* MIT License @@ -632,11 +633,12 @@ namespace ST.Library.UI g.TranslateTransform(this._CanvasOffsetX, this._CanvasOffsetY); //移动坐标系 g.ScaleTransform(this._CanvasScale, this._CanvasScale); //缩放绘图表面 - this.OnDrawNode(m_drawing_tools, this.ControlToCanvas(this.ClientRectangle)); this.OnDrawConnectedLine(m_drawing_tools); + this.OnDrawNode(m_drawing_tools, this.ControlToCanvas(this.ClientRectangle)); if (m_ca == CanvasAction.ConnectOption) { //如果正在连线 m_drawing_tools.Pen.Color = this._HighLineColor; + g.SmoothingMode = SmoothingMode.HighQuality; if (m_option_down.IsInput) this.DrawBezier(g, m_drawing_tools.Pen, m_pt_in_canvas, m_pt_dot_down, this._Curvature); else @@ -777,21 +779,23 @@ namespace ST.Library.UI this.OnHoverChanged(new EventArgs()); bRedraw = true; } - if (this._HoverNode != null) + if (this._HoverNode != null) { this._HoverNode.OnMouseMove(new MouseEventArgs(e.Button, e.Clicks, (int)m_pt_in_canvas.X - this._HoverNode.Left, (int)m_pt_in_canvas.Y - this._HoverNode.Top, e.Delta)); - - GraphicsPath gp = null; - foreach (var v in m_dic_gp_info) { //判断鼠标是否悬停到连线路径上 - if (v.Key.IsOutlineVisible(m_pt_in_canvas, m_p_line_hover)) { - gp = v.Key; - break; + m_gp_hover = null; + } else { + GraphicsPath gp = null; + foreach (var v in m_dic_gp_info) { //判断鼠标是否悬停到连线路径上 + if (v.Key.IsOutlineVisible(m_pt_in_canvas, m_p_line_hover)) { + gp = v.Key; + break; + } + } + if (m_gp_hover != gp) { + m_gp_hover = gp; + bRedraw = true; } - } - if (m_gp_hover != gp) { - m_gp_hover = gp; - bRedraw = true; } if (bRedraw) this.Invalidate(); } @@ -942,7 +946,7 @@ namespace ST.Library.UI //var rect_canvas_display = this.ControlToCanvas(rect); Image img_border = null; foreach (STNode n in this._Nodes) { - n.CheckSize(dt); + //n.CheckSize(dt); img_border = m_img_border; if (this._ShowBorder) { //如果绘制边框 判断状态 if (this._ActiveNode == n) img_border = m_img_border_active; @@ -1701,24 +1705,26 @@ namespace ST.Library.UI Dictionary dic = new Dictionary(); s.Write(new byte[] { (byte)'S', (byte)'T', (byte)'N', (byte)'D' }, 0, 4); //file head s.WriteByte(1); //ver - s.Write(BitConverter.GetBytes(this._CanvasOffsetX), 0, 4); - s.Write(BitConverter.GetBytes(this._CanvasOffsetY), 0, 4); - s.Write(BitConverter.GetBytes(this._CanvasScale), 0, 4); - s.Write(BitConverter.GetBytes(this._Nodes.Count), 0, 4); - foreach (STNode node in this._Nodes) { - try { - byte[] byNode = node.GetSaveData(); - s.Write(BitConverter.GetBytes(byNode.Length), 0, 4); - s.Write(byNode, 0, byNode.Length); - foreach (STNodeOption op in node.InputOptions) dic.Add(op, dic.Count); - foreach (STNodeOption op in node.OutputOptions) dic.Add(op, dic.Count); - } catch (Exception ex) { - throw new Exception("获取节点数据出错-" + node.Title, ex); + using (GZipStream gs = new GZipStream(s, CompressionMode.Compress)) { + gs.Write(BitConverter.GetBytes(this._CanvasOffsetX), 0, 4); + gs.Write(BitConverter.GetBytes(this._CanvasOffsetY), 0, 4); + gs.Write(BitConverter.GetBytes(this._CanvasScale), 0, 4); + gs.Write(BitConverter.GetBytes(this._Nodes.Count), 0, 4); + foreach (STNode node in this._Nodes) { + try { + byte[] byNode = node.GetSaveData(); + gs.Write(BitConverter.GetBytes(byNode.Length), 0, 4); + gs.Write(byNode, 0, byNode.Length); + foreach (STNodeOption op in node.InputOptions) dic.Add(op, dic.Count); + foreach (STNodeOption op in node.OutputOptions) dic.Add(op, dic.Count); + } catch (Exception ex) { + throw new Exception("获取节点数据出错-" + node.Title, ex); + } } + gs.Write(BitConverter.GetBytes(m_dic_gp_info.Count), 0, 4); + foreach (var v in m_dic_gp_info.Values) + gs.Write(BitConverter.GetBytes(((dic[v.Output] << 32) | dic[v.Input])), 0, 8); } - s.Write(BitConverter.GetBytes(m_dic_gp_info.Count), 0, 4); - foreach (var v in m_dic_gp_info.Values) - s.Write(BitConverter.GetBytes(((dic[v.Output] << 32) | dic[v.Input])), 0, 8); } /// /// 获取画布中内容二进制数据 @@ -1800,42 +1806,53 @@ namespace ST.Library.UI if (BitConverter.ToInt32(byLen, 0) != BitConverter.ToInt32(new byte[] { (byte)'S', (byte)'T', (byte)'N', (byte)'D' }, 0)) throw new InvalidDataException("无法识别的文件类型"); if (s.ReadByte() != 1) throw new InvalidDataException("无法识别的文件版本号"); - s.Read(byLen, 0, 4); - float x = BitConverter.ToSingle(byLen, 0); - s.Read(byLen, 0, 4); - float y = BitConverter.ToSingle(byLen, 0); - s.Read(byLen, 0, 4); - float scale = BitConverter.ToSingle(byLen, 0); - s.Read(byLen, 0, 4); - int nCount = BitConverter.ToInt32(byLen, 0); - Dictionary dic = new Dictionary(); - byte[] byData = null; - for (int i = 0; i < nCount; i++) { - s.Read(byLen, 0, byLen.Length); - nLen = BitConverter.ToInt32(byLen, 0); - byData = new byte[nLen]; - s.Read(byData, 0, byData.Length); - STNode node = this.GetNodeFromData(byData); - try { this._Nodes.Add(node); } catch (Exception ex) { throw new Exception("加载节点出错-" + node.Title, ex); } - foreach (STNodeOption op in node.InputOptions) dic.Add(dic.Count, op); - foreach (STNodeOption op in node.OutputOptions) dic.Add(dic.Count, op); + using (GZipStream gs = new GZipStream(s, CompressionMode.Decompress)) { + gs.Read(byLen, 0, 4); + float x = BitConverter.ToSingle(byLen, 0); + gs.Read(byLen, 0, 4); + float y = BitConverter.ToSingle(byLen, 0); + gs.Read(byLen, 0, 4); + float scale = BitConverter.ToSingle(byLen, 0); + gs.Read(byLen, 0, 4); + int nCount = BitConverter.ToInt32(byLen, 0); + Dictionary dic = new Dictionary(); + byte[] byData = null; + for (int i = 0; i < nCount; i++) { + gs.Read(byLen, 0, byLen.Length); + nLen = BitConverter.ToInt32(byLen, 0); + byData = new byte[nLen]; + gs.Read(byData, 0, byData.Length); + STNode node = null; + try { node = this.GetNodeFromData(byData); } catch (Exception ex) { + throw new Exception("加载节点时发生错误可能数据已损坏\r\n" + ex.Message, ex); + } + try { this._Nodes.Add(node); } catch (Exception ex) { + throw new Exception("加载节点出错-" + node.Title, ex); + } + foreach (STNodeOption op in node.InputOptions) dic.Add(dic.Count, op); + foreach (STNodeOption op in node.OutputOptions) dic.Add(dic.Count, op); + } + gs.Read(byLen, 0, 4); + nCount = BitConverter.ToInt32(byLen, 0); + byData = new byte[8]; + for (int i = 0; i < nCount; i++) { + gs.Read(byData, 0, byData.Length); + long id = BitConverter.ToInt64(byData, 0); + long op_out = id >> 32; + long op_in = (int)id; + dic[op_out].ConnectOption(dic[op_in]); + } + this.ScaleCanvas(scale, 0, 0); + this.MoveCanvas(x, y, false, CanvasMoveArgs.All); } - s.Read(byLen, 0, 4); - nCount = BitConverter.ToInt32(byLen, 0); - byData = new byte[8]; - for (int i = 0; i < nCount; i++) { - s.Read(byData, 0, byData.Length); - long id = BitConverter.ToInt64(byData, 0); - long op_out = id >> 32; - long op_in = (int)id; - dic[op_out].ConnectOption(dic[op_in]); - } - this.ScaleCanvas(scale, 0, 0); - this.MoveCanvas(x, y, false, CanvasMoveArgs.All); this.BuildBounds(); + foreach (STNode node in this._Nodes) node.OnEditorLoadCompleted(); } + private STNode GetNodeFromData(byte[] byData) { int nIndex = 0; + string strModel = Encoding.UTF8.GetString(byData, nIndex + 1, byData[nIndex]); + nIndex += byData[nIndex] + 1; string strGUID = Encoding.UTF8.GetString(byData, nIndex + 1, byData[nIndex]); nIndex += byData[nIndex] + 1; @@ -1854,7 +1871,7 @@ namespace ST.Library.UI nIndex += nLen; dic.Add(strKey, byValue); } - if (!m_dic_type.ContainsKey(strGUID)) throw new TypeLoadException("无法找到类型 {" + strGUID + "} 所在程序集 确保所需程序集已被编辑器正确加载 可通过调用LoadAssembly()加载程序集"); + if (!m_dic_type.ContainsKey(strGUID)) throw new TypeLoadException("无法找到类型 {" + strGUID + "} 所在程序集 确保程序集{" + strModel + "}已被编辑器正确加载 可通过调用LoadAssembly()加载程序集"); Type t = m_dic_type[strGUID]; ; STNode node = (STNode)Activator.CreateInstance(t); node.OnLoadNode(dic); diff --git a/ST.Library.UI/STNodeEditor/STNodeOption.cs b/ST.Library.UI/STNodeEditor/STNodeOption.cs index 8b96550..db11c63 100755 --- a/ST.Library.UI/STNodeEditor/STNodeOption.cs +++ b/ST.Library.UI/STNodeEditor/STNodeOption.cs @@ -103,7 +103,16 @@ namespace ST.Library.UI /// public int DotSize { get { return _DotSize; } - protected internal set { _DotSize = value; } + protected set { _DotSize = value; } + } + + private Rectangle _TextRectangle; + /// + /// 获取当前 Option 文本区域 + /// + public Rectangle TextRectangle { + get { return _TextRectangle; } + internal set { _TextRectangle = value; } } private object _Data; diff --git a/ST.Library.UI/STNodeEditor/STNodeOptionCollection.cs b/ST.Library.UI/STNodeEditor/STNodeOptionCollection.cs index 762a98d..e0902f5 100755 --- a/ST.Library.UI/STNodeEditor/STNodeOptionCollection.cs +++ b/ST.Library.UI/STNodeEditor/STNodeOptionCollection.cs @@ -220,5 +220,12 @@ namespace ST.Library.UI IEnumerator IEnumerable.GetEnumerator() { return this.GetEnumerator(); } + + public STNodeOption[] ToArray() { + STNodeOption[] ops = new STNodeOption[this._Count]; + for (int i = 0; i < ops.Length; i++) + ops[i] = m_options[i]; + return ops; + } } } \ No newline at end of file diff --git a/WinNodeEditerTest.suo b/WinNodeEditerTest.suo index a85da7b68b11f38e390e427956d8d63faba138a7..732b6f1feff655ac12e59da294b717bfab9c2d6d 100755 GIT binary patch delta 5723 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 diff --git a/WinNodeEditerTest/Demo_Image/STNodeImageInput.cs b/WinNodeEditerTest/Demo_Image/STNodeImageInput.cs index ec54ade..940e237 100755 --- a/WinNodeEditerTest/Demo_Image/STNodeImageInput.cs +++ b/WinNodeEditerTest/Demo_Image/STNodeImageInput.cs @@ -41,8 +41,8 @@ namespace ST.Library.UI.Demo_Image return m_sz; } - protected override Point OnSetOptionLocation(STNodeOption op) { - return new Point(op.DotLeft, this.Top + 35); + protected override Point OnSetOptionDotLocation(STNodeOption op, Point pt) { + return new Point(pt.X, pt.Y + 10); //return base.OnSetOptionLocation(op); } diff --git a/WinNodeEditerTest/Form1.cs b/WinNodeEditerTest/Form1.cs index 7102db6..2bdce0f 100755 --- a/WinNodeEditerTest/Form1.cs +++ b/WinNodeEditerTest/Form1.cs @@ -80,8 +80,8 @@ namespace ST.Library.UI OpenFileDialog ofd = new OpenFileDialog(); ofd.Filter = "*.stn|*.stn"; if (ofd.ShowDialog() != DialogResult.OK) return; - stNodeEditor1.LoadCanvas(ofd.FileName); stNodeEditor1.Nodes.Clear(); + stNodeEditor1.LoadCanvas(ofd.FileName); } } } diff --git a/WinNodeEditerTest/Form2.Designer.cs b/WinNodeEditerTest/Form2.Designer.cs new file mode 100755 index 0000000..5392566 --- /dev/null +++ b/WinNodeEditerTest/Form2.Designer.cs @@ -0,0 +1,96 @@ +namespace ST.Library.UI +{ + partial class Form2 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) { + if (disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // button1 + // + this.button1.Location = new System.Drawing.Point(0, 0); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 0; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // button2 + // + this.button2.Location = new System.Drawing.Point(0, 29); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 1; + this.button2.Text = "button2"; + this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.button2_Click); + // + // button3 + // + this.button3.Location = new System.Drawing.Point(0, 58); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(75, 23); + this.button3.TabIndex = 2; + this.button3.Text = "button3"; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // button4 + // + this.button4.Location = new System.Drawing.Point(0, 87); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(75, 23); + this.button4.TabIndex = 3; + this.button4.Text = "button4"; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // Form2 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(292, 273); + this.Controls.Add(this.button4); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Name = "Form2"; + this.Text = "Form2"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button4; + } +} \ No newline at end of file diff --git a/WinNodeEditerTest/Form2.cs b/WinNodeEditerTest/Form2.cs new file mode 100755 index 0000000..c8457af --- /dev/null +++ b/WinNodeEditerTest/Form2.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace ST.Library.UI +{ + public partial class Form2 : Form + { + public Form2() { + InitializeComponent(); + } + + Graphics m_g; + + private void button1_Click(object sender, EventArgs e) { + m_g = this.CreateGraphics(); + } + + private void button2_Click(object sender, EventArgs e) { + m_g.DrawRectangle(Pens.Red, 10, 10, 30, 30); + } + + private void button3_Click(object sender, EventArgs e) { + m_g.DrawRectangle(Pens.Yellow, 45, 45, 20, 20); + } + + private void button4_Click(object sender, EventArgs e) { + this.CreateGraphics().FillRectangle(Brushes.Black, 20, 20, 20, 20); + } + } +} diff --git a/WinNodeEditerTest/Form2.resx b/WinNodeEditerTest/Form2.resx new file mode 100755 index 0000000..29dcb1b --- /dev/null +++ b/WinNodeEditerTest/Form2.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/WinNodeEditerTest/NodeNumberAdd.cs b/WinNodeEditerTest/NodeNumberAdd.cs index d2c12e4..7d30aa9 100755 --- a/WinNodeEditerTest/NodeNumberAdd.cs +++ b/WinNodeEditerTest/NodeNumberAdd.cs @@ -28,7 +28,7 @@ namespace ST.Library.UI //当有数据传入时 void m_in_num_DataTransfer(object sender, STNodeOptionEventArgs e) { //判断连线是否是连接状态(建立连线 断开连线 都会触发该事件) - if (e.Status == ConnectionStatus.Connected) { + if (e.Status == ConnectionStatus.Connected && e.TargetOption.Data != null) { if (sender == m_in_num1) m_nNum1 = (int)e.TargetOption.Data;//TargetOption为触发此事件的Option else diff --git a/WinNodeEditerTest/WinNodeEditerTest.csproj b/WinNodeEditerTest/WinNodeEditerTest.csproj index 67964b8..b13a2df 100755 --- a/WinNodeEditerTest/WinNodeEditerTest.csproj +++ b/WinNodeEditerTest/WinNodeEditerTest.csproj @@ -64,6 +64,12 @@ Form1.cs + + Form + + + Form2.cs + @@ -73,6 +79,9 @@ Form1.cs + + Form2.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/docs/doc.html b/docs/doc.html index acc910b..ab585a2 100755 --- a/docs/doc.html +++ b/docs/doc.html @@ -88,7 +88,7 @@ - 最后编辑时间 2020-12-30 + 最后编辑时间 2021-01-21

概述

@@ -595,21 +595,40 @@ void OnDrawMark(DrawingTools dt) dt绘制工具 - -   - 当计算Option位置时候发生 - Point OnSetOptionLocation(STNodeOption op) - - op需要计算的Option - -   +   绘制选项连线的点 void OnDrawOptionDot(DrawingTools dt, STNodeOption op) dt绘制工具 - op指定的选项 + op需要绘制的Option +   + 绘制选项的文本 + void OnDrawOptionText(DrawingTools dt, STNodeOption op) + + dt绘制工具 + + + op需要绘制的Option + +   + 当计算Option连线点位置时候发生 + Point OnSetOptionDotLocation(STNodeOption op, Point pt) + + op需要计算的Option + + + op自动计算出的位置 + +   + 当计算Option文本区域时候发生 + Rectangle OnSetOptionTextRectangle(STNodeOption op, Rectangle rect) + + op需要计算的Option + + + op自动计算出的区域   计算当前Node所需要的矩形区域 @@ -634,13 +653,18 @@ 当需要保存时候 此Node有哪些需要额外保存的数据 void OnSaveNode(Dictionary<string, byte[]>) - 保存时并不会进行序列化 仅自动保存Mark属性 还原时候仅重新通过空参数构造器创建此Node + + dic需要保存的数据 + + 保存时并不会进行序列化 仅自动保存部分(Guid,Left,Top,Mark,LockOption,LockLocation)属性 还原时候仅重新通过空参数构造器创建此Node
然后调用OnLoadNode()将保存的数据进行还原 - void OnLoadNode(Dictionary dic) + void OnLoadNode(Dictionary<string, byte[]> dic) dic保存时候的数据   + 当编辑器加载完成所有的节点时候发生 + void OnEditorLoadCompleted() 
protected override void OnSaveNode(Dictionary<string, byte[]>) {
     dic.Add("count", BitConverter.GetBytes(this.InputOptionsCount));