Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
SO664-HCSingleStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 29f3db64
由
LN
编写于
2021-02-01 13:09:16 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
界面调整,分辨率 1024X768
1 个父辈
bffc092a
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
16 行增加
和
26 行删除
source/HCSingleStore/FrmAxisDebug.Designer.cs
source/HCSingleStore/FrmBox.Designer.cs
source/HCSingleStore/FrmIDConfig.Designer.cs
source/HCSingleStore/FrmInOutStore.Designer.cs
source/HCSingleStore/FrmStore.Designer.cs
source/HCSingleStore/positionTool/AxisJogControl.Designer.cs
source/HCSingleStore/positionTool/FrmTool.Designer.cs
source/HCSingleStore/positionTool/FrmTool.resx
source/HCSingleStore/userControl/AxisMoveControl.Designer.cs
source/HCSingleStore/FrmAxisDebug.Designer.cs
查看文件 @
29f3db6
此文件的差异被折叠,
点击展开。
source/HCSingleStore/FrmBox.Designer.cs
查看文件 @
29f3db6
此文件的差异被折叠,
点击展开。
source/HCSingleStore/FrmIDConfig.Designer.cs
查看文件 @
29f3db6
...
...
@@ -78,7 +78,7 @@
//
this
.
label1
.
AutoSize
=
true
;
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
(
55
,
1
2
1
);
this
.
label1
.
Location
=
new
System
.
Drawing
.
Point
(
55
,
1
1
1
);
this
.
label1
.
Name
=
"label1"
;
this
.
label1
.
Size
=
new
System
.
Drawing
.
Size
(
65
,
17
);
this
.
label1
.
TabIndex
=
0
;
...
...
@@ -89,7 +89,7 @@
this
.
btnNext
.
Anchor
=
System
.
Windows
.
Forms
.
AnchorStyles
.
Top
;
this
.
btnNext
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnNext
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
12F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnNext
.
Location
=
new
System
.
Drawing
.
Point
(
444
,
1
53
);
this
.
btnNext
.
Location
=
new
System
.
Drawing
.
Point
(
444
,
1
39
);
this
.
btnNext
.
Name
=
"btnNext"
;
this
.
btnNext
.
Size
=
new
System
.
Drawing
.
Size
(
120
,
45
);
this
.
btnNext
.
TabIndex
=
275
;
...
...
@@ -114,7 +114,7 @@
this
.
cmbId
.
DropDownStyle
=
System
.
Windows
.
Forms
.
ComboBoxStyle
.
DropDownList
;
this
.
cmbId
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
12F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
cmbId
.
FormattingEnabled
=
true
;
this
.
cmbId
.
Location
=
new
System
.
Drawing
.
Point
(
128
,
1
1
4
);
this
.
cmbId
.
Location
=
new
System
.
Drawing
.
Point
(
128
,
1
0
4
);
this
.
cmbId
.
Name
=
"cmbId"
;
this
.
cmbId
.
Size
=
new
System
.
Drawing
.
Size
(
111
,
29
);
this
.
cmbId
.
TabIndex
=
276
;
...
...
@@ -134,7 +134,7 @@
//
this
.
label3
.
AutoSize
=
true
;
this
.
label3
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
label3
.
Location
=
new
System
.
Drawing
.
Point
(
43
,
73
);
this
.
label3
.
Location
=
new
System
.
Drawing
.
Point
(
43
,
68
);
this
.
label3
.
Name
=
"label3"
;
this
.
label3
.
Size
=
new
System
.
Drawing
.
Size
(
80
,
17
);
this
.
label3
.
TabIndex
=
278
;
...
...
@@ -143,7 +143,7 @@
// txtLineAddr
//
this
.
txtLineAddr
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtLineAddr
.
Location
=
new
System
.
Drawing
.
Point
(
128
,
70
);
this
.
txtLineAddr
.
Location
=
new
System
.
Drawing
.
Point
(
128
,
65
);
this
.
txtLineAddr
.
Name
=
"txtLineAddr"
;
this
.
txtLineAddr
.
Size
=
new
System
.
Drawing
.
Size
(
285
,
26
);
this
.
txtLineAddr
.
TabIndex
=
279
;
...
...
@@ -163,7 +163,7 @@
this
.
btnReset
.
Anchor
=
System
.
Windows
.
Forms
.
AnchorStyles
.
Top
;
this
.
btnReset
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnReset
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnReset
.
Location
=
new
System
.
Drawing
.
Point
(
444
,
6
7
);
this
.
btnReset
.
Location
=
new
System
.
Drawing
.
Point
(
444
,
6
2
);
this
.
btnReset
.
Name
=
"btnReset"
;
this
.
btnReset
.
Size
=
new
System
.
Drawing
.
Size
(
89
,
33
);
this
.
btnReset
.
TabIndex
=
281
;
...
...
@@ -187,7 +187,7 @@
this
.
groupBox1
.
Controls
.
Add
(
this
.
txtLineAddr
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
label2
);
this
.
groupBox1
.
Controls
.
Add
(
this
.
label3
);
this
.
groupBox1
.
Location
=
new
System
.
Drawing
.
Point
(
12
,
6
);
this
.
groupBox1
.
Location
=
new
System
.
Drawing
.
Point
(
12
,
3
);
this
.
groupBox1
.
Name
=
"groupBox1"
;
this
.
groupBox1
.
Size
=
new
System
.
Drawing
.
Size
(
586
,
368
);
this
.
groupBox1
.
TabIndex
=
283
;
...
...
@@ -198,7 +198,7 @@
//
this
.
lblMsg
.
AutoSize
=
true
;
this
.
lblMsg
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
lblMsg
.
Location
=
new
System
.
Drawing
.
Point
(
245
,
1
2
1
);
this
.
lblMsg
.
Location
=
new
System
.
Drawing
.
Point
(
245
,
1
1
1
);
this
.
lblMsg
.
Name
=
"lblMsg"
;
this
.
lblMsg
.
Size
=
new
System
.
Drawing
.
Size
(
176
,
17
);
this
.
lblMsg
.
TabIndex
=
286
;
...
...
@@ -210,9 +210,9 @@
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Left
)
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Right
)));
this
.
pictureBox1
.
Image
=
((
System
.
Drawing
.
Image
)(
resources
.
GetObject
(
"pictureBox1.Image"
)));
this
.
pictureBox1
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
204
);
this
.
pictureBox1
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
190
);
this
.
pictureBox1
.
Name
=
"pictureBox1"
;
this
.
pictureBox1
.
Size
=
new
System
.
Drawing
.
Size
(
57
2
,
158
);
this
.
pictureBox1
.
Size
=
new
System
.
Drawing
.
Size
(
57
0
,
171
);
this
.
pictureBox1
.
SizeMode
=
System
.
Windows
.
Forms
.
PictureBoxSizeMode
.
Zoom
;
this
.
pictureBox1
.
TabIndex
=
285
;
this
.
pictureBox1
.
TabStop
=
false
;
...
...
@@ -222,7 +222,7 @@
this
.
lblRightCid
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
lblRightCid
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
lblRightCid
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
lblRightCid
.
Location
=
new
System
.
Drawing
.
Point
(
279
,
1
59
);
this
.
lblRightCid
.
Location
=
new
System
.
Drawing
.
Point
(
279
,
1
45
);
this
.
lblRightCid
.
Name
=
"lblRightCid"
;
this
.
lblRightCid
.
Size
=
new
System
.
Drawing
.
Size
(
147
,
32
);
this
.
lblRightCid
.
TabIndex
=
284
;
...
...
@@ -234,7 +234,7 @@
this
.
lblLeftCid
.
BorderStyle
=
System
.
Windows
.
Forms
.
BorderStyle
.
FixedSingle
;
this
.
lblLeftCid
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
lblLeftCid
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
lblLeftCid
.
Location
=
new
System
.
Drawing
.
Point
(
128
,
1
60
);
this
.
lblLeftCid
.
Location
=
new
System
.
Drawing
.
Point
(
128
,
1
46
);
this
.
lblLeftCid
.
Name
=
"lblLeftCid"
;
this
.
lblLeftCid
.
Size
=
new
System
.
Drawing
.
Size
(
145
,
30
);
this
.
lblLeftCid
.
TabIndex
=
283
;
...
...
@@ -389,7 +389,7 @@
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Right
)));
this
.
tabControl1
.
Controls
.
Add
(
this
.
tabPage1
);
this
.
tabControl1
.
Controls
.
Add
(
this
.
tabPage2
);
this
.
tabControl1
.
Location
=
new
System
.
Drawing
.
Point
(
12
,
3
80
);
this
.
tabControl1
.
Location
=
new
System
.
Drawing
.
Point
(
12
,
3
74
);
this
.
tabControl1
.
Name
=
"tabControl1"
;
this
.
tabControl1
.
SelectedIndex
=
0
;
this
.
tabControl1
.
Size
=
new
System
.
Drawing
.
Size
(
586
,
233
);
...
...
@@ -550,7 +550,7 @@
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
7F
,
17F
);
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
Font
;
this
.
ClientSize
=
new
System
.
Drawing
.
Size
(
610
,
6
89
);
this
.
ClientSize
=
new
System
.
Drawing
.
Size
(
610
,
6
71
);
this
.
Controls
.
Add
(
this
.
btnSavePosID
);
this
.
Controls
.
Add
(
this
.
tabControl1
);
this
.
Controls
.
Add
(
this
.
btnBack
);
...
...
source/HCSingleStore/FrmInOutStore.Designer.cs
查看文件 @
29f3db6
...
...
@@ -230,8 +230,7 @@
//
// FrmInOutStore
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
7F
,
17F
);
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
Font
;
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
None
;
this
.
ClientSize
=
new
System
.
Drawing
.
Size
(
1003
,
621
);
this
.
Controls
.
Add
(
this
.
tableLayoutPanel1
);
this
.
Name
=
"FrmInOutStore"
;
...
...
source/HCSingleStore/FrmStore.Designer.cs
查看文件 @
29f3db6
...
...
@@ -212,7 +212,7 @@
this
.
logBox
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
logBox
.
Location
=
new
System
.
Drawing
.
Point
(
241
,
6
);
this
.
logBox
.
Name
=
"logBox"
;
this
.
logBox
.
Size
=
new
System
.
Drawing
.
Size
(
1085
,
6
13
);
this
.
logBox
.
Size
=
new
System
.
Drawing
.
Size
(
1085
,
6
28
);
this
.
logBox
.
TabIndex
=
106
;
this
.
logBox
.
Text
=
""
;
this
.
logBox
.
VisibleChanged
+=
new
System
.
EventHandler
(
this
.
logBox_VisibleChanged
);
...
...
source/HCSingleStore/positionTool/AxisJogControl.Designer.cs
查看文件 @
29f3db6
此文件的差异被折叠,
点击展开。
source/HCSingleStore/positionTool/FrmTool.Designer.cs
查看文件 @
29f3db6
此文件的差异被折叠,
点击展开。
source/HCSingleStore/positionTool/FrmTool.resx
查看文件 @
29f3db6
...
...
@@ -126,15 +126,6 @@
<metadata name="Column_Del.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Index.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_position.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Del.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
...
...
source/HCSingleStore/userControl/AxisMoveControl.Designer.cs
查看文件 @
29f3db6
此文件的差异被折叠,
点击展开。
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论