diff --git a/logPlus/BorderPreView.cpp b/logPlus/BorderPreView.cpp index 8e68441..c463e88 100644 --- a/logPlus/BorderPreView.cpp +++ b/logPlus/BorderPreView.cpp @@ -1,4 +1,4 @@ -#include "BorderPreView.h" +#include "borderpreview.h" #include #include #include diff --git a/logPlus/LineStyleView.cpp b/logPlus/LineStyleView.cpp index 952ff6d..e1a40b7 100644 --- a/logPlus/LineStyleView.cpp +++ b/logPlus/LineStyleView.cpp @@ -1,4 +1,4 @@ -#include "LineStyleView.h" +#include "linestyleview.h" #include #include #include diff --git a/logPlus/LogmudResultItem.h b/logPlus/LogmudResultItem.h index 7e91c56..3dbba5f 100644 --- a/logPlus/LogmudResultItem.h +++ b/logPlus/LogmudResultItem.h @@ -133,7 +133,7 @@ public: float depth; float Number; struct logmud_stru CoreValues; - QVector> ValueTypes; +// QVector> ValueTypes; bool ContainTextItem(double depth, double sideWidth, double boundingWidth); QString CurveName; int m_BeginDotPos, m_EndDotPos; @@ -146,4 +146,4 @@ public: }; -#endif // LOGMUDRESULTITEM_H \ No newline at end of file +#endif // LOGMUDRESULTITEM_H diff --git a/logPlus/QtWindowWellSection.cpp b/logPlus/QtWindowWellSection.cpp index 2cf0a69..143e069 100644 --- a/logPlus/QtWindowWellSection.cpp +++ b/logPlus/QtWindowWellSection.cpp @@ -5,16 +5,16 @@ #include #include "completertextedit.h" // #include "ObjectEvent.h" -#include "curveline.h" +#include "CurveLine.h" #include "DataHelper.h" -#include "ObjWellLogTABLE.h" -#include "ObjWellLogINP.h" +#include "ObjWelllogTABLE.h" +#include "ObjWelllogINP.h" // #include "DrawCurveCommand.h" #include "ConsoleOutputWidget.h" #include "QtWindowWellSection.h" #include "chooseShiftCurvesDlg.h" // #include "WellSectionWindowDocument.h" -#include "GeometryUtils.h" +#include "geometryutils.h" // #include "ObjWellRulerTrack.h" #include "DataImport.h" #include "DataManagger.h" diff --git a/logPlus/QtWindowWellSection.h b/logPlus/QtWindowWellSection.h index 54bc917..e69f2e4 100644 --- a/logPlus/QtWindowWellSection.h +++ b/logPlus/QtWindowWellSection.h @@ -13,7 +13,7 @@ #include "BaseObject.h" #include "ObjWelllog.h" // #include "VecWindow.h" -#include "List_Table_Inf.h" +#include "LIST_TABLE_INF.h" // #include "WellSectionExport.h" // #include "ObjWellTrack.h" // #include "WellSectionWindowDocument.h" diff --git a/logPlusAll.pro b/logPlusAll.pro index 1654f6a..d207379 100644 --- a/logPlusAll.pro +++ b/logPlusAll.pro @@ -45,7 +45,7 @@ ModuleConsole.file = ModuleConsole/src/ModuleConsole.pro appDllTest.file = appDllTest/src/appDllTest.pro DataOutput.file = DataOutput/src/DataOutput.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 EditPlotHeader.file = EditPlotHeader/src/EditPlotHeader.pro logPlus.file = logPlus/logPlus.pro diff --git a/tran/LISConvertor/src/LisConvertor.pro b/tran/LISConvertor/src/LisConvertor.pro index 63a37a7..ca79ea2 100644 --- a/tran/LISConvertor/src/LisConvertor.pro +++ b/tran/LISConvertor/src/LisConvertor.pro @@ -15,7 +15,7 @@ INCLUDEPATH += $(OSGHOME)/include \ ../../../Slfio/include\ ../../../ConvertorManager/include\ ../../../OSGDataModel/include\ -../../../Workflow/include\ +#../../../Workflow/include\ ../../../Workflow/WFCrystal/Crystal/include\ ../../../Workflow/WFCrystal/Plugin/include\ ../../../Workflow/WFCrystal/SysUtility/utils/include\ @@ -28,6 +28,9 @@ INCLUDEPATH += $(OSGHOME)/include \ ../../../Workflow/WFWidget/include\ ./GeneratedFiles +win32 { + INCLUDEPATH += ../../../Workflow/include +} #include(../../OSGDataModel/paiobjectmodel.libinfo) HEADERS += ../include/*.h \