diff --git a/INT69DC_7C/DataStore.cs b/INT69DC_7C/DataStore.cs
index e0c6fa0..db82067 100644
--- a/INT69DC_7C/DataStore.cs
+++ b/INT69DC_7C/DataStore.cs
@@ -4035,7 +4035,7 @@ namespace INT69DC_7C
ret = 0.0;
else
{
- sValue = string.Format("{0:0.0}", ((double)this.TotalExNgCount / (double)this.TotalCount) * 100);
+ sValue = string.Format("{0:0.00}", ((double)this.TotalExNgCount / (double)this.TotalCount) * 100.0);
ret = double.Parse(sValue);
}
diff --git a/INT69DC_7C/DialogForms/DialogFormMessage.cs b/INT69DC_7C/DialogForms/DialogFormMessage.cs
index 3b66afc..432366f 100644
--- a/INT69DC_7C/DialogForms/DialogFormMessage.cs
+++ b/INT69DC_7C/DialogForms/DialogFormMessage.cs
@@ -27,44 +27,36 @@ namespace INT69DC_7C.DialogForms
///
///
///
- public DialogFormMessage(string str, DataStore.LanguageID language)
+ public DialogFormMessage(string str, DataStore.LanguageID language, string code)
{
InitializeComponent();
- this.labelErrorCode.Text = "";
+ this.labelErrorCode.Text = code;
this.labelMessage1.Text = "";
this.labelMessage2.Text = "";
switch (language)
{
case DataStore.LanguageID.Korean:
- this.labelErrorCode.Text = "Notice";
this.labelMessage1.Text = str + "개의 파일이 백업되었습니다.";
break;
case DataStore.LanguageID.English:
- this.labelErrorCode.Text = "Notice";
this.labelMessage1.Text = str + " files are backed up";
break;
case DataStore.LanguageID.Chinese:
this.buttonOK.Text = "好";
-
- this.labelErrorCode.Text = "通知";
this.labelMessage1.Text = str + " 个文件已备份";
break;
case DataStore.LanguageID.Czech:
- this.labelErrorCode.Text = "Upozornění";
this.labelMessage1.Text = "Těchto " + str + " soubory byly zálohovány.";
break;
case DataStore.LanguageID.German:
this.buttonOK.Text = "Bestätigen";
-
- this.labelErrorCode.Text = "Meldung";
this.labelMessage1.Text = str + " Dateien wurden gesichert";
break;
case DataStore.LanguageID.Russian:
break;
default:
- this.labelErrorCode.Text = "Notice";
this.labelMessage1.Text = str + "개의 파일이 백업되었습니다.";
break;
}
diff --git a/INT69DC_7C/Forms/FormDataBackup.cs b/INT69DC_7C/Forms/FormDataBackup.cs
index 03d4171..ecbc858 100644
--- a/INT69DC_7C/Forms/FormDataBackup.cs
+++ b/INT69DC_7C/Forms/FormDataBackup.cs
@@ -304,7 +304,7 @@ namespace INT69DC_7C.Forms
file.Delete();
}
this.labelFileCount.Text = this.listBoxDataList.Items.Count.ToString();
- DialogFormMessage msg = new DialogFormMessage(count.ToString(), this.ParentForm.SystemConfig.Language);
+ DialogFormMessage msg = new DialogFormMessage(count.ToString(), this.ParentForm.SystemConfig.Language, "Data backup");
splash.Finish();
msg.ShowDialog();
}
diff --git a/INT69DC_7C/Forms/FormDataBackup_Part11.cs b/INT69DC_7C/Forms/FormDataBackup_Part11.cs
index 107cf68..ba27047 100644
--- a/INT69DC_7C/Forms/FormDataBackup_Part11.cs
+++ b/INT69DC_7C/Forms/FormDataBackup_Part11.cs
@@ -23,6 +23,7 @@ namespace INT69DC_7C.Forms
private SmartSplash Splash;
private string EncFileName;
private DataStore.E_DataType SelecteDataType;
+ private int CopyFileCount;
private List ListInspectionFile;
private List ListHistoryFile;
@@ -100,6 +101,7 @@ namespace INT69DC_7C.Forms
{
this.EncFileName = "";
this.SelecteDataType = DataStore.E_DataType.None;
+ this.CopyFileCount = 0;
this.ListInspectionFile = new List();
this.ListHistoryFile = new List();
@@ -131,9 +133,22 @@ namespace INT69DC_7C.Forms
if (dataFolderPath == "")
return;
-
+
targetPath = "하드 디스크\\";
+
+ #region 백업 할 파일 리스트
listSelectedFile = this.GetSeletedNodeList(view);
+ this.CopyFileCount = listSelectedFile.Count;
+ #endregion
+
+ #region 백업할 파일 유무 체크
+ if (listSelectedFile.Count == 0)
+ {
+ DialogFormMessage msg = new DialogFormMessage(4, this.ParentForm.SystemConfig.Language);
+ msg.ShowDialog();
+ return;
+ }
+ #endregion
#region USB 장착 유무 체크
dir = new DirectoryInfo(targetPath);
@@ -145,20 +160,11 @@ namespace INT69DC_7C.Forms
return;
}
#endregion
- #region 백업할 파일 유무 체크
- if (listSelectedFile.Count == 0)
- {
- DialogFormMessage msg = new DialogFormMessage(4, this.ParentForm.SystemConfig.Language);
- msg.ShowDialog();
- return;
- }
- #endregion
// Splash Start
this.SplashStart();
#region Header && Encryption 폴더에 파일 삭제
- // Header && Encryption 폴더에 파일 삭제
this.DirectoryFileDelete(this.ParentForm.PathEncryptionFolder);
this.DirectoryFileDelete(this.ParentForm.PathHeaderFolder);
#endregion
@@ -275,7 +281,7 @@ namespace INT69DC_7C.Forms
}
// 복사 완료 메시지
- DialogFormMessage msg = new DialogFormMessage((count / 2).ToString(), this.ParentForm.SystemConfig.Language);
+ DialogFormMessage msg = new DialogFormMessage(this.CopyFileCount.ToString(), this.ParentForm.SystemConfig.Language, type.ToString());
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.DataBackup, type.ToString());
this.SplashFinish();
msg.ShowDialog();
@@ -305,19 +311,14 @@ namespace INT69DC_7C.Forms
return;
targetPath = "하드 디스크\\";
+
+ #region 백업할 파일 유무 체크
if (this.listBoxOther.Items.Count == 0)
{
DialogFormMessage msg = new DialogFormMessage(4, this.ParentForm.SystemConfig.Language);
msg.ShowDialog();
return;
}
-
- this.SplashStart();
-
- #region Header && Encryption 폴더에 파일 삭제
- // Header && Encryption 폴더에 파일 삭제
- this.DirectoryFileDelete(this.ParentForm.PathEncryptionFolder);
- this.DirectoryFileDelete(this.ParentForm.PathHeaderFolder);
#endregion
#region USB 장착 유무 체크
@@ -327,16 +328,23 @@ namespace INT69DC_7C.Forms
{
// USB메모리가 장착되지 않았습니다
DialogFormMessage msg = new DialogFormMessage(5, this.ParentForm.SystemConfig.Language);
- this.SplashFinish();
msg.ShowDialog();
return;
}
#endregion
+ this.SplashStart();
+
+ #region Header && Encryption 폴더에 파일 삭제
+ this.DirectoryFileDelete(this.ParentForm.PathEncryptionFolder);
+ this.DirectoryFileDelete(this.ParentForm.PathHeaderFolder);
+ #endregion
+
try
{
dir = new DirectoryInfo(this.ParentForm.PathDataBackupFolder);
files = dir.GetFiles();
+ this.CopyFileCount = files.Length;
List listSelectedFile = new List();
// jpg 파일 -> EncryptionFolder로 복사
@@ -358,6 +366,7 @@ namespace INT69DC_7C.Forms
header.LoginId = this.ParentForm.SystemConfig.CurrentUser.ID;
header.SerialNumber = this.ParentForm.SystemConfig.SerialNumber;
header.EquipmentColumns = this.ParentForm.SystemConfig.EquipmentColumns;
+ header.EquipmentType = 103;
for (int i = 0; i < listSelectedFile.Count; i++)
this.CreateHeaderFile(this.ParentForm.PathHeaderFolder, listSelectedFile[i], header);
@@ -862,23 +871,23 @@ namespace INT69DC_7C.Forms
private void treeViewInspection_AfterSelect(object sender, TreeViewEventArgs e)
{
- if (e.Node.Text.Substring(0, 1) == "I")
- {
- if (e.Node.Checked == true)
- e.Node.Checked = false;
- else
- e.Node.Checked = true;
- }
+ //if (e.Node.Text.Substring(0, 1) == "I")
+ //{
+ // if (e.Node.Checked == true)
+ // e.Node.Checked = false;
+ // else
+ // e.Node.Checked = true;
+ //}
}
private void treeViewHistory_AfterSelect(object sender, TreeViewEventArgs e)
{
- if (e.Node.Text.Substring(0, 1) == "H")
- {
- if (e.Node.Checked == true)
- e.Node.Checked = false;
- else
- e.Node.Checked = true;
- }
+ //if (e.Node.Text.Substring(0, 1) == "H")
+ //{
+ // if (e.Node.Checked == true)
+ // e.Node.Checked = false;
+ // else
+ // e.Node.Checked = true;
+ //}
}
private void buttonInspectionBackupEncryption_Click(object sender, EventArgs e)
diff --git a/INT69DC_7C/Forms/FormDataStatistics.cs b/INT69DC_7C/Forms/FormDataStatistics.cs
index d8c8fc7..b004a3b 100644
--- a/INT69DC_7C/Forms/FormDataStatistics.cs
+++ b/INT69DC_7C/Forms/FormDataStatistics.cs
@@ -1099,7 +1099,7 @@ namespace INT69DC_7C.Forms
this.FileCopy(file, filePath + file.Name);
file.Delete();
}
- DialogFormMessage msg = new DialogFormMessage("2", this.ParentForm.SystemConfig.Language);
+ DialogFormMessage msg = new DialogFormMessage("2", this.ParentForm.SystemConfig.Language, "Statistics");
msg.ShowDialog();
}
catch
diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs
index 8bebc11..05a750b 100644
--- a/INT69DC_7C/Forms/FormInformation.cs
+++ b/INT69DC_7C/Forms/FormInformation.cs
@@ -140,7 +140,7 @@ namespace INT69DC_7C.Forms
}
private void DefaultSetting()
{
- this.labelDisplayVer.Text = "11.0.2";
+ this.labelDisplayVer.Text = "11.0.3";
this.labelUserMgerVer.Text = "";
this.labelAes128Ver.Text = "";
this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;
diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt
index 54bdbc7..c3deafe 100644
--- a/INT69DC_7C/Version.txt
+++ b/INT69DC_7C/Version.txt
@@ -15,6 +15,20 @@
Ƽ 8,10,12 /ƽ 跮
*/
+@ Ver 11.0.3 by LSJ
+ - 2024.03.08
+ - Ver 11.0.2 Modify
+ - Framework : SmartX Framework V3.1.1(update: 2019.03.21)
+ - Part11
+ Ÿ Ǿ ߰ : OtherBackup();
+ Inspection, History Ʈ ý ٸ Ǵ
+ USB ڽ caption ǥ ǵ
+ -
+ Percentage
+ TotalExNgPercentage Ҽ 0.0 -> 0.00
+ -> ,, 0.00ǥ Ҽ
+ ۼƮ ȭ ǥ Ҷ 0̸ 0.00 ǥ ǵ
+
@ Ver 11.0.2 by LSJ
- 2024.01.04
- Ver 11.0.1 Modify