Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC30-AutoInOutStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 43ce91a2
由
LN
编写于
2019-10-09 16:30:35 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
1
1 个父辈
9466bc41
显示空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
15 行增加
和
24 行删除
source/ACSingleStore/positionTool/FrmPositionTool.Designer.cs
source/DeviceLibrary/DeviceLibrary/halcon/CodeManager.cs
source/ACSingleStore/positionTool/FrmPositionTool.Designer.cs
查看文件 @
43ce91a
...
...
@@ -44,7 +44,6 @@
this
.
txtSpeed
=
new
System
.
Windows
.
Forms
.
TextBox
();
this
.
label8
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
txtFileName
=
new
System
.
Windows
.
Forms
.
TextBox
();
this
.
ioStatusControl1
=
new
UserFromControl
.
IOStatusControl
();
this
.
btnAbsMove
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
label3
=
new
System
.
Windows
.
Forms
.
Label
();
this
.
label7
=
new
System
.
Windows
.
Forms
.
Label
();
...
...
@@ -70,6 +69,7 @@
this
.
btnClear
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
richTextBox1
=
new
System
.
Windows
.
Forms
.
RichTextBox
();
this
.
timer1
=
new
System
.
Windows
.
Forms
.
Timer
(
this
.
components
);
this
.
ioStatusControl1
=
new
UserFromControl
.
IOStatusControl
();
this
.
groupBox6
.
SuspendLayout
();
this
.
groupBox2
.
SuspendLayout
();
this
.
groupBox1
.
SuspendLayout
();
...
...
@@ -258,16 +258,6 @@
this
.
txtFileName
.
TabIndex
=
278
;
this
.
txtFileName
.
Text
=
"position.csv"
;
//
// ioStatusControl1
//
this
.
ioStatusControl1
.
IOName
=
"检测信号"
;
this
.
ioStatusControl1
.
IOValue
=
0
;
this
.
ioStatusControl1
.
isCanClick
=
false
;
this
.
ioStatusControl1
.
Location
=
new
System
.
Drawing
.
Point
(
134
,
401
);
this
.
ioStatusControl1
.
Name
=
"ioStatusControl1"
;
this
.
ioStatusControl1
.
Size
=
new
System
.
Drawing
.
Size
(
171
,
39
);
this
.
ioStatusControl1
.
TabIndex
=
279
;
//
// btnAbsMove
//
this
.
btnAbsMove
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
9F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
...
...
@@ -488,7 +478,6 @@
//
// txtIoIp
//
this
.
txtIoIp
.
Enabled
=
false
;
this
.
txtIoIp
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
txtIoIp
.
Location
=
new
System
.
Drawing
.
Point
(
136
,
97
);
this
.
txtIoIp
.
MaxLength
=
30
;
...
...
@@ -536,6 +525,16 @@
this
.
timer1
.
Interval
=
1000
;
this
.
timer1
.
Tick
+=
new
System
.
EventHandler
(
this
.
timer1_Tick
);
//
// ioStatusControl1
//
this
.
ioStatusControl1
.
IOName
=
"检测信号"
;
this
.
ioStatusControl1
.
IOValue
=
0
;
this
.
ioStatusControl1
.
isCanClick
=
false
;
this
.
ioStatusControl1
.
Location
=
new
System
.
Drawing
.
Point
(
134
,
401
);
this
.
ioStatusControl1
.
Name
=
"ioStatusControl1"
;
this
.
ioStatusControl1
.
Size
=
new
System
.
Drawing
.
Size
(
171
,
39
);
this
.
ioStatusControl1
.
TabIndex
=
279
;
//
// FrmPositionTool
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
96F
,
96F
);
...
...
source/DeviceLibrary/DeviceLibrary/halcon/CodeManager.cs
查看文件 @
43ce91a
...
...
@@ -110,12 +110,8 @@ namespace OnlineStore.DeviceLibrary
{
if
(
balserNameList
.
Contains
(
cameraName
))
{
bool
result
=
BaslerCamera
.
Instance
.
IsOpen
;
if
(!
result
)
{
result
=
BaslerCamera
.
Instance
.
Open
(
cameraName
);
LogUtil
.
info
(
"打开相机:"
+
cameraName
+
"("
+
result
+
")"
);
}
bool
result
=
BaslerCamera
.
Instance
.
Open
(
cameraName
);
// LogUtil.info("打开相机:" + cameraName + "(" + result + ")");
if
(
result
)
{
BaslerCamera
.
Instance
.
GrabOne
();
...
...
@@ -129,12 +125,8 @@ namespace OnlineStore.DeviceLibrary
}
else
if
(
hikNameList
.
Contains
(
cameraName
))
{
bool
result
=
HIKCamera
.
Instance
.
IsOpen
;
if
(!
result
)
{
result
=
HIKCamera
.
Instance
.
Open
(
cameraName
);
LogUtil
.
info
(
"打开相机:"
+
cameraName
+
"("
+
result
+
")"
);
}
bool
result
=
HIKCamera
.
Instance
.
Open
(
cameraName
);
// LogUtil.info("打开相机:" + cameraName + "(" + result + ")");
if
(
result
)
{
HIKCamera
.
Instance
.
GrabOne
();
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论