|
@@ -109,12 +109,12 @@ namespace SmartSEMControl
|
|
|
|
|
|
#region 固定参数
|
|
|
//判断这个文件夹是否存在20200826
|
|
|
- private readonly String ELYPATH = @"C:\ProgramData\Carl Zeiss\SmartFIB\API\Drop\";
|
|
|
+ //private readonly String ELYPATH = @"C:\ProgramData\Carl Zeiss\SmartFIB\API\Drop\";
|
|
|
private readonly String ELYFILENAME = "ApiLayout.ely";
|
|
|
- private readonly String MLFPATH = @"C:\ProgramData\Carl Zeiss\SmartSEM\User\Service\";
|
|
|
+ //private readonly String MLFPATH = @"C:\ProgramData\Carl Zeiss\SmartSEM\User\Service\";
|
|
|
private readonly String MLFFILENAME = "Opton.MLF";
|
|
|
- private String REMOTEELYPATH = @"";
|
|
|
- private String REMOTEMLFPATH = @"";
|
|
|
+ private String REMOTEDesELYPATH = @"";
|
|
|
+ private String REMOTEDesMLFPATH = @"";
|
|
|
#endregion
|
|
|
|
|
|
#region 模拟参数
|
|
@@ -294,15 +294,15 @@ namespace SmartSEMControl
|
|
|
//LogManager.InitHardwareLog();
|
|
|
Init();
|
|
|
//判断ELY默认文件夹是否存在
|
|
|
- if(!Directory.Exists(ELYPATH))
|
|
|
- {
|
|
|
- Directory.CreateDirectory(ELYPATH);
|
|
|
- }
|
|
|
+ //if(!Directory.Exists(ELYPATH))
|
|
|
+ //{
|
|
|
+ // Directory.CreateDirectory(ELYPATH);
|
|
|
+ //}
|
|
|
|
|
|
- if (!Directory.Exists(MLFPATH))
|
|
|
- {
|
|
|
- Directory.CreateDirectory(MLFPATH);
|
|
|
- }
|
|
|
+ //if (!Directory.Exists(MLFPATH))
|
|
|
+ //{
|
|
|
+ // Directory.CreateDirectory(MLFPATH);
|
|
|
+ //}
|
|
|
}
|
|
|
#endregion
|
|
|
|
|
@@ -1773,22 +1773,23 @@ namespace SmartSEMControl
|
|
|
//log.Info("CMDMCFFilename = " + filename, ret);
|
|
|
//return ret;
|
|
|
|
|
|
- if (File.Exists(_MLFFullFileName) && Directory.Exists(MLFPATH))
|
|
|
+ if (File.Exists(_MLFFullFileName) )
|
|
|
{
|
|
|
//移动文件
|
|
|
- if (_MLFFullFileName != (MLFPATH + MLFFILENAME))
|
|
|
- {
|
|
|
- File.Copy(_MLFFullFileName, MLFPATH + MLFFILENAME, true);
|
|
|
- log.Info("CmdFIBLoadMLF Copy FileName:" + _MLFFullFileName + " To " + MLFPATH + MLFFILENAME, true);
|
|
|
- try
|
|
|
- {
|
|
|
- if (REMOTEMLFPATH != "")
|
|
|
+ //if (_MLFFullFileName != (MLFPATH + MLFFILENAME))
|
|
|
+ //{
|
|
|
+ // File.Copy(_MLFFullFileName, MLFPATH + MLFFILENAME, true);
|
|
|
+ // log.Info("CmdFIBLoadMLF Copy FileName:" + _MLFFullFileName + " To " + MLFPATH + MLFFILENAME, true);
|
|
|
+ // try
|
|
|
+ // {
|
|
|
+ if (REMOTEDesMLFPATH != "")
|
|
|
{
|
|
|
- File.Copy(_MLFFullFileName, REMOTEMLFPATH + MLFFILENAME, true);
|
|
|
+ File.Copy(_MLFFullFileName, REMOTEDesMLFPATH + MLFFILENAME, true);
|
|
|
+ log.Info("CmdFIBLoadELY Success Execute " + _MLFFullFileName + "to " + REMOTEDesMLFPATH + MLFFILENAME);
|
|
|
}
|
|
|
- }
|
|
|
- catch { }
|
|
|
- }
|
|
|
+ // }
|
|
|
+ // catch { }
|
|
|
+ //}
|
|
|
Boolean ret = ExecuteCmd(MCF_FILENAME + MLFFILENAME.Substring(0,MLFFILENAME.Length-4));
|
|
|
log.Info("CmdFIBLoadMLF Success Execute " + _MLFFullFileName, true);
|
|
|
return ret;
|
|
@@ -2165,25 +2166,15 @@ namespace SmartSEMControl
|
|
|
#region FIB加载.ely文件
|
|
|
public Boolean CmdFIBLoadELY(String _ELYFullFileName)
|
|
|
{
|
|
|
- if (File.Exists(_ELYFullFileName) && Directory.Exists(ELYPATH))
|
|
|
+ if (File.Exists(_ELYFullFileName) )
|
|
|
{
|
|
|
- //移动文件
|
|
|
- if(_ELYFullFileName != ( ELYPATH + ELYFILENAME ))
|
|
|
- {
|
|
|
- File.Copy(_ELYFullFileName, ELYPATH + ELYFILENAME, true);
|
|
|
- log.Info("CmdFIBLoadELY Copy FileName:" + _ELYFullFileName + " To " + ELYPATH + ELYFILENAME, true);
|
|
|
- try
|
|
|
- {
|
|
|
- if (REMOTEELYPATH != "")
|
|
|
- {
|
|
|
- File.Copy(_ELYFullFileName, REMOTEELYPATH + ELYFILENAME, true);
|
|
|
- }
|
|
|
- }
|
|
|
- catch
|
|
|
- {
|
|
|
|
|
|
- }
|
|
|
+ if (REMOTEDesELYPATH != "")
|
|
|
+ {
|
|
|
+ File.Copy(_ELYFullFileName, REMOTEDesELYPATH + ELYFILENAME, true);
|
|
|
+ log.Info("copy " + _ELYFullFileName + " to " + REMOTEDesELYPATH + ELYFILENAME);
|
|
|
}
|
|
|
+
|
|
|
Boolean ret = ExecuteCmd(CMD_SMARTFIB_LOAD_ELY);
|
|
|
log.Info("CmdFIBLoadELY Success Execute " + _ELYFullFileName, true);
|
|
|
return ret;
|
|
@@ -2440,14 +2431,14 @@ namespace SmartSEMControl
|
|
|
#endregion
|
|
|
|
|
|
//20201102 远程服务地址
|
|
|
- public void SetRemoteELYPath(String path)
|
|
|
+ public void SetRemoteDesELYPath(String path)
|
|
|
{
|
|
|
- this.REMOTEELYPATH = path;
|
|
|
+ this.REMOTEDesELYPATH = path;
|
|
|
}
|
|
|
|
|
|
- public void SetRemoteMLFPath(String path)
|
|
|
+ public void SetRemoteDesMLFPath(String path)
|
|
|
{
|
|
|
- this.REMOTEMLFPATH = path;
|
|
|
+ this.REMOTEDesMLFPATH = path;
|
|
|
}
|
|
|
|
|
|
public void SetReduced(int x, int y, int W, int H)
|