Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
李娜
/
AutoCountMachine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 38518ea8
由
LN
编写于
2020-06-08 16:00:37 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
获取图片更新,增加验证
1 个父辈
033376d3
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
31 行增加
和
14 行删除
RC1266-AutoCountMachine/dll/X-Ray/Asa.CarerayImage.dll
RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.Designer.cs
RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip.cs
RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs
RC1266-AutoCountMachine/dll/X-Ray/Asa.CarerayImage.dll
查看文件 @
38518ea
此文件类型无法预览
RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.Designer.cs
查看文件 @
38518ea
...
...
@@ -197,6 +197,8 @@
//
this
.
chbOpenX
.
AutoSize
=
true
;
this
.
chbOpenX
.
BackColor
=
System
.
Drawing
.
Color
.
Transparent
;
this
.
chbOpenX
.
Checked
=
true
;
this
.
chbOpenX
.
CheckState
=
System
.
Windows
.
Forms
.
CheckState
.
Checked
;
this
.
chbOpenX
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
10.5F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
chbOpenX
.
Location
=
new
System
.
Drawing
.
Point
(
188
,
17
);
this
.
chbOpenX
.
Name
=
"chbOpenX"
;
...
...
RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip.cs
查看文件 @
38518ea
...
...
@@ -14,7 +14,7 @@ namespace OnlineStore.DeviceLibrary
{
public
partial
class
X_RAY_Equip
:
EquipBase
{
public
bool
OpenXLine
=
false
;
public
bool
OpenXLine
=
true
;
public
ReelInfo
In_ReelInfo
=
new
ReelInfo
();
public
ReelInfo
Work_ReelInfo
=
new
ReelInfo
();
...
...
RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs
查看文件 @
38518ea
...
...
@@ -413,25 +413,40 @@ namespace OnlineStore.DeviceLibrary
ConfigAppSettings
.
SaveValue
(
Setting_Init
.
XRay_Data
,
lastData
);
ClearFilePath
();
carerayImage
.
GetImage
();
bool
imgResult
=
carerayImage
.
GetImage
();
carerayImage
.
WindowWidth
=
Config
.
WindowWidth
;
carerayImage
.
WindowLevel
=
Config
.
WindowLevel
;
Bitmap
bmp
=
carerayImage
.
Get48bImage
();
lastFileName
=
Work_ReelInfo
.
GetRealId
()
+
"-"
+
DateTime
.
Now
.
ToString
(
"yyyyMMddHHmmss"
)
+
".png"
;
string
fileP
=
path1_tif
+
@"\"
+
lastFileName
;
bmp
.
Save
(
fileP
,
System
.
Drawing
.
Imaging
.
ImageFormat
.
Png
);
string
backFile
=
path_XRAY
+
lastFileName
;
try
if
(
imgResult
)
{
bmp
.
Save
(
backFile
,
System
.
Drawing
.
Imaging
.
ImageFormat
.
Png
);
Bitmap
bmp
=
carerayImage
.
Get48bImage
();
if
(
bmp
!=
null
)
{
lastFileName
=
Work_ReelInfo
.
GetRealId
()
+
"-"
+
DateTime
.
Now
.
ToString
(
"yyyyMMddHHmmss"
)
+
".png"
;
string
fileP
=
path1_tif
+
@"\"
+
lastFileName
;
bmp
.
Save
(
fileP
,
System
.
Drawing
.
Imaging
.
ImageFormat
.
Png
);
string
backFile
=
path_XRAY
+
@"back\"
+
lastFileName
;
try
{
bmp
.
Save
(
backFile
,
System
.
Drawing
.
Imaging
.
ImageFormat
.
Png
);
}
catch
(
Exception
ex
)
{
LogUtil
.
error
(
"X图片备份到【"
+
backFile
+
"】错误:"
+
ex
.
ToString
());
}
WorkLog
(
"点料:获取X射线图形,保存到: "
+
fileP
+
",备份到:"
+
backFile
+
",记录时间"
+
lastData
+
",停止X射线"
);
GetImageEvent
?.
Invoke
(
bmp
);
}
else
{
WorkLog
(
"点料:获取X射线图形,获取图片失败,carerayImage.Get48bImage()=null"
);
LogUtil
.
error
(
Name
+
" 获取图片失败,carerayImage.Get48bImage()=null"
);
}
}
catch
(
Exception
ex
)
else
{
LogUtil
.
error
(
"X图片备份到【"
+
backFile
+
"】错误:"
+
ex
.
ToString
());
WorkLog
(
"点料:获取X射线图形,获取图片失败,carerayImage.GetImage()="
+
imgResult
);
LogUtil
.
error
(
Name
+
" 获取图片失败,carerayImage.GetImage()="
+
imgResult
);
}
WorkLog
(
"点料:获取X射线图形,保存到: "
+
fileP
+
",备份到:"
+
backFile
+
",记录时间"
+
lastData
+
",停止X射线"
);
GetImageEvent
?.
Invoke
(
bmp
);
bool
result
=
xRay
.
Stop
();
if
(!
result
)
{
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论