Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 269dcfad 由 LN
选项

增加报警提示屏幕

1 个父辈 5ecfb4c7
内嵌 并排
正在显示 14 个修改的文件 包含 1008 行增加 和 98 行删除
Common/Setting_Init.cs
......@@ -193,10 +193,16 @@ namespace TSA_V.Common
public static string DisShowScreenAlarm = "DisShowScreenAlarm";
///// <summary>
///// 实时播放视频所在屏幕索引号
///// </summary>
//public static string VideoFrom_Index = "VideoFrom_Index";
//public static string VideoForm_Show = "VideoForm_Show";
/// <summary>
/// 实时播放视频所在屏幕索引号
/// 投影屏幕索引，默认1
/// </summary>
public static string VideoFrom_Index = "VideoFrom_Index";
public static string VideoForm_Show = "VideoForm_Show";
public static string ProjectorScreen_Index = "ProjectorScreen_Index";
}
}
DeviceLibrary/manager/ProjectorProcess.cs
......@@ -14,6 +14,10 @@ namespace TSA_V
{
public class ProjectorProcess
{
/// <summary>
/// 第二屏幕是否显示，默认不显示
/// </summary>
public static bool ViewScreen_Show = false;
public static bool AOIopen = false;
......@@ -37,7 +41,7 @@ namespace TSA_V
proTimer.Interval = 1000;
proTimer.Elapsed += ProTimer_Elapsed;
proTimer.Start();
}
}
}
public static bool IsAlarm(out string msg)
......
DeviceLibrary/manager/WorkModeUtil.cs
......@@ -46,7 +46,8 @@ namespace TSA_V.DeviceLibrary
{
return;
}
OnlyGuoBan = true;
IsSelected = true;
LogUtil.error(Name + " 默认进入过板模式，不加载转盘");
ModeCheckEnd();
......
TSA-V/App.config
......@@ -132,6 +132,7 @@
<add key ="DisShowScreenAlarm" value ="1"/>
<!--显示实时视频浮窗-->
<add key ="VideoForm_Show" value ="1"/>
<add key ="ProjectorScreen_Index" value ="1"/>
</appSettings>
<log4net>
<appender name="defaultAppender" type="log4net.Appender.RollingFileAppender">
......
TSA-V/FrmMenu.cs
......@@ -368,15 +368,35 @@ namespace TSA_V
{
lblMsg.Text = TSAVBean.GetShowMsg();
Screen[] sc = Screen.AllScreens;
if ((!FrmProjectorScreen.instance.ISShow) && sc.Length > FrmProjectorScreen.instance.ScreenIndex)
if (sc.Length == 3 || FrmProjectorScreen.instance.ScreenIndex==2)
{
bool result = FrmProjectorScreen.instance.ShowForm();
if (!FrmProjectorScreen.instance.ISShow)
{
LogUtil.info("检测到工三个个显示器，显示投影界面，视图提示界面");
ProjectorProcess.ViewScreen_Show = true;
int secondSIndex = 2;
if (FrmProjectorScreen.instance.ScreenIndex == 2)
{
secondSIndex = 1;
}
bool result = FrmProjectorScreen.instance.ShowForm();
FrmViewScreen.instance.ShowForm(secondSIndex);
}
}
else if (sc.Length <= FrmProjectorScreen.instance.ScreenIndex && FrmProjectorScreen.instance.ISShow)
else
{
FrmProjectorScreen.instance.Close();
FrmProjectorScreen.instance = new FrmProjectorScreen();
LogUtil.info("检测到只有一个显示器，关闭投影界面");
if ((!FrmProjectorScreen.instance.ISShow) && sc.Length > FrmProjectorScreen.instance.ScreenIndex)
{
LogUtil.info("检测到工二个显示器，显示投影界面");
bool result = FrmProjectorScreen.instance.ShowForm();
}
else if (sc.Length <= FrmProjectorScreen.instance.ScreenIndex && FrmProjectorScreen.instance.ISShow)
{
LogUtil.info("检测到共一个显示器，关闭投影界面");
FrmProjectorScreen.instance.Close();
FrmProjectorScreen.instance = new FrmProjectorScreen();
}
}
//ShowCameraPlay();
}
......
TSA-V/FrmPointInfo.Designer.cs
......@@ -67,10 +67,9 @@
this.btnPre.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnPre.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPre.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPre.Location = new System.Drawing.Point(61, 704);
this.btnPre.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnPre.Location = new System.Drawing.Point(46, 563);
this.btnPre.Name = "btnPre";
this.btnPre.Size = new System.Drawing.Size(160, 56);
this.btnPre.Size = new System.Drawing.Size(120, 45);
this.btnPre.TabIndex = 62;
this.btnPre.Text = "上一个";
this.btnPre.UseVisualStyleBackColor = true;
......@@ -81,10 +80,9 @@
this.btnSaveAndNext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnSaveAndNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveAndNext.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveAndNext.Location = new System.Drawing.Point(400, 704);
this.btnSaveAndNext.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSaveAndNext.Location = new System.Drawing.Point(300, 563);
this.btnSaveAndNext.Name = "btnSaveAndNext";
this.btnSaveAndNext.Size = new System.Drawing.Size(160, 56);
this.btnSaveAndNext.Size = new System.Drawing.Size(120, 45);
this.btnSaveAndNext.TabIndex = 61;
this.btnSaveAndNext.Text = "保存并继续";
this.btnSaveAndNext.UseVisualStyleBackColor = true;
......@@ -110,11 +108,9 @@
this.groupBox1.Controls.Add(this.txtX);
this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(59, 11);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Location = new System.Drawing.Point(44, 9);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupBox1.Size = new System.Drawing.Size(671, 282);
this.groupBox1.Size = new System.Drawing.Size(503, 226);
this.groupBox1.TabIndex = 59;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "组装信息";
......@@ -123,19 +119,17 @@
//
this.cmbPnList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPnList.FormattingEnabled = true;
this.cmbPnList.Location = new System.Drawing.Point(180, 78);
this.cmbPnList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbPnList.Location = new System.Drawing.Point(135, 62);
this.cmbPnList.Name = "cmbPnList";
this.cmbPnList.Size = new System.Drawing.Size(291, 28);
this.cmbPnList.Size = new System.Drawing.Size(219, 25);
this.cmbPnList.TabIndex = 86;
this.cmbPnList.SelectedIndexChanged += new System.EventHandler(this.cmbPnList_SelectedIndexChanged);
//
// lblNotes
//
this.lblNotes.Location = new System.Drawing.Point(8, 224);
this.lblNotes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblNotes.Location = new System.Drawing.Point(6, 179);
this.lblNotes.Name = "lblNotes";
this.lblNotes.Size = new System.Drawing.Size(655, 45);
this.lblNotes.Size = new System.Drawing.Size(491, 36);
this.lblNotes.TabIndex = 85;
this.lblNotes.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
......@@ -143,10 +137,9 @@
//
this.chbCheck.AutoSize = true;
this.chbCheck.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbCheck.Location = new System.Drawing.Point(180, 176);
this.chbCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbCheck.Location = new System.Drawing.Point(135, 141);
this.chbCheck.Name = "chbCheck";
this.chbCheck.Size = new System.Drawing.Size(212, 28);
this.chbCheck.Size = new System.Drawing.Size(168, 24);
this.chbCheck.TabIndex = 84;
this.chbCheck.Text = "设置为红外坐标校准点";
this.chbCheck.UseVisualStyleBackColor = true;
......@@ -154,20 +147,18 @@
// txtWeldTemp
//
this.txtWeldTemp.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWeldTemp.Location = new System.Drawing.Point(281, 174);
this.txtWeldTemp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWeldTemp.Location = new System.Drawing.Point(211, 139);
this.txtWeldTemp.MaxLength = 8;
this.txtWeldTemp.Name = "txtWeldTemp";
this.txtWeldTemp.Size = new System.Drawing.Size(119, 30);
this.txtWeldTemp.Size = new System.Drawing.Size(90, 26);
this.txtWeldTemp.TabIndex = 83;
this.txtWeldTemp.Visible = false;
//
// label6
//
this.label6.Location = new System.Drawing.Point(23, 221);
this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label6.Location = new System.Drawing.Point(17, 177);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(216, 28);
this.label6.Size = new System.Drawing.Size(162, 22);
this.label6.TabIndex = 82;
this.label6.Text = "焊接时间：";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -176,20 +167,18 @@
// txtWeldTime
//
this.txtWeldTime.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWeldTime.Location = new System.Drawing.Point(247, 221);
this.txtWeldTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtWeldTime.Location = new System.Drawing.Point(185, 177);
this.txtWeldTime.MaxLength = 8;
this.txtWeldTime.Name = "txtWeldTime";
this.txtWeldTime.Size = new System.Drawing.Size(119, 30);
this.txtWeldTime.Size = new System.Drawing.Size(90, 26);
this.txtWeldTime.TabIndex = 81;
this.txtWeldTime.Visible = false;
//
// label7
//
this.label7.Location = new System.Drawing.Point(57, 175);
this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label7.Location = new System.Drawing.Point(43, 140);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(216, 28);
this.label7.Size = new System.Drawing.Size(162, 22);
this.label7.TabIndex = 80;
this.label7.Text = "焊接温度：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -198,10 +187,9 @@
// chbNeedCheck
//
this.chbNeedCheck.AutoSize = true;
this.chbNeedCheck.Location = new System.Drawing.Point(385, 221);
this.chbNeedCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbNeedCheck.Location = new System.Drawing.Point(289, 177);
this.chbNeedCheck.Name = "chbNeedCheck";
this.chbNeedCheck.Size = new System.Drawing.Size(91, 24);
this.chbNeedCheck.Size = new System.Drawing.Size(75, 21);
this.chbNeedCheck.TabIndex = 79;
this.chbNeedCheck.Text = "需要检测";
this.chbNeedCheck.UseVisualStyleBackColor = true;
......@@ -210,10 +198,9 @@
// label3
//
this.label3.Enabled = false;
this.label3.Location = new System.Drawing.Point(79, 125);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Location = new System.Drawing.Point(59, 100);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(99, 28);
this.label3.Size = new System.Drawing.Size(74, 22);
this.label3.TabIndex = 74;
this.label3.Text = "X：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -222,20 +209,18 @@
//
this.txtTagNo.Enabled = false;
this.txtTagNo.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTagNo.Location = new System.Drawing.Point(180, 30);
this.txtTagNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtTagNo.Location = new System.Drawing.Point(135, 24);
this.txtTagNo.MaxLength = 30;
this.txtTagNo.Name = "txtTagNo";
this.txtTagNo.Size = new System.Drawing.Size(291, 30);
this.txtTagNo.Size = new System.Drawing.Size(219, 26);
this.txtTagNo.TabIndex = 64;
//
// chbNeedSoldering
//
this.chbNeedSoldering.AutoSize = true;
this.chbNeedSoldering.Location = new System.Drawing.Point(420, 180);
this.chbNeedSoldering.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.chbNeedSoldering.Location = new System.Drawing.Point(315, 144);
this.chbNeedSoldering.Name = "chbNeedSoldering";
this.chbNeedSoldering.Size = new System.Drawing.Size(91, 24);
this.chbNeedSoldering.Size = new System.Drawing.Size(75, 21);
this.chbNeedSoldering.TabIndex = 78;
this.chbNeedSoldering.Text = "需要焊接";
this.chbNeedSoldering.UseVisualStyleBackColor = true;
......@@ -244,30 +229,27 @@
// txtY
//
this.txtY.Enabled = false;
this.txtY.Location = new System.Drawing.Point(376, 125);
this.txtY.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtY.Location = new System.Drawing.Point(282, 100);
this.txtY.MaxLength = 20;
this.txtY.Name = "txtY";
this.txtY.Size = new System.Drawing.Size(117, 27);
this.txtY.Size = new System.Drawing.Size(89, 23);
this.txtY.TabIndex = 77;
//
// label4
//
this.label4.Enabled = false;
this.label4.Location = new System.Drawing.Point(307, 125);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Location = new System.Drawing.Point(230, 100);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(64, 28);
this.label4.Size = new System.Drawing.Size(48, 22);
this.label4.TabIndex = 76;
this.label4.Text = "Y：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label2
//
this.label2.Location = new System.Drawing.Point(8, 32);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Location = new System.Drawing.Point(6, 26);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(171, 28);
this.label2.Size = new System.Drawing.Size(128, 22);
this.label2.TabIndex = 60;
this.label2.Text = "位号：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -275,29 +257,26 @@
// txtPn
//
this.txtPn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPn.Location = new System.Drawing.Point(180, 78);
this.txtPn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtPn.Location = new System.Drawing.Point(135, 62);
this.txtPn.MaxLength = 30;
this.txtPn.Name = "txtPn";
this.txtPn.Size = new System.Drawing.Size(291, 30);
this.txtPn.Size = new System.Drawing.Size(219, 26);
this.txtPn.TabIndex = 33;
//
// txtX
//
this.txtX.Enabled = false;
this.txtX.Location = new System.Drawing.Point(180, 125);
this.txtX.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtX.Location = new System.Drawing.Point(135, 100);
this.txtX.MaxLength = 20;
this.txtX.Name = "txtX";
this.txtX.Size = new System.Drawing.Size(117, 27);
this.txtX.Size = new System.Drawing.Size(89, 23);
this.txtX.TabIndex = 75;
//
// label1
//
this.label1.Location = new System.Drawing.Point(8, 80);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Location = new System.Drawing.Point(6, 64);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(171, 28);
this.label1.Size = new System.Drawing.Size(128, 22);
this.label1.TabIndex = 32;
this.label1.Text = "物料编码：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -307,10 +286,9 @@
this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(569, 704);
this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnCancel.Location = new System.Drawing.Point(427, 563);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(160, 56);
this.btnCancel.Size = new System.Drawing.Size(120, 45);
this.btnCancel.TabIndex = 58;
this.btnCancel.Text = "取消";
this.btnCancel.UseVisualStyleBackColor = true;
......@@ -321,10 +299,9 @@
this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSave.Location = new System.Drawing.Point(231, 704);
this.btnSave.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSave.Location = new System.Drawing.Point(173, 563);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(160, 56);
this.btnSave.Size = new System.Drawing.Size(120, 45);
this.btnSave.TabIndex = 57;
this.btnSave.Text = "保存";
this.btnSave.UseVisualStyleBackColor = true;
......@@ -335,25 +312,24 @@
this.xyMoveControl1.BackColor = System.Drawing.Color.White;
this.xyMoveControl1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.xyMoveControl1.GroupName = "坐标";
this.xyMoveControl1.Location = new System.Drawing.Point(55, 301);
this.xyMoveControl1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.xyMoveControl1.Location = new System.Drawing.Point(41, 241);
this.xyMoveControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xyMoveControl1.Name = "xyMoveControl1";
this.xyMoveControl1.PenWidth = 2;
this.xyMoveControl1.PointSizeX = 4;
this.xyMoveControl1.PointSizeY = 1;
this.xyMoveControl1.PointType = 1;
this.xyMoveControl1.ShowText = "";
this.xyMoveControl1.Size = new System.Drawing.Size(687, 374);
this.xyMoveControl1.Size = new System.Drawing.Size(506, 315);
this.xyMoveControl1.TabIndex = 63;
this.xyMoveControl1.XValue = 1D;
this.xyMoveControl1.YValue = 1D;
//this.xyMoveControl1.Load += new System.EventHandler(this.xyMoveControl1_Load);
//
// FrmPointInfo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(799, 802);
this.ClientSize = new System.Drawing.Size(599, 642);
this.Controls.Add(this.xyMoveControl1);
this.Controls.Add(this.btnPre);
this.Controls.Add(this.btnSaveAndNext);
......@@ -361,7 +337,7 @@
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnSave);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "FrmPointInfo";
this.Text = "组装信息";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPointInfo_FormClosing);
......
TSA-V/Smart-Workstation.csproj
......@@ -192,6 +192,12 @@
<DependentUpon>FrmBoardPutCom.cs</DependentUpon>
</Compile>
<Compile Include="messageBox\MessageBoxMidle.cs" />
<Compile Include="projector\FrmViewScreen.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="projector\FrmViewScreen.Designer.cs">
<DependentUpon>FrmViewScreen.cs</DependentUpon>
</Compile>
<Compile Include="projector\FrmProjectorScreen.cs">
<SubType>Form</SubType>
</Compile>
......@@ -355,6 +361,9 @@
<EmbeddedResource Include="FrmBoardPutCom.resx">
<DependentUpon>FrmBoardPutCom.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="projector\FrmViewScreen.resx">
<DependentUpon>FrmViewScreen.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="projector\FrmProjectorScreen.resx">
<DependentUpon>FrmProjectorScreen.cs</DependentUpon>
</EmbeddedResource>
......
TSA-V/projector/FrmProjectorScreen.cs
......@@ -19,6 +19,7 @@ namespace TSA_V
public FrmProjectorScreen()
{
InitializeComponent();
ScreenIndex = ConfigAppSettings.GetIntValue(Setting_Init.ProjectorScreen_Index, 1);
}
public int ScreenIndex = 1;
public int ScreenWidth = 1920;
......@@ -360,7 +361,7 @@ namespace TSA_V
panAoi.BackColor = Color.Black;
panAoi.Visible = true;
}
else if (ProjectorProcess.IsAlarm(out string msg))
else if (ProjectorProcess.IsAlarm(out string msg) &&(! ProjectorProcess.ViewScreen_Show))
{
panAoi.Visible = false;
if (panel1.BackgroundImage != null)
......
TSA-V/projector/FrmViewScreen.Designer.cs 0 → 100644
namespace TSA_V
{
partial class FrmViewScreen
{
/// <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()
{
this.components = new System.ComponentModel.Container();
this.panel1 = new System.Windows.Forms.Panel();
this.lblAlarm = new System.Windows.Forms.Label();
this.panAoi = new System.Windows.Forms.Panel();
this.colorDialog1 = new System.Windows.Forms.ColorDialog();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.Black;
this.panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.panel1.Controls.Add(this.lblAlarm);
this.panel1.Controls.Add(this.panAoi);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(800, 633);
this.panel1.TabIndex = 0;
//
// lblAlarm
//
this.lblAlarm.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblAlarm.Font = new System.Drawing.Font("微软雅黑", 42F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAlarm.ForeColor = System.Drawing.Color.Red;
this.lblAlarm.Location = new System.Drawing.Point(8, 4);
this.lblAlarm.Name = "lblAlarm";
this.lblAlarm.Size = new System.Drawing.Size(784, 132);
this.lblAlarm.TabIndex = 0;
this.lblAlarm.Text = "label1";
this.lblAlarm.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panAoi
//
this.panAoi.BackColor = System.Drawing.Color.White;
this.panAoi.Location = new System.Drawing.Point(0, 557);
this.panAoi.Name = "panAoi";
this.panAoi.Size = new System.Drawing.Size(800, 76);
this.panAoi.TabIndex = 1;
this.panAoi.Visible = false;
//
// timer1
//
this.timer1.Interval = 600;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// FrmViewScreen
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(800, 633);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FrmViewScreen";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "显示测试";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.FrmScreenTest_Load);
this.Shown += new System.EventHandler(this.FrmScreenTest_Shown);
this.panel1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.ColorDialog colorDialog1;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Label lblAlarm;
private System.Windows.Forms.Panel panAoi;
}
}
\ No newline at end of file
TSA-V/projector/FrmViewScreen.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Drawing.Drawing2D;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using TSA_V.Common;
using TSA_V.DeviceLibrary;
namespace TSA_V
{
public partial class FrmViewScreen : Form
{
public static FrmViewScreen instance = new FrmViewScreen();
public FrmViewScreen()
{
InitializeComponent();
}
public int ScreenIndex = 1;
public int ScreenWidth = 1920;
public int ScreenHeight = 1280;
public int LastX = 0;
public int LastY = 0;
public int LastType = 1;
public int LastSizeX = 2;
public int LastSizeY = 2;
public bool ISShow = false;
// private bool hasShow = false;
private void FrmScreenTest_Load(object sender, EventArgs e)
{
this.Text = "显示测试_" + ScreenIndex;
this.StartPosition = FormStartPosition.Manual;
timer1.Start();
if (panel1.BackgroundImage != null)
{
panel1.BackgroundImage = null;
}
if (lblAlarm.Visible)
{
lblAlarm.Visible = false;
}
}
public bool CloseShowName = false;
public bool ShowForm(int index=1)
{
ScreenIndex = index;
Screen[] sc = Screen.AllScreens;
this.StartPosition = FormStartPosition.Manual;
this.WindowState = FormWindowState.Maximized;
if (sc.Count() > ScreenIndex)
{
Screen screen = sc[ScreenIndex];
foreach (Screen s in sc)
{
if (!s.Primary)
{
screen = s;
break;
}
}
string text = "名称：" + screen.DeviceName + "\r\n";
text += "Width：" + screen.Bounds.Width + "\r\n";
text += "Heigh：" + screen.Bounds.Height + "\r\n";
text += "是否主显示器：" + screen.Primary.ToString() + "\r\n";
//lblInfo.Text = text;
ScreenWidth = screen.Bounds.Width;
ScreenHeight = screen.Bounds.Height;
TSAVBean.X_Max = ScreenWidth;
TSAVBean.Y_Max = ScreenHeight;
TSAVBean.X_Min = 1;
TSAVBean.Y_Min = 1;
ISShow = true;
this.Location = new Point(screen.Bounds.Left, screen.Bounds.Top);
this.Show();
LogUtil.info("第二屏幕显示成功，屏幕索引=" + ScreenIndex + " ！");
return true;
}
else
{
LogUtil.info("第二屏幕显示失败：屏幕索引=" + ScreenIndex + " 未找到");
return false;
}
}
private void FrmScreenTest_Shown(object sender, EventArgs e)
{
ShowPoint(new ProjectorPInfo(ScreenWidth / 2, ScreenHeight / 2));
DrawArea();
panAoi.BackColor = Color.Black;
panAoi.Visible = false;
}
public void DrawArea()
{
if (!ISShow)
{
return;
}
int startX = 0;
int startY = 0;
int Point_X_Length = 3;
int Point_Y_Length = 3;
int lineWidth = (ScreenWidth) / (Point_X_Length - 1);
int lineHeight = (ScreenHeight) / (Point_Y_Length - 1);
Graphics grfx = panel1.CreateGraphics();
Color color = Color.White;
grfx.SmoothingMode = SmoothingMode.HighQuality;
//循环画线
for (int i = 0; i <= Point_X_Length; i++)
{
float line = 0.2F;
float picLocationX = startX + lineWidth * i;
if (picLocationX >= ScreenWidth)
{
picLocationX = ScreenWidth - 2;
}
grfx.DrawLine(new Pen(color, line), picLocationX, startY, picLocationX, ScreenHeight);
}
for (int i = 0; i <= Point_Y_Length; i++)
{
float line = 0.2F;
float picLocationY = startY + lineHeight * i;
if (picLocationY >= ScreenHeight)
{
picLocationY = ScreenHeight - 1;
}
grfx.DrawLine(new Pen(color, line), startX, picLocationY, ScreenWidth, picLocationY);
}
grfx.Dispose();
}
public void DrawLine()
{
if (!ISShow)
{
return;
}
int startX = 0;
int startY = 0;
int Point_X_Length = 21;
int Point_Y_Length = 21;
int lineWidth = (ScreenWidth - startX * 2) / (Point_X_Length - 1);
int lineHeight = (ScreenHeight - startY * 2) / (Point_Y_Length - 1);
Graphics grfx = panel1.CreateGraphics();
Color color = Color.White;
grfx.SmoothingMode = SmoothingMode.HighQuality;
//循环画线
for (int i = 0; i <= Point_X_Length; i++)
{
float line = 0.2F;
float picLocationX = startX + lineWidth * i;
if (i.Equals(Point_X_Length / 2))
{
line = 1;
}
else if (((i % 5).Equals(0)) && (i > 0) && (i < Point_X_Length))
{
line = 0.5F;
}
grfx.DrawLine(new Pen(color, line), picLocationX, startY, picLocationX, ScreenHeight);
}
for (int i = 0; i <= Point_Y_Length; i++)
{
float line = 0.2F;
float picLocationY = startY + lineHeight * i;
if (i.Equals(Point_Y_Length / 2))
{
line = 1;
}
else if (((i % 5).Equals(0)) && (i > 0) && (i < Point_Y_Length))
{
line = 0.5F;
}
grfx.DrawLine(new Pen(color, line), startX, picLocationY, ScreenWidth, picLocationY);
}
grfx.Dispose();
}
private Color CurrColor = Color.White;
public void ClearPoint()
{
try
{
if (!ISShow)
{
return;
}
Graphics g = this.panel1.CreateGraphics();
g.Clear(Color.Black);
g.Dispose();//释放资源
}
catch (Exception ex)
{
LogUtil.error("ClearPoint 出错：" + ex.ToString());
}
}
private void DrawPoint(Graphics g, int x, int y, int type = 0, int sizeX = 2, int sizeY = 2, int lineLength = 2, string name = "")
{
if (sizeX < 2)
{
sizeX = 2;
}
if (sizeY < 2)
{
sizeY = 2;
}
LastX = x;
LastY = y;
LastSizeX = sizeX;
LastSizeY = sizeY;
LastType = type;
Pen pen = new Pen(CurrColor, lineLength);
System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(CurrColor);
//点类型，1 = 点，2 = +，3 =|，4 = -，5 = 方形，6 = 圆圈
if (type.Equals(PointType_Define.PlusSign_2))
{
g.DrawLine(pen, new Point(x - sizeX, y), new Point(x + sizeX, y));
g.DrawLine(pen, new Point(x, y - sizeY), new Point(x, y + sizeY));
}
else if (type.Equals(PointType_Define.VerticalLine_3))
{
g.DrawLine(pen, new Point(x, y - sizeY), new Point(x, y + sizeY));
}
else if (type.Equals(PointType_Define.Line_4))
{
g.DrawLine(pen, new Point(x - sizeX, y), new Point(x + sizeX, y));
}
else if (type.Equals(PointType_Define.Rectangle_5))
{
g.DrawRectangle(pen, x - sizeX / 2, y - sizeY / 2, sizeX, sizeY);
}
else if (type.Equals(PointType_Define.Cycle_6))
{
g.DrawEllipse(pen, x - sizeX / 2, y - sizeY / 2, sizeX, sizeY);
}
else if (type.Equals(PointType_Define.Plus_Up_7))
{
int plusSize = sizeX / 2;
int pX = x;
int pY = y - sizeY / 2 - lineLength - plusSize;
g.DrawLine(pen, new Point(pX - plusSize, pY), new Point(pX + plusSize, pY));
g.DrawLine(pen, new Point(pX, pY - plusSize), new Point(pX, pY + plusSize));
g.DrawRectangle(pen, x - sizeX / 2, y - sizeY / 2, sizeX, sizeY);
}
else if (type.Equals(PointType_Define.Plus_Down_8))
{
g.DrawRectangle(pen, x - sizeX / 2, y - sizeY / 2, sizeX, sizeY);
int plusSize = sizeX / 2;
int pX = x;
int pY = y + sizeY / 2 + lineLength + plusSize;
g.DrawLine(pen, new Point(pX - plusSize, pY), new Point(pX + plusSize, pY));
g.DrawLine(pen, new Point(pX, pY - plusSize), new Point(pX, pY + plusSize));
}
else if (type.Equals(PointType_Define.Plus_Left_9))
{
g.DrawRectangle(pen, x - sizeX / 2, y - sizeY / 2, sizeX, sizeY);
int plusSize = sizeY / 2;
int pX = x - sizeX / 2 - lineLength - plusSize;
int pY = y;
g.DrawLine(pen, new Point(pX - plusSize, pY), new Point(pX + plusSize, pY));
g.DrawLine(pen, new Point(pX, pY - plusSize), new Point(pX, pY + plusSize));
}
else if (type.Equals(PointType_Define.Plus_Right_10))
{
g.DrawRectangle(pen, x - sizeX / 2, y - sizeY / 2, sizeX, sizeY);
int plusSize = sizeY / 2;
int pX = x + sizeX / 2 + lineLength + plusSize;
int pY = y;
g.DrawLine(pen, new Point(pX - plusSize, pY), new Point(pX + plusSize, pY));
g.DrawLine(pen, new Point(pX, pY - plusSize), new Point(pX, pY + plusSize));
}
else
{
g.FillEllipse(myBrush, new Rectangle(x - sizeX / 2, y - sizeY / 2, sizeX, sizeY));//画实心椭圆
}
if (!name.Equals(""))
{
int size = (sizeX + sizeY) / 2;
size = 30;
if (!CloseShowName)
{
g.DrawString(name, new Font("Arial ", size, FontStyle.Regular), Brushes.White, x - size + 5, y + size + 2);
}
}
}
public void ShowPoint(DeviceLibrary.ProjectorPInfo p)
{
if (!ISShow)
{
return;
}
Graphics g = panel1.CreateGraphics();
DrawPoint(g, p.PX, p.PY, p.PType, p.SizeX, p.SizeY, p.PenWidth, p.ShowText);
g.Dispose();
}
public void ShowPoint(bool showName, params SMTPointInfo[] points)
{
if (!ISShow)
{
return;
}
ClearPoint();
Graphics g = panel1.CreateGraphics();
foreach (SMTPointInfo point in points)
{
int type = point.PointType;
int x = (int)point.NodePositionX;
int y = (int)point.NodePositionY;
int sizex = point.PointSizeX;
int sizey = point.PointSizeY;
DrawPoint(g, x, y, type, sizex, sizey, point.PenWidth, "");
if (showName)
{
int size = (sizex + sizey) / 2;
if (!CloseShowName)
{
if (point.CheckOK && (points.Length > 1))
{
g.DrawString(point.ShowText, new Font("Arial ", size, FontStyle.Regular), Brushes.Red, x - size / 2 + 5, y + size / 2 + 2);
}
else
{
g.DrawString(point.ShowText, new Font("Arial ", size, FontStyle.Regular), Brushes.White, x - size / 2 + 5, y + size / 2 + 2);
}
}
}
}
g.Dispose();
}
private void timer1_Tick(object sender, EventArgs e)
{
if (ProjectorProcess.IsAlarm(out string msg))
{
panAoi.Visible = false;
if (panel1.BackgroundImage != null)
{
panel1.BackgroundImage = null;
}
else
{
//if (ProjectorProcess.DisShowScreenAlarm)
//{
//}
//else
{
panel1.BackgroundImage = ImageManager.imgAlarm;
panel1.BackgroundImageLayout = ImageLayout.Zoom;
}
lblAlarm.ForeColor = Color.Red;
lblAlarm.Text = msg;
lblAlarm.Visible = true;
}
}
else
{
string text = TSAVBean.GetShowMsg();
if (text != "")
{
lblAlarm.ForeColor = Color.White;
lblAlarm.Text = msg;
lblAlarm.Visible = true;
}
else
{
panAoi.Visible = false;
if (panel1.BackgroundImage != null)
{
panel1.BackgroundImage = null;
}
if (lblAlarm.Visible)
{
lblAlarm.Visible = false;
}
}
}
}
}
}
TSA-V/projector/FrmViewScreen.resx 0 → 100644
<?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>
<metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>144, 17</value>
</metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>
\ No newline at end of file
UserFromControl/ProjectorControl.Designer.cs
......@@ -96,9 +96,8 @@
//
// panImg
//
this.panImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.panImg.ForeColor = System.Drawing.Color.White;
this.panImg.Location = new System.Drawing.Point(343, 16);
this.panImg.Location = new System.Drawing.Point(310, 16);
this.panImg.Name = "panImg";
this.panImg.Size = new System.Drawing.Size(153, 84);
this.panImg.TabIndex = 328;
......@@ -291,10 +290,9 @@
//
// btnDown
//
this.btnDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDown.Location = new System.Drawing.Point(381, 239);
this.btnDown.Location = new System.Drawing.Point(348, 239);
this.btnDown.Name = "btnDown";
this.btnDown.Size = new System.Drawing.Size(80, 36);
this.btnDown.TabIndex = 309;
......@@ -304,10 +302,9 @@
//
// btnUp
//
this.btnUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUp.Location = new System.Drawing.Point(381, 160);
this.btnUp.Location = new System.Drawing.Point(348, 160);
this.btnUp.Name = "btnUp";
this.btnUp.Size = new System.Drawing.Size(80, 36);
this.btnUp.TabIndex = 308;
......@@ -317,10 +314,9 @@
//
// btnLeft
//
this.btnLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnLeft.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLeft.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLeft.Location = new System.Drawing.Point(345, 199);
this.btnLeft.Location = new System.Drawing.Point(312, 199);
this.btnLeft.Name = "btnLeft";
this.btnLeft.Size = new System.Drawing.Size(72, 36);
this.btnLeft.TabIndex = 307;
......@@ -330,10 +326,9 @@
//
// btnRight
//
this.btnRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnRight.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRight.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRight.Location = new System.Drawing.Point(421, 199);
this.btnRight.Location = new System.Drawing.Point(388, 199);
this.btnRight.Name = "btnRight";
this.btnRight.Size = new System.Drawing.Size(72, 36);
this.btnRight.TabIndex = 306;
......@@ -381,10 +376,9 @@
//
// btnShowPoint
//
this.btnShowPoint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnShowPoint.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnShowPoint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnShowPoint.Location = new System.Drawing.Point(371, 110);
this.btnShowPoint.Location = new System.Drawing.Point(338, 110);
this.btnShowPoint.Name = "btnShowPoint";
this.btnShowPoint.Size = new System.Drawing.Size(100, 37);
this.btnShowPoint.TabIndex = 293;
......
dll/ConfigHelper.dll 0 → 100644
此文件类型无法预览
dll/ConfigHelper.xml 0 → 100644
<?xml version="1.0"?>
<doc>
<assembly>
<name>ConfigHelper</name>
</assembly>
<members>
<member name="F:ConfigHelper.AdvanceConfigEdit.CustomEditor">
<summary>
自定义编辑器
</summary>
</member>
<member name="F:ConfigHelper.AdvanceConfigEdit.components">
<summary>
必需的设计器变量。
</summary>
</member>
<member name="M:ConfigHelper.AdvanceConfigEdit.Dispose(System.Boolean)">
<summary>
清理所有正在使用的资源。
</summary>
<param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
</member>
<member name="M:ConfigHelper.AdvanceConfigEdit.InitializeComponent">
<summary>
设计器支持所需的方法 - 不要修改
使用代码编辑器修改此方法的内容。
</summary>
</member>
<member name="M:ConfigHelper.AdvanceConfigForm.AddCustomEditor``1(System.String)">
<summary>
添加自定义编辑器
</summary>
<typeparam name="T"></typeparam>
<param name="name"></param>
</member>
<member name="M:ConfigHelper.AdvanceConfigForm.ShowEditDialog(System.Windows.Forms.IWin32Window,System.Boolean)">
<summary>
显示配置界面,2秒内调用约6次后显示
</summary>
<param name="owner"></param>
<param name="TopMost"></param>
</member>
<member name="F:ConfigHelper.AdvanceConfigForm.components">
<summary>
Required designer variable.
</summary>
</member>
<member name="M:ConfigHelper.AdvanceConfigForm.Dispose(System.Boolean)">
<summary>
Clean up any resources being used.
</summary>
<param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
</member>
<member name="M:ConfigHelper.AdvanceConfigForm.InitializeComponent">
<summary>
Required method for Designer support - do not modify
the contents of this method with the code editor.
</summary>
</member>
<member name="T:ConfigHelper.Config">
<summary>
自定义配置存取
</summary>
</member>
<member name="F:ConfigHelper.Config.hasChange">
<summary>
指示配置文件是否存在变化
</summary>
</member>
<member name="P:ConfigHelper.Config.SaveToAppdata">
<summary>
将设置保存至appdata目录
</summary>
</member>
<member name="M:ConfigHelper.Config.ReloadConfig">
<summary>
重载配置
</summary>
</member>
<member name="M:ConfigHelper.Config.SetComment(System.String,System.String)">
<summary>
设置备注
</summary>
<param name="key"></param>
<param name="Comment"></param>
</member>
<member name="M:ConfigHelper.Config.Get(System.String)">
<summary>
读取配置
</summary>
<param name="key"></param>
<returns></returns>
</member>
<member name="M:ConfigHelper.Config.Get(System.Object)">
<summary>
读取配置
</summary>
<param name="key">传入一个枚举值</param>
<returns></returns>
</member>
<member name="M:ConfigHelper.Config.Get``1(System.Object,``0)">
<summary>
读取配置
</summary>
<typeparam name="T">返回类型</typeparam>
<param name="key">传入一个枚举值</param>
<param name="defaultvalue">失败默认值</param>
<returns></returns>
</member>
<member name="M:ConfigHelper.Config.Get``1(System.String,``0)">
<summary>
读取配置
</summary>
<typeparam name="T">返回类型</typeparam>
<param name="key">key</param>
<param name="defaultvalue">失败默认值</param>
<returns></returns>
</member>
<member name="M:ConfigHelper.Config.Set(System.String,System.String)">
<summary>
设置配置
</summary>
<param name="key"></param>
<param name="value"></param>
</member>
<member name="M:ConfigHelper.Config.Set(System.Object,System.String)">
<summary>
设置配置
</summary>
<param name="key">配置枚举值</param>
<param name="value"></param>
</member>
<member name="M:ConfigHelper.Config.Set``1(System.Object,``0)">
<summary>
设置配置
</summary>
<param name="key">配置枚举值</param>
<param name="value"></param>
</member>
<member name="M:ConfigHelper.Config.Set``1(System.String,``0)">
<summary>
设置配置
</summary>
<typeparam name="T">值类型</typeparam>
<param name="key"></param>
<param name="value"></param>
</member>
<member name="M:ConfigHelper.Config.SaveChangeDebounce">
<summary>
保存设置
</summary>
</member>
<member name="M:ConfigHelper.Config.SaveChange">
<summary>
保存设置
</summary>
</member>
<member name="P:ConfigHelper.Config.Configlist">
<summary>
获取所有配置文本
</summary>
</member>
<member name="M:ConfigHelper.Config.FileSave(System.String,System.String)">
<summary>
不通过系统缓存立刻写入磁盘
</summary>
<param name="content"></param>
<param name="destfilename"></param>
</member>
<member name="M:ConfigHelper.Config.PropertyBind(System.Object,System.Object,System.String,System.String,System.String)">
<summary>
绑定UI属性
</summary>
<param name="key">配置key</param>
<param name="uiobj">ui对象</param>
<param name="Property">绑定属性</param>
<param name="SaveEvent">绑定事件(object s, EventArgs x),可以为空</param>
<param name="defaultvalue">默认值</param>
</member>
<member name="M:ConfigHelper.Config.PropertyBind``1(System.Object,System.Object,System.String,System.String,``0)">
<summary>
绑定UI属性
</summary>
<param name="key">配置key</param>
<param name="uiobj">ui对象</param>
<param name="Property">绑定属性</param>
<param name="SaveEvent">绑定事件(object s, EventArgs x),可以为空</param>
<param name="defaultvalue">默认值</param>
</member>
<member name="M:ConfigHelper.Config.LoadMyConfig(System.Type)">
<summary>
转换自定义配置类
</summary>
<param name="ConfigClassType"></param>
<returns>加载到的配置Key数量</returns>
</member>
<member name="T:ConfigHelper.ICustEditor">
<summary>
自定义编辑器接口
</summary>
</member>
<member name="M:ConfigHelper.ICustEditor.ValueEdit(System.Object)">
<summary>
自己的编辑方法或界面
</summary>
<param name="value">传入的值</param>
<returns>传出的值</returns>
</member>
<member name="T:ConfigHelper.MyConfig`1">
<summary>
自动化我的配置
</summary>
</member>
<member name="F:ConfigHelper.MyConfig`1.Key">
<summary>
配置的Key
</summary>
</member>
<member name="P:ConfigHelper.MyConfig`1.Val">
<summary>
配置的值
</summary>
</member>
<member name="M:ConfigHelper.MyConfig`1.ToString">
<summary>
获取配置数据的文本
</summary>
<returns></returns>
</member>
<member name="M:ConfigHelper.MyConfig`1.op_Implicit(ConfigHelper.MyConfig{`0})~`0">
<summary>
隐式转换,读值
</summary>
<param name="m1"></param>
</member>
<member name="M:ConfigHelper.MyConfig`1.op_Implicit(`0)~ConfigHelper.MyConfig{`0}">
<summary>
隐式转换,写值
</summary>
<param name="v1"></param>
</member>
<member name="T:ConfigHelper.MyConfigComment">
<summary>
自定义配置描述
</summary>
</member>
<member name="M:ConfigHelper.MyConfigComment.#ctor(System.String)">
<summary>
配置的说明
</summary>
<param name="comment"></param>
</member>
</members>
</doc>
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!