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

logPlus/PropertyWidget.cpp

@@ -6,6 +6,7 @@
 #include <QLabel>
 #include "CallManage.h"
 #include "geometryutils.h"
+#include "DrawTvd.h"
 
 extern double g_dPixelPerCm;//每厘米像素数
 //extern int m_iY1;

logPlus/formdraw.cpp

@@ -13,6 +13,7 @@
 #include "DrawNrad.h"
 #include "formline.h"
 #include "PropertyWidget.h"
+#include "DrawTvd.h"
 
 //以下参数从配置文件读取
 extern int g_iIndex;

logPlus/forminfo.cpp

@@ -10,6 +10,7 @@
 #include <QPainterPath>
 #include "geometryutils.h"
 #include "qtColorSchemeComboBox.h"
+#include "DrawTvd.h"
 
 //曲线名称（单个）
 FormInfo::FormInfo(QWidget *parent, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QColor lineColor) :

logPlus/forminfo.h

@@ -8,7 +8,6 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
-#include "DrawTvd.h"
 #include "qcustomplot.h"
 
 #pragma execution_character_set("utf-8")
@@ -17,6 +16,7 @@ namespace Ui {
 class FormInfo;
 }
 
+class CDrawTvd;
 class FormInfo : public QWidget
 {
     Q_OBJECT