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 @@
{BE733E79-9D41-44C5-A0A3-048959EE70A0}
QtVS_v304
10.0.17763.0
- 10.0.22621.0
+ 10.0.17763.0
$(MSBuildProjectDirectory)\QtMsBuild
@@ -304,6 +304,8 @@
$(ProjectName)d
+ ..\BinR
+ ..\tmp\x64\$(ProjectName)
@@ -316,11 +318,11 @@
- ../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_)
+ ./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_)
- 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_)
- ..\Bin;%(AdditionalLibraryDirectories)
+ 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_)
+ ..\BinR;%(AdditionalLibraryDirectories)