Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
ACSingleStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 44012970
由
几米阳光
编写于
2019-01-25 11:50:00 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
启动失败增加提示
1 个父辈
1450631f
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
232 行增加
和
70 行删除
source/ACSingleStore/FrmStoreBox.cs
source/ACSingleStore/Properties/Resource.en-US.resx
source/ACSingleStore/Properties/Resource.zh-CN.resx
source/DeviceLibrary/ResourceControl.cs
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
source/ACSingleStore/FrmStoreBox.cs
查看文件 @
4401297
...
@@ -329,7 +329,7 @@ namespace OnlineStore.ACSingleStore
...
@@ -329,7 +329,7 @@ namespace OnlineStore.ACSingleStore
else
else
{
{
lblThisSta
.
Text
=
WaitStart
;
lblThisSta
.
Text
=
WaitStart
;
lblWarnMsg
.
Text
=
""
;
lblWarnMsg
.
Text
=
store
.
WarnMsg
;
btnStartAuTo
.
Text
=
StartAuto
;
btnStartAuTo
.
Text
=
StartAuto
;
}
}
}
}
...
...
source/ACSingleStore/Properties/Resource.en-US.resx
查看文件 @
4401297
...
@@ -780,37 +780,112 @@
...
@@ -780,37 +780,112 @@
<data name="FrmStoreBox_退出ToolStripMenuItem_Text" xml:space="preserve">
<data name="FrmStoreBox_退出ToolStripMenuItem_Text" xml:space="preserve">
<value>Exit</value>
<value>Exit</value>
</data>
</data>
<data name="FrmCodeDecode_Text xml:space=preserve"> <value>Qr code recognition</value></data>
<data name="FrmCodeDecode_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeDecode_label4_Text xml:space=preserve"> <value>Parameters of the path</value></data>
<value>Qr code recognition</value>
<data name="FrmCodeDecode_chbUseParam_Text xml:space=preserve"> <value>operation parameter</value></data>
</data>
<data name="FrmCodeDecode_btnAn_Text xml:space=preserve"> <value>darken</value></data>
<data name="FrmCodeDecode_label4_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeDecode_btnLight_Text xml:space=preserve"> <value>brighten</value></data>
<value>Parameters of the path</value>
<data name="FrmCodeDecode_label3_Text xml:space=preserve"> <value>Bar code type:</value></data>
</data>
<data name="FrmCodeDecode_label2_Text xml:space=preserve"> <value>Camera list:</value></data>
<data name="FrmCodeDecode_chbUseParam_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeDecode_btnExit_Text xml:space=preserve"> <value>Exit</value></data>
<value>operation parameter</value>
<data name="FrmCodeDecode_btnCameraImage_Text xml:space=preserve"> <value>camera image</value></data>
</data>
<data name="FrmCodeDecode_lblCount_Text xml:space=preserve"> <value>Barcode number:</value></data>
<data name="FrmCodeDecode_btnAn_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeDecode_btnClearLog_Text xml:space=preserve"> <value>Clear log</value></data>
<value>darken</value>
<data name="FrmCodeDecode_btnDCode_Text xml:space=preserve"> <value>Qr code recognition</value></data>
</data>
<data name="FrmCodeDecode_btnLearn_Text xml:space=preserve"> <value>learn</value></data>
<data name="FrmCodeDecode_btnLight_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeDecode_btnbarCode_Text xml:space=preserve"> <value>One dimensional code recognition</value></data>
<value>brighten</value>
<data name="FrmCodeDecode_btnGray_Text xml:space=preserve"> <value>Turning grey</value></data>
</data>
<data name="FrmCodeDecode_btnErZhi_Text xml:space=preserve"> <value>binaryzation </value></data>
<data name="FrmCodeDecode_label3_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeDecode_btnSelImage_Text xml:space=preserve"> <value>Open local image</value></data>
<value>Bar code type:</value>
<data name="FrmCodeDecode_label1_Text xml:space=preserve"> <value>Image path</value></data>
</data>
<data name="FrmCodeLearn_Text xml:space=preserve"> <value>Bar code parameter learning</value></data>
<data name="FrmCodeDecode_label2_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeLearn_chbHalcon_Text xml:space=preserve"> <value>Halcon Get photo</value></data>
<value>Camera list:</value>
<data name="FrmCodeLearn_label4_Text xml:space=preserve"> <value>Image path</value></data>
</data>
<data name="FrmCodeLearn_btnDelOld_Text xml:space=preserve"> <value>Delete old parameter</value></data>
<data name="FrmCodeDecode_btnExit_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeLearn_chbUseCamera_Text xml:space=preserve"> <value>camera image</value></data>
<value>Exit</value>
<data name="FrmCodeLearn_btnSelImage_Text xml:space=preserve"> <value>Open local image</value></data>
</data>
<data name="FrmCodeLearn_chbTest_Text xml:space=preserve"> <value>Automatic identification test</value></data>
<data name="FrmCodeDecode_btnCameraImage_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeLearn_btnClearLog_Text xml:space=preserve"> <value>Clear log</value></data>
<value>camera image</value>
<data name="FrmCodeLearn_lblCount_Text xml:space=preserve"> <value>Barcode number:</value></data>
</data>
<data name="FrmCodeLearn_label3_Text xml:space=preserve"> <value>Parameters of the path</value></data>
<data name="FrmCodeDecode_lblCount_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeLearn_label2_Text xml:space=preserve"> <value>Type:</value></data>
<value>Barcode number:</value>
<data name="FrmCodeLearn_label1_Text xml:space=preserve"> <value>camera:</value></data>
</data>
<data name="FrmCodeLearn_btnExit_Text xml:space=preserve"> <value>Exit</value></data>
<data name="FrmCodeDecode_btnClearLog_Text xml:space=preserve" xml:space="preserve">
<data name="FrmCodeLearn_btnStop_Text xml:space=preserve"> <value>End of learning</value></data>
<value>Clear log</value>
<data name="FrmCodeLearn_btnOpen_Text xml:space=preserve"> <value>start to learn</value></data>
</data>
<data name="FrmCodeDecode_btnDCode_Text xml:space=preserve" xml:space="preserve">
<value>Qr code recognition</value>
</data>
<data name="FrmCodeDecode_btnLearn_Text xml:space=preserve" xml:space="preserve">
<value>learn</value>
</data>
<data name="FrmCodeDecode_btnbarCode_Text xml:space=preserve" xml:space="preserve">
<value>One dimensional code recognition</value>
</data>
<data name="FrmCodeDecode_btnGray_Text xml:space=preserve" xml:space="preserve">
<value>Turning grey</value>
</data>
<data name="FrmCodeDecode_btnErZhi_Text xml:space=preserve" xml:space="preserve">
<value>binaryzation </value>
</data>
<data name="FrmCodeDecode_btnSelImage_Text xml:space=preserve" xml:space="preserve">
<value>Open local image</value>
</data>
<data name="FrmCodeDecode_label1_Text xml:space=preserve" xml:space="preserve">
<value>Image path</value>
</data>
<data name="FrmCodeLearn_Text xml:space=preserve" xml:space="preserve">
<value>Bar code parameter learning</value>
</data>
<data name="FrmCodeLearn_chbHalcon_Text xml:space=preserve" xml:space="preserve">
<value>Halcon Get photo</value>
</data>
<data name="FrmCodeLearn_label4_Text xml:space=preserve" xml:space="preserve">
<value>Image path</value>
</data>
<data name="FrmCodeLearn_btnDelOld_Text xml:space=preserve" xml:space="preserve">
<value>Delete old parameter</value>
</data>
<data name="FrmCodeLearn_chbUseCamera_Text xml:space=preserve" xml:space="preserve">
<value>camera image</value>
</data>
<data name="FrmCodeLearn_btnSelImage_Text xml:space=preserve" xml:space="preserve">
<value>Open local image</value>
</data>
<data name="FrmCodeLearn_chbTest_Text xml:space=preserve" xml:space="preserve">
<value>Automatic identification test</value>
</data>
<data name="FrmCodeLearn_btnClearLog_Text xml:space=preserve" xml:space="preserve">
<value>Clear log</value>
</data>
<data name="FrmCodeLearn_lblCount_Text xml:space=preserve" xml:space="preserve">
<value>Barcode number:</value>
</data>
<data name="FrmCodeLearn_label3_Text xml:space=preserve" xml:space="preserve">
<value>Parameters of the path</value>
</data>
<data name="FrmCodeLearn_label2_Text xml:space=preserve" xml:space="preserve">
<value>Type:</value>
</data>
<data name="FrmCodeLearn_label1_Text xml:space=preserve" xml:space="preserve">
<value>camera:</value>
</data>
<data name="FrmCodeLearn_btnExit_Text xml:space=preserve" xml:space="preserve">
<value>Exit</value>
</data>
<data name="FrmCodeLearn_btnStop_Text xml:space=preserve" xml:space="preserve">
<value>End of learning</value>
</data>
<data name="FrmCodeLearn_btnOpen_Text xml:space=preserve" xml:space="preserve">
<value>start to learn</value>
</data>
<data name="PreConnectFail" xml:space="preserve">
<value>Startup failure: compression shaft connection failed</value>
</data>
<data name="startFail" xml:space="preserve">
<value>Startup failure: emergency stop not opened</value>
</data>
<data name="startFailAir" xml:space="preserve">
<value>Startup failure: no air pressure signal</value>
</data>
</root>
</root>
\ No newline at end of file
\ No newline at end of file
source/ACSingleStore/Properties/Resource.zh-CN.resx
查看文件 @
4401297
...
@@ -780,39 +780,112 @@
...
@@ -780,39 +780,112 @@
<data name="FrmStoreBox_toolStripMenuItem1_Text" xml:space="preserve">
<data name="FrmStoreBox_toolStripMenuItem1_Text" xml:space="preserve">
<value>退出</value>
<value>退出</value>
</data>
</data>
<data name="FrmCodeDecode_Text" xml:space="preserve"> <value>二维码识别</value></data>
<data name="FrmCodeDecode_Text" xml:space="preserve">
<data name="FrmCodeDecode_label4_Text" xml:space="preserve"> <value>参数路径</value></data>
<value>二维码识别</value>
<data name="FrmCodeDecode_chbUseParam_Text" xml:space="preserve"> <value>使用参数</value></data>
</data>
<data name="FrmCodeDecode_btnAn_Text" xml:space="preserve"> <value>变暗</value></data>
<data name="FrmCodeDecode_label4_Text" xml:space="preserve">
<data name="FrmCodeDecode_btnLight_Text" xml:space="preserve"> <value>提亮</value></data>
<value>参数路径</value>
<data name="FrmCodeDecode_label3_Text" xml:space="preserve"> <value>条码类型：</value></data>
</data>
<data name="FrmCodeDecode_label2_Text" xml:space="preserve"> <value>相机列表：</value></data>
<data name="FrmCodeDecode_chbUseParam_Text" xml:space="preserve">
<data name="FrmCodeDecode_btnExit_Text" xml:space="preserve"> <value>退出</value></data>
<value>使用参数</value>
<data name="FrmCodeDecode_btnCameraImage_Text" xml:space="preserve"> <value>相机获取图片</value></data>
</data>
<data name="FrmCodeDecode_lblCount_Text" xml:space="preserve"> <value>条码数量：</value></data>
<data name="FrmCodeDecode_btnAn_Text" xml:space="preserve">
<data name="FrmCodeDecode_btnClearLog_Text" xml:space="preserve"> <value>清理日志</value></data>
<value>变暗</value>
<data name="FrmCodeDecode_btnDCode_Text" xml:space="preserve"> <value>二维码识别</value></data>
</data>
<data name="FrmCodeDecode_btnLearn_Text" xml:space="preserve"> <value>学习</value></data>
<data name="FrmCodeDecode_btnLight_Text" xml:space="preserve">
<data name="FrmCodeDecode_btnbarCode_Text" xml:space="preserve"> <value>一维码识别</value></data>
<value>提亮</value>
<data name="FrmCodeDecode_btnGray_Text" xml:space="preserve"> <value>图像转灰</value></data>
</data>
<data name="FrmCodeDecode_btnErZhi_Text" xml:space="preserve"> <value>二值化</value></data>
<data name="FrmCodeDecode_label3_Text" xml:space="preserve">
<data name="FrmCodeDecode_btnSelImage_Text" xml:space="preserve"> <value>打开本地图片</value></data>
<value>条码类型：</value>
<data name="FrmCodeDecode_label1_Text" xml:space="preserve"> <value>图片路径</value></data>
</data>
<data name="FrmCodeLearn_Text" xml:space="preserve"> <value>条码参数学习</value></data>
<data name="FrmCodeDecode_label2_Text" xml:space="preserve">
<data name="FrmCodeLearn_chbHalcon_Text" xml:space="preserve"> <value>Halcon获取图片</value></data>
<value>相机列表：</value>
<data name="FrmCodeLearn_label4_Text" xml:space="preserve"> <value>图片路径</value></data>
</data>
<data name="FrmCodeLearn_btnDelOld_Text" xml:space="preserve"> <value>删除旧参数</value></data>
<data name="FrmCodeDecode_btnExit_Text" xml:space="preserve">
<data name="FrmCodeLearn_chbUseCamera_Text" xml:space="preserve"> <value>相机获取实时图片</value></data>
<value>退出</value>
<data name="FrmCodeLearn_btnSelImage_Text" xml:space="preserve"> <value>打开本地图片</value></data>
</data>
<data name="FrmCodeLearn_chbTest_Text" xml:space="preserve"> <value>学习结束自动识别测试</value></data>
<data name="FrmCodeDecode_btnCameraImage_Text" xml:space="preserve">
<data name="FrmCodeLearn_btnClearLog_Text" xml:space="preserve"> <value>清理日志</value></data>
<value>相机获取图片</value>
<data name="FrmCodeLearn_lblCount_Text" xml:space="preserve"> <value>条码数量：</value></data>
</data>
<data name="FrmCodeLearn_label3_Text" xml:space="preserve"> <value>参数路径</value></data>
<data name="FrmCodeDecode_lblCount_Text" xml:space="preserve">
<data name="FrmCodeLearn_label2_Text" xml:space="preserve"> <value>类型：</value></data>
<value>条码数量：</value>
<data name="FrmCodeLearn_label1_Text" xml:space="preserve"> <value>相机：</value></data>
</data>
<data name="FrmCodeLearn_btnExit_Text" xml:space="preserve"> <value>退出</value></data>
<data name="FrmCodeDecode_btnClearLog_Text" xml:space="preserve">
<data name="FrmCodeLearn_btnStop_Text" xml:space="preserve"> <value>结束学习</value></data>
<value>清理日志</value>
<data name="FrmCodeLearn_btnOpen_Text" xml:space="preserve"> <value>开始学习</value></data>
</data>
<data name="FrmCodeDecode_btnDCode_Text" xml:space="preserve">
<value>二维码识别</value>
</data>
<data name="FrmCodeDecode_btnLearn_Text" xml:space="preserve">
<value>学习</value>
</data>
<data name="FrmCodeDecode_btnbarCode_Text" xml:space="preserve">
<value>一维码识别</value>
</data>
<data name="FrmCodeDecode_btnGray_Text" xml:space="preserve">
<value>图像转灰</value>
</data>
<data name="FrmCodeDecode_btnErZhi_Text" xml:space="preserve">
<value>二值化</value>
</data>
<data name="FrmCodeDecode_btnSelImage_Text" xml:space="preserve">
<value>打开本地图片</value>
</data>
<data name="FrmCodeDecode_label1_Text" xml:space="preserve">
<value>图片路径</value>
</data>
<data name="FrmCodeLearn_Text" xml:space="preserve">
<value>条码参数学习</value>
</data>
<data name="FrmCodeLearn_chbHalcon_Text" xml:space="preserve">
<value>Halcon获取图片</value>
</data>
<data name="FrmCodeLearn_label4_Text" xml:space="preserve">
<value>图片路径</value>
</data>
<data name="FrmCodeLearn_btnDelOld_Text" xml:space="preserve">
<value>删除旧参数</value>
</data>
<data name="FrmCodeLearn_chbUseCamera_Text" xml:space="preserve">
<value>相机获取实时图片</value>
</data>
<data name="FrmCodeLearn_btnSelImage_Text" xml:space="preserve">
<value>打开本地图片</value>
</data>
<data name="FrmCodeLearn_chbTest_Text" xml:space="preserve">
<value>学习结束自动识别测试</value>
</data>
<data name="FrmCodeLearn_btnClearLog_Text" xml:space="preserve">
<value>清理日志</value>
</data>
<data name="FrmCodeLearn_lblCount_Text" xml:space="preserve">
<value>条码数量：</value>
</data>
<data name="FrmCodeLearn_label3_Text" xml:space="preserve">
<value>参数路径</value>
</data>
<data name="FrmCodeLearn_label2_Text" xml:space="preserve">
<value>类型：</value>
</data>
<data name="FrmCodeLearn_label1_Text" xml:space="preserve">
<value>相机：</value>
</data>
<data name="FrmCodeLearn_btnExit_Text" xml:space="preserve">
<value>退出</value>
</data>
<data name="FrmCodeLearn_btnStop_Text" xml:space="preserve">
<value>结束学习</value>
</data>
<data name="FrmCodeLearn_btnOpen_Text" xml:space="preserve">
<value>开始学习</value>
</data>
<data name="PreConnectFail" xml:space="preserve">
<value>启动失败：压紧轴连接失败</value>
</data>
<data name="startFail" xml:space="preserve">
<value>启动失败：急停未开</value>
</data>
<data name="startFailAir" xml:space="preserve">
<value>启动失败：没有气压信号</value>
</data>
</root>
</root>
\ No newline at end of file
\ No newline at end of file
source/DeviceLibrary/ResourceControl.cs
查看文件 @
4401297
...
@@ -176,6 +176,17 @@ namespace OnlineStore.DeviceLibrary
...
@@ -176,6 +176,17 @@ namespace OnlineStore.DeviceLibrary
///"电钢目标位置："
///"电钢目标位置："
/// </summary>
/// </summary>
public
static
string
TargetPosition
=
"TargetPosition"
;
public
static
string
TargetPosition
=
"TargetPosition"
;
/// <summary>
///启动失败：压紧轴连接失败
/// </summary>
public
static
string
PreConnectFail
=
"PreConnectFail"
;
/// <summary>
///启动失败：急停未开
/// </summary>
public
static
string
startFail
=
"startFail"
;
/// <summary>
///启动失败：没有气压信号
/// </summary>
public
static
string
startFailAir
=
"startFailAir"
;
}
}
}
}
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @
4401297
...
@@ -319,6 +319,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -319,6 +319,7 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
ShuoKeControls
.
isRun
==
false
&&
(!
ACStoreManager
.
OpenShuoKe
(
this
)))
if
(
ShuoKeControls
.
isRun
==
false
&&
(!
ACStoreManager
.
OpenShuoKe
(
this
)))
{
{
WarnMsg
=
ResourceControl
.
GetString
(
ResourceControl
.
PreConnectFail
,
"启动失败：压紧轴连接失败"
);
LogUtil
.
info
(
StoreName
+
"打开驱动器串口失败，启动失败！"
);
LogUtil
.
info
(
StoreName
+
"打开驱动器串口失败，启动失败！"
);
return
false
;
return
false
;
}
}
...
@@ -361,10 +362,12 @@ namespace OnlineStore.DeviceLibrary
...
@@ -361,10 +362,12 @@ namespace OnlineStore.DeviceLibrary
{
{
if
(
suddenBtn
.
Equals
(
IO_VALUE
.
LOW
))
if
(
suddenBtn
.
Equals
(
IO_VALUE
.
LOW
))
{
{
WarnMsg
=
ResourceControl
.
GetString
(
ResourceControl
.
startFail
,
"启动失败：急停未开"
);
LogUtil
.
error
(
LOGGER
,
" ("
+
StoreName
+
")启动出现错误：急停没开 ！启动失败！"
);
LogUtil
.
error
(
LOGGER
,
" ("
+
StoreName
+
")启动出现错误：急停没开 ！启动失败！"
);
}
}
else
else
{
{
WarnMsg
=
ResourceControl
.
GetString
(
ResourceControl
.
startFailAir
,
"启动失败：没有气压信号"
);
LogUtil
.
error
(
LOGGER
,
" ("
+
StoreName
+
")启动出现错误：没有气压信号 ！启动失败！"
);
LogUtil
.
error
(
LOGGER
,
" ("
+
StoreName
+
")启动出现错误：没有气压信号 ！启动失败！"
);
}
}
return
false
;
return
false
;
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论
