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

Compare commits

base: jiayulong:2d53ddff19483ceaadbfa36b69cb6c8b9214d52d
Branches Tags
jiayulong:main
jiayulong:master
...
compare: jiayulong:c2af5af25086af63f6aca7cc4845932839779a98
Branches Tags
jiayulong:main
jiayulong:master

2 Commits
2d53ddff19 ... c2af5af250

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
1 changed files with 14 additions and 1 deletions
Show Stats Expand all files Collapse all files

13
logPlus/formdraw.cpp
View File

@ -13,6 +13,8 @@
#include "PropertyWidget.h" #include "PropertyWidget.h"
#include "DrawTvd.h" #include "DrawTvd.h"
#include "DepthProgress.h" #include "DepthProgress.h"
#include "CallGlobalManage.h"
#include "CylinderImagePlot.h"
//以下参数从配置文件读取 //以下参数从配置文件读取
extern int g_iOneWidth; //道宽 extern int g_iOneWidth; //道宽
@ -4290,6 +4292,7 @@ void FormDraw::s_addDrawImage(QString strUuid, QString strSlfName, QString strWe
} }
// //
QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName, "DrawImageObject"); QMyCustomPlot *curv = new QMyCustomPlot(this, strSlfName, strWellName, strTrackName, strLineName, "DrawImageObject");
//绑定m_formTrack，方便关联formInfo //绑定m_formTrack，方便关联formInfo
curv->m_formTrack = m_formTrack; curv->m_formTrack = m_formTrack;
@ -4305,8 +4308,18 @@ void FormDraw::s_addDrawImage(QString strUuid, QString strSlfName, QString strWe
QString strWaveName = ""; QString strWaveName = "";
int _nSamples = 0; int _nSamples = 0;
curv->initImage(strSlfName, strWaveName); curv->initImage(strSlfName, strWaveName);
//curv->initImage3D(strSlfName, strWaveName);
//DrawImageNew_NoFilter(curv, strSlfName, strWaveName, _nSamples); //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*))); connect(curv, SIGNAL(mouseWheel(QWheelEvent*)), this, SLOT(s_mouseWheel(QWheelEvent*)));