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

Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus

Browse Source 
# Conflicts:
#	logPlus/formdraw.cpp
This commit is contained in:
zhaolei 2026-05-13 11:25:29 +08:00
commit c2af5af250
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
logPlus/formdraw.cpp
View File

@ -3594,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)
{ {
//井名&道名不一致 //井名&道名不一致
@ -4292,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;