From fbc9f4a24c8e8172a26c6299760b07c72e2ea0e2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-450PEFP\\mainc" <mainchar@163.com>
Date: Wed, 20 May 2026 11:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=89=88=E5=8A=A0=E8=BD=BDTDT?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logPlus/formdraw.cpp    |  4 ++++
 logPlus/forminfo.h      |  2 +-
 logPlus/logplus.vcxproj | 10 ++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp
index 2d5f9e6..0d5e43d 100644
--- a/logPlus/formdraw.cpp
+++ b/logPlus/formdraw.cpp
@@ -184,6 +184,10 @@ void FormDraw::setDrawData(QStringList listdt, QJsonObject objInfo)
 			//图像 成像
 			curv->initImage(strSlfName, strLineName);
 		}
+		else if ("tdtObject" == strType)
+		{
+			initTDT(curv);
+		}
 		else if ("waveObject" == strType)
 		{
 			curv->m_nMode = pInfo->getFillTypeIndex();
diff --git a/logPlus/forminfo.h b/logPlus/forminfo.h
index 9cc0f60..414a99d 100644
--- a/logPlus/forminfo.h
+++ b/logPlus/forminfo.h
@@ -182,7 +182,7 @@ public:
 	bool m_bDrawBase = false;		// 绘制波基线
 	bool m_bOddEven = false;		// 奇偶配色
 
-	QString m_strAmp = "ABC";		// 幅度刻度
+    QString m_strAmp = "";		// 幅度刻度
 	float	m_fMaxAmp;		// 最大振幅
 	bool	m_bShowScale;	// 显示刻度
 
diff --git a/logPlus/logplus.vcxproj b/logPlus/logplus.vcxproj
index e99cb7a..85b8e55 100644
--- a/logPlus/logplus.vcxproj
+++ b/logPlus/logplus.vcxproj
@@ -258,7 +258,7 @@
     <ProjectGuid>{BE733E79-9D41-44C5-A0A3-048959EE70A0}</ProjectGuid>
     <Keyword>QtVS_v304</Keyword>
     <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>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -304,6 +304,8 @@
     <TargetName>$(ProjectName)d</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutDir>..\BinR</OutDir>
+    <IntDir>..\tmp\x64\$(ProjectName)</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -316,11 +318,11 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <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>
     <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>
-      <AdditionalLibraryDirectories>..\Bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <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>..\BinR;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" Label="Configuration">