diff --git a/ModuleConsole/include/LogModuleConsole.h b/ModuleConsole/include/LogModuleConsole.h index b5e3c16..20a471a 100644 --- a/ModuleConsole/include/LogModuleConsole.h +++ b/ModuleConsole/include/LogModuleConsole.h @@ -8,7 +8,7 @@ #ifndef WORKFLOWCONSOLE_H #define WORKFLOWCONSOLE_H #pragma warning( push ,0) -#include "logModuleParamers.h" +#include "LogModuleParamers.h" // #include "VecWindow.h" #include #include diff --git a/ModuleConsole/include/LogModuleParamers.h b/ModuleConsole/include/LogModuleParamers.h index b059444..28552a6 100644 --- a/ModuleConsole/include/LogModuleParamers.h +++ b/ModuleConsole/include/LogModuleParamers.h @@ -49,7 +49,7 @@ public: * @brief 窗口关闭之前调用,做一些清理工作 */ virtual void closeEvent(QCloseEvent *event); - void CModuleParamers::OpenOrClose(); + void OpenOrClose(); void InitCardParamSettings(pai::workflow::CModuleInformation * amoduleInfo); CParameterEditor * CreatParamControlWidget(); public: diff --git a/ModuleConsole/src/LogModuleConsole.cpp b/ModuleConsole/src/LogModuleConsole.cpp index e00cba8..c5cb2d0 100644 --- a/ModuleConsole/src/LogModuleConsole.cpp +++ b/ModuleConsole/src/LogModuleConsole.cpp @@ -17,7 +17,7 @@ #include // #include "QtWellSceneManager.h" #include "LogModuleConsole.h" -#include "GeometryUtils.h" +#include "geometryutils.h" #include "WorkflowWidget.h" #include "WorkflowSceneManager.h" #include "BaseObject.h" @@ -27,7 +27,7 @@ // #include "ModuleGraphicsItem.h" // #include "PaiModuleTree.h" #include "Module.h" -#include "WorkflowFile.h" +#include "WorkFlowFile.h" #include "PELibraryModule.h" #include "ModuleManager.h" #include "SaveHelper.h" @@ -39,7 +39,7 @@ // #include "VecSceneManager.h" // #include "VecDisplayObjectCommand.h" #include "ModuleInformation.h" -#include "GeometryUtils.h" +#include "geometryutils.h" #include "ParameterEditorModel.h" #include "ModuleTreeDlg.h" #include "PaiPushButton.h" @@ -47,7 +47,7 @@ #include "PaiWorkflowTemplateTree.h" // #include "ObjWelllogINP.h" // #include "DataTree.h" -#include "logmoduleparamers.h" +#include "LogModuleParamers.h" #pragma warning( pop ) // using namespace pai::graphics2d; diff --git a/ModuleConsole/src/LogModuleParamers.cpp b/ModuleConsole/src/LogModuleParamers.cpp index e0f743f..822792a 100644 --- a/ModuleConsole/src/LogModuleParamers.cpp +++ b/ModuleConsole/src/LogModuleParamers.cpp @@ -21,7 +21,7 @@ // #include "QtWellSceneManager.h" #include "LogModuleConsole.h" #include "LogModuleParamers.h" -#include "GeometryUtils.h" +#include "geometryutils.h" #include "WorkflowWidget.h" #include "WorkflowSceneManager.h" #include "BaseObject.h" @@ -43,7 +43,7 @@ // #include "VecSceneManager.h" // #include "VecDisplayObjectCommand.h" #include "ModuleInformation.h" -#include "GeometryUtils.h" +#include "geometryutils.h" #include "ParameterEditorModel.h" #include "ModuleTreeDlg.h" #include "PaiPushButton.h" diff --git a/ModuleConsole/src/ModuleConsole.pro b/ModuleConsole/src/ModuleConsole.pro index 11def5f..24e3958 100644 --- a/ModuleConsole/src/ModuleConsole.pro +++ b/ModuleConsole/src/ModuleConsole.pro @@ -99,7 +99,9 @@ INCLUDEPATH += ../../DataMgr/include INCLUDEPATH += ../../WellLogModule/include INCLUDEPATH += ../../WellLogUI/include INCLUDEPATH += ../../WellLogModule/include -INCLUDEPATH += ../../Workflow/include +win32 { + INCLUDEPATH += ../../Workflow/include +} INCLUDEPATH += ../../Workflow/WFCrystal/SysUtility/utils/include INCLUDEPATH += ../../Workflow/WFCrystal/Crystal/include INCLUDEPATH += ../../Workflow/WFCrystal/Plugin/include @@ -115,14 +117,15 @@ INCLUDEPATH += ../../Workflow/WFWidget/include CONFIG(debug, debug|release){ LIBS += -L$$PWD/../../Bin -lslfiod LIBS += -L$$PWD/../../Bin -lBaseFund + LIBS += -L$$PWD/../../Bin -lWFWidgetd + LIBS += -L$$PWD/../../Bin -lWFCrystald + LIBS += -L$$PWD/../../Bin -lWFEngined LIBS += -L$$PWD/../../Bin -lOSGDataModeld LIBS += -L$$PWD/../../Bin -lDataMgrd LIBS += -L$$PWD/../../Bin -lOSGFrameworkd LIBS += -L$$PWD/../../Bin -lWellLogUId LIBS += -L$$PWD/../../Bin -lWellLogModuled - LIBS += -L$$PWD/../../Bin -lWFWidgetd - LIBS += -L$$PWD/../../Bin -lWFCrystald - LIBS += -L$$PWD/../../Bin -lWFEngined + } else { LIBS += -L$$PWD/../../BinR -lslfio LIBS += -L$$PWD/../../BinR -lBaseFun diff --git a/ModuleConsole/src/PaiInfoEditor.cpp b/ModuleConsole/src/PaiInfoEditor.cpp index b71e49f..39ce75d 100644 --- a/ModuleConsole/src/PaiInfoEditor.cpp +++ b/ModuleConsole/src/PaiInfoEditor.cpp @@ -42,7 +42,7 @@ // #include "Log.h" #include "WorkflowConst.h" // #include "TimeStampLogger.h" -#include "GeometryUtils.h" +#include "geometryutils.h" const char* g_szDeleteButtonName = "pai_parameter_editor_delete_button"; const char* g_szHideShowButtonName = "pai_parameter_editor_hideshow_button"; using namespace pai; diff --git a/ModuleConsole/src/PaiModuleTree.cpp b/ModuleConsole/src/PaiModuleTree.cpp index bdf65d0..96ca09f 100644 --- a/ModuleConsole/src/PaiModuleTree.cpp +++ b/ModuleConsole/src/PaiModuleTree.cpp @@ -30,7 +30,7 @@ // #include "Log.h" #include "ModuleInformation.h" // #include "PaiTypes.h" -#include "GeometryUtils.h" +#include "geometryutils.h" using namespace std; using namespace pai; using namespace pai::gui; diff --git a/ModuleConsole/src/ParameterEditor.cpp b/ModuleConsole/src/ParameterEditor.cpp index ebf48f7..93ba678 100644 --- a/ModuleConsole/src/ParameterEditor.cpp +++ b/ModuleConsole/src/ParameterEditor.cpp @@ -6,7 +6,7 @@ */ #include #include -#include "logModuleParamers.h" +#include "LogModuleParamers.h" #include #include #include diff --git a/ModuleConsole/src/ParameterProperty.cpp b/ModuleConsole/src/ParameterProperty.cpp index a485c11..3b636b2 100644 --- a/ModuleConsole/src/ParameterProperty.cpp +++ b/ModuleConsole/src/ParameterProperty.cpp @@ -9,7 +9,7 @@ #include "ParameterProperty.h" #include "ModuleParameter.h" // #include "ModuleParameterUtil.h" -#include "GeometryUtils.h" +#include "geometryutils.h" using namespace std; using namespace pai::module; using namespace pai::graphics2d; diff --git a/ModuleConsole/src/WellLogWorkflowRunner.cpp b/ModuleConsole/src/WellLogWorkflowRunner.cpp index 2696d40..c036580 100644 --- a/ModuleConsole/src/WellLogWorkflowRunner.cpp +++ b/ModuleConsole/src/WellLogWorkflowRunner.cpp @@ -8,9 +8,9 @@ #include "ObjWelllog.h" // #include "VecWindow.h" // #include "PaiJob.h" -#include "WorkflowFile.h" +#include "WorkFlowFile.h" // #include "QtWellSceneManager.h" -#include "ObjWellLogINP.h" +#include "ObjWelllogINP.h" #include "LogModuleConsole.h" // #include "VecDisplayObjectCommand.h" // #include "VecWindow.h" diff --git a/ModuleConsole/src/WorkflowPluginControl.cpp b/ModuleConsole/src/WorkflowPluginControl.cpp index 8c3c647..09a611a 100644 --- a/ModuleConsole/src/WorkflowPluginControl.cpp +++ b/ModuleConsole/src/WorkflowPluginControl.cpp @@ -51,7 +51,7 @@ #include "SaveAllWorkflowsCmd.h" // #include "SubmitWorkflowCmd.h" // #include "PaiAction.h" -#include "basefun.h" +#include "BaseFun.h" #include "PaiWorkflowTemplateTree.h" // #include "PaiFileDialog.h" // #include "PaiSelectSurveyDialog.h" @@ -75,7 +75,7 @@ #include "BaseObject.h" // #include "QtViewer.h" // #include "VecWindowCommand.h" -#include "GeometryUtils.h" +#include "geometryutils.h" // #include "ConsoleOutputWidget.h" #include "ObjWell.h" #include "PELibraryModule.h"