추가패치
This commit is contained in:
@@ -7,6 +7,7 @@ using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Windows.Forms;
|
||||
using System.Xml;
|
||||
using DDUtilityApp.DATA;
|
||||
using DDUtilityApp.LOGPARSER.DATA;
|
||||
using DDUtilityApp.SECS;
|
||||
using JWH;
|
||||
@@ -367,49 +368,42 @@ namespace DDUtilityApp.LOGPARSER.PARSER
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="args"></param>
|
||||
/// <returns></returns>
|
||||
public override string[] FileSelector(FrmLogParser sender, params string[] args)
|
||||
public override LogFile[] FileSelector(FrmLogParser sender, params LogFile[] args)
|
||||
{
|
||||
FrmEqSelector dlg = null;
|
||||
try
|
||||
{
|
||||
List<LogFile> lstLogFile = new List<LogFile>();
|
||||
foreach (string filename in args)
|
||||
{
|
||||
LogFile logFile = new LogFile(filename);
|
||||
lstLogFile.Add(logFile);
|
||||
}
|
||||
List<LogFile> logFiles = new List<LogFile>();
|
||||
logFiles.AddRange(args);
|
||||
|
||||
FrmEqSelector dlg = new FrmEqSelector();
|
||||
dlg = new FrmEqSelector();
|
||||
dlg.Owner = sender;
|
||||
dlg.Size = sender.Size;
|
||||
dlg.StartPosition = FormStartPosition.CenterParent;
|
||||
dlg.Equipment = sender.Equipment;
|
||||
dlg.ServerName = this.ServerName;
|
||||
dlg.EquipmentID = this.EquipmentID;
|
||||
dlg.SelectedLogFiles = lstLogFile.ToArray();
|
||||
dlg.Equipment = sender.Equipment;
|
||||
dlg.SelectedLogFiles = logFiles.ToArray();
|
||||
DialogResult dlgResult = dlg.ShowDialog();
|
||||
if (dlgResult != DialogResult.OK)
|
||||
{
|
||||
dlg.Dispose();
|
||||
return null;
|
||||
}
|
||||
if (dlgResult != DialogResult.OK) return null;
|
||||
|
||||
this.Account = dlg.Account;
|
||||
EisEquipment equipment = dlg.Equipment as EisEquipment;
|
||||
if (equipment == null) return null;
|
||||
|
||||
sender.Equipment = equipment;
|
||||
sender.SECSDefine = dlg.SECSDefine;
|
||||
List<string> lstFilename = new List<string>();
|
||||
foreach (LogFile logFile in dlg.SelectedLogFiles)
|
||||
lstFilename.Add(logFile.FullName);
|
||||
dlg.Dispose();
|
||||
|
||||
return lstFilename.ToArray();
|
||||
return dlg.SelectedLogFiles;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
XLogger.Instance.Fatal(ex, true);
|
||||
return null;
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (dlg != null) dlg.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
Reference in New Issue
Block a user