Skip to content

李娜 / Line-Smart-Workstation

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

新校准功能

1 个父辈 be66979d
全部展开
内嵌 并排
正在显示 22 个修改的文件 包含 351 行增加 和 36 行删除
Common/Setting_NInit.cs
...@@ -131,6 +131,16 @@ namespace TSA_V.Common ...@@ -131,6 +131,16 @@ namespace TSA_V.Common
public static MyConfig<string> App_Server = ""; public static MyConfig<string> App_Server = "";
[MyConfigComment("设备Cid")] [MyConfigComment("设备Cid")]
public static MyConfig<string> App_Cid = ""; public static MyConfig<string> App_Cid = "";
[MyConfigComment("是否打开报警音效")]
public static MyConfig<bool> Set_AlarmSound =true;
[MyConfigComment("是否打开提示音")]
public static MyConfig<bool> Set_TipSound = true;
[MyConfigComment("是否限制鼠标不能移出主屏幕")]
public static MyConfig<bool> Set_CursorProcess= true;
public static void ChangeConfig() public static void ChangeConfig()
{ {
try try
......
DeviceLibrary/bean/BoardInfo.cs
...@@ -196,9 +196,23 @@ namespace TSA_V.DeviceLibrary ...@@ -196,9 +196,23 @@ namespace TSA_V.DeviceLibrary
return true; return true;
} }
public CalibrateBean calInfo = null;
} }
public class CalibrateBean
{
public Point leftUpPoint = new Point();
public Point rightBottomPoint = new Point();
/// <summary>
/// 1=已确认左上角位置
/// 2=已确认右下角位置
/// 3=正在校准中
/// </summary>
public int CurrStep = 0;
}
/// <summary> /// <summary>
///组装信息信息 ///组装信息信息
/// </summary> /// </summary>
...@@ -358,6 +372,10 @@ namespace TSA_V.DeviceLibrary ...@@ -358,6 +372,10 @@ namespace TSA_V.DeviceLibrary
/// </summary> /// </summary>
public bool Disable = false; public bool Disable = false;
/// <summary>
/// 是否编辑成功
/// </summary>
public bool IsEdit = false;
/// <summary> /// <summary>
/// 导出导入程序时使用 /// 导出导入程序时使用
......
DeviceLibrary/manager/ProjectorProcess.cs
...@@ -87,6 +87,10 @@ namespace TSA_V ...@@ -87,6 +87,10 @@ namespace TSA_V
public static void StartPlay( ) public static void StartPlay( )
{ {
if (!Setting_NInit.Set_AlarmSound)
{
return;
}
// 音频文件路径 // 音频文件路径
string audioFilePath = Application.StartupPath+ soundFileName; string audioFilePath = Application.StartupPath+ soundFileName;
......
TSA-V/FrmAddBoard.cs
...@@ -40,7 +40,7 @@ namespace TSA_V ...@@ -40,7 +40,7 @@ namespace TSA_V
//"10="+str10 //"10="+str10
//}; //};
xyMoveControl1.loadTypeList(ResourceCulture.GetPTypes()); xyMoveControl1.loadTypeList(ResourceCulture.GetPTypes(), ResourceCulture.GetXYControlMap());
} }
private void btnCancel_Click(object sender, EventArgs e) private void btnCancel_Click(object sender, EventArgs e)
......
TSA-V/FrmBase.cs
...@@ -11,6 +11,7 @@ using System.Text; ...@@ -11,6 +11,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using TSA_V.Common; using TSA_V.Common;
using UserFromControl;
namespace TSA_V namespace TSA_V
{ {
...@@ -293,6 +294,10 @@ namespace TSA_V ...@@ -293,6 +294,10 @@ namespace TSA_V
} }
// con.Refresh(); // con.Refresh();
} }
else if (con is ProjectorControl)
{
continue;
}
else if (con.Controls.Count > 0) else if (con.Controls.Count > 0)
{ {
PreControlLanaguage(con); PreControlLanaguage(con);
......
TSA-V/FrmBoardInfo.cs
 
using AccAOI; using AccAOI;
using log4net; using log4net;
using OpenCvSharp.Flann;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
...@@ -12,6 +13,7 @@ using System.Threading.Tasks; ...@@ -12,6 +13,7 @@ using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using TSA_V.Common; using TSA_V.Common;
using TSA_V.DeviceLibrary; using TSA_V.DeviceLibrary;
using TSA_V.frmBoard;
using TSA_V.LoadCSVLibrary; using TSA_V.LoadCSVLibrary;
namespace TSA_V namespace TSA_V
...@@ -311,6 +313,7 @@ namespace TSA_V ...@@ -311,6 +313,7 @@ namespace TSA_V
view.Cells[Column_PenWidth.Index].Value = point.PenWidth; view.Cells[Column_PenWidth.Index].Value = point.PenWidth;
view.Cells[Column_ShowText.Index].Value = point.ShowText; view.Cells[Column_ShowText.Index].Value = point.ShowText;
view.Cells[Column_disable.Index].Value = point.Disable; view.Cells[Column_disable.Index].Value = point.Disable;
view.Cells[col_IsEdit.Index].Value=point.IsEdit;
if (updateBoardInfo != null) if (updateBoardInfo != null)
{ {
...@@ -717,7 +720,8 @@ namespace TSA_V ...@@ -717,7 +720,8 @@ namespace TSA_V
point.PointType = Convert.ToInt32(row.Cells[this.Column_PointType.Name].Value.ToString()); point.PointType = Convert.ToInt32(row.Cells[this.Column_PointType.Name].Value.ToString());
point.PenWidth = Convert.ToInt32(row.Cells[this.Column_PenWidth.Name].Value.ToString()); point.PenWidth = Convert.ToInt32(row.Cells[this.Column_PenWidth.Name].Value.ToString());
point.ShowText = (row.Cells[this.Column_ShowText.Name].Value.ToString()); point.ShowText = (row.Cells[this.Column_ShowText.Name].Value.ToString());
point.Disable = Convert.ToBoolean(row.Cells[this.Column_disable.Name].Value.ToString()); point.Disable = Convert.ToBoolean(row.Cells[this.Column_disable.Name].Value.ToString());
point.IsEdit = Convert.ToBoolean(row.Cells[this.col_IsEdit.Name].Value.ToString());
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -1523,6 +1527,38 @@ namespace TSA_V ...@@ -1523,6 +1527,38 @@ namespace TSA_V
btnColorChange.ForeColor = Color.Black; btnColorChange.ForeColor = Color.Black;
} }
private void btnCalibrate_Click(object sender, EventArgs e)
{
FrmCalibrate frm = new FrmCalibrate(updateBoardInfo);
DialogResult dialog = frm.ShowDialog();
if (dialog.Equals(DialogResult.OK))
{
int index = dgvList.FirstDisplayedScrollingRowIndex;
updateBoardInfo = BoardManager.getBoardByName(updateBoardInfo.boardName);
int color = btnColorChange.BackColor.ToArgb();
updateBoardInfo.PointColor = color;
for (int i = 0; i < updateBoardInfo.smtList.Count; i++)
{
dgvList.Rows[i].Cells[this.Column_NodeX.Name].Value = updateBoardInfo.smtList[i].NodePositionX;
dgvList.Rows[i].Cells[this.Column_NodeY.Name].Value = updateBoardInfo.smtList[i].NodePositionY;
dgvList.Rows[i].Cells[this.Column_PointSizeX.Name].Value = updateBoardInfo.smtList[i].PointSizeX;
dgvList.Rows[i].Cells[this.Column_PointSizeY.Name].Value = updateBoardInfo.smtList[i].PointSizeY;
}
SetListCurrCell(index);
FrmProjectorScreen.instance.ClearPoint();
FrmProjectorScreen.instance.ShowPoint(false, updateBoardInfo.PointColor, updateBoardInfo.smtList.ToArray());
this.Cursor = Cursors.Default;
//重新加载
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.TrainOK, "坐标校准完成！"));
}
}
private void panBoard_Paint(object sender, PaintEventArgs e)
{
}
private void llblAllUSel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) private void llblAllUSel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{ {
int cout = dgvList.Rows.Count; int cout = dgvList.Rows.Count;
......
TSA-V/FrmBoardInfo.resx
...@@ -213,6 +213,9 @@ ...@@ -213,6 +213,9 @@
<metadata name="Column_Notes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Notes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="col_IsEdit.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_getPosition.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_getPosition.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
......
TSA-V/FrmPointInfo.cs
...@@ -48,7 +48,7 @@ namespace TSA_V ...@@ -48,7 +48,7 @@ namespace TSA_V
this.txtX.Text = x.ToString(); this.txtX.Text = x.ToString();
this.txtY.Text = y.ToString(); this.txtY.Text = y.ToString();
xyMoveControl1.loadTypeList(ResourceCulture.GetPTypes()); xyMoveControl1.loadTypeList(ResourceCulture.GetPTypes(), ResourceCulture.GetXYControlMap());
xyMoveControl1.ShowColor = boardInfo.PointColor; xyMoveControl1.ShowColor = boardInfo.PointColor;
} }
...@@ -110,13 +110,13 @@ namespace TSA_V ...@@ -110,13 +110,13 @@ namespace TSA_V
ProjectorControl.MaxY = (int)TSAVBean.Y_Max; ProjectorControl.MaxY = (int)TSAVBean.Y_Max;
this.PointList = list; this.PointList = list;
this.CurrIndex = currIndex; this.CurrIndex = currIndex;
ShowPoint(); ShowPoint(null);
xyMoveControl1.ShowColor = boardInfo.PointColor; xyMoveControl1.ShowColor = boardInfo.PointColor;
xyMoveControl1.loadTypeList(ResourceCulture.GetPTypes()); xyMoveControl1.loadTypeList(ResourceCulture.GetPTypes(), ResourceCulture.GetXYControlMap());
} }
private void ShowPoint() private void ShowPoint(SMTPointInfo prePoint)
{ {
updateFrom(false); updateFrom(false);
btnSave.Visible = true; btnSave.Visible = true;
...@@ -135,6 +135,18 @@ namespace TSA_V ...@@ -135,6 +135,18 @@ namespace TSA_V
xyMoveControl1.PointSizeY = smtPointInfo.PointSizeY; xyMoveControl1.PointSizeY = smtPointInfo.PointSizeY;
xyMoveControl1.PenWidth = smtPointInfo.PenWidth; xyMoveControl1.PenWidth = smtPointInfo.PenWidth;
xyMoveControl1.ShowText = smtPointInfo.ShowText; xyMoveControl1.ShowText = smtPointInfo.ShowText;
if(this.smtPointInfo.IsEdit==false)
{
if (prePoint != null && prePoint.IsEdit)
{
xyMoveControl1.PointType = prePoint.PointType;
xyMoveControl1.PointSizeX = prePoint.PointSizeX;
xyMoveControl1.PointSizeY = prePoint.PointSizeY;
xyMoveControl1.PenWidth = prePoint.PenWidth;
}
}
xyMoveControl1.ShowCurrPoint();
if (boardInfo != null) if (boardInfo != null)
{ {
xyMoveControl1.ShowColor = boardInfo.PointColor; xyMoveControl1.ShowColor = boardInfo.PointColor;
...@@ -264,6 +276,8 @@ namespace TSA_V ...@@ -264,6 +276,8 @@ namespace TSA_V
} }
else else
{ {
//设置为已保存
smtPointInfo.IsEdit = true;
if (String.IsNullOrEmpty(smtPointInfo.PositionNum)) if (String.IsNullOrEmpty(smtPointInfo.PositionNum))
{ {
ComponetInfo com = CSVBomManager.GetCom(boardInfo.bomName, smtPointInfo); ComponetInfo com = CSVBomManager.GetCom(boardInfo.bomName, smtPointInfo);
...@@ -320,7 +334,7 @@ namespace TSA_V ...@@ -320,7 +334,7 @@ namespace TSA_V
CurrIndex++; CurrIndex++;
if (PointList.Count > CurrIndex) if (PointList.Count > CurrIndex)
{ {
ShowPoint(); ShowPoint(prePoint);
NextEvent?.Invoke(CurrIndex,prePoint); NextEvent?.Invoke(CurrIndex,prePoint);
} }
} }
...@@ -336,7 +350,7 @@ namespace TSA_V ...@@ -336,7 +350,7 @@ namespace TSA_V
} }
if (PointList.Count > CurrIndex) if (PointList.Count > CurrIndex)
{ {
ShowPoint(); ShowPoint(null);
NextEvent?.Invoke(CurrIndex); NextEvent?.Invoke(CurrIndex);
} }
} }
......
TSA-V/Properties/Resource.en-US.resx
...@@ -2645,4 +2645,16 @@ ...@@ -2645,4 +2645,16 @@
<data name = "Type13" xml:space = "preserve"> <value> Polarity_bottom-left </value> </data> <data name = "Type13" xml:space = "preserve"> <value> Polarity_bottom-left </value> </data>
<data name = "Type14" xml:space = "preserve"> <value> Polarity_bottom-right</value> </data> <data name = "Type14" xml:space = "preserve"> <value> Polarity_bottom-right</value> </data>
<data name = "FrmBoardInfo_btnColorChange_Text" xml:space = "preserve"> <value> Projection Color </value> </data> <data name = "FrmBoardInfo_btnColorChange_Text" xml:space = "preserve"> <value> Projection Color </value> </data>
<data name = "FrmBoardInfo_btnCalibrate_Text" xml:space = "preserve"> <value> Projection Calibration </value> </data>
<data name = "CalMsg1" xml:space = "preserve"> <value> Step 1: Move the projection cursor to the upper left corner of the board and click on the Setup button. </value> </data>
<data name = "FrmCalibrate_Text" xml:space = "preserve"> <value> Projection Calibration </value> </data>
<data name = "FrmCalibrate_groupBox2_Text" xml:space = "preserve"> <value> illustration </value> </data>
<data name = "FrmCalibrate_groupBox1_Text" xml:space = "preserve"> <value> Projection Calibration </value> </data>
<data name = "FrmCalibrate_btnExit_Text" xml:space = "preserve"> <value> Exit </value> </data>
<data name = "FrmCalibrate_btnCal_Text" xml:space = "preserve"> <value> Start Calibration </value> </data>
<data name = "FrmCalibrate_btnRightBottom_Text" xml:space = "preserve"> <value> Set to bottom right position </value> </data>
<data name = "FrmCalibrate_btnLeftUp_Text" xml:space = "preserve"> <value> Set to top left position </value> </data>
<data name = "FrmCalibrate_lblMsg_Text" xml:space = "preserve"> <value> Step 1: Move the projection cursor to the upper left corner of the board </value> </data>
<data name = "CalMsg2" xml:space = "preserve"> <value> Step 2: Move the projection cursor to the lower right corner of the board </value> </data>
<data name = "CalMsg3" xml:space = "preserve"> <value> Step 3: Click the Start Calibration button </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
...@@ -2629,4 +2629,16 @@ ...@@ -2629,4 +2629,16 @@
<data name = "Type13" xml:space = "preserve"> <value> 极性_左下方 </value> </data> <data name = "Type13" xml:space = "preserve"> <value> 极性_左下方 </value> </data>
<data name = "Type14" xml:space = "preserve"> <value> 极性_右下方 </value> </data> <data name = "Type14" xml:space = "preserve"> <value> 极性_右下方 </value> </data>
<data name = "FrmBoardInfo_btnColorChange_Text" xml:space = "preserve"> <value> 投影颜色 </value> </data> <data name = "FrmBoardInfo_btnColorChange_Text" xml:space = "preserve"> <value> 投影颜色 </value> </data>
<data name = "FrmBoardInfo_btnCalibrate_Text" xml:space = "preserve"> <value> 投影标定 </value> </data>
<data name = "CalMsg1" xml:space = "preserve"> <value> 第一步：请将光标移动至如图示电路板左上角位置，确认后点击设置按钮 </value> </data>
<data name = "FrmCalibrate_Text" xml:space = "preserve"> <value> 投影标定 </value> </data>
<data name = "FrmCalibrate_groupBox2_Text" xml:space = "preserve"> <value> 图示 </value> </data>
<data name = "FrmCalibrate_groupBox1_Text" xml:space = "preserve"> <value> 投影标定 </value> </data>
<data name = "FrmCalibrate_btnExit_Text" xml:space = "preserve"> <value> 退出 </value> </data>
<data name = "FrmCalibrate_btnCal_Text" xml:space = "preserve"> <value> 开始校准 </value> </data>
<data name = "FrmCalibrate_btnRightBottom_Text" xml:space = "preserve"> <value> 设置为右下角位置 </value> </data>
<data name = "FrmCalibrate_btnLeftUp_Text" xml:space = "preserve"> <value> 设置为左上角位置 </value> </data>
<data name = "FrmCalibrate_lblMsg_Text" xml:space = "preserve"> <value> 第一步：请将光标移动至如图示电路板左上角位置，确认后点击设置按钮 </value> </data>
<data name = "CalMsg2" xml:space = "preserve"> <value> 第二步：请将光标移动至如图示电路板右下角位置，确认后点击设置按钮 </value> </data>
<data name = "CalMsg3" 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
...@@ -2643,5 +2643,17 @@ ...@@ -2643,5 +2643,17 @@
<data name = "Type12" xml:space = "preserve"> <value> 极性_右上方 </value> </data> <data name = "Type12" xml:space = "preserve"> <value> 极性_右上方 </value> </data>
<data name = "Type13" xml:space = "preserve"> <value> 极性_左下方 </value> </data> <data name = "Type13" xml:space = "preserve"> <value> 极性_左下方 </value> </data>
<data name = "Type14" xml:space = "preserve"> <value> 极性_右下方 </value> </data> <data name = "Type14" xml:space = "preserve"> <value> 极性_右下方 </value> </data>
<data name = "FrmBoardInfo_btnColorChange_Text" xml:space = "preserve"> <value> 投影颜色 </value> </data> <data name = "FrmBoardInfo_btnColorChange_Text" xml:space = "preserve"> <value> 投影颜色 </value> </data>
<data name = "FrmBoardInfo_btnCalibrate_Text" xml:space = "preserve"> <value> 投影标定 </value> </data>
<data name = "CalMsg1" xml:space = "preserve"> <value> 第一步：请将光标移动至如图示电路板左上角位置，确认后点击设置按钮 </value> </data>
<data name = "FrmCalibrate_Text" xml:space = "preserve"> <value> 投影标定 </value> </data>
<data name = "FrmCalibrate_groupBox2_Text" xml:space = "preserve"> <value> 图示 </value> </data>
<data name = "FrmCalibrate_groupBox1_Text" xml:space = "preserve"> <value> 投影标定 </value> </data>
<data name = "FrmCalibrate_btnExit_Text" xml:space = "preserve"> <value> 退出 </value> </data>
<data name = "FrmCalibrate_btnCal_Text" xml:space = "preserve"> <value> 开始校准 </value> </data>
<data name = "FrmCalibrate_btnRightBottom_Text" xml:space = "preserve"> <value> 设置为右下角位置 </value> </data>
<data name = "FrmCalibrate_btnLeftUp_Text" xml:space = "preserve"> <value> 设置为左上角位置 </value> </data>
<data name = "FrmCalibrate_lblMsg_Text" xml:space = "preserve"> <value> 第一步：请将光标移动至如图示电路板左上角位置，确认后点击设置按钮 </value> </data>
<data name = "CalMsg2" xml:space = "preserve"> <value> 第二步：请将光标移动至如图示电路板右下角位置，确认后点击设置按钮 </value> </data>
<data name = "CalMsg3" xml:space = "preserve"> <value> 第三步：请点击开始校准按钮，自动计算投影坐标 </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resources.Designer.cs
...@@ -63,6 +63,16 @@ namespace TSA_V.Properties { ...@@ -63,6 +63,16 @@ namespace TSA_V.Properties {
/// <summary> /// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary> /// </summary>
internal static System.Drawing.Bitmap _202403181014 {
get {
object obj = ResourceManager.GetObject("202403181014", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap axisbg { internal static System.Drawing.Bitmap axisbg {
get { get {
object obj = ResourceManager.GetObject("axisbg", resourceCulture); object obj = ResourceManager.GetObject("axisbg", resourceCulture);
......
TSA-V/Properties/Resources.resx
...@@ -118,20 +118,23 @@ ...@@ -118,20 +118,23 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="NEO_STATION" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\NEO STATION.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ok1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="退出" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="退出" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\退出.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\退出.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="设备配置背景" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="设备配置背景" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\设备配置背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\设备配置背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="IMG_3501" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\IMG_3501.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="x+" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="x+" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\x+.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\image\x+.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="编辑" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="neo_station1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\编辑.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\neo station.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="z+" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="z+" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\z+.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\image\z+.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
...@@ -139,8 +142,8 @@ ...@@ -139,8 +142,8 @@
<data name="error" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="error" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\image\error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="元器件信息背景" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="编辑" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\元器件信息背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\编辑.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="程序编辑背景" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="程序编辑背景" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\程序编辑背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\程序编辑背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
...@@ -151,8 +154,8 @@ ...@@ -151,8 +154,8 @@
<data name="defaultBoard0" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="defaultBoard0" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\defaultBoard0.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\defaultBoard0.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="ok1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="IMG_3501" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ok.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\IMG_3501.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="程序编辑背景3" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="程序编辑背景3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\程序编辑背景3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\程序编辑背景3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
...@@ -160,12 +163,18 @@ ...@@ -160,12 +163,18 @@
<data name="统计分析" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="统计分析" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\统计分析.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\统计分析.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="背景图dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\背景图dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="程序编辑背景1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="程序编辑背景1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\程序编辑背景1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\程序编辑背景1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="程序编辑背景2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="程序编辑背景2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\程序编辑背景2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\程序编辑背景2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="backImage" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\backImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="背景图" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="背景图" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\背景图.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\image\背景图.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
...@@ -178,12 +187,18 @@ ...@@ -178,12 +187,18 @@
<data name="开始工作背景" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="开始工作背景" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\开始工作背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\开始工作背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="axisbg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\axisbg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="退出背景" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="退出背景" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\退出背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\退出背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="设备配置" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="设备配置" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\设备配置.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\设备配置.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="元器件信息背景" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\元器件信息背景.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="开始工作" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="开始工作" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\开始工作.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\开始工作.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
...@@ -199,19 +214,7 @@ ...@@ -199,19 +214,7 @@
<data name="元器件信息" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="元器件信息" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\元器件信息.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\元器件信息.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="backImage" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="202403181014" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\image\backImage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\202403181014.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="背景图dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\背景图dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="NEO_STATION" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\NEO STATION.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="neo_station1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\neo station.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="axisbg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\axisbg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/ResourceCulture.cs
...@@ -151,6 +151,26 @@ namespace TSA_V ...@@ -151,6 +151,26 @@ namespace TSA_V
{ {
return className + spiltStr + Text; return className + spiltStr + Text;
} }
public static Dictionary<string, string> GetXYControlMap() {
Dictionary<string, string> controlTextMap = new Dictionary<string, string>();
controlTextMap.Add("group_Text", ResourceCulture.GetString("FrmPointInfo_group_Text", "坐标"));
controlTextMap.Add("lblLineWidth_Text", ResourceCulture.GetString("FrmPointInfo_lblLineWidth_Text", "画笔宽度："));
controlTextMap.Add("lblName_Text", ResourceCulture.GetString("FrmPointInfo_lblName_Text", "投影文字："));
controlTextMap.Add("lblSizeLength_Text", ResourceCulture.GetString("FrmPointInfo_lblSizeLength_Text", "横向大小→："));
controlTextMap.Add("lblSizeWidth_Text", ResourceCulture.GetString("FrmPointInfo_lblSizeWidth_Text", "纵向大小↓： "));
controlTextMap.Add("lblStepValue_Text", ResourceCulture.GetString("FrmPointInfo_lblStepValue_Text", "步进值："));
controlTextMap.Add("lbltype_Text", ResourceCulture.GetString("FrmPointInfo_lbltype_Text", "坐标点形状："));
controlTextMap.Add("lblx_Text", ResourceCulture.GetString("FrmPointInfo_lblx_Text", "Y轴坐标："));
controlTextMap.Add("lbly_Text", ResourceCulture.GetString("FrmPointInfo_lbly_Text", "X轴坐标："));
controlTextMap.Add("btnDown_Text", ResourceCulture.GetString("FrmPointInfo_btnDown_Text", "下移"));
controlTextMap.Add("btnUp_Text", ResourceCulture.GetString("FrmPointInfo_btnUp_Text", "上移"));
controlTextMap.Add("btnShowPoint_Text", ResourceCulture.GetString("FrmPointInfo_btnShowPoint_Text", "移动测试"));
controlTextMap.Add("btnLeft_Text", ResourceCulture.GetString("FrmPointInfo_btnLeft_Text", "左移"));
controlTextMap.Add("btnRight_Text", ResourceCulture.GetString("FrmPointInfo_btnRight_Text", "右移"));
return controlTextMap;
}
public static string[] GetPTypes() public static string[] GetPTypes()
{ {
string str7 = ResourceCulture.GetString(ResourceCulture.Type7, "极性_上方"); string str7 = ResourceCulture.GetString(ResourceCulture.Type7, "极性_上方");
......
TSA-V/Smart-Workstation.csproj
...@@ -120,6 +120,12 @@ ...@@ -120,6 +120,12 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="frmBoard\FrmCalibrate.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmBoard\FrmCalibrate.Designer.cs">
<DependentUpon>FrmCalibrate.cs</DependentUpon>
</Compile>
<Compile Include="manager\AOIManager.cs" /> <Compile Include="manager\AOIManager.cs" />
<Compile Include="DataCalculate.cs"> <Compile Include="DataCalculate.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
...@@ -356,6 +362,9 @@ ...@@ -356,6 +362,9 @@
<EmbeddedResource Include="FrmBoardList.resx"> <EmbeddedResource Include="FrmBoardList.resx">
<DependentUpon>FrmBoardList.cs</DependentUpon> <DependentUpon>FrmBoardList.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="frmBoard\FrmCalibrate.resx">
<DependentUpon>FrmCalibrate.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmHistory.resx"> <EmbeddedResource Include="FrmHistory.resx">
<DependentUpon>FrmHistory.cs</DependentUpon> <DependentUpon>FrmHistory.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
...@@ -515,6 +524,7 @@ ...@@ -515,6 +524,7 @@
<Content Include="image\alarm2.gif"> <Content Include="image\alarm2.gif">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="Resources\202403181014.png" />
<Content Include="sound\alarm.wav"> <Content Include="sound\alarm.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
......
TSA-V/frmBoard/FrmCalibrate.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="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
\ No newline at end of file \ No newline at end of file
TSA-V/manager/MouseManager.cs
...@@ -34,10 +34,17 @@ namespace TSA_V ...@@ -34,10 +34,17 @@ namespace TSA_V
try try
{ {
Thread.Sleep(50); Thread.Sleep(50);
MouseProcess(); if (!Setting_NInit.Set_CursorProcess)
}catch (Exception ex) {
}
else
{
MouseProcess();
}
}
catch (Exception ex)
{ {
LogUtil.error("光标处理出错："+ex.ToString()); LogUtil.error("光标处理出错：" + ex.ToString());
} }
} }
LogUtil.info("光标位置处理线程已退出."); LogUtil.info("光标位置处理线程已退出.");
......
UserFromControl/ProjectorControl.cs
...@@ -56,7 +56,7 @@ namespace UserFromControl ...@@ -56,7 +56,7 @@ namespace UserFromControl
cmbType.Items.Add(str); cmbType.Items.Add(str);
} }
} }
public void loadTypeList(string[] list) public void loadTypeList(string[] list,Dictionary<string,string> controlTextMap)
{ {
typeList = new List<string>(); typeList = new List<string>();
this.cmbType.Items.Clear(); this.cmbType.Items.Clear();
...@@ -78,6 +78,22 @@ namespace UserFromControl ...@@ -78,6 +78,22 @@ namespace UserFromControl
{ {
cmbType.Items.Add(str); cmbType.Items.Add(str);
} }
group.Text = controlTextMap["group_Text"];
lblLineWidth.Text = controlTextMap["lblLineWidth_Text"];
lblName.Text = controlTextMap["lblName_Text"];
lblSizeLength.Text = controlTextMap["lblSizeLength_Text"];
lblSizeWidth.Text = controlTextMap["lblSizeWidth_Text"];
lblStepValue.Text = controlTextMap["lblStepValue_Text"];
lbltype.Text = controlTextMap["lbltype_Text"];
lblx.Text = controlTextMap["lblx_Text"];
lbly.Text = controlTextMap["lbly_Text"];
btnDown.Text = controlTextMap["btnDown_Text"];
btnUp.Text = controlTextMap["btnUp_Text"];
btnShowPoint.Text = controlTextMap["btnShowPoint_Text"];
btnLeft.Text = controlTextMap["btnLeft_Text"];
btnRight.Text = controlTextMap["btnRight_Text"];
//
} }
public string GroupName public string GroupName
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!