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

Compare commits

base: jiayulong:2d7f3dcf7514a7fdd50264559b77f61f5f963d24
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:6e1cd420e3504fe46e09853bb318889bde32594f
Branches Tags
jiayulong:main
jiayulong:master

No commits in common. "2d7f3dcf7514a7fdd50264559b77f61f5f963d24" and "6e1cd420e3504fe46e09853bb318889bde32594f" have entirely different histories.
2d7f3dcf75 ... 6e1cd420e3

4 changed files with 1 additions and 4 deletions
Show Stats Expand all files Collapse all files

1
logPlus/PropertyWidget.cpp
View File

@ -6,7 +6,6 @@
#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,7 +13,6 @@
#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,7 +10,6 @@
#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,6 +8,7 @@
#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")
@ -16,7 +17,6 @@ namespace Ui {
class FormInfo; class FormInfo;
} }
class CDrawTvd;
class FormInfo : public QWidget class FormInfo : public QWidget
{ {
Q_OBJECT Q_OBJECT