Skip to content

刘韬 / HZH_Controls

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 00af66e3 由 kwwwvagaa
选项

朝上瓶子bug修复

1 个父辈 ae4f024e
内嵌 并排
正在显示 3 个修改的文件 包含 9 行增加 和 11 行删除
HZH_Controls/HZH_Controls/Controls/FactoryControls/Blower/UCBlower.cs
...@@ -117,9 +117,7 @@ namespace HZH_Controls.Controls ...@@ -117,9 +117,7 @@ namespace HZH_Controls.Controls
get { return turnAround; } get { return turnAround; }
set set
{ {
turnAround = value; turnAround = value;
if (ControlHelper.IsDesignMode())
return;
if (value == HZH_Controls.Controls.TurnAround.None) if (value == HZH_Controls.Controls.TurnAround.None)
{ {
timer1.Enabled = false; timer1.Enabled = false;
...@@ -144,9 +142,7 @@ namespace HZH_Controls.Controls ...@@ -144,9 +142,7 @@ namespace HZH_Controls.Controls
{ {
if (value < 100 || value > 1000) if (value < 100 || value > 1000)
return; return;
turnSpeed = value; turnSpeed = value;
if (ControlHelper.IsDesignMode())
return;
timer1.Interval = value; timer1.Interval = value;
} }
} }
......
HZH_Controls/HZH_Controls/Controls/FactoryControls/Bottle/UCBottle.cs
...@@ -414,11 +414,13 @@ namespace HZH_Controls.Controls ...@@ -414,11 +414,13 @@ namespace HZH_Controls.Controls
new PointF((float)(m_workingRect.Left+(decYTHeight-(m_workingRect.Height-15)))+3,(float)(m_workingRect.Bottom-decYTHeight)), new PointF((float)(m_workingRect.Left+(decYTHeight-(m_workingRect.Height-15)))+3,(float)(m_workingRect.Bottom-decYTHeight)),
new PointF((float)(m_workingRect.Right-(decYTHeight-(m_workingRect.Height-15)))-3,(float)(m_workingRect.Bottom-decYTHeight)), new PointF((float)(m_workingRect.Right-(decYTHeight-(m_workingRect.Height-15)))-3,(float)(m_workingRect.Bottom-decYTHeight)),
new PointF(m_workingRect.Right-1, m_workingRect.Top+15), new PointF(m_workingRect.Right-1, m_workingRect.Top+15),
new PointF(m_workingRect.Right-1, m_workingRect.Bottom),
new PointF(m_workingRect.Left, m_workingRect.Bottom),
new PointF(m_workingRect.Left, m_workingRect.Top+15), new PointF(m_workingRect.Left, m_workingRect.Top+15),
}; };
pathYT.AddLines(psYT); pathYT.AddLines(psYT);
pathYT.CloseAllFigures(); pathYT.CloseAllFigures();
rectYT = new Rectangle(m_workingRect.Left + (int)(decYTHeight - (m_workingRect.Height - 15)) + 3, (int)(m_workingRect.Bottom - decYTHeight), m_workingRect.Width - (int)(decYTHeight - (m_workingRect.Height - 15)) * 2 - 8, 10); rectYT = new Rectangle(m_workingRect.Left + (int)(decYTHeight - (m_workingRect.Height - 15)) +1, (int)(m_workingRect.Bottom - decYTHeight - 4), m_workingRect.Width - (int)(decYTHeight - (m_workingRect.Height - 15)) * 2-2 , 10);
} }
else else
{ {
......
HZH_Controls/Test/UC/UCTestConduit.Designer.cs
...@@ -445,9 +445,9 @@ ...@@ -445,9 +445,9 @@
this.ucBottle2.NO = "1#"; this.ucBottle2.NO = "1#";
this.ucBottle2.Size = new System.Drawing.Size(73, 150); this.ucBottle2.Size = new System.Drawing.Size(73, 150);
this.ucBottle2.TabIndex = 53; this.ucBottle2.TabIndex = 53;
this.ucBottle2.Title = "12345"; this.ucBottle2.Title = "";
this.ucBottle2.Value = new decimal(new int[] { this.ucBottle2.Value = new decimal(new int[] {
50, 90,
0, 0,
0, 0,
0}); 0});
...@@ -470,7 +470,7 @@ ...@@ -470,7 +470,7 @@
this.ucBottle1.TabIndex = 53; this.ucBottle1.TabIndex = 53;
this.ucBottle1.Title = ""; this.ucBottle1.Title = "";
this.ucBottle1.Value = new decimal(new int[] { this.ucBottle1.Value = new decimal(new int[] {
50, 10,
0, 0,
0, 0,
0}); 0});
...@@ -505,7 +505,7 @@ ...@@ -505,7 +505,7 @@
this.ucBlower4.Name = "ucBlower4"; this.ucBlower4.Name = "ucBlower4";
this.ucBlower4.Size = new System.Drawing.Size(116, 154); this.ucBlower4.Size = new System.Drawing.Size(116, 154);
this.ucBlower4.TabIndex = 62; this.ucBlower4.TabIndex = 62;
this.ucBlower4.TurnAround = HZH_Controls.Controls.TurnAround.None; this.ucBlower4.TurnAround = HZH_Controls.Controls.TurnAround.Clockwise;
this.ucBlower4.TurnSpeed = 100; this.ucBlower4.TurnSpeed = 100;
// //
// UCTestConduit // UCTestConduit
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!