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

麒麟适配，大小写、pThread.h引用等问题优化

Browse Source
This commit is contained in:
jiayulong 2026-06-29 14:48:49 +08:00
parent 7887e4bfaa
commit e2fd22d752
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
logPlus/BorderPreView.cpp
View File

@ -1,4 +1,4 @@
#include "BorderPreView.h" #include "borderpreview.h"
#include <QPainter> #include <QPainter>
#include <QMouseEvent> #include <QMouseEvent>
#include <QPair> #include <QPair>

2
logPlus/LineStyleView.cpp
View File

@ -1,4 +1,4 @@
#include "LineStyleView.h" #include "linestyleview.h"
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include <QScrollBar> #include <QScrollBar>
#include <QHeaderView> #include <QHeaderView>

4
logPlus/LogmudResultItem.h
View File

@ -133,7 +133,7 @@ public:
float depth; float depth;
float Number; float Number;
struct logmud_stru CoreValues; struct logmud_stru CoreValues;
QVector<QVector<float>> ValueTypes; // QVector<QVector<float>> ValueTypes;
bool ContainTextItem(double depth, double sideWidth, double boundingWidth); bool ContainTextItem(double depth, double sideWidth, double boundingWidth);
QString CurveName; QString CurveName;
int m_BeginDotPos, m_EndDotPos; int m_BeginDotPos, m_EndDotPos;
@ -146,4 +146,4 @@ public:
}; };
#endif // LOGMUDRESULTITEM_H #endif // LOGMUDRESULTITEM_H

8
logPlus/QtWindowWellSection.cpp
View File

@ -5,16 +5,16 @@
#include <QLibrary> #include <QLibrary>
#include "completertextedit.h" #include "completertextedit.h"
// #include "ObjectEvent.h" // #include "ObjectEvent.h"
#include "curveline.h" #include "CurveLine.h"
#include "DataHelper.h" #include "DataHelper.h"
#include "ObjWellLogTABLE.h" #include "ObjWelllogTABLE.h"
#include "ObjWellLogINP.h" #include "ObjWelllogINP.h"
// #include "DrawCurveCommand.h" // #include "DrawCurveCommand.h"
#include "ConsoleOutputWidget.h" #include "ConsoleOutputWidget.h"
#include "QtWindowWellSection.h" #include "QtWindowWellSection.h"
#include "chooseShiftCurvesDlg.h" #include "chooseShiftCurvesDlg.h"
// #include "WellSectionWindowDocument.h" // #include "WellSectionWindowDocument.h"
#include "GeometryUtils.h" #include "geometryutils.h"
// #include "ObjWellRulerTrack.h" // #include "ObjWellRulerTrack.h"
#include "DataImport.h" #include "DataImport.h"
#include "DataManagger.h" #include "DataManagger.h"

2
logPlus/QtWindowWellSection.h
View File

@ -13,7 +13,7 @@
#include "BaseObject.h" #include "BaseObject.h"
#include "ObjWelllog.h" #include "ObjWelllog.h"
// #include "VecWindow.h" // #include "VecWindow.h"
#include "List_Table_Inf.h" #include "LIST_TABLE_INF.h"
// #include "WellSectionExport.h" // #include "WellSectionExport.h"
// #include "ObjWellTrack.h" // #include "ObjWellTrack.h"
// #include "WellSectionWindowDocument.h" // #include "WellSectionWindowDocument.h"

2
logPlusAll.pro
View File

@ -45,7 +45,7 @@ ModuleConsole.file = ModuleConsole/src/ModuleConsole.pro
appDllTest.file = appDllTest/src/appDllTest.pro appDllTest.file = appDllTest/src/appDllTest.pro
DataOutput.file = DataOutput/src/DataOutput.pro DataOutput.file = DataOutput/src/DataOutput.pro
SLFAscIIConvertor.file = tran/SLFAscIIConvertor/src/SLFAsciiConvertor.pro SLFAscIIConvertor.file = tran/SLFAscIIConvertor/src/SLFAsciiConvertor.pro
LISConvertor.file = tran/LISConvertor/src/LISConvertor.pro LISConvertor.file = tran/LISConvertor/src/LisConvertor.pro
DrawBase.file = DrawBase/src/DrawBase.pro DrawBase.file = DrawBase/src/DrawBase.pro
EditPlotHeader.file = EditPlotHeader/src/EditPlotHeader.pro EditPlotHeader.file = EditPlotHeader/src/EditPlotHeader.pro
logPlus.file = logPlus/logPlus.pro logPlus.file = logPlus/logPlus.pro

5
tran/LISConvertor/src/LisConvertor.pro
View File

@ -15,7 +15,7 @@ INCLUDEPATH += $(OSGHOME)/include \
../../../Slfio/include\ ../../../Slfio/include\
../../../ConvertorManager/include\ ../../../ConvertorManager/include\
../../../OSGDataModel/include\ ../../../OSGDataModel/include\
../../../Workflow/include\ #../../../Workflow/include\
../../../Workflow/WFCrystal/Crystal/include\ ../../../Workflow/WFCrystal/Crystal/include\
../../../Workflow/WFCrystal/Plugin/include\ ../../../Workflow/WFCrystal/Plugin/include\
../../../Workflow/WFCrystal/SysUtility/utils/include\ ../../../Workflow/WFCrystal/SysUtility/utils/include\
@ -28,6 +28,9 @@ INCLUDEPATH += $(OSGHOME)/include \
../../../Workflow/WFWidget/include\ ../../../Workflow/WFWidget/include\
./GeneratedFiles ./GeneratedFiles
win32 {
INCLUDEPATH += ../../../Workflow/include
}
#include(../../OSGDataModel/paiobjectmodel.libinfo) #include(../../OSGDataModel/paiobjectmodel.libinfo)
HEADERS += ../include/*.h \ HEADERS += ../include/*.h \