From 8b29dc7a9fb2a950bae037eaacce1b14d16505b5 Mon Sep 17 00:00:00 2001 From: sj84 Date: Thu, 31 Aug 2023 14:23:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=B0=B1=EC=97=85?= =?UTF-8?q?=20Header=20=EC=B6=94=EA=B0=80=20:=20=EC=9E=A5=EB=B9=84?= =?UTF-8?q?=ED=83=80=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/DataStore.cs | 23 ++++++++--------------- INT69DC_7C/Forms/FormDataBackup_Part11.cs | 7 +++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/INT69DC_7C/DataStore.cs b/INT69DC_7C/DataStore.cs index 5da8b9f..a38a64f 100644 --- a/INT69DC_7C/DataStore.cs +++ b/INT69DC_7C/DataStore.cs @@ -415,6 +415,7 @@ namespace INT69DC_7C SerialNumber, EquipmentColumns, TimeStamp, + EquipmentType, } public enum MessageBoxIcon @@ -4359,7 +4360,8 @@ namespace INT69DC_7C { #region Field private int m_EquipmentColumns; - + private int m_EquipmentType; + private string m_LoginId; private string m_SerialNumber; @@ -4378,6 +4380,11 @@ namespace INT69DC_7C get { return this.m_EquipmentColumns; } set { this.m_EquipmentColumns = value; } } + public int EquipmentType + { + get { return this.m_EquipmentType; } + set { this.m_EquipmentType = value; } + } public string LoginId { @@ -4401,20 +4408,6 @@ namespace INT69DC_7C #endregion } #endregion - #region Struct FileHeaderItem - [StructLayout(LayoutKind.Sequential)] - public struct StructFileHeaderItem - { - public int EquipmentColumns; - - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 20)] - public string LoginId; - [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 20)] - public string SerialNumber; - - public DateTime TimeStamp; - } - #endregion #region CalibrationStatus public class CalibrationStatus diff --git a/INT69DC_7C/Forms/FormDataBackup_Part11.cs b/INT69DC_7C/Forms/FormDataBackup_Part11.cs index f0b2c7c..25fc14c 100644 --- a/INT69DC_7C/Forms/FormDataBackup_Part11.cs +++ b/INT69DC_7C/Forms/FormDataBackup_Part11.cs @@ -176,6 +176,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); @@ -746,6 +747,12 @@ namespace INT69DC_7C.Forms value = header.TimeStamp.ToString("MM/dd/yyyy HH:mm:ss"); IniFile.WriteString(filePath, section, key, value); Thread.Sleep(5); + + // EquipmentType + key = DataStore.E_FileHeaderItem.EquipmentType.ToString(); + value = header.EquipmentType.ToString(); + IniFile.WriteString(filePath, section, key, value); + Thread.Sleep(5); } private void DirectoryFileDelete(string dirPath) {