Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
刘韬
/
1069_MIMO_PlUS
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit 68e202e2
由
张东亮
编写于
2023-09-04 10:00:51 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
监控画面单独开一个窗口
1 个父辈
120b4e9c
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
59 行增加
和
10 行删除
TheMachine/Form1.Designer.cs
TheMachine/Form1.cs
TheMachine/WindowManager.cs
TheMachine/resources/en-US.lngres
TheMachine/resources/ja-JP.lngres
TheMachine/resources/zh-CN.lngres
TheMachine/Form1.Designer.cs
查看文件 @
68e202e
...
...
@@ -45,7 +45,6 @@ namespace TheMachine
this
.
tabc
=
new
System
.
Windows
.
Forms
.
TabControl
();
this
.
tabP1
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
pnl
=
new
System
.
Windows
.
Forms
.
Panel
();
this
.
panelVideo
=
new
System
.
Windows
.
Forms
.
Panel
();
this
.
groupBox1
=
new
System
.
Windows
.
Forms
.
GroupBox
();
this
.
stateView
=
new
System
.
Windows
.
Forms
.
ListView
();
this
.
btn_releasestring
=
new
System
.
Windows
.
Forms
.
Button
();
...
...
@@ -58,12 +57,15 @@ namespace TheMachine
this
.
listView1
=
new
System
.
Windows
.
Forms
.
ListView
();
this
.
btn_stop
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
btn_run
=
new
System
.
Windows
.
Forms
.
Button
();
this
.
tabMonitor
=
new
System
.
Windows
.
Forms
.
TabPage
();
this
.
panelVideo
=
new
System
.
Windows
.
Forms
.
Panel
();
this
.
menuStrip1
.
SuspendLayout
();
this
.
tabc
.
SuspendLayout
();
this
.
tabP1
.
SuspendLayout
();
this
.
pnl
.
SuspendLayout
();
this
.
groupBox1
.
SuspendLayout
();
((
System
.
ComponentModel
.
ISupportInitialize
)(
this
.
pictureBox2
)).
BeginInit
();
this
.
tabMonitor
.
SuspendLayout
();
this
.
SuspendLayout
();
//
// menuStrip1
...
...
@@ -176,6 +178,7 @@ namespace TheMachine
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Left
)
|
System
.
Windows
.
Forms
.
AnchorStyles
.
Right
)));
this
.
tabc
.
Controls
.
Add
(
this
.
tabP1
);
this
.
tabc
.
Controls
.
Add
(
this
.
tabMonitor
);
this
.
tabc
.
Font
=
new
System
.
Drawing
.
Font
(
"微软雅黑"
,
12F
,
System
.
Drawing
.
FontStyle
.
Regular
,
System
.
Drawing
.
GraphicsUnit
.
Point
,
((
byte
)(
134
)));
this
.
tabc
.
Location
=
new
System
.
Drawing
.
Point
(
0
,
119
);
this
.
tabc
.
Name
=
"tabc"
;
...
...
@@ -195,7 +198,6 @@ namespace TheMachine
//
// pnl
//
this
.
pnl
.
Controls
.
Add
(
this
.
panelVideo
);
this
.
pnl
.
Controls
.
Add
(
this
.
groupBox1
);
this
.
pnl
.
Controls
.
Add
(
this
.
btn_releasestring
);
this
.
pnl
.
Controls
.
Add
(
this
.
cb_IgnoreSafecheck
);
...
...
@@ -210,13 +212,6 @@ namespace TheMachine
this
.
pnl
.
Size
=
new
System
.
Drawing
.
Size
(
1000
,
560
);
this
.
pnl
.
TabIndex
=
273
;
//
// panelVideo
//
this
.
panelVideo
.
Location
=
new
System
.
Drawing
.
Point
(
21
,
258
);
this
.
panelVideo
.
Name
=
"panelVideo"
;
this
.
panelVideo
.
Size
=
new
System
.
Drawing
.
Size
(
436
,
271
);
this
.
panelVideo
.
TabIndex
=
273
;
//
// groupBox1
//
this
.
groupBox1
.
Controls
.
Add
(
this
.
stateView
);
...
...
@@ -266,7 +261,7 @@ namespace TheMachine
// pictureBox2
//
this
.
pictureBox2
.
BackColor
=
System
.
Drawing
.
Color
.
Gainsboro
;
this
.
pictureBox2
.
Location
=
new
System
.
Drawing
.
Point
(
472
,
258
);
this
.
pictureBox2
.
Location
=
new
System
.
Drawing
.
Point
(
6
,
269
);
this
.
pictureBox2
.
Name
=
"pictureBox2"
;
this
.
pictureBox2
.
Size
=
new
System
.
Drawing
.
Size
(
436
,
271
);
this
.
pictureBox2
.
SizeMode
=
System
.
Windows
.
Forms
.
PictureBoxSizeMode
.
Zoom
;
...
...
@@ -362,6 +357,24 @@ namespace TheMachine
this
.
btn_run
.
UseVisualStyleBackColor
=
true
;
this
.
btn_run
.
Click
+=
new
System
.
EventHandler
(
this
.
btn_run_Click
);
//
// tabMonitor
//
this
.
tabMonitor
.
Controls
.
Add
(
this
.
panelVideo
);
this
.
tabMonitor
.
Location
=
new
System
.
Drawing
.
Point
(
4
,
36
);
this
.
tabMonitor
.
Name
=
"tabMonitor"
;
this
.
tabMonitor
.
Size
=
new
System
.
Drawing
.
Size
(
1000
,
560
);
this
.
tabMonitor
.
TabIndex
=
1
;
this
.
tabMonitor
.
Text
=
"监控"
;
this
.
tabMonitor
.
UseVisualStyleBackColor
=
true
;
//
// panelVideo
//
this
.
panelVideo
.
Dock
=
System
.
Windows
.
Forms
.
DockStyle
.
Fill
;
this
.
panelVideo
.
Location
=
new
System
.
Drawing
.
Point
(
0
,
0
);
this
.
panelVideo
.
Name
=
"panelVideo"
;
this
.
panelVideo
.
Size
=
new
System
.
Drawing
.
Size
(
1000
,
560
);
this
.
panelVideo
.
TabIndex
=
274
;
//
// Form1
//
this
.
AutoScaleDimensions
=
new
System
.
Drawing
.
SizeF
(
9F
,
17F
);
...
...
@@ -389,6 +402,7 @@ namespace TheMachine
this
.
pnl
.
PerformLayout
();
this
.
groupBox1
.
ResumeLayout
(
false
);
((
System
.
ComponentModel
.
ISupportInitialize
)(
this
.
pictureBox2
)).
EndInit
();
this
.
tabMonitor
.
ResumeLayout
(
false
);
this
.
ResumeLayout
(
false
);
this
.
PerformLayout
();
...
...
@@ -423,6 +437,7 @@ namespace TheMachine
private
System
.
Windows
.
Forms
.
ToolStripMenuItem
简体中文
ToolStripMenuItem
;
private
System
.
Windows
.
Forms
.
ToolStripMenuItem
日本语
ToolStripMenuItem
;
private
System
.
Windows
.
Forms
.
ToolStripMenuItem
englishToolStripMenuItem
;
private
System
.
Windows
.
Forms
.
TabPage
tabMonitor
;
private
System
.
Windows
.
Forms
.
Panel
panelVideo
;
}
}
...
...
TheMachine/Form1.cs
查看文件 @
68e202e
...
...
@@ -705,5 +705,24 @@ namespace TheMachine
base
.
OnHandleDestroyed
(
e
);
}
#
endregion
private
void
panelVideo_DoubleClick
(
object
sender
,
EventArgs
e
)
{
var
obj
=
sender
as
Panel
;
if
(
obj
.
Dock
==
DockStyle
.
Fill
)
obj
.
Dock
=
DockStyle
.
None
;
else
{
obj
.
BringToFront
();
obj
.
Dock
=
DockStyle
.
Fill
;
}
}
private
void
panelVideo_MouseDown
(
object
sender
,
MouseEventArgs
e
)
{
var
obj
=
sender
as
Panel
;
if
(
obj
.
Dock
==
DockStyle
.
Fill
)
obj
.
Dock
=
DockStyle
.
None
;
}
}
}
TheMachine/WindowManager.cs
查看文件 @
68e202e
...
...
@@ -33,6 +33,18 @@ namespace TheMachine
foreach
(
var
item
in
windInfos
)
item
.
WindowHandle
=
WindowUtil
.
PutIntoForm
(
item
.
Parent
,
item
.
Name
);
}
public
static
void
Hide
()
{
foreach
(
var
item
in
windInfos
)
{
if
(
item
.
WindowHandle
!=
IntPtr
.
Zero
)
{
item
.
WindowHandle
=
IntPtr
.
Zero
;
WindowUtil
.
RemoveFromForm
(
item
.
Name
);
}
}
}
}
class
WindInfo
{
...
...
TheMachine/resources/en-US.lngres
查看文件 @
68e202e
...
...
@@ -32,6 +32,7 @@ Form1_tabc_tabP1_pnl_cb_IgnoreGratingSignal_Text 忽略安全光栅 Skip safety
Form1_tabc_tabP1_pnl_cb_IgnoreSafecheck_Text 忽略安全检查(含安全光栅) Skip safety check including safety light curtain.
Form1_tabc_tabP1_pnl_groupBox1_Text 运行状态 Running Status
Form1_tabc_tabP1_Text 信息 Info.
Form1_tabc_tabMonitor_Text 监控 Monitor
FrmCodeDecode_btnAn_Text 变暗 darken
FrmCodeDecode_btnbarCode_Text 一维码识别 One dimensional code recognition
...
...
TheMachine/resources/ja-JP.lngres
查看文件 @
68e202e
...
...
@@ -32,6 +32,7 @@ Form1_tabc_tabP1_pnl_cb_IgnoreGratingSignal_Text 忽略安全光栅 ライトカ
Form1_tabc_tabP1_pnl_cb_IgnoreSafecheck_Text 忽略安全检查(含安全光栅) セーフティチックを無視する(ライトカーテン含み)
Form1_tabc_tabP1_pnl_groupBox1_Text 运行状态 実行状況
Form1_tabc_tabP1_Text 信息 情報
Form1_tabc_tabMonitor_Text 监控 モニター
FrmCodeDecode_btnAn_Text 变暗 暗く
FrmCodeDecode_btnbarCode_Text 一维码识别 バーコード識別
...
...
TheMachine/resources/zh-CN.lngres
查看文件 @
68e202e
...
...
@@ -7,6 +7,7 @@ AboutBox1_tableLayoutPanel_okButton_Text 确定 确定
Form1_btn_stop_Text 停止 停止
Form1_btn_run_Text 启动 启动
Form1_tabc_tabP1_Text 信息 信息
Form1_tabc_tabMonitor_Text 监控 监控
Form1_tabc_tabP1_pnl_groupBox1_Text 运行状态 运行状态
Form1_tabc_tabP1_pnl_btn_releasestring_Text 安全释放料串 安全释放料串
Form1_tabc_tabP1_pnl_cb_IgnoreSafecheck_Text 忽略安全检查(含安全光栅) 忽略安全检查(含安全光栅)
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论