diff --git a/WellLogModule/src/PELibraryModule.cpp b/WellLogModule/src/PELibraryModule.cpp index 455e2cc..630db56 100644 --- a/WellLogModule/src/PELibraryModule.cpp +++ b/WellLogModule/src/PELibraryModule.cpp @@ -6,12 +6,12 @@ #include #include "DepthProgress.h" #include -#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 diff --git a/WellLogModule/src/WellLogModule.pro b/WellLogModule/src/WellLogModule.pro index 019ecc8..ff3b396 100644 --- a/WellLogModule/src/WellLogModule.pro +++ b/WellLogModule/src/WellLogModule.pro @@ -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 diff --git a/WellLogUI/include/TxtEditorDlg.h b/WellLogUI/include/TxtEditorDlg.h index 88b8c7f..c894454 100644 --- a/WellLogUI/include/TxtEditorDlg.h +++ b/WellLogUI/include/TxtEditorDlg.h @@ -1,7 +1,7 @@ #pragma once // #include "ui_TxtEditorDlg.h" #include "WellLogUI.h" -#include "ObjWellLogINP.h" +#include "ObjWelllogINP.h" class QString; namespace Ui { diff --git a/WellLogUI/include/griddataadapter.h b/WellLogUI/include/griddataadapter.h index 912a356..5d88ff4 100644 --- a/WellLogUI/include/griddataadapter.h +++ b/WellLogUI/include/griddataadapter.h @@ -21,7 +21,7 @@ #include #include "BaseFun.h" // #include "ObjCoreImage.h" -#include "ObjWellLogWavefile.h" +#include "ObjWelllogWavefile.h" #include "ObjWelllog.h" #include "LogIO.h" // #include "CurveLineLog.h" diff --git a/WellLogUI/src/TxtEditorDlg.cpp b/WellLogUI/src/TxtEditorDlg.cpp index 2cc8d91..b919011 100644 --- a/WellLogUI/src/TxtEditorDlg.cpp +++ b/WellLogUI/src/TxtEditorDlg.cpp @@ -1,6 +1,6 @@ #include "TxtEditorDlg.h" #include "ui_TxtEditorDlg.h" -#include "GeometryUtils.h" +#include "geometryutils.h" TxtEditorDlg::TxtEditorDlg(CObjWellLogINP * currentinp) { diff --git a/WellLogUI/src/WellDialog.cpp b/WellLogUI/src/WellDialog.cpp index 40716b1..898469f 100644 --- a/WellLogUI/src/WellDialog.cpp +++ b/WellLogUI/src/WellDialog.cpp @@ -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()); diff --git a/WellLogUI/src/WellLogTableDialogNew.cpp b/WellLogUI/src/WellLogTableDialogNew.cpp index 1da111e..7e59838 100644 --- a/WellLogUI/src/WellLogTableDialogNew.cpp +++ b/WellLogUI/src/WellLogTableDialogNew.cpp @@ -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" diff --git a/WellLogUI/src/WellLogUI.pro b/WellLogUI/src/WellLogUI.pro index 7dbc6db..abcf11b 100644 --- a/WellLogUI/src/WellLogUI.pro +++ b/WellLogUI/src/WellLogUI.pro @@ -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