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
This commit is contained in:
crqiqi77 2026-03-26 17:38:37 +08:00
commit d09d1006ca
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
logPlus/PropertyWidget.cpp
View File

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

1
logPlus/formdraw.cpp
View File

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

1
logPlus/forminfo.cpp
View File

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

2
logPlus/forminfo.h
View File

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