提交formdraw.cpp覆盖内容
This commit is contained in:
parent
86d142d093
commit
7c5e28700f
|
|
@ -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; //道宽
|
||||||
|
|
@ -3592,7 +3594,7 @@ void FormDraw::s_AddLine_Property(QString strUuid, QString strSlfName, QString s
|
||||||
|
|
||||||
AppendConsole(PAI_INFO, "FormDraw s_AddLine_Property end");
|
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)
|
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
|
//绑定m_formTrack,方便关联formInfo
|
||||||
curv->m_formTrack = m_formTrack;
|
curv->m_formTrack = m_formTrack;
|
||||||
|
curv->setScaleX(0, 264);
|
||||||
curv->setDepthY(m_iY1, m_iY2);
|
curv->setDepthY(m_iY1, m_iY2);
|
||||||
if (nW <= 0)
|
if (nW <= 0)
|
||||||
nW = g_iOneWidth;
|
nW = g_iOneWidth;
|
||||||
|
|
@ -4304,8 +4307,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*)));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user