Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO664-HCSingleStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit c20a9f00
由
LN
编写于
2020-11-26 10:02:39 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
点位调试增加报警日志
1 个父辈
b1b24648
全部展开
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
24 行增加
和
24 行删除
source/DeviceLibrary/acSingleStore/BoxAutoPoint.cs
source/HCSingleStore/positionTool/FrmTool.Designer.cs
source/HCSingleStore/positionTool/FrmTool.cs
source/HuichuanLibrary/HCBoardManager_Axis.cs
source/DeviceLibrary/acSingleStore/BoxAutoPoint.cs
查看文件 @
c20a9f0
此文件的差异被折叠,
点击展开。
source/HCSingleStore/positionTool/FrmTool.Designer.cs
查看文件 @
c20a9f0
...
...
@@ -35,6 +35,8 @@
this
.
lblFileP
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
btnOpenFolder
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
group2
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
txtUpdownStart
=
new
System
.
Windows
.
Forms
.
TextBox
();
this
.
label1
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
txtTargetPosition
=
new
System
.
Windows
.
Forms
.
TextBox
();
this
.
label14
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
btnUpdownP
=
new
System
.
Windows
.
Forms
.
Button
();
...
...
@@ -69,8 +71,6 @@
this
.
panel1
=
new
System
.
Windows
.
Forms
.
Panel
();
this
.
axisJogControl1
=
new
OnlineStore
.
ACSingleStore
.
AxisJogControl
();
this
.
timer1
=
new
System
.
Windows
.
Forms
.
Timer
(
this
.
components
);
this
.
txtUpdownStart
=
new
System
.
Windows
.
Forms
.
TextBox
();
this
.
label1
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
panelAll
.
SuspendLayout
();
this
.
group6
.
SuspendLayout
();
this
.
group2
.
SuspendLayout
();
...
...
@@ -108,7 +108,7 @@
this
.
lblMoveInfo
.
ForeColor
=
System
.
Drawing
.
Color
.
Blue
;
this
.
lblMoveInfo
.
Location
=
new
System
.
Drawing
.
Point
(
422
,
379
);
this
.
lblMoveInfo
.
Name
=
"lblMoveInfo"
;
this
.
lblMoveInfo
.
Size
=
new
System
.
Drawing
.
Size
(
498
,
67
);
this
.
lblMoveInfo
.
Size
=
new
System
.
Drawing
.
Size
(
498
,
94
);
this
.
lblMoveInfo
.
TabIndex
=
324
;
this
.
lblMoveInfo
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleLeft
;
//
...
...
@@ -158,6 +158,25 @@
this
.
group2
.
TabStop
=
false
;
this
.
group2
.
Text
=
"第二步:确认(轴二)升降轴最高位置:"
;
//
// txtUpdownStart
//
this
.
txtUpdownStart
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpdownStart
.
Location
=
new
System
.
Drawing
.
Point
(
126
,
23
);
this
.
txtUpdownStart
.
MaxLength
=
30
;
this
.
txtUpdownStart
.
Name
=
"txtUpdownStart"
;
this
.
txtUpdownStart
.
Size
=
new
System
.
Drawing
.
Size
(
105
,
26
);
this
.
txtUpdownStart
.
TabIndex
=
260
;
//
// label1
//
this
.
label1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
label1
.
Location
=
new
System
.
Drawing
.
Point
(
8
,
27
);
this
.
label1
.
Name
=
"label1"
;
this
.
label1
.
Size
=
new
System
.
Drawing
.
Size
(
110
,
20
);
this
.
label1
.
TabIndex
=
261
;
this
.
label1
.
Text
=
"升降轴开始位置:"
;
this
.
label1
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleRight
;
//
// txtTargetPosition
//
this
.
txtTargetPosition
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
...
...
@@ -533,25 +552,6 @@
this
.
timer1
.
Interval
=
1000
;
this
.
timer1
.
Tick
+=
new
System
.
EventHandler
(
this
.
timer1_Tick
);
//
// txtUpdownStart
//
this
.
txtUpdownStart
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtUpdownStart
.
Location
=
new
System
.
Drawing
.
Point
(
126
,
23
);
this
.
txtUpdownStart
.
MaxLength
=
30
;
this
.
txtUpdownStart
.
Name
=
"txtUpdownStart"
;
this
.
txtUpdownStart
.
Size
=
new
System
.
Drawing
.
Size
(
105
,
26
);
this
.
txtUpdownStart
.
TabIndex
=
260
;
//
// label1
//
this
.
label1
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
label1
.
Location
=
new
System
.
Drawing
.
Point
(
8
,
27
);
this
.
label1
.
Name
=
"label1"
;
this
.
label1
.
Size
=
new
System
.
Drawing
.
Size
(
110
,
20
);
this
.
label1
.
TabIndex
=
261
;
this
.
label1
.
Text
=
"升降轴开始位置:"
;
this
.
label1
.
TextAlign
=
System
.
Drawing
.
ContentAlignment
.
MiddleRight
;
//
// FrmTool
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
96F
,
96F
);
...
...
source/HCSingleStore/positionTool/FrmTool.cs
查看文件 @
c20a9f0
source/HuichuanLibrary/HCBoardManager_Axis.cs
查看文件 @
c20a9f0
...
...
@@ -152,7 +152,7 @@ namespace HuichuanLibrary
}
else
{
Show
Log
(
" Axis["
+
axisNo
+
"] FinishHoming OK!"
);
Debug
Log
(
" Axis["
+
axisNo
+
"] FinishHoming OK!"
);
return
true
;
}
}
...
...
@@ -296,7 +296,7 @@ namespace HuichuanLibrary
}
else
{
Show
Log
(
" Axis["
+
axisNo
+
"] MoveStop OK"
);
Debug
Log
(
" Axis["
+
axisNo
+
"] MoveStop OK"
);
return
true
;
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论