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

ModuleConsole 适配 linux

Browse Source
This commit is contained in:
jinyuan 2026-05-15 09:43:54 +08:00
parent 497d96f05a
commit 58c4b3dbd4
11 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ModuleConsole/include/LogModuleConsole.h
View File

@ -8,7 +8,7 @@
#ifndef WORKFLOWCONSOLE_H #ifndef WORKFLOWCONSOLE_H
#define WORKFLOWCONSOLE_H #define WORKFLOWCONSOLE_H
#pragma warning( push ,0) #pragma warning( push ,0)
#include "logModuleParamers.h" #include "LogModuleParamers.h"
// #include "VecWindow.h" // #include "VecWindow.h"
#include <QMainWindow> #include <QMainWindow>
#include <QSplitter> #include <QSplitter>

2
ModuleConsole/include/LogModuleParamers.h
View File

@ -49,7 +49,7 @@ public:
* @brief 窗口关闭之前调用，做一些清理工作 * @brief 窗口关闭之前调用，做一些清理工作
*/ */
virtual void closeEvent(QCloseEvent *event); virtual void closeEvent(QCloseEvent *event);
void CModuleParamers::OpenOrClose(); void OpenOrClose();
void InitCardParamSettings(pai::workflow::CModuleInformation * amoduleInfo); void InitCardParamSettings(pai::workflow::CModuleInformation * amoduleInfo);
CParameterEditor * CreatParamControlWidget(); CParameterEditor * CreatParamControlWidget();
public: public:

8
ModuleConsole/src/LogModuleConsole.cpp
View File

@ -17,7 +17,7 @@
#include <QPushButton> #include <QPushButton>
// #include "QtWellSceneManager.h" // #include "QtWellSceneManager.h"
#include "LogModuleConsole.h" #include "LogModuleConsole.h"
#include "GeometryUtils.h" #include "geometryutils.h"
#include "WorkflowWidget.h" #include "WorkflowWidget.h"
#include "WorkflowSceneManager.h" #include "WorkflowSceneManager.h"
#include "BaseObject.h" #include "BaseObject.h"
@ -27,7 +27,7 @@
// #include "ModuleGraphicsItem.h" // #include "ModuleGraphicsItem.h"
// #include "PaiModuleTree.h" // #include "PaiModuleTree.h"
#include "Module.h" #include "Module.h"
#include "WorkflowFile.h" #include "WorkFlowFile.h"
#include "PELibraryModule.h" #include "PELibraryModule.h"
#include "ModuleManager.h" #include "ModuleManager.h"
#include "SaveHelper.h" #include "SaveHelper.h"
@ -39,7 +39,7 @@
// #include "VecSceneManager.h" // #include "VecSceneManager.h"
// #include "VecDisplayObjectCommand.h" // #include "VecDisplayObjectCommand.h"
#include "ModuleInformation.h" #include "ModuleInformation.h"
#include "GeometryUtils.h" #include "geometryutils.h"
#include "ParameterEditorModel.h" #include "ParameterEditorModel.h"
#include "ModuleTreeDlg.h" #include "ModuleTreeDlg.h"
#include "PaiPushButton.h" #include "PaiPushButton.h"
@ -47,7 +47,7 @@
#include "PaiWorkflowTemplateTree.h" #include "PaiWorkflowTemplateTree.h"
// #include "ObjWelllogINP.h" // #include "ObjWelllogINP.h"
// #include "DataTree.h" // #include "DataTree.h"
#include "logmoduleparamers.h" #include "LogModuleParamers.h"
#pragma warning( pop ) #pragma warning( pop )
// using namespace pai::graphics2d; // using namespace pai::graphics2d;

4
ModuleConsole/src/LogModuleParamers.cpp
View File

@ -21,7 +21,7 @@
// #include "QtWellSceneManager.h" // #include "QtWellSceneManager.h"
#include "LogModuleConsole.h" #include "LogModuleConsole.h"
#include "LogModuleParamers.h" #include "LogModuleParamers.h"
#include "GeometryUtils.h" #include "geometryutils.h"
#include "WorkflowWidget.h" #include "WorkflowWidget.h"
#include "WorkflowSceneManager.h" #include "WorkflowSceneManager.h"
#include "BaseObject.h" #include "BaseObject.h"
@ -43,7 +43,7 @@
// #include "VecSceneManager.h" // #include "VecSceneManager.h"
// #include "VecDisplayObjectCommand.h" // #include "VecDisplayObjectCommand.h"
#include "ModuleInformation.h" #include "ModuleInformation.h"
#include "GeometryUtils.h" #include "geometryutils.h"
#include "ParameterEditorModel.h" #include "ParameterEditorModel.h"
#include "ModuleTreeDlg.h" #include "ModuleTreeDlg.h"
#include "PaiPushButton.h" #include "PaiPushButton.h"

11
ModuleConsole/src/ModuleConsole.pro
View File

@ -99,7 +99,9 @@ INCLUDEPATH += ../../DataMgr/include
INCLUDEPATH += ../../WellLogModule/include INCLUDEPATH += ../../WellLogModule/include
INCLUDEPATH += ../../WellLogUI/include INCLUDEPATH += ../../WellLogUI/include
INCLUDEPATH += ../../WellLogModule/include INCLUDEPATH += ../../WellLogModule/include
INCLUDEPATH += ../../Workflow/include win32 {
INCLUDEPATH += ../../Workflow/include
}
INCLUDEPATH += ../../Workflow/WFCrystal/SysUtility/utils/include INCLUDEPATH += ../../Workflow/WFCrystal/SysUtility/utils/include
INCLUDEPATH += ../../Workflow/WFCrystal/Crystal/include INCLUDEPATH += ../../Workflow/WFCrystal/Crystal/include
INCLUDEPATH += ../../Workflow/WFCrystal/Plugin/include INCLUDEPATH += ../../Workflow/WFCrystal/Plugin/include
@ -115,14 +117,15 @@ INCLUDEPATH += ../../Workflow/WFWidget/include
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
LIBS += -L$$PWD/../../Bin -lslfiod LIBS += -L$$PWD/../../Bin -lslfiod
LIBS += -L$$PWD/../../Bin -lBaseFund 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 -lOSGDataModeld
LIBS += -L$$PWD/../../Bin -lDataMgrd LIBS += -L$$PWD/../../Bin -lDataMgrd
LIBS += -L$$PWD/../../Bin -lOSGFrameworkd LIBS += -L$$PWD/../../Bin -lOSGFrameworkd
LIBS += -L$$PWD/../../Bin -lWellLogUId LIBS += -L$$PWD/../../Bin -lWellLogUId
LIBS += -L$$PWD/../../Bin -lWellLogModuled LIBS += -L$$PWD/../../Bin -lWellLogModuled
LIBS += -L$$PWD/../../Bin -lWFWidgetd
LIBS += -L$$PWD/../../Bin -lWFCrystald
LIBS += -L$$PWD/../../Bin -lWFEngined
} else { } else {
LIBS += -L$$PWD/../../BinR -lslfio LIBS += -L$$PWD/../../BinR -lslfio
LIBS += -L$$PWD/../../BinR -lBaseFun LIBS += -L$$PWD/../../BinR -lBaseFun

2
ModuleConsole/src/PaiInfoEditor.cpp
View File

@ -42,7 +42,7 @@
// #include "Log.h" // #include "Log.h"
#include "WorkflowConst.h" #include "WorkflowConst.h"
// #include "TimeStampLogger.h" // #include "TimeStampLogger.h"
#include "GeometryUtils.h" #include "geometryutils.h"
const char* g_szDeleteButtonName = "pai_parameter_editor_delete_button"; const char* g_szDeleteButtonName = "pai_parameter_editor_delete_button";
const char* g_szHideShowButtonName = "pai_parameter_editor_hideshow_button"; const char* g_szHideShowButtonName = "pai_parameter_editor_hideshow_button";
using namespace pai; using namespace pai;

2
ModuleConsole/src/PaiModuleTree.cpp
View File

@ -30,7 +30,7 @@
// #include "Log.h" // #include "Log.h"
#include "ModuleInformation.h" #include "ModuleInformation.h"
// #include "PaiTypes.h" // #include "PaiTypes.h"
#include "GeometryUtils.h" #include "geometryutils.h"
using namespace std; using namespace std;
using namespace pai; using namespace pai;
using namespace pai::gui; using namespace pai::gui;

2
ModuleConsole/src/ParameterEditor.cpp
View File

@ -6,7 +6,7 @@
*/ */
#include <QMainWindow> #include <QMainWindow>
#include <QDebug> #include <QDebug>
#include "logModuleParamers.h" #include "LogModuleParamers.h"
#include <QItemDelegate> #include <QItemDelegate>
#include <QModelIndex> #include <QModelIndex>
#include <QPainter> #include <QPainter>

2
ModuleConsole/src/ParameterProperty.cpp
View File

@ -9,7 +9,7 @@
#include "ParameterProperty.h" #include "ParameterProperty.h"
#include "ModuleParameter.h" #include "ModuleParameter.h"
// #include "ModuleParameterUtil.h" // #include "ModuleParameterUtil.h"
#include "GeometryUtils.h" #include "geometryutils.h"
using namespace std; using namespace std;
using namespace pai::module; using namespace pai::module;
using namespace pai::graphics2d; using namespace pai::graphics2d;

4
ModuleConsole/src/WellLogWorkflowRunner.cpp
View File

@ -8,9 +8,9 @@
#include "ObjWelllog.h" #include "ObjWelllog.h"
// #include "VecWindow.h" // #include "VecWindow.h"
// #include "PaiJob.h" // #include "PaiJob.h"
#include "WorkflowFile.h" #include "WorkFlowFile.h"
// #include "QtWellSceneManager.h" // #include "QtWellSceneManager.h"
#include "ObjWellLogINP.h" #include "ObjWelllogINP.h"
#include "LogModuleConsole.h" #include "LogModuleConsole.h"
// #include "VecDisplayObjectCommand.h" // #include "VecDisplayObjectCommand.h"
// #include "VecWindow.h" // #include "VecWindow.h"

4
ModuleConsole/src/WorkflowPluginControl.cpp
View File

@ -51,7 +51,7 @@
#include "SaveAllWorkflowsCmd.h" #include "SaveAllWorkflowsCmd.h"
// #include "SubmitWorkflowCmd.h" // #include "SubmitWorkflowCmd.h"
// #include "PaiAction.h" // #include "PaiAction.h"
#include "basefun.h" #include "BaseFun.h"
#include "PaiWorkflowTemplateTree.h" #include "PaiWorkflowTemplateTree.h"
// #include "PaiFileDialog.h" // #include "PaiFileDialog.h"
// #include "PaiSelectSurveyDialog.h" // #include "PaiSelectSurveyDialog.h"
@ -75,7 +75,7 @@
#include "BaseObject.h" #include "BaseObject.h"
// #include "QtViewer.h" // #include "QtViewer.h"
// #include "VecWindowCommand.h" // #include "VecWindowCommand.h"
#include "GeometryUtils.h" #include "geometryutils.h"
// #include "ConsoleOutputWidget.h" // #include "ConsoleOutputWidget.h"
#include "ObjWell.h" #include "ObjWell.h"
#include "PELibraryModule.h" #include "PELibraryModule.h"