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

Compare commits

base: jiayulong:d835af126e4b13f43b548e473ff9f6795e454ee1
Branches Tags
jiayulong:main
jiayulong:master
...
compare: jiayulong:1acf9b3d9552bad35614af5573b5f0606d29a3c9
Branches Tags
jiayulong:main
jiayulong:master

2 Commits
d835af126e ... 1acf9b3d95

Author SHA1 Message Date
DESKTOP-450PEFP\mainc
1acf9b3d95 Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus 2026-05-20 11:09:29 +08:00
DESKTOP-450PEFP\mainc
fbc9f4a24c 模版加载TDT。 2026-05-20 11:07:46 +08:00
3 changed files with 11 additions and 5 deletions
Show Stats Expand all files Collapse all files

4
logPlus/formdraw.cpp
View File

@ -184,6 +184,10 @@ void FormDraw::setDrawData(QStringList listdt, QJsonObject objInfo)
//图像 成像 //图像 成像
curv->initImage(strSlfName, strLineName); curv->initImage(strSlfName, strLineName);
} }
else if ("tdtObject" == strType)
{
initTDT(curv);
}
else if ("waveObject" == strType) else if ("waveObject" == strType)
{ {
curv->m_nMode = pInfo->getFillTypeIndex(); curv->m_nMode = pInfo->getFillTypeIndex();

2
logPlus/forminfo.h
View File

@ -182,7 +182,7 @@ public:
bool m_bDrawBase = false; // 绘制波基线 bool m_bDrawBase = false; // 绘制波基线
bool m_bOddEven = false; // 奇偶配色 bool m_bOddEven = false; // 奇偶配色
QString m_strAmp = "ABC"; // 幅度刻度 QString m_strAmp = ""; // 幅度刻度
float m_fMaxAmp; // 最大振幅 float m_fMaxAmp; // 最大振幅
bool m_bShowScale; // 显示刻度 bool m_bShowScale; // 显示刻度

10
logPlus/logplus.vcxproj
View File

@ -258,7 +258,7 @@
<ProjectGuid>{BE733E79-9D41-44C5-A0A3-048959EE70A0}</ProjectGuid> <ProjectGuid>{BE733E79-9D41-44C5-A0A3-048959EE70A0}</ProjectGuid>
<Keyword>QtVS_v304</Keyword> <Keyword>QtVS_v304</Keyword>
<WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0.17763.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">10.0.17763.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0.22621.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">10.0.17763.0</WindowsTargetPlatformVersion>
<QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild> <QtMsBuild Condition="'$(QtMsBuild)'=='' OR !Exists('$(QtMsBuild)\qt.targets')">$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@ -304,6 +304,8 @@
<TargetName>$(ProjectName)d</TargetName> <TargetName>$(ProjectName)d</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutDir>..\BinR</OutDir>
<IntDir>..\tmp\x64\$(ProjectName)</IntDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
@ -316,11 +318,11 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>../include;../CallPlugin;./;./3rd_qcustomplot;./3rd_qcustomplot/v2_1;../Slfio/include;../CallManage;../common;../WellLogUI/include;../qtpropertybrowser;../BaseFun/include;../ConvertorManager/include;../OSGDataModel/include;../OSGFramework/include;../DataOutput/include;../DataMgr/include;../DrawBase/include;../ModuleConsole/include;../WellLogModule/include;../Workflow/include;../Workflow/WFCrystal/Crystal/include;../Workflow/WFCrystal/Plugin/include;../Workflow/WFCrystal/SysUtility/utils/include;../Workflow/WFEngine/IOService/include;../Workflow/WFEngine/Module/include;../Workflow/WFEngine/Component/WorkflowWidget/include;../Workflow/WFEngine/ObjectModel/ObjectModel/include;../Workflow/WFEngine/WorkflowEngine/include;../Workflow/WFEngine/ObjectModel/ObjectModelBase/include;../Workflow/WFWidget/include%(AdditionalIncludeDirectories);$(Qt_INCLUDEPATH_)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>./3rd_tiff/zlib/src;./3rd_tiff/libtiff/libtiff;../include;../CallPlugin;./;./3rd_qcustomplot;./3rd_qcustomplot/v2_1;../EditPlotHeader/include;../Slfio/include;../CallManage;../common;../WellLogUI/include;../qtpropertybrowser;../BaseFun/include;../ConvertorManager/include;../OSGDataModel/include;../OSGFramework/include;../DataOutput/include;../DataMgr/include;../DrawBase/include;../ModuleConsole/include;../WellLogModule/include;../Workflow/include;../Workflow/WFCrystal/Crystal/include;../Workflow/WFCrystal/Plugin/include;../Workflow/WFCrystal/SysUtility/utils/include;../Workflow/WFEngine/IOService/include;../Workflow/WFEngine/Module/include;../Workflow/WFEngine/Component/WorkflowWidget/include;../Workflow/WFEngine/ObjectModel/ObjectModel/include;../Workflow/WFEngine/WorkflowEngine/include;../Workflow/WFEngine/ObjectModel/ObjectModelBase/include;../Workflow/WFWidget/include%(AdditionalIncludeDirectories);$(Qt_INCLUDEPATH_)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>BaseFun.lib;slfio.lib;WellLogUI.lib;qtpropertybrowser.lib;ConvertorManager.lib;OSGDataModel.lib;DataOutput.lib;CallPlugin.lib;HPluginManage.lib;DataMgr.lib;DrawBase.lib;LogModuleConsole.lib;WFEngine.lib;%(AdditionalDependencies);$(Qt_LIBS_)</AdditionalDependencies> <AdditionalDependencies>BaseFun.lib;slfio.lib;WellLogUI.lib;qtpropertybrowser.lib;ConvertorManager.lib;OSGDataModel.lib;DataOutput.lib;CallPlugin.lib;HPluginManage.lib;DataMgr.lib;DrawBase.lib;LogModuleConsole.lib;WFEngine.lib;EditPlotHeader.lib;%(AdditionalDependencies);$(Qt_LIBS_)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\Bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>..\BinR;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">