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

解决冲突

Browse Source
This commit is contained in:
wangxiaolei 2026-03-13 17:55:52 +08:00
parent e6bef9af94
commit 912bcdc996
1 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
logPlus/qmycustomplot.h
View File

@ -235,40 +235,6 @@ public:
public slots: public slots:
void slot_time(); void slot_time();
public:
void init(QString strName, QVector<double> x, QVector<double> y);
//岩心照片
void addImageToPlot(double left_Low, double right_Hight, const QString imagePath);
//曲线
void addRandomGraph(QVector<double> x, QVector<double> y, QString strSlfName, QString strLineName, QString strAliasName, QString strUnit,
double newLeftScale, double newRightScale, QString strScaleType, QColor &newlineColor, double width, Qt::PenStyle lineStyle);
//文字结论
void addTextToPlot(double left_Low, double right_Hight, const QString strText, QColor crColor=QColor(255, 255, 255, 80));
//地质分层
void addLayerToPlot(double left_Low, double right_Hight, const QString strText, QColor crColor=QColor(255, 255, 255, 80));
//解释结论
TransparentGroupResult* addResultGroup(double left_Low, double right_Hight, QString &strUuid, QString strText = "");
void addResultToPlot(double left_Low, double right_Hight, QString myResult, QString &strUuid, QString strText="");
//录井剖面
void addGeoLithToPlot(double left_Low, double right_Hight, const QString myLith, const QString myOil, const QString myColor, bool bRefresh=true);
//井壁取心
void addSwallCoreToPlot(double Depth, QString LithologyImage, QString OilGasImage, QString ColorImage, double Sideleft, double width, int iColor);
//固井结论
void addGujingToPlot(double left_Low, double right_Hight, const QString strResult);
//气测/FMT/射孔/文本
public slots:
void slot_time();
public: public:
void init(QString strName, QVector<double> x, QVector<double> y); void init(QString strName, QVector<double> x, QVector<double> y);