From 7c5e28700fe44e57546dea65c5640bf1372a25d3 Mon Sep 17 00:00:00 2001
From: zhaolei <353719554@qq.com>
Date: Wed, 13 May 2026 10:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4formdraw.cpp=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logPlus/formdraw.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp
index 8cbf922..6271bbf 100644
--- a/logPlus/formdraw.cpp
+++ b/logPlus/formdraw.cpp
@@ -13,6 +13,8 @@
 #include "PropertyWidget.h"
 #include "DrawTvd.h"
 #include "DepthProgress.h"
+#include "CallGlobalManage.h"
+#include "CylinderImagePlot.h"
 
 //以下参数从配置文件读取
 extern int g_iOneWidth;  //道宽
@@ -3592,7 +3594,7 @@ void FormDraw::s_AddLine_Property(QString strUuid, QString strSlfName, QString s
 
     AppendConsole(PAI_INFO, "FormDraw s_AddLine_Property end");
 }
-//#include "CylinderImagePlot.h"
+
 void FormDraw::s_addWave(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strWaveName)
 {
     //井名&道名不一致
@@ -4290,9 +4292,10 @@ void FormDraw::s_addDrawImage(QString strUuid, QString strSlfName, QString strWe
     }
 
     //
-    QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName);
+    QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName, "DrawImageObject");
     //绑定m_formTrack，方便关联formInfo
     curv->m_formTrack = m_formTrack;
+	curv->setScaleX(0, 264);
 	curv->setDepthY(m_iY1, m_iY2);
 	if (nW <= 0)
 		nW = g_iOneWidth;
@@ -4304,8 +4307,18 @@ void FormDraw::s_addDrawImage(QString strUuid, QString strSlfName, QString strWe
 	QString strWaveName = "";
 	int _nSamples = 0;
 	curv->initImage(strSlfName, strWaveName);
+	//curv->initImage3D(strSlfName, strWaveName);
+	
 	//DrawImageNew_NoFilter(curv, strSlfName, strWaveName, _nSamples);
 
+	//curv->m_colorMap->setVisible(false);
+	//CylindricalImageMap* cylinderMap = new CylindricalImageMap(curv->xAxis, curv->yAxis);
+	//cylinderMap->setData(curv->m_colorMap->data());
+	//cylinderMap->setCylinderRadius(2.0);
+	//cylinderMap->setSourceColorMap(curv->m_colorMap); // 共享梯度
+	//cylinderMap->setAzimuth(45);
+	//cylinderMap->setElevation(30);
+
     //
     connect(curv, SIGNAL(mouseWheel(QWheelEvent*)), this, SLOT(s_mouseWheel(QWheelEvent*)));