Skip to content

李娜 / Line-Smart-Workstation

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

屏幕显示bug修改

1 个父辈 e894aa89
内嵌 并排
正在显示 16 个修改的文件 包含 357 行增加 和 60 行删除
Common/Setting_Init.cs
...@@ -90,15 +90,7 @@ namespace TSA_V.Common ...@@ -90,15 +90,7 @@ namespace TSA_V.Common
public static string AuToSoldering_FilePath = "AuToSoldering_FilePath"; public static string AuToSoldering_FilePath = "AuToSoldering_FilePath";
public static string IsDebug = "IsDebug"; public static string IsDebug = "IsDebug";
// public static string XAxis_Change = "XAxis_Change";
//public static string XAxis_MaxValue = "XAxis_MaxValue";
//public static string XAxis_MinValue = "XAxis_MinValue";
//public static string YAxis_Change = "YAxis_Change";
//public static string YAxis_MaxValue = "YAxis_MaxValue";
//public static string YAxis_MinValue = "YAxis_MinValue";
public static string SolderingLedIP = "SolderingLedIP"; public static string SolderingLedIP = "SolderingLedIP";
public static string SolderingLedIndex = "SolderingLedIndex"; public static string SolderingLedIndex = "SolderingLedIndex";
...@@ -192,14 +184,7 @@ namespace TSA_V.Common ...@@ -192,14 +184,7 @@ namespace TSA_V.Common
public static string DisContinueWorking = "DisContinueWorking"; public static string DisContinueWorking = "DisContinueWorking";
public static string DisShowScreenAlarm = "DisShowScreenAlarm"; public static string DisShowScreenAlarm = "DisShowScreenAlarm";
///// <summary>
///// 实时播放视频所在屏幕索引号
///// </summary>
//public static string VideoFrom_Index = "VideoFrom_Index";
//public static string VideoForm_Show = "VideoForm_Show";
/// <summary> /// <summary>
/// 投影屏幕索引，默认1 /// 投影屏幕索引，默认1
/// </summary> /// </summary>
......
Common/Setting_NInit.cs 0 → 100644
using ConfigHelper;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace TSA_V.Common
{
public class Setting_NInit
{
[MyConfigComment("程序开机自启动")]
public static MyConfig<bool> App_AutoRun = false;
/// <summary>
/// 系统主界面标题
/// </summary>
public static string App_Title = "App_Title";
public static string Board_ConfigPath = "Board_ConfigPath";
public static string Position_Config = "Position_Config";
public static string Position_Config_Label = "Position_Config_Label";
public static string ComPath_Config = "ComPath_Config";
/// <summary>
/// 保存图片地址
/// </summary>
public static string BOARD_IMAGE_PATH = "Board_Image_Path";
/// <summary>
/// 默认图片
/// </summary>
public static string BOARD_IMAGE_DEFAULT = "BOARD_IMAGE_DEFAULT";
/// <summary>
/// 康奈德Ip配置
/// </summary>
public static string IO_IP = "IO_IP";
public static string IO_Port = "IO_Port";
public static string Default_BoardID = "Default_BoardID";
/// <summary>
/// IP地址
/// </summary>
public static string PUSICAN_Ip = "PUSICAN_Ip";
/// <summary>
/// 端口号
/// </summary>
public static string PUSICAN_Port = "PUSICAN_Port";
public static string PUSICAN_Position = "PUSICAN_Position";
public static string RotateNode_MicroStepping = "RotateNode_MicroStepping";
public static string RotateNode_MaxSpeed = "RotateNode_MaxSpeed";
public static string RotateNode_StartSpeed = "RotateNode_StartSpeed";
public static string RotateNode_StopSpeed = "RotateNode_StopSpeed";
public static string RotateNode_AddSpeed = "RotateNode_AddSpeed";
public static string RotateNode_DelSpeed = "RotateNode_DelSpeed";
public static string RotateNode_MaxPhaseCurrent = "RotateNode_MaxPhaseCurrent";
public static string RotateNode_DelPhaseCurrent = "RotateNode_DelPhaseCurrent";
public static string RotateNode_HomeSpeed = "RotateNode_HomeSpeed";
public static string RotateNode_HomeStartSpeed = "RotateNode_HomeStartSpeed";
public static string RotateNode_HomeStopSpeed = "RotateNode_HomeStopSpeed";
/// <summary>
/// 料盘旋转轴
/// </summary>
public static string RNode_Addr = "RNode_Addr";
/// <summary>
/// 元器件库的数量，=1表示有一个五层的料库
/// </summary>
public static string TSAV_Storage_Count = "TSAV_Storage_Count";
/// <summary>
/// 旋转轴（库位轴）默认的位置
/// </summary>
public static string RotateNode_DefaultPosition = "RotateNode_DefaultPosition";
/// <summary>
/// 元器件信息模板
/// </summary>
public static string Componet_Template = "Componet_Template";
public static string Default_Language = "Default_Language";
public static string AuToSoldering_FilePath = "AuToSoldering_FilePath";
public static string IsDebug = "IsDebug";
// public static string XAxis_Change = "XAxis_Change";
//public static string XAxis_MaxValue = "XAxis_MaxValue";
//public static string XAxis_MinValue = "XAxis_MinValue";
//public static string YAxis_Change = "YAxis_Change";
//public static string YAxis_MaxValue = "YAxis_MaxValue";
//public static string YAxis_MinValue = "YAxis_MinValue";
public static string SolderingLedIP = "SolderingLedIP";
public static string SolderingLedIndex = "SolderingLedIndex";
public static string CameraName = "CameraName";
/// <summary>
/// 是否需要进行AOI检测
/// </summary>
public static string IsNeedAOI = "IsNeedAOI";
/// <summary>
/// 工作模式
/// </summary>
public static string WorkMode = "WorkMode";
/// <summary>
/// 自动工作间隔
/// </summary>
public static string AuToModeSeconds = "AuToModeSeconds";
public static string WorkCount_ConfigPath = "WorkCount_ConfigPath";
public static string IsNeedCount = "IsNeedCount";
public static string UseAIOBOX = "UseAIOBOX";
/// <summary>
/// 元器件库名称的类型，0=英文，1=中文
/// </summary>
public static string LibNameType = "LibNameType";
/// <summary>
/// AOI文件路径
/// </summary>
public static string AOIFileConfig = "AOIFileConfig";
//public static string Config_Pwd = "Config_Pwd";
public static string DefaultPointSize = "DefaultPointSize";
public static string DefaultPointType = "DefaultPointType";
public static string Line_HomeWidth = "Line_HomeWidth";
public static string Line_ChangeValue = "Line_ChangeValue";
public static string Line_NodeAddr = "Line_NodeAddr";
public static string Line_LastWidth = "Line_LastWidth";
public static string Line_WidthPosition = "Line_WidthPosition";
public static string Line_HomeSpeed = "Line_HomeSpeed";
public static string Line_HomeStartSpeed = "Line_HomeStartSpeed";
public static string Line_HomeStopSpeed = "Line_HomeStopSpeed";
public static string Line_MicroStepping = "Line_MicroStepping";
public static string Line_MaxSpeed = "Line_MaxSpeed";
public static string Line_StartSpeed = "Line_StartSpeed";
public static string Line_StopSpeed = "Line_StopSpeed";
public static string Line_AddSpeed = "Line_AddSpeed";
public static string Line_DelSpeed = "Line_DelSpeed";
public static string Line_MaxPhaseCurrent = "Line_MaxPhaseCurrent";
public static string Line_DelPhaseCurrent = "Line_DelPhaseCurrent";
public static string Server_Log_Open = "Server_Log_Open";
public static string DCSServerAddr = "DCSServerAddr";
public static string WebServiceAddr = "WebServiceAddr";
/// <summary>
/// 是否需要输入pcb条码
/// </summary>
public static string NeedPCBCode = "NeedPCBCode";
public static string DisableSideCylinder = "DisableSideCylinder";
public static string DisableBottomCylinder = "DisableBottomCylinder";
public static string IsCycleDebug = "IsCycleDebug";
public static string SideCylinderMoveFirst = "SideCylinderMoveFirst";
public static string WorkSingleStart = "WorkSingleStart";
public static string OfflineMode = "OfflineMode";
public static string PointDisplayType = "PointDisplayType";
/// <summary>
/// 运行中断程序名称
/// </summary>
public static string ProcedureName = "ProcedureName";
/// <summary>
/// 位号
/// </summary>
public static string TagNumber = "TagNumber";
/// <summary>
/// 禁用继续未完成程序功能
/// </summary>
public static string DisContinueWorking = "DisContinueWorking";
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 ProjectorScreen_Index = "ProjectorScreen_Index";
}
}
DeviceLibrary/manager/ScanRequestLabel.cs
...@@ -14,7 +14,7 @@ namespace TSA_V.DeviceLibrary.manager ...@@ -14,7 +14,7 @@ namespace TSA_V.DeviceLibrary.manager
{ {
public class ScanRequestLabel public class ScanRequestLabel
{ {
//static Dictionary<string,string> pairs = new Dictionary<string,string>(); private static Dictionary<string,string> lastPirs = new Dictionary<string,string>();
/// <summary> /// <summary>
/// 开灯、记录地址信息 /// 开灯、记录地址信息
...@@ -53,7 +53,7 @@ namespace TSA_V.DeviceLibrary.manager ...@@ -53,7 +53,7 @@ namespace TSA_V.DeviceLibrary.manager
if (!string.IsNullOrWhiteSpace(position.DeviceIP)) if (!string.IsNullOrWhiteSpace(position.DeviceIP))
{ {
//开灯 //开灯
LogUtil.info($"电子屏开灯：{position.DeviceIP}，{position.Leds}，{true}"); LogUtil.info($"电子屏开灯：{position.PositionNum} {position.DeviceIP}，{position.Leds}，{true}");
lightTagsLed(position.DeviceIP, position.Leds, true); lightTagsLed(position.DeviceIP, position.Leds, true);
pairs.Add("Ip", position.DeviceIP); pairs.Add("Ip", position.DeviceIP);
pairs.Add("Mac", position.Leds); pairs.Add("Mac", position.Leds);
...@@ -73,6 +73,7 @@ namespace TSA_V.DeviceLibrary.manager ...@@ -73,6 +73,7 @@ namespace TSA_V.DeviceLibrary.manager
{ {
} }
dic = pairs; dic = pairs;
lastPirs = pairs;
} }
/// <summary> /// <summary>
......
DeviceLibrary/manager/TSAVBean.cs
...@@ -305,9 +305,9 @@ namespace TSA_V.DeviceLibrary ...@@ -305,9 +305,9 @@ namespace TSA_V.DeviceLibrary
resetStep = ResetStep.AddNode_1; resetStep = ResetStep.AddNode_1;
Thread.Sleep(PUSICANControl.SleepMS); Thread.Sleep(PUSICANControl.SleepMS);
if (WorkModeUtil.OnlyGuoBan) if (WorkModeUtil.NoRotaryDisk)
{ {
LogUtil.info(Name + "重置中 " + resetStep + "： OnlyGuoBan 模式，不需要初始化旋转轴 "); LogUtil.info(Name + "重置中 " + resetStep + "： NoRotaryDisk 模式，不需要初始化旋转轴 ");
} }
else else
{ {
...@@ -428,9 +428,9 @@ namespace TSA_V.DeviceLibrary ...@@ -428,9 +428,9 @@ namespace TSA_V.DeviceLibrary
bool isAllOk = true; bool isAllOk = true;
bool lineOk = true; bool lineOk = true;
SLAVE_STATUS rStatus = new SLAVE_STATUS(); SLAVE_STATUS rStatus = new SLAVE_STATUS();
if (WorkModeUtil.OnlyGuoBan) if (WorkModeUtil.NoRotaryDisk)
{ {
LogUtil.info(Name + "重置中 " + resetStep + "：InitNode OnlyGuoBan 模式，不需要验证转盘是否在线 "); LogUtil.info(Name + "重置中 " + resetStep + "：InitNode NoRotaryDisk 模式，不需要验证转盘是否在线 ");
} }
else else
{ {
...@@ -459,7 +459,7 @@ namespace TSA_V.DeviceLibrary ...@@ -459,7 +459,7 @@ namespace TSA_V.DeviceLibrary
} }
} }
if (WorkModeUtil.OnlyGuoBan) if (WorkModeUtil.NoRotaryDisk)
{ {
if (!IOBase.NoLine) if (!IOBase.NoLine)
{ {
...@@ -911,9 +911,9 @@ namespace TSA_V.DeviceLibrary ...@@ -911,9 +911,9 @@ namespace TSA_V.DeviceLibrary
IOManager.IOMove(IOManager.Line_FStart, IO_VALUE.LOW); IOManager.IOMove(IOManager.Line_FStart, IO_VALUE.LOW);
LogUtil.info("StopMove，开始停止所有旋转轴"); LogUtil.info("StopMove，开始停止所有旋转轴");
if (WorkModeUtil.OnlyGuoBan) if (WorkModeUtil.NoRotaryDisk)
{ {
LogUtil.info("StopMove，仅过板模式，不需要停止旋转轴"); LogUtil.info("StopMove，NoRotaryDisk 模式，不需要停止旋转轴");
} }
else else
{ {
......
DeviceLibrary/manager/WorkInfo.cs
...@@ -324,7 +324,6 @@ namespace TSA_V.DeviceLibrary ...@@ -324,7 +324,6 @@ namespace TSA_V.DeviceLibrary
#region 2023-09-22 添加 控制便签功能 #region 2023-09-22 添加 控制便签功能
else if (position.PositionType.Equals(2)) else if (position.PositionType.Equals(2))
{ {
LogUtil.info("电子屏闪烁！");
var smtPoint=TSAVBean.Work.currPoint; var smtPoint=TSAVBean.Work.currPoint;
ComponetInfo com = CSVBomManager.GetCom(BoardManager.CurrBoard.bomName, smtPoint); ComponetInfo com = CSVBomManager.GetCom(BoardManager.CurrBoard.bomName, smtPoint);
string count=null; string count=null;
......
DeviceLibrary/manager/WorkModeUtil.cs
...@@ -19,7 +19,7 @@ namespace TSA_V.DeviceLibrary ...@@ -19,7 +19,7 @@ namespace TSA_V.DeviceLibrary
/// <summary> /// <summary>
/// 只能进入过板模式 /// 只能进入过板模式
/// </summary> /// </summary>
public static bool OnlyGuoBan = false; public static bool NoRotaryDisk = false;
public static bool HasZhuanPan = true; public static bool HasZhuanPan = true;
private static bool IsSelected = false; private static bool IsSelected = false;
...@@ -31,6 +31,14 @@ namespace TSA_V.DeviceLibrary ...@@ -31,6 +31,14 @@ namespace TSA_V.DeviceLibrary
public static event CheckModeEnd checkModeEndEvent; public static event CheckModeEnd checkModeEndEvent;
public delegate void CheckModeEnd( ); public delegate void CheckModeEnd( );
public static bool OnlyGB
{
get
{
return WorkModeUtil.NoRotaryDisk && WorkModeUtil.HasZhuanPan;
}
}
public static bool SelectOk() public static bool SelectOk()
{ {
return IsSelected; return IsSelected;
...@@ -47,7 +55,7 @@ namespace TSA_V.DeviceLibrary ...@@ -47,7 +55,7 @@ namespace TSA_V.DeviceLibrary
return; return;
} }
OnlyGuoBan = true; NoRotaryDisk = true;
IsSelected = true; IsSelected = true;
LogUtil.error(Name + " 默认进入过板模式，不加载转盘"); LogUtil.error(Name + " 默认进入过板模式，不加载转盘");
ModeCheckEnd(); ModeCheckEnd();
...@@ -80,7 +88,7 @@ namespace TSA_V.DeviceLibrary ...@@ -80,7 +88,7 @@ namespace TSA_V.DeviceLibrary
LogUtil.error(Name + " 询问是否进入过板模式 ,结果：" + result.ToString()); LogUtil.error(Name + " 询问是否进入过板模式 ,结果：" + result.ToString());
if (result.Equals(DialogResult.OK)) if (result.Equals(DialogResult.OK))
{ {
OnlyGuoBan = true; NoRotaryDisk = true;
LogUtil.info(Name + " 选择过板模式，不需要复位料塔 "); LogUtil.info(Name + " 选择过板模式，不需要复位料塔 ");
TSAVBean.RemoveNode(); TSAVBean.RemoveNode();
......
TSA-V/FrmComponentList.Designer.cs
...@@ -64,6 +64,8 @@ ...@@ -64,6 +64,8 @@
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn(); this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.btnBack = new System.Windows.Forms.Button(); this.btnBack = new System.Windows.Forms.Button();
this.btnNew = new System.Windows.Forms.Button(); this.btnNew = new System.Windows.Forms.Button();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.linkLabel2 = new System.Windows.Forms.LinkLabel();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupInfo.SuspendLayout(); this.groupInfo.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvList)).BeginInit();
...@@ -153,6 +155,8 @@ ...@@ -153,6 +155,8 @@
// //
this.groupInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupInfo.Controls.Add(this.linkLabel2);
this.groupInfo.Controls.Add(this.linkLabel1);
this.groupInfo.Controls.Add(this.txtId); this.groupInfo.Controls.Add(this.txtId);
this.groupInfo.Controls.Add(this.btnNewCom); this.groupInfo.Controls.Add(this.btnNewCom);
this.groupInfo.Controls.Add(this.cmbPositionNumList); this.groupInfo.Controls.Add(this.cmbPositionNumList);
...@@ -207,8 +211,9 @@ ...@@ -207,8 +211,9 @@
this.cmbPositionNumList.FormattingEnabled = true; this.cmbPositionNumList.FormattingEnabled = true;
this.cmbPositionNumList.Location = new System.Drawing.Point(126, 302); this.cmbPositionNumList.Location = new System.Drawing.Point(126, 302);
this.cmbPositionNumList.Name = "cmbPositionNumList"; this.cmbPositionNumList.Name = "cmbPositionNumList";
this.cmbPositionNumList.Size = new System.Drawing.Size(171, 27); this.cmbPositionNumList.Size = new System.Drawing.Size(112, 27);
this.cmbPositionNumList.TabIndex = 75; this.cmbPositionNumList.TabIndex = 75;
this.cmbPositionNumList.SelectedIndexChanged += new System.EventHandler(this.cmbPositionNumList_SelectedIndexChanged);
// //
// txtPartNum // txtPartNum
// //
...@@ -244,7 +249,7 @@ ...@@ -244,7 +249,7 @@
this.txtCount.Location = new System.Drawing.Point(126, 257); this.txtCount.Location = new System.Drawing.Point(126, 257);
this.txtCount.MaxLength = 30; this.txtCount.MaxLength = 30;
this.txtCount.Name = "txtCount"; this.txtCount.Name = "txtCount";
this.txtCount.Size = new System.Drawing.Size(171, 29); this.txtCount.Size = new System.Drawing.Size(112, 29);
this.txtCount.TabIndex = 70; this.txtCount.TabIndex = 70;
// //
// label5 // label5
...@@ -464,6 +469,28 @@ ...@@ -464,6 +469,28 @@
this.btnNew.Visible = false; this.btnNew.Visible = false;
this.btnNew.Click += new System.EventHandler(this.btnNew_Click); this.btnNew.Click += new System.EventHandler(this.btnNew_Click);
// //
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(243, 308);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(56, 17);
this.linkLabel1.TabIndex = 78;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "亮灯测试";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// linkLabel2
//
this.linkLabel2.AutoSize = true;
this.linkLabel2.Location = new System.Drawing.Point(305, 308);
this.linkLabel2.Name = "linkLabel2";
this.linkLabel2.Size = new System.Drawing.Size(56, 17);
this.linkLabel2.TabIndex = 79;
this.linkLabel2.TabStop = true;
this.linkLabel2.Text = "关灯测试";
this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked);
//
// FrmComponentList // FrmComponentList
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -523,5 +550,7 @@ ...@@ -523,5 +550,7 @@
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Y; private System.Windows.Forms.DataGridViewTextBoxColumn Column_Y;
private System.Windows.Forms.DataGridViewLinkColumn Column_Del; private System.Windows.Forms.DataGridViewLinkColumn Column_Del;
private System.Windows.Forms.TextBox txtId; private System.Windows.Forms.TextBox txtId;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.LinkLabel linkLabel2;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmComponentList.cs
...@@ -11,6 +11,7 @@ using System.Threading.Tasks; ...@@ -11,6 +11,7 @@ using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using System.IO; using System.IO;
using TSA_V.LoadCSVLibrary; using TSA_V.LoadCSVLibrary;
using TSA_V.DeviceLibrary.manager;
namespace TSA_V namespace TSA_V
{ {
...@@ -567,6 +568,46 @@ namespace TSA_V ...@@ -567,6 +568,46 @@ namespace TSA_V
{ {
LanguagePro(); LanguagePro();
} }
} }
private void cmbPositionNumList_SelectedIndexChanged(object sender, EventArgs e)
{
string pNum = cmbPositionNumList.Text;
if (pNum.Equals(""))
{
return;
}
TSAVPosition position = CSVPositionReader<TSAVPosition>.GetPositonByNum(pNum);
if (position != null && position.PositionType.Equals(2))
{
linkLabel1.Visible = true;
linkLabel2.Visible = true;
}
else{
linkLabel1.Visible = false ;
linkLabel2.Visible = false ;
}
}
Dictionary<string, string> pairs = new Dictionary<string, string>();
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
string pNum = cmbPositionNumList.Text;
TSAVPosition position = CSVPositionReader<TSAVPosition>.GetPositonByNum(pNum);
if (position != null&&position.PositionType.Equals(2))
{
ScanRequestLabel.RequestPost(position, txtCount.Text, txtPartNum.Text, txtDes.Text, out pairs);
}
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
if (pairs.Count != 0)
{
ScanRequestLabel.Turnoffthelights(pairs);
pairs.Clear();
}
}
} }
} }
TSA-V/FrmMaintenance.cs
...@@ -32,7 +32,7 @@ namespace TSA_V ...@@ -32,7 +32,7 @@ namespace TSA_V
private void btnPosition_Click(object sender, EventArgs e) private void btnPosition_Click(object sender, EventArgs e)
{ {
string msg = ""; string msg = "";
if (WorkModeUtil.OnlyGuoBan) if (WorkModeUtil.NoRotaryDisk)
{ {
msg = ResourceControl.GetString("GuobanMode", "操作失败，当前为过板模式"); msg = ResourceControl.GetString("GuobanMode", "操作失败，当前为过板模式");
......
TSA-V/FrmMenu.cs
...@@ -475,7 +475,7 @@ namespace TSA_V ...@@ -475,7 +475,7 @@ namespace TSA_V
private void btnReplenish_Click(object sender, EventArgs e) private void btnReplenish_Click(object sender, EventArgs e)
{ {
if (WorkModeUtil.OnlyGuoBan) if (WorkModeUtil.NoRotaryDisk)
{ {
string msg = ResourceControl.GetString("GuobanMode", "操作失败，当前为过板模式"); string msg = ResourceControl.GetString("GuobanMode", "操作失败，当前为过板模式");
MessageBoxMidle.Show(this, msg, ResourceCulture.GetString("提示"), MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBoxMidle.Show(this, msg, ResourceCulture.GetString("提示"), MessageBoxButtons.OK, MessageBoxIcon.Error);
......
TSA-V/Properties/Resource.en-US.resx
...@@ -2592,4 +2592,10 @@ ...@@ -2592,4 +2592,10 @@
<data name = "FrmAOICheck_btnUpdateImg_Text" xml:space = "preserve"> <value> amendment </value> </data> <data name = "FrmAOICheck_btnUpdateImg_Text" xml:space = "preserve"> <value> amendment </value> </data>
<data name = "SureUpdateMethod" xml:space = "preserve"> <value> Sure about the amendment?{0}？ </value> </data> <data name = "SureUpdateMethod" xml:space = "preserve"> <value> Sure about the amendment?{0}？ </value> </data>
<data name = "FrmLanguage_rbtnRussian_Text" xml:space = "preserve"> <value> Russian </value> </data> <data name = "FrmLanguage_rbtnRussian_Text" xml:space = "preserve"> <value> Russian </value> </data>
<data name="FrmComponentList_linkLabel1_Text" xml:space="preserve">
<value>Open LED</value>
</data>
<data name="FrmComponentList_linkLabel2_Text" xml:space="preserve">
<value>Close LED</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
...@@ -2588,4 +2588,10 @@ ...@@ -2588,4 +2588,10 @@
<data name = "FrmAOICheck_btnUpdateImg_Text" xml:space = "preserve"> <value> 修正 </value> </data> <data name = "FrmAOICheck_btnUpdateImg_Text" xml:space = "preserve"> <value> 修正 </value> </data>
<data name = "SureUpdateMethod" xml:space = "preserve"> <value> 确定修正{0}？ </value> </data> <data name = "SureUpdateMethod" xml:space = "preserve"> <value> 确定修正{0}？ </value> </data>
<data name = "FrmLanguage_rbtnRussian_Text" xml:space = "preserve"> <value> 俄文 </value> </data> <data name = "FrmLanguage_rbtnRussian_Text" xml:space = "preserve"> <value> 俄文 </value> </data>
<data name="FrmComponentList_linkLabel1_Text" xml:space="preserve">
<value>亮灯测试</value>
</data>
<data name="FrmComponentList_linkLabel2_Text" xml:space="preserve">
<value>关灯测试</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -2583,9 +2583,25 @@ ...@@ -2583,9 +2583,25 @@
<data name="iscontinue" xml:space="preserve"> <data name="iscontinue" xml:space="preserve">
<value>有未结束的程序'{0}'，是否继续?</value> <value>有未结束的程序'{0}'，是否继续?</value>
</data> </data>
<data name = "不使用AOI" xml:space = "preserve"> <value> 不使用AOI </value> </data> <data name="不使用AOI" xml:space="preserve">
<data name = "FrmWork_lblGuoBan_Text" xml:space = "preserve"> <value> 过板模式 </value> </data> <value> 不使用AOI </value>
<data name = "FrmAOICheck_btnUpdateImg_Text" xml:space = "preserve"> <value> 修正 </value> </data> </data>
<data name = "SureUpdateMethod" xml:space = "preserve"> <value> 确定修正{0}？ </value> </data> <data name="FrmWork_lblGuoBan_Text" xml:space="preserve">
<data name = "FrmLanguage_rbtnRussian_Text" xml:space = "preserve"> <value> 俄文 </value> </data> <value> 过板模式 </value>
</data>
<data name="FrmAOICheck_btnUpdateImg_Text" xml:space="preserve">
<value> 修正 </value>
</data>
<data name="SureUpdateMethod" xml:space="preserve">
<value> 确定修正{0}？ </value>
</data>
<data name="FrmLanguage_rbtnRussian_Text" xml:space="preserve">
<value> 俄文 </value>
</data>
<data name="FrmComponentList_linkLabel1_Text" xml:space="preserve">
<value>亮灯测试</value>
</data>
<data name="FrmComponentList_linkLabel2_Text" xml:space="preserve">
<value>关灯测试</value>
</data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/projector/FrmProjectorScreen.cs
...@@ -54,14 +54,14 @@ namespace TSA_V ...@@ -54,14 +54,14 @@ namespace TSA_V
if (sc.Count() > ScreenIndex) if (sc.Count() > ScreenIndex)
{ {
Screen screen = sc[ScreenIndex]; Screen screen = sc[ScreenIndex];
foreach (Screen s in sc) //foreach (Screen s in sc)
{ //{
if (!s.Primary) // if (!s.Primary)
{ // {
screen = s; // screen = s;
break; // break;
} // }
} //}
string text = "名称：" + screen.DeviceName + "\r\n"; string text = "名称：" + screen.DeviceName + "\r\n";
text += "Width：" + screen.Bounds.Width + "\r\n"; text += "Width：" + screen.Bounds.Width + "\r\n";
...@@ -81,7 +81,7 @@ namespace TSA_V ...@@ -81,7 +81,7 @@ namespace TSA_V
this.Location = new Point(screen.Bounds.Left, screen.Bounds.Top); this.Location = new Point(screen.Bounds.Left, screen.Bounds.Top);
this.Show(); this.Show();
LogUtil.info("投影显示成功，屏幕索引=" + ScreenIndex + " ！"); LogUtil.info($"投影显示成功，屏幕索引={ ScreenIndex} , 位置X:{screen.Bounds.Left} ,Y:{screen.Bounds.Top} ");
return true; return true;
} }
else else
......
TSA-V/projector/FrmViewScreen.cs
...@@ -54,14 +54,14 @@ namespace TSA_V ...@@ -54,14 +54,14 @@ namespace TSA_V
if (sc.Count() > ScreenIndex) if (sc.Count() > ScreenIndex)
{ {
Screen screen = sc[ScreenIndex]; Screen screen = sc[ScreenIndex];
foreach (Screen s in sc) //foreach (Screen s in sc)
{ //{
if (!s.Primary) // if (!s.Primary)
{ // {
screen = s; // screen = s;
break; // break;
} // }
} //}
string text = "名称：" + screen.DeviceName + "\r\n"; string text = "名称：" + screen.DeviceName + "\r\n";
text += "Width：" + screen.Bounds.Width + "\r\n"; text += "Width：" + screen.Bounds.Width + "\r\n";
...@@ -81,7 +81,7 @@ namespace TSA_V ...@@ -81,7 +81,7 @@ namespace TSA_V
this.Location = new Point(screen.Bounds.Left, screen.Bounds.Top); this.Location = new Point(screen.Bounds.Left, screen.Bounds.Top);
this.Show(); this.Show();
LogUtil.info("第二屏幕显示成功，屏幕索引=" + ScreenIndex + " ！"); LogUtil.info($"第二屏幕显示成功，屏幕索引={ ScreenIndex}, X: {screen.Bounds.Left} ,Y:{screen.Bounds.Top} ");
return true; return true;
} }
else else
......
TSA-V/workForm/FrmBoardSelect.cs
...@@ -69,7 +69,7 @@ namespace TSA_V ...@@ -69,7 +69,7 @@ namespace TSA_V
private void modePro() private void modePro()
{ {
if (WorkModeUtil.OnlyGuoBan) if (WorkModeUtil.OnlyGB)
{ {
chbOffLine.Checked = false; chbOffLine.Checked = false;
chbWorkSingleStart.Checked = false; chbWorkSingleStart.Checked = false;
...@@ -343,7 +343,7 @@ namespace TSA_V ...@@ -343,7 +343,7 @@ namespace TSA_V
{ {
//如果是过板模式，直接取消 //如果是过板模式，直接取消
if (WorkModeUtil.OnlyGuoBan) if (WorkModeUtil.OnlyGB)
{ {
chbGuoban.Checked = true; chbGuoban.Checked = true;
return; return;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!