From 55326eb33d77c330763999023e5fe8d6da8a4922 Mon Sep 17 00:00:00 2001
From: "DESKTOP-450PEFP\\mainc" <mainchar@163.com>
Date: Mon, 29 Jun 2026 09:26:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A2=E5=88=97=E4=BF=AE=E6=94=B9bug?=
 =?UTF-8?q?=EF=BC=8C=E6=8B=96=E5=8A=A8=E6=96=B0=E6=B3=A2=E5=88=97=E7=BB=98?=
 =?UTF-8?q?=E5=9B=BE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logPlus/formwave.cpp            |  2 +-
 logPlus/logplus.vcxproj         |  4 ++++
 logPlus/logplus.vcxproj.filters | 12 ++++++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/logPlus/formwave.cpp b/logPlus/formwave.cpp
index 6018223..1a19f80 100644
--- a/logPlus/formwave.cpp
+++ b/logPlus/formwave.cpp
@@ -70,7 +70,7 @@ void FormWave::initGeometry(QString strUuid, int nscale, double fW, int nH)
 	m_iScale = nscale;
 
 	int ntmpw = fW * g_dPixelPerCm;
-	this->setGeometry(0, 0, ntmpw - 2, (int)nH);
+	this->setGeometry(0, 0, ntmpw - 2, (int)nH*m_nbb);
 
 	//修改滚动条，针对新建的
 	emit CallManage::getInstance()->sig_changeScrollBar(m_strUuid);
diff --git a/logPlus/logplus.vcxproj b/logPlus/logplus.vcxproj
index 7f98d56..17d73c4 100644
--- a/logPlus/logplus.vcxproj
+++ b/logPlus/logplus.vcxproj
@@ -21,6 +21,8 @@
     <QtMoc Include="linestyleview.h" />
     <QtMoc Include="CellBorderDlg.h" />
     <QtMoc Include="BorderPreView.h" />
+    <QtMoc Include="CreateResoultStructDlg.h" />
+    <ClInclude Include="LIST_TABLE_INF.h" />
     <ClInclude Include="LogmuditemDrawer.h" />
     <QtMoc Include="LogmudResultItem.h" />
     <QtMoc Include="selectlinedialog.h" />
@@ -166,6 +168,7 @@
     <ClCompile Include="CellBorderDlg.cpp" />
     <ClCompile Include="chooseShiftCurvesDlg.cpp" />
     <ClCompile Include="ConsoleOutputWidget.cpp" />
+    <ClCompile Include="CreateResoultStructDlg.cpp" />
     <ClCompile Include="CurveLine.cpp" />
     <ClCompile Include="customtabbar.cpp" />
     <ClCompile Include="customtabwidget.cpp" />
@@ -248,6 +251,7 @@
   <ItemGroup>
     <QtUic Include="CellBorderDalog.ui" />
     <QtUic Include="chooseShiftCurves.ui" />
+    <QtUic Include="CreateResoultStruct.ui" />
     <QtUic Include="formdraw.ui" />
     <QtUic Include="formhead.ui" />
     <QtUic Include="formimage.ui" />
diff --git a/logPlus/logplus.vcxproj.filters b/logPlus/logplus.vcxproj.filters
index 305cb26..123dfc3 100644
--- a/logPlus/logplus.vcxproj.filters
+++ b/logPlus/logplus.vcxproj.filters
@@ -119,6 +119,9 @@
     <ClInclude Include="LogmuditemDrawer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="LIST_TABLE_INF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="ConsoleOutputWidget.h">
@@ -349,6 +352,9 @@
     <QtMoc Include="BorderPreView.h">
       <Filter>Header Files</Filter>
     </QtMoc>
+    <QtMoc Include="CreateResoultStructDlg.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="backgrounddelegate.cpp">
@@ -729,6 +735,9 @@
     <ClCompile Include="BorderPreView.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="CreateResoultStructDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtRcc Include="logplus.qrc">
@@ -820,5 +829,8 @@
     <QtUic Include="CellBorderDalog.ui">
       <Filter>Form Files</Filter>
     </QtUic>
+    <QtUic Include="CreateResoultStruct.ui">
+      <Filter>Form Files</Filter>
+    </QtUic>
   </ItemGroup>
 </Project>
\ No newline at end of file