From f55658f774cfbac7935550eb3aeb277dce5e8c4e Mon Sep 17 00:00:00 2001 From: jinyuan Date: Fri, 15 May 2026 10:00:54 +0800 Subject: [PATCH] =?UTF-8?q?logPlus=20=E9=80=82=E9=85=8Dlinux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/3rd_qcustomplot/3rd_qcustomplot.pri | 7 +++- logPlus/DepPairs.cpp | 2 +- logPlus/DepPairs.h | 2 +- logPlus/DrawNrad.cpp | 2 +- logPlus/DrawTvd.cpp | 38 ++++++++------------- logPlus/GeoIndicatorGenerator.cpp | 2 +- logPlus/LogmudItemDrawer.cpp | 2 +- logPlus/LogmudResultItem.cpp | 2 +- logPlus/formdraw.cpp | 2 +- logPlus/formdraw.h | 2 +- logPlus/formlogmud.cpp | 6 ++-- logPlus/formlogmud.h | 8 ++--- logPlus/formtracktop.cpp | 4 +-- logPlus/logPlus.pro | 26 +++++++++----- logPlus/mainwindow.cpp | 4 +-- logPlus/mainwindowcurve.cpp | 13 +++++-- logPlus/qmycustomplot.cpp | 2 +- logPlus/qmytreewidget.cpp | 2 +- logPlus/qtprojectwidgets.cpp | 5 +++ logPlus/selectlinedialog.cpp | 2 +- 20 files changed, 73 insertions(+), 60 deletions(-) diff --git a/logPlus/3rd_qcustomplot/3rd_qcustomplot.pri b/logPlus/3rd_qcustomplot/3rd_qcustomplot.pri index 38e13e2..6284eea 100644 --- a/logPlus/3rd_qcustomplot/3rd_qcustomplot.pri +++ b/logPlus/3rd_qcustomplot/3rd_qcustomplot.pri @@ -4,7 +4,12 @@ greaterThan(QT_MAJOR_VERSION, 4): CONFIG += c++11 #下面用于开启opengl DEFINES += QCUSTOMPLOT_USE_OPENGL -LIBS += -lopengl32 -lglu32 +win32 { + LIBS += -lopengl32 -lglu32 +} +unix:!macx { + LIBS += -lGL +} #将当前目录加入到头文件路径 INCLUDEPATH += $$PWD diff --git a/logPlus/DepPairs.cpp b/logPlus/DepPairs.cpp index ef07a36..9e598d3 100644 --- a/logPlus/DepPairs.cpp +++ b/logPlus/DepPairs.cpp @@ -17,7 +17,7 @@ #include "geometryutils.h" #include #include "qapplication.h" -#include +#include int GetDepPairs(float* curve1,float stdep1,float endep1,float rlev1, float* curve2,float stdep2,float endep2,float rlev2,float cmins, diff --git a/logPlus/DepPairs.h b/logPlus/DepPairs.h index c1d9214..6c45971 100644 --- a/logPlus/DepPairs.h +++ b/logPlus/DepPairs.h @@ -70,7 +70,7 @@ class DepPairs { protected: public: - DepPairs::DepPairs(float* curve1,float stdep1,float endep1,float rlev1, + DepPairs(float* curve1,float stdep1,float endep1,float rlev1, float* curve2,float stdep2,float endep2,float rlev2,float cmins, float winLength,float stepLength, float searchLength ); diff --git a/logPlus/DrawNrad.cpp b/logPlus/DrawNrad.cpp index fa2669b..27613f1 100644 --- a/logPlus/DrawNrad.cpp +++ b/logPlus/DrawNrad.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "MemRdwt.h" +#include "MemRdWt.h" #include "DrawNrad.h" #define MAX_ARM 100 // 最大臂数 diff --git a/logPlus/DrawTvd.cpp b/logPlus/DrawTvd.cpp index 1e23f05..94a6d83 100644 --- a/logPlus/DrawTvd.cpp +++ b/logPlus/DrawTvd.cpp @@ -8,8 +8,8 @@ #include "DrawBase.h" //#include "VecSceneManager.h" //#include "WellSectionWindowDocument.h" -#include "memrdwt.h" -#include "GeometryUtils.h" +#include "MemRdWt.h" +#include "geometryutils.h" #include "DrawTvd.h" #pragma warning( pop ) @@ -202,12 +202,12 @@ void CDrawTvd::ReadData() for(int i=0;i0) { - char ss[4]; - itoa(ii,ss,10); - strcat(ScMiaoShu,ss); + strcat(ScMiaoShu,QString::number(ii).toStdString().c_str()); } int h=strlen(ScMiaoShu); pDC->setPen(m_ScBxPointMessage.Color); @@ -1201,9 +1199,7 @@ int CDrawTvd::DrawFst(int y_Start1, QPainter* pDC,QRectF mrt) if(m_SjBxPointMessage.MiaoShu[0]=='A')SjMiaoShu[0]+=ii; else if(ii>0) { - char ss[4]; - itoa(ii,ss,10); - strcat(SjMiaoShu,ss); + strcat(SjMiaoShu,QString::number(ii).toStdString().c_str()); } pDC->setPen(m_SjBxPointMessage.Color); if(0) @@ -1533,9 +1529,7 @@ int CDrawTvd::DrawCst(int y_Start1, QPainter* pDC,QRectF mrt,CST_PAR CPar,int no if(m_ScBxPointMessage.MiaoShu[0]=='A')ScMiaoShu[0]+=i; else if(i>0) { - char ss[4]; - itoa(i,ss,10); - strcat(ScMiaoShu,ss); + strcat(ScMiaoShu,QString::number(i).toStdString().c_str()); } int h=strlen(ScMiaoShu); pDC->setPen(m_ScBxPointMessage.Color); @@ -1544,9 +1538,7 @@ int CDrawTvd::DrawCst(int y_Start1, QPainter* pDC,QRectF mrt,CST_PAR CPar,int no if(m_SjBxPointMessage.MiaoShu[0]=='A')SjMiaoShu[0]+=i; else if(i>0) { - char ss[4]; - itoa(i,ss,10); - strcat(SjMiaoShu,ss); + strcat(SjMiaoShu,QString::number(i).toStdString().c_str()); } pDC->setPen(m_SjBxPointMessage.Color); pDC->drawText(x+xadd*strlen(SjMiaoShu)*NoteFontWidth,y+yadd*NoteFontHeight,QString::fromLocal8Bit(SjMiaoShu)); diff --git a/logPlus/GeoIndicatorGenerator.cpp b/logPlus/GeoIndicatorGenerator.cpp index 121792e..54e7fc1 100644 --- a/logPlus/GeoIndicatorGenerator.cpp +++ b/logPlus/GeoIndicatorGenerator.cpp @@ -3,7 +3,7 @@ #include #include -#include "GeometryUtils.h" +#include "geometryutils.h" #include "GeoIndicatorGenerator.h" #include diff --git a/logPlus/LogmudItemDrawer.cpp b/logPlus/LogmudItemDrawer.cpp index 46b823d..6a83d48 100644 --- a/logPlus/LogmudItemDrawer.cpp +++ b/logPlus/LogmudItemDrawer.cpp @@ -5,7 +5,7 @@ #include #include #include -#include "LogmudItemDrawer.h" +#include "LogmuditemDrawer.h" #include #include #include diff --git a/logPlus/LogmudResultItem.cpp b/logPlus/LogmudResultItem.cpp index d2952b6..736241a 100644 --- a/logPlus/LogmudResultItem.cpp +++ b/logPlus/LogmudResultItem.cpp @@ -114,7 +114,7 @@ bool LogmudResultItem::operator> (const LogmudResultItem& other) bool LogmudResultItem::operator== (const LogmudResultItem& other) { - return fabs(other.Number-Number)<1e-10; + return qAbs(other.Number-Number)<1e-10; } bool LogmudResultItem::Contains(double depth) const diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index b743ef9..5d755b6 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -6761,7 +6761,7 @@ TDTResultItem* FormDraw::LoadTDTResult_SLF(QString strSlfName) if(!logio->Open(strSlfName.toStdString().c_str(),CSlfIO::modeRead)) { delete logio; - return false; + return NULL; } QStringList slist; slist<<"U1_DOT"<<"U2_DOT"<<"U3_DOT"<<"U4_DOT"<<"U5_DOT"<<"U6_DOT"<<"U7_DOT" diff --git a/logPlus/formdraw.h b/logPlus/formdraw.h index 62ac8de..489cb3a 100644 --- a/logPlus/formdraw.h +++ b/logPlus/formdraw.h @@ -9,7 +9,7 @@ #include "formtrack.h" #include "LogIO.h" #include "MemRdWt.h" -#include "FormLine.h" +#include "formline.h" #include "FormBase.h" #pragma execution_character_set("utf-8") diff --git a/logPlus/formlogmud.cpp b/logPlus/formlogmud.cpp index 4882ccd..70b5711 100644 --- a/logPlus/formlogmud.cpp +++ b/logPlus/formlogmud.cpp @@ -1,5 +1,5 @@ -#include "FormLogmud.h" -#include "ui_FormLogmud.h" +#include "formlogmud.h" +#include "ui_formlogmud.h" #include #include "CallManage.h" #include "MemRdWt.h" @@ -106,7 +106,7 @@ bool FormLogmud::LoadFromSLF_LogMud() if (matchedLogmud&&qAbs(pResult->type - 2.0f) < 0.5f) { float safeC1 = qAbs(pResult->CoreValues.C1); - if (!IsFiniteNumber(safeC1) || safeC1 < 1e-6f) safeC1 = 1e-6f; + if (!IsFiniteNumber(safeC1) || safeC1 < 1e-6f) safeC1 = 1e-6f; float valx = (pResult->CoreValues.C2 / safeC1)*1000.0f; float valy = (pResult->CoreValues.C3 / safeC1)*1000.0f; if (!IsFiniteNumber(valx) || valx <= 0.0f) valx = 1.0f; diff --git a/logPlus/formlogmud.h b/logPlus/formlogmud.h index 20faa7b..2738596 100644 --- a/logPlus/formlogmud.h +++ b/logPlus/formlogmud.h @@ -34,12 +34,8 @@ protected: virtual void wheelEvent(QWheelEvent *event); bool IsFiniteNumber(float v) - { -#ifdef _MSC_VER - return _finite(v) != 0; -#else - return (v == v) && (v <= FLT_MAX) && (v >= -FLT_MAX); -#endif + { + return qIsFinite(v) != 0; } public: diff --git a/logPlus/formtracktop.cpp b/logPlus/formtracktop.cpp index 602674f..c9996a2 100644 --- a/logPlus/formtracktop.cpp +++ b/logPlus/formtracktop.cpp @@ -1,5 +1,5 @@ -#include "FormTrackTop.h" -#include "ui_FormTrackTop.h" +#include "formtracktop.h" +#include "ui_formtracktop.h" #include "CallManage.h" #include diff --git a/logPlus/logPlus.pro b/logPlus/logPlus.pro index 4fdf6ce..e7cf481 100644 --- a/logPlus/logPlus.pro +++ b/logPlus/logPlus.pro @@ -201,7 +201,9 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin include (3rd_qcustomplot/3rd_qcustomplot.pri) -include (3rd_tiff/libtiff.pri) +win32 { + include (3rd_tiff/libtiff.pri) +} RESOURCES += \ logplus.qrc @@ -230,7 +232,9 @@ INCLUDEPATH += $$PWD/../DataMgr/include INCLUDEPATH += $$PWD/../DrawBase/include INCLUDEPATH += $$PWD/../ModuleConsole/include INCLUDEPATH += $$PWD/../WellLogModule/include -INCLUDEPATH += $$PWD/../Workflow/include +win32 { + INCLUDEPATH += $$PWD/../Workflow/include +} INCLUDEPATH += $$PWD/../Workflow/WFCrystal/Crystal/include INCLUDEPATH += $$PWD/../Workflow/WFCrystal/Plugin/include INCLUDEPATH += $$PWD/../Workflow/WFCrystal/SysUtility/utils/include @@ -244,16 +248,20 @@ INCLUDEPATH += $$PWD/../Workflow/WFWidget/include INCLUDEPATH += $$PWD/../EditPlotHeader/include CONFIG(debug, debug|release){ - LIBS += -L$$PWD/../Bin -lBaseFund - LIBS += -L$$PWD/../Bin -lslfiod - LIBS += -L$$PWD/../Bin -lWellLogUId - LIBS += -L$$PWD/../Bin -lqtpropertybrowserd - LIBS += -L$$PWD/../Bin -lConvertorManagerd - LIBS += -L$$PWD/../Bin -lOSGDataModeld - LIBS += -L$$PWD/../Bin -lDataOutputd + LIBS += -L$$PWD/../Bin/ -lBaseFund + LIBS += -L$$PWD/../Bin/ -lslfiod + LIBS += -L$$PWD/../Bin/ -lWellLogUId + LIBS += -L$$PWD/../Bin/ -lqtpropertybrowserd + LIBS += -L$$PWD/../Bin/ -lConvertorManagerd + LIBS += -L$$PWD/../Bin/ -lOSGDataModeld + LIBS += -L$$PWD/../Bin/ -lDataOutputd LIBS += -L$$PWD/../Bin/ -lCallPlugind -lHPluginManaged LIBS += -L$$PWD/../Bin/ -lDataMgrd LIBS += -L$$PWD/../Bin/ -lDrawBased + LIBS += -L$$PWD/../Bin/ -lWFWidgetd + LIBS += -L$$PWD/../Bin/ -lWFCrystald + LIBS += -L$$PWD/../Bin/ -lOSGFrameworkd + LIBS += -L$$PWD/../Bin/ -lWellLogModuled LIBS += -L$$PWD/../Bin/ -lLogModuleConsoled LIBS += -L$$PWD/../Bin/ -lWFEngined LIBS += -L$$PWD/../Bin/ -lEditPlotHeaderd diff --git a/logPlus/mainwindow.cpp b/logPlus/mainwindow.cpp index ed4f1df..8fe9fdd 100644 --- a/logPlus/mainwindow.cpp +++ b/logPlus/mainwindow.cpp @@ -20,7 +20,7 @@ #include #include #include "fileopenthread.h" -#include "ObjWellLogINP.h" +#include "ObjWelllogINP.h" #include "TxtEditorDlg.h" #include "ObjWell.h" #include "wellloginformation.h" @@ -473,7 +473,7 @@ void MainWindow::s_Open() fileFull = QFileDialog::getOpenFileName(this, tr("打开项目"), GetProjectFolder(), - tr("项目文件(*.wwl)")); + tr("项目文件 (*.wwl)")); if (!fileFull.isEmpty()) { //关闭老项目 diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index 47df0a1..4045ce2 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -19,8 +19,11 @@ #include #include "ItemBorderDelegate.h" -#include "TIFFIO.H" -#include "TIFF.H" +#ifdef WIN32 +#include "tiffio.h" +#include "tiff.h" +#endif + #include "DepthProgress.h" #include "wellheader.h" @@ -2735,6 +2738,7 @@ QImage MainWindowCurve::convertToQImage(const QPixmap pixmap) void MainWindowCurve::writeTiff(const QImage image, const QString filename) { +#ifdef WIN32 TIFF *tiff = TIFFOpen(filename.toStdString().c_str(), "w"); if (!tiff) { qDebug() << "Error opening TIFF file for writing"; @@ -2774,11 +2778,12 @@ void MainWindowCurve::writeTiff(const QImage image, const QString filename) // Close the TIFF file. TIFFClose(tiff); +#endif } bool MainWindowCurve::saveMultipageTiff(const QList images, const QString filename) { - +#ifdef WIN32 int width_Max = images.first().width(); int height_Total = 0; // 计算总高度 for (const QImage &image : images) @@ -2828,6 +2833,8 @@ bool MainWindowCurve::saveMultipageTiff(const QList images, const QStrin } TIFFClose(tiff); +#endif + return true; } diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index ac9bcd9..86bee42 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -16,7 +16,7 @@ #include "TransparentDraggableLine.h" #include "TransparentDraggableLine_Master.h" #include "transparentdraggableSelectRect.h" -#include "transparentdraggableLayer.h" +#include "TransparentDraggableLayer.h" #include "transparentdraggableRightList.h" #include "TransparentDraggableCorePhysics.h" #include "qtcommonclass.h" diff --git a/logPlus/qmytreewidget.cpp b/logPlus/qmytreewidget.cpp index 299bc46..4bdda5d 100644 --- a/logPlus/qmytreewidget.cpp +++ b/logPlus/qmytreewidget.cpp @@ -1,5 +1,5 @@ #include "qmytreewidget.h" -#include "ObjWellLog.h" +#include "ObjWelllog.h" #include QMyTreeWidget::QMyTreeWidget(QWidget *parent) diff --git a/logPlus/qtprojectwidgets.cpp b/logPlus/qtprojectwidgets.cpp index cab5759..c021504 100644 --- a/logPlus/qtprojectwidgets.cpp +++ b/logPlus/qtprojectwidgets.cpp @@ -266,6 +266,7 @@ void QtProjectWidgets::s_loadTreeWidget(QString fileFull) itemIndex->setExpanded(true); } + void QtProjectWidgets::loadIndexSysTree(QTreeWidgetItem *parent, QString fileFull, QString prjname) { //Logdata @@ -297,6 +298,10 @@ void QtProjectWidgets::loadIndexSysTree(QTreeWidgetItem *parent, QString fileFul } else { + qDebug() << " folderPath " << folderPath; + + + //井目录 //取当前当前目录内容 QDir dir(folderPath); diff --git a/logPlus/selectlinedialog.cpp b/logPlus/selectlinedialog.cpp index 93b1167..06eb97d 100644 --- a/logPlus/selectlinedialog.cpp +++ b/logPlus/selectlinedialog.cpp @@ -152,7 +152,7 @@ void SelectLineDialog::setInfo(QString fileFull, QString strWellName, QString st #ifdef WIN32 if(_isnan(temp)||!_finite(temp)) continue; #else - if(__isnan(temp)||!__finite(temp)) continue; + if(qIsNaN(temp)||!qIsFinite(temp)) continue; #endif // WIN32 if(acurveinfo.MaxValue