Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
URSolderingRobot
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 005d9f15
由
几米阳光
编写于
2018-07-31 18:01:36 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
机器人调试修改
1 个父辈
76f9c750
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
25 行增加
和
254 行删除
URSolderingClient/FrmBoardInfo.Designer.cs
URSolderingClient/FrmBoardInfo.cs
URSolderingClient/FrmDebugMenu.Designer.cs
URSolderingClient/FrmOrgConfig.Designer.cs
URSolderingClient/FrmOrgConfig.cs
URSolderingClient/FrmTest.Designer.cs
URSolderingClient/FrmTest.cs
URSolderingClient/FrmTest.resx
URSolderingClient/FrmWork.cs
URSolderingClient/URSolderingClient.csproj
URSolderingClient/FrmBoardInfo.Designer.cs
查看文件 @
005d9f1
此文件的差异被折叠,
点击展开。
URSolderingClient/FrmBoardInfo.cs
查看文件 @
005d9f1
...
@@ -168,7 +168,7 @@ namespace URSoldering.Client
...
@@ -168,7 +168,7 @@ namespace URSoldering.Client
txtBoardWidth
.
Text
=
updateBoardInfo
.
boardWidth
.
ToString
();
txtBoardWidth
.
Text
=
updateBoardInfo
.
boardWidth
.
ToString
();
txtOriginX
.
Text
=
updateBoardInfo
.
originX
.
ToString
();
txtOriginX
.
Text
=
updateBoardInfo
.
originX
.
ToString
();
txtOriginY
.
Text
=
updateBoardInfo
.
originY
.
ToString
();
txtOriginY
.
Text
=
updateBoardInfo
.
originY
.
ToString
();
txtRobotZHighValue
.
Text
=
updateBoardInfo
.
ZHighValue
.
ToString
();
//
txtRobotZHighValue.Text = updateBoardInfo.ZHighValue.ToString();
if
(
updateBoardInfo
.
orgType
>=
1
&&
updateBoardInfo
.
orgType
<=
4
)
if
(
updateBoardInfo
.
orgType
>=
1
&&
updateBoardInfo
.
orgType
<=
4
)
{
{
cmbOrgType
.
SelectedIndex
=
updateBoardInfo
.
orgType
-
1
;
cmbOrgType
.
SelectedIndex
=
updateBoardInfo
.
orgType
-
1
;
...
@@ -462,7 +462,7 @@ namespace URSoldering.Client
...
@@ -462,7 +462,7 @@ namespace URSoldering.Client
board
.
originX
=
FormUtil
.
getDoubleValue
(
txtOriginX
);
board
.
originX
=
FormUtil
.
getDoubleValue
(
txtOriginX
);
board
.
originY
=
FormUtil
.
getDoubleValue
(
txtOriginY
);
board
.
originY
=
FormUtil
.
getDoubleValue
(
txtOriginY
);
//board.boardCode = FormUtil.getValue(txtWareCode);
//board.boardCode = FormUtil.getValue(txtWareCode);
board
.
ZHighValue
=
FormUtil
.
getDoubleValue
(
txtRobotZHighValue
);
//
board.ZHighValue = FormUtil.getDoubleValue(txtRobotZHighValue);
board
.
WareCode
=
FormUtil
.
getValue
(
txtCode
);
board
.
WareCode
=
FormUtil
.
getValue
(
txtCode
);
if
(
board
.
boardName
.
Equals
(
""
))
if
(
board
.
boardName
.
Equals
(
""
))
...
@@ -1416,23 +1416,23 @@ namespace URSoldering.Client
...
@@ -1416,23 +1416,23 @@ namespace URSoldering.Client
}
}
else
if
(
value
.
Equals
(
2
))
else
if
(
value
.
Equals
(
2
))
{
{
StepValue
=
0.
2
;
StepValue
=
0.
5
;
}
}
else
if
(
value
.
Equals
(
3
))
else
if
(
value
.
Equals
(
3
))
{
{
StepValue
=
0.5
;
StepValue
=
1
;
}
}
else
if
(
value
.
Equals
(
4
))
else
if
(
value
.
Equals
(
4
))
{
{
StepValue
=
1
;
StepValue
=
3
;
}
}
else
if
(
value
.
Equals
(
5
))
else
if
(
value
.
Equals
(
5
))
{
{
StepValue
=
3
;
StepValue
=
5
;
}
}
else
if
(
value
.
Equals
(
6
))
else
if
(
value
.
Equals
(
6
))
{
{
StepValue
=
5
;
StepValue
=
10
;
}
}
lblSpeed
.
Text
=
"步进值:"
+
StepValue
+
"mm"
;
lblSpeed
.
Text
=
"步进值:"
+
StepValue
+
"mm"
;
}
}
...
@@ -1474,5 +1474,10 @@ namespace URSoldering.Client
...
@@ -1474,5 +1474,10 @@ namespace URSoldering.Client
}
}
}
}
}
}
private
void
btnExit_Click
(
object
sender
,
EventArgs
e
)
{
this
.
Close
();
}
}
}
}
}
URSolderingClient/FrmDebugMenu.Designer.cs
查看文件 @
005d9f1
...
@@ -35,7 +35,6 @@ namespace URSoldering.Client
...
@@ -35,7 +35,6 @@ namespace URSoldering.Client
this
.
btnSendWireDebug
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnSendWireDebug
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnIODebug
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnIODebug
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnWeldDebug
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnWeldDebug
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btnCamera
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
SuspendLayout
();
this
.
SuspendLayout
();
//
//
// btnCodeTest
// btnCodeTest
...
@@ -47,7 +46,7 @@ namespace URSoldering.Client
...
@@ -47,7 +46,7 @@ namespace URSoldering.Client
this
.
btnCodeTest
.
ForeColor
=
System
.
Drawing
.
Color
.
White
;
this
.
btnCodeTest
.
ForeColor
=
System
.
Drawing
.
Color
.
White
;
this
.
btnCodeTest
.
Location
=
new
System
.
Drawing
.
Point
(
104
,
284
);
this
.
btnCodeTest
.
Location
=
new
System
.
Drawing
.
Point
(
104
,
284
);
this
.
btnCodeTest
.
Name
=
"btnCodeTest"
;
this
.
btnCodeTest
.
Name
=
"btnCodeTest"
;
this
.
btnCodeTest
.
Size
=
new
System
.
Drawing
.
Size
(
146
,
95
);
this
.
btnCodeTest
.
Size
=
new
System
.
Drawing
.
Size
(
228
,
95
);
this
.
btnCodeTest
.
TabIndex
=
11
;
this
.
btnCodeTest
.
TabIndex
=
11
;
this
.
btnCodeTest
.
Text
=
"AOI调试"
;
this
.
btnCodeTest
.
Text
=
"AOI调试"
;
this
.
btnCodeTest
.
UseVisualStyleBackColor
=
false
;
this
.
btnCodeTest
.
UseVisualStyleBackColor
=
false
;
...
@@ -60,9 +59,9 @@ namespace URSoldering.Client
...
@@ -60,9 +59,9 @@ namespace URSoldering.Client
this
.
btnBack
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnBack
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnBack
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
14.25F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnBack
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
14.25F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnBack
.
ForeColor
=
System
.
Drawing
.
Color
.
White
;
this
.
btnBack
.
ForeColor
=
System
.
Drawing
.
Color
.
White
;
this
.
btnBack
.
Location
=
new
System
.
Drawing
.
Point
(
404
,
284
);
this
.
btnBack
.
Location
=
new
System
.
Drawing
.
Point
(
338
,
284
);
this
.
btnBack
.
Name
=
"btnBack"
;
this
.
btnBack
.
Name
=
"btnBack"
;
this
.
btnBack
.
Size
=
new
System
.
Drawing
.
Size
(
162
,
95
);
this
.
btnBack
.
Size
=
new
System
.
Drawing
.
Size
(
228
,
95
);
this
.
btnBack
.
TabIndex
=
6
;
this
.
btnBack
.
TabIndex
=
6
;
this
.
btnBack
.
Text
=
"返回(&B)"
;
this
.
btnBack
.
Text
=
"返回(&B)"
;
this
.
btnBack
.
UseVisualStyleBackColor
=
false
;
this
.
btnBack
.
UseVisualStyleBackColor
=
false
;
...
@@ -128,27 +127,11 @@ namespace URSoldering.Client
...
@@ -128,27 +127,11 @@ namespace URSoldering.Client
this
.
btnWeldDebug
.
UseVisualStyleBackColor
=
false
;
this
.
btnWeldDebug
.
UseVisualStyleBackColor
=
false
;
this
.
btnWeldDebug
.
Click
+=
new
System
.
EventHandler
(
this
.
btnSoldering_Click
);
this
.
btnWeldDebug
.
Click
+=
new
System
.
EventHandler
(
this
.
btnSoldering_Click
);
//
//
// btnCamera
//
this
.
btnCamera
.
BackColor
=
System
.
Drawing
.
Color
.
Goldenrod
;
this
.
btnCamera
.
FlatAppearance
.
BorderSize
=
0
;
this
.
btnCamera
.
FlatStyle
=
System
.
Windows
.
Forms
.
FlatStyle
.
Flat
;
this
.
btnCamera
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
14.25F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
btnCamera
.
ForeColor
=
System
.
Drawing
.
Color
.
White
;
this
.
btnCamera
.
Location
=
new
System
.
Drawing
.
Point
(
254
,
284
);
this
.
btnCamera
.
Name
=
"btnCamera"
;
this
.
btnCamera
.
Size
=
new
System
.
Drawing
.
Size
(
146
,
95
);
this
.
btnCamera
.
TabIndex
=
12
;
this
.
btnCamera
.
Text
=
"摄像机测试"
;
this
.
btnCamera
.
UseVisualStyleBackColor
=
false
;
this
.
btnCamera
.
Click
+=
new
System
.
EventHandler
(
this
.
btnCamera_Click
);
//
// FrmDebugMenu
// FrmDebugMenu
//
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
7F
,
17F
);
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
7F
,
17F
);
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
Font
;
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
Font
;
this
.
ClientSize
=
new
System
.
Drawing
.
Size
(
684
,
461
);
this
.
ClientSize
=
new
System
.
Drawing
.
Size
(
684
,
461
);
this
.
Controls
.
Add
(
this
.
btnCamera
);
this
.
Controls
.
Add
(
this
.
btnCodeTest
);
this
.
Controls
.
Add
(
this
.
btnCodeTest
);
this
.
Controls
.
Add
(
this
.
btnBack
);
this
.
Controls
.
Add
(
this
.
btnBack
);
this
.
Controls
.
Add
(
this
.
btnWeldConfig
);
this
.
Controls
.
Add
(
this
.
btnWeldConfig
);
...
@@ -170,6 +153,5 @@ namespace URSoldering.Client
...
@@ -170,6 +153,5 @@ namespace URSoldering.Client
private
System
.
Windows
.
Forms
.
Button
btnWeldConfig
;
private
System
.
Windows
.
Forms
.
Button
btnWeldConfig
;
private
System
.
Windows
.
Forms
.
Button
btnBack
;
private
System
.
Windows
.
Forms
.
Button
btnBack
;
private
System
.
Windows
.
Forms
.
Button
btnCodeTest
;
private
System
.
Windows
.
Forms
.
Button
btnCodeTest
;
private
System
.
Windows
.
Forms
.
Button
btnCamera
;
}
}
}
}
\ No newline at end of file
\ No newline at end of file
URSolderingClient/FrmOrgConfig.Designer.cs
查看文件 @
005d9f1
...
@@ -115,7 +115,7 @@
...
@@ -115,7 +115,7 @@
// btnSetClear2
// btnSetClear2
//
//
this
.
btnSetClear2
.
FlatAppearance
.
BorderSize
=
0
;
this
.
btnSetClear2
.
FlatAppearance
.
BorderSize
=
0
;
this
.
btnSetClear2
.
Location
=
new
System
.
Drawing
.
Point
(
3
47
,
192
);
this
.
btnSetClear2
.
Location
=
new
System
.
Drawing
.
Point
(
3
59
,
188
);
this
.
btnSetClear2
.
Name
=
"btnSetClear2"
;
this
.
btnSetClear2
.
Name
=
"btnSetClear2"
;
this
.
btnSetClear2
.
Size
=
new
System
.
Drawing
.
Size
(
159
,
38
);
this
.
btnSetClear2
.
Size
=
new
System
.
Drawing
.
Size
(
159
,
38
);
this
.
btnSetClear2
.
TabIndex
=
38
;
this
.
btnSetClear2
.
TabIndex
=
38
;
...
@@ -126,7 +126,7 @@
...
@@ -126,7 +126,7 @@
// btnSetClear1
// btnSetClear1
//
//
this
.
btnSetClear1
.
FlatAppearance
.
BorderSize
=
0
;
this
.
btnSetClear1
.
FlatAppearance
.
BorderSize
=
0
;
this
.
btnSetClear1
.
Location
=
new
System
.
Drawing
.
Point
(
3
47
,
142
);
this
.
btnSetClear1
.
Location
=
new
System
.
Drawing
.
Point
(
3
59
,
126
);
this
.
btnSetClear1
.
Name
=
"btnSetClear1"
;
this
.
btnSetClear1
.
Name
=
"btnSetClear1"
;
this
.
btnSetClear1
.
Size
=
new
System
.
Drawing
.
Size
(
159
,
38
);
this
.
btnSetClear1
.
Size
=
new
System
.
Drawing
.
Size
(
159
,
38
);
this
.
btnSetClear1
.
TabIndex
=
37
;
this
.
btnSetClear1
.
TabIndex
=
37
;
...
@@ -158,7 +158,7 @@
...
@@ -158,7 +158,7 @@
// btnSetOrigin
// btnSetOrigin
//
//
this
.
btnSetOrigin
.
FlatAppearance
.
BorderSize
=
0
;
this
.
btnSetOrigin
.
FlatAppearance
.
BorderSize
=
0
;
this
.
btnSetOrigin
.
Location
=
new
System
.
Drawing
.
Point
(
3
47
,
42
);
this
.
btnSetOrigin
.
Location
=
new
System
.
Drawing
.
Point
(
3
59
,
9
);
this
.
btnSetOrigin
.
Name
=
"btnSetOrigin"
;
this
.
btnSetOrigin
.
Name
=
"btnSetOrigin"
;
this
.
btnSetOrigin
.
Size
=
new
System
.
Drawing
.
Size
(
159
,
38
);
this
.
btnSetOrigin
.
Size
=
new
System
.
Drawing
.
Size
(
159
,
38
);
this
.
btnSetOrigin
.
TabIndex
=
32
;
this
.
btnSetOrigin
.
TabIndex
=
32
;
...
@@ -170,7 +170,7 @@
...
@@ -170,7 +170,7 @@
// btnSaveHome
// btnSaveHome
//
//
this
.
btnSaveHome
.
FlatAppearance
.
BorderSize
=
0
;
this
.
btnSaveHome
.
FlatAppearance
.
BorderSize
=
0
;
this
.
btnSaveHome
.
Location
=
new
System
.
Drawing
.
Point
(
3
47
,
92
);
this
.
btnSaveHome
.
Location
=
new
System
.
Drawing
.
Point
(
3
59
,
66
);
this
.
btnSaveHome
.
Name
=
"btnSaveHome"
;
this
.
btnSaveHome
.
Name
=
"btnSaveHome"
;
this
.
btnSaveHome
.
Size
=
new
System
.
Drawing
.
Size
(
159
,
38
);
this
.
btnSaveHome
.
Size
=
new
System
.
Drawing
.
Size
(
159
,
38
);
this
.
btnSaveHome
.
TabIndex
=
36
;
this
.
btnSaveHome
.
TabIndex
=
36
;
...
...
URSolderingClient/FrmOrgConfig.cs
查看文件 @
005d9f1
...
@@ -97,9 +97,9 @@ namespace URSoldering.Client
...
@@ -97,9 +97,9 @@ namespace URSoldering.Client
private
void
btnSetOrigin_Click
(
object
sender
,
EventArgs
e
)
private
void
btnSetOrigin_Click
(
object
sender
,
EventArgs
e
)
{
{
URPointValue
point
=
GetCurrRobotPoint
();
//
URPointValue point = GetCurrRobotPoint();
ConfigAppSettings
.
SaveValue
(
Setting_Init
.
BOARD_ORIGIN_X
,
point
.
X
.
ToString
());
//
ConfigAppSettings.SaveValue(Setting_Init.BOARD_ORIGIN_X, point.X.ToString());
ConfigAppSettings
.
SaveValue
(
Setting_Init
.
BOARD_ORIGIN_Y
,
point
.
Y
.
ToString
());
//
ConfigAppSettings.SaveValue(Setting_Init.BOARD_ORIGIN_Y, point.Y.ToString());
}
}
private
void
btnSaveHome_Click
(
object
sender
,
EventArgs
e
)
private
void
btnSaveHome_Click
(
object
sender
,
EventArgs
e
)
{
{
...
...
URSolderingClient/FrmTest.Designer.cs
deleted
100644 → 0
查看文件 @
76f9c75
namespace
URSoldering.Client
{
partial
class
FrmTest
{
/// <summary>
/// Required designer variable.
/// </summary>
private
System
.
ComponentModel
.
IContainer
components
=
null
;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected
override
void
Dispose
(
bool
disposing
)
{
if
(
disposing
&&
(
components
!=
null
))
{
components
.
Dispose
();
}
base
.
Dispose
(
disposing
);
}
#
region
Windows
Form
Designer
generated
code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private
void
InitializeComponent
()
{
System
.
ComponentModel
.
ComponentResourceManager
resources
=
new
System
.
ComponentModel
.
ComponentResourceManager
(
typeof
(
FrmTest
));
this
.
axCKVisionCtrl1
=
new
AxCKVisionCtrlLib
.
AxCKVisionCtrl
();
((
System
.
ComponentModel
.
ISupportInitialize
)(
this
.
axCKVisionCtrl1
)).
BeginInit
();
this
.
SuspendLayout
();
//
// axCKVisionCtrl1
//
this
.
axCKVisionCtrl1
.
Enabled
=
true
;
this
.
axCKVisionCtrl1
.
Location
=
new
System
.
Drawing
.
Point
(
150
,
158
);
this
.
axCKVisionCtrl1
.
Name
=
"axCKVisionCtrl1"
;
this
.
axCKVisionCtrl1
.
OcxState
=
((
System
.
Windows
.
Forms
.
AxHost
.
State
)(
resources
.
GetObject
(
"axCKVisionCtrl1.OcxState"
)));
this
.
axCKVisionCtrl1
.
Size
=
new
System
.
Drawing
.
Size
(
100
,
50
);
this
.
axCKVisionCtrl1
.
TabIndex
=
0
;
//
// FrmTest
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
6F
,
12F
);
this
.
AutoScaleMode
=
System
.
Windows
.
Forms
.
AutoScaleMode
.
Font
;
this
.
ClientSize
=
new
System
.
Drawing
.
Size
(
800
,
450
);
this
.
Controls
.
Add
(
this
.
axCKVisionCtrl1
);
this
.
Name
=
"FrmTest"
;
this
.
Text
=
"FrmTest"
;
((
System
.
ComponentModel
.
ISupportInitialize
)(
this
.
axCKVisionCtrl1
)).
EndInit
();
this
.
ResumeLayout
(
false
);
}
#
endregion
private
AxCKVisionCtrlLib
.
AxCKVisionCtrl
axCKVisionCtrl1
;
}
}
\ No newline at end of file
\ No newline at end of file
URSolderingClient/FrmTest.cs
deleted
100644 → 0
查看文件 @
76f9c75
using
System
;
using
System.Collections.Generic
;
using
System.ComponentModel
;
using
System.Data
;
using
System.Drawing
;
using
System.Linq
;
using
System.Text
;
using
System.Windows.Forms
;
namespace
URSoldering.Client
{
public
partial
class
FrmTest
:
Form
{
public
FrmTest
()
{
InitializeComponent
();
}
}
}
URSolderingClient/FrmTest.resx
deleted
100644 → 0
查看文件 @
76f9c75
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="axCKVisionCtrl1.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAJQAAAAIB
AAAAAQAAAAAAAAAAAAAAABAAAAAAAAEAVgoAACsFAAAAAAAACw==
</value>
</data>
</root>
\ No newline at end of file
\ No newline at end of file
URSolderingClient/FrmWork.cs
查看文件 @
005d9f1
...
@@ -63,6 +63,7 @@ namespace URSoldering.Client
...
@@ -63,6 +63,7 @@ namespace URSoldering.Client
this
.
btnChange
.
Focus
();
this
.
btnChange
.
Focus
();
btnStart
.
Text
=
"启动"
;
btnStart
.
Text
=
"启动"
;
btnStart
.
Enabled
=
true
;
btnStart
.
Enabled
=
true
;
btnWeld
.
Enabled
=
false
;
btnStop
.
Enabled
=
false
;
btnStop
.
Enabled
=
false
;
Robot
.
IsAutoRun
=
chbXunHuan
.
Checked
;
Robot
.
IsAutoRun
=
chbXunHuan
.
Checked
;
LoadAOI
();
LoadAOI
();
...
@@ -260,7 +261,7 @@ namespace URSoldering.Client
...
@@ -260,7 +261,7 @@ namespace URSoldering.Client
catch
(
Exception
ex
)
catch
(
Exception
ex
)
{
{
}
}
if
(
id
!=
board
.
boardId
||
currWeldIndex
==
-
3
||
currWeldIndex
.
Equals
(
-
1
))
if
(
id
!=
board
.
boardId
||
currWeldIndex
==
-
3
||
currWeldIndex
.
Equals
(
-
1
)
||(
board
.
pointList
.
Count
!=
listPoint
.
Items
.
Count
)
)
{
{
this
.
lblPointCount
.
Text
=
board
.
pointList
.
Count
.
ToString
();
this
.
lblPointCount
.
Text
=
board
.
pointList
.
Count
.
ToString
();
this
.
lblProName
.
Text
=
board
.
boardName
;
this
.
lblProName
.
Text
=
board
.
boardName
;
...
@@ -369,6 +370,7 @@ namespace URSoldering.Client
...
@@ -369,6 +370,7 @@ namespace URSoldering.Client
else
else
{
{
btnStart
.
Text
=
"复位"
;
btnStart
.
Text
=
"复位"
;
btnStart
.
Enabled
=
true
;
btnStop
.
Enabled
=
true
;
btnStop
.
Enabled
=
true
;
OpenUsbCamera
();
OpenUsbCamera
();
}
}
...
...
URSolderingClient/URSolderingClient.csproj
查看文件 @
005d9f1
...
@@ -163,12 +163,6 @@
...
@@ -163,12 +163,6 @@
<Compile Include="FrmSoldDebug.Designer.cs">
<Compile Include="FrmSoldDebug.Designer.cs">
<DependentUpon>FrmSoldDebug.cs</DependentUpon>
<DependentUpon>FrmSoldDebug.cs</DependentUpon>
</Compile>
</Compile>
<Compile Include="FrmTest.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmTest.Designer.cs">
<DependentUpon>FrmTest.cs</DependentUpon>
</Compile>
<Compile Include="FrmWeldPointInfo.cs">
<Compile Include="FrmWeldPointInfo.cs">
<SubType>Form</SubType>
<SubType>Form</SubType>
</Compile>
</Compile>
...
@@ -234,9 +228,6 @@
...
@@ -234,9 +228,6 @@
<EmbeddedResource Include="FrmSoldDebug.resx">
<EmbeddedResource Include="FrmSoldDebug.resx">
<DependentUpon>FrmSoldDebug.cs</DependentUpon>
<DependentUpon>FrmSoldDebug.cs</DependentUpon>
</EmbeddedResource>
</EmbeddedResource>
<EmbeddedResource Include="FrmTest.resx">
<DependentUpon>FrmTest.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmWeldPointInfo.resx">
<EmbeddedResource Include="FrmWeldPointInfo.resx">
<DependentUpon>FrmWeldPointInfo.cs</DependentUpon>
<DependentUpon>FrmWeldPointInfo.cs</DependentUpon>
</EmbeddedResource>
</EmbeddedResource>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论