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

WellLogUI,WellLogModule适配linux

Browse Source
This commit is contained in:
jinyuan 2026-05-15 09:57:53 +08:00
parent 8a449628fa
commit 8df235f63a
8 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WellLogModule/src/PELibraryModule.cpp
View File

@ -6,12 +6,12 @@
#include <ObjWelllogINP.h>
#include "DepthProgress.h"
#include <QDir>
#include "GeometryUtils.h"
#include "geometryutils.h"
// #include "LogPlusClient.h"
// #include "ObjectEvent.h"
// #include "ObjProject.h"
#include "ObjWell.h"
#include "ObjWellLogTABLE.h"
#include "ObjWelllogTABLE.h"
#include "ObjWelllogRound.h"
#include "ParameterItem.h"
#include <QTextCodec>

4
WellLogModule/src/WellLogModule.pro
View File

@ -64,7 +64,9 @@ INCLUDEPATH += ../../common
INCLUDEPATH += ../../BaseFun/include
INCLUDEPATH += ../../OSGDataModel/include
INCLUDEPATH += ../../DataMgr/include
INCLUDEPATH += ../../Workflow/include
win32 {
INCLUDEPATH += ../../Workflow/include
}
INCLUDEPATH += ../../Workflow/WFEngine/Module/include
INCLUDEPATH += ../../Workflow/WFEngine/ObjectModel/ObjectModelBase/include
INCLUDEPATH += ../../Workflow/WFCrystal/SysUtility/utils/include

2
WellLogUI/include/TxtEditorDlg.h
View File

@ -1,7 +1,7 @@
#pragma once
// #include "ui_TxtEditorDlg.h"
#include "WellLogUI.h"
#include "ObjWellLogINP.h"
#include "ObjWelllogINP.h"
class QString;
namespace Ui
{

2
WellLogUI/include/griddataadapter.h
View File

@ -21,7 +21,7 @@
#include <QApplication>
#include "BaseFun.h"
// #include "ObjCoreImage.h"
#include "ObjWellLogWavefile.h"
#include "ObjWelllogWavefile.h"
#include "ObjWelllog.h"
#include "LogIO.h"
// #include "CurveLineLog.h"

2
WellLogUI/src/TxtEditorDlg.cpp
View File

@ -1,6 +1,6 @@
#include "TxtEditorDlg.h"
#include "ui_TxtEditorDlg.h"
#include "GeometryUtils.h"
#include "geometryutils.h"
TxtEditorDlg::TxtEditorDlg(CObjWellLogINP * currentinp)
{

7
WellLogUI/src/WellDialog.cpp
View File

@ -353,10 +353,9 @@ void CWellDialog::ViewToData()
wellLR.SetAreaName(m_pUI->areaName->text().toStdString());
wellLR.SetOilCompanyName(m_pUI->companyName->text().toStdString());
QString xcode=m_pUI->xCode->text();
char buf[100];
strcpy(buf,xcode.toStdString().c_str());
wellLR.SetXCode(_atof_l(buf,0));
hd.x=_atof_l(buf,0);
wellLR.SetXCode(xcode.toDouble());
hd.x=xcode.toDouble();
wellLR.SetYCode(m_pUI->yCode->text().toFloat());
hd.y=m_pUI->yCode->text().toFloat();
wellLR.SetXOffset(m_pUI->xOffset->text().toFloat());

2
WellLogUI/src/WellLogTableDialogNew.cpp
View File

@ -15,7 +15,7 @@
#include "LogIO.h"
//#include "CurveLineLog.h"
#include "ObjWelllogTABLE.h"
#include "ObjWellLogTDT.h"
#include "ObjWelllogTDT.h"
//#include "DataManagger.h"
#include "griddataadapter.h"

4
WellLogUI/src/WellLogUI.pro
View File

@ -99,7 +99,9 @@ INCLUDEPATH += ../../common
INCLUDEPATH += ../../BaseFun/include
INCLUDEPATH += ../../OSGDataModel/include
INCLUDEPATH += ../../DataMgr/include
INCLUDEPATH += ../../Workflow/include
win32 {
INCLUDEPATH += ../../Workflow/include
}
INCLUDEPATH += ../../Workflow/WFCrystal/Crystal/include
INCLUDEPATH += ../../Workflow/WFCrystal/Plugin/include
INCLUDEPATH += ../../Workflow/WFCrystal/SysUtility/utils/include