jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus

Browse Source
This commit is contained in:
jiayulong 2026-06-29 09:46:45 +08:00
commit 42e6fc32d6
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
logPlus/formwave.cpp
View File

@ -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);

4
logPlus/logplus.vcxproj
View File

@ -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" />

12
logPlus/logplus.vcxproj.filters
View File

@ -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>