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

# Conflicts:
#	logPlus/formdraw.cpp

logPlus/formdraw.cpp

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