Commit 3274cda8 LN

1

1 个父辈 ce2fb319
...@@ -17,6 +17,7 @@ using AccAOI; ...@@ -17,6 +17,7 @@ using AccAOI;
using System.Speech.Synthesis; using System.Speech.Synthesis;
using Asa; using Asa;
using System.Threading; using System.Threading;
using GerberVS;
namespace TSA_V namespace TSA_V
{ {
...@@ -49,6 +50,7 @@ namespace TSA_V ...@@ -49,6 +50,7 @@ namespace TSA_V
} }
lblMsg.Text = ""; lblMsg.Text = "";
Setting_NInit.ChangeConfig(); Setting_NInit.ChangeConfig();
AGerberController.ErrorLogEvent += AGerberController_ErrorLogEvent;
//if (FormManager.UserInfo.Limit.Equals(UserLimit.Admin)) //if (FormManager.UserInfo.Limit.Equals(UserLimit.Admin))
//{ //{
// btnMaintenance.Visible = true; // btnMaintenance.Visible = true;
...@@ -58,6 +60,12 @@ namespace TSA_V ...@@ -58,6 +60,12 @@ namespace TSA_V
// btnMaintenance.Visible = false ; // btnMaintenance.Visible = false ;
//} //}
} }
private void AGerberController_ErrorLogEvent(Exception ex)
{
LogUtil.error("AGerberController_ErrorLogEvent: " + ex.ToString());
}
public static void Speak(string text) public static void Speak(string text)
{ {
using (SpeechSynthesizer speech = new SpeechSynthesizer()) using (SpeechSynthesizer speech = new SpeechSynthesizer())
......
...@@ -566,8 +566,9 @@ namespace TSA_V ...@@ -566,8 +566,9 @@ namespace TSA_V
openFileDialog.Multiselect = true; openFileDialog.Multiselect = true;
if (openFileDialog.ShowDialog() == DialogResult.OK) if (openFileDialog.ShowDialog() == DialogResult.OK)
{ {
string defPath = Path.GetPathRoot(Application.StartupPath) + @"image\";
//List<string> newFiles = FileUtil.FileProcess(openFileDialog.FileNames); //List<string> newFiles = FileUtil.FileProcess(openFileDialog.FileNames);
bool result = GerberVS.AGerberController.OpenLayers(openFileDialog.FileNames, out string filename); bool result = GerberVS.AGerberController.OpenLayers(openFileDialog.FileNames,defPath, out string filename);
if (result && File.Exists(filename)) if (result && File.Exists(filename))
{ {
......
此文件类型无法预览
此文件类型无法预览
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!