Compare commits

...

2 Commits

Author SHA1 Message Date
zhaolei
c2af5af250 Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus
# Conflicts:
#	logPlus/formdraw.cpp
2026-05-13 11:25:29 +08:00
zhaolei
7c5e28700f 提交formdraw.cpp覆盖内容 2026-05-13 10:59:37 +08:00

View File

@ -13,6 +13,8 @@
#include "PropertyWidget.h"
#include "DrawTvd.h"
#include "DepthProgress.h"
#include "CallGlobalManage.h"
#include "CylinderImagePlot.h"
//以下参数从配置文件读取
extern int g_iOneWidth; //道宽
@ -4290,10 +4292,11 @@ void FormDraw::s_addDrawImage(QString strUuid, QString strSlfName, QString strWe
}
//
QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName, "DrawImageObject");
//绑定m_formTrack方便关联formInfo
curv->m_formTrack = m_formTrack;
curv->setScaleX(0, 264);
curv->setScaleX(0, 264);
curv->setDepthY(m_iY1, m_iY2);
if (nW <= 0)
nW = g_iOneWidth;
@ -4305,8 +4308,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*)));