From 3c97a368cb2bcadbb5e4f56aeba96dae9b068511 Mon Sep 17 00:00:00 2001
From: zhaolei <353719554@qq.com>
Date: Sat, 29 Nov 2025 18:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=A1=A8=E6=A0=BC=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E5=9E=8B=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataMgr/src/CreateNewTableDlg.cpp | 16 ++++++++++++++++
 DataMgr/src/CreateNewTableDlg.h   |  1 +
 DataMgr/src/DataHelper.cpp        |  7 ++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/DataMgr/src/CreateNewTableDlg.cpp b/DataMgr/src/CreateNewTableDlg.cpp
index 2c66ca8..b2bcabe 100644
--- a/DataMgr/src/CreateNewTableDlg.cpp
+++ b/DataMgr/src/CreateNewTableDlg.cpp
@@ -85,6 +85,7 @@ void CCreateNewTableDlg::slotGetCell(int row,int column)
 }
 void CCreateNewTableDlg::slotChangeTableType(int No)
 {
+    m_No = No;
 	m_pUI.lineEdit_Name->setText(DefauleTable[No].TableName);
 	m_pUI.lineEdit_Name_2->setText(DefauleTable[No].TableAliasName);
 	int fNum=DefauleTable[No].ZdNum;
@@ -162,7 +163,22 @@ void CCreateNewTableDlg::slotSave()
 			logio.Close();
 			return;
 		}
+
+        QString strDigit = DefauleTable[m_No].tinfo[i].Reserved;//pField[i].Reserved;
+        bool bDigit = true;
+        for (int n =0;n<strDigit.size();n++)
+        {
+            if (!strDigit[n].isDigit()) // to check if it is number!!
+            {
+                bDigit = false;
+                break;
+            }
+        }
+        //FieldInfo[i].Reserved=*(DWORD *)&pf[i].Reserved;
+        if (bDigit)
+            *(DWORD *)&pField[i].Reserved = strDigit.toInt();
 	}
+
     int table=logio.CreateTable(0,TableName.toLocal8Bit().toStdString().c_str(),TableHzName.toLocal8Bit().toStdString().c_str(),fNum,&pField[0],0);
 	delete []pField;
 	logio.CloseTable(table);
diff --git a/DataMgr/src/CreateNewTableDlg.h b/DataMgr/src/CreateNewTableDlg.h
index 5026642..724e657 100644
--- a/DataMgr/src/CreateNewTableDlg.h
+++ b/DataMgr/src/CreateNewTableDlg.h
@@ -15,6 +15,7 @@ public:
 	QString FileName;//slf文件名
 	QString TableName;//表名
 private:
+    int m_No;
 	Ui::CCreateNewTableDlg m_pUI;
 	//动态表格行数
 	int m_rowCount;
diff --git a/DataMgr/src/DataHelper.cpp b/DataMgr/src/DataHelper.cpp
index 2095596..f65643a 100644
--- a/DataMgr/src/DataHelper.cpp
+++ b/DataMgr/src/DataHelper.cpp
@@ -192,7 +192,6 @@ void DataHelper::InitDefauleTable()
 //	line = line.toUpper();
 	while(!textstream.atEnd())
 	{
-		line=textstream.readLine(5000);
 		while(line.indexOf("#")>=0)
 		{
 			line=line.replace("#","");
@@ -238,7 +237,7 @@ void DataHelper::InitDefauleTable()
 				else
 					ZdRes.append(DataList.at(3).toUpper());
 			}
-			DefauleTable[DefTabNum++]=SetTableInf(TableName,TableAliasName,ZdName.count(),ZdName,HzName,ZdUnit,ZdType,ZdLen,ZdRes);
+            DefauleTable[DefTabNum++]=SetTableInf(TableName,TableAliasName,ZdName.count(),ZdName,HzName,ZdUnit,ZdType,ZdLen,ZdRes);
 			ZdName.clear();
 			ZdLen.clear();
 			ZdType.clear();
@@ -246,8 +245,10 @@ void DataHelper::InitDefauleTable()
 			HzName.clear();
 			ZdUnit.clear();
 			ZdRes.clear();
-			break;
+            // break;
 		}
+
+        line=textstream.readLine(5000);
 	}
 	InFile.close();
 }