From 5611be0dfe280ec390e0bac20919522e1084dd6d Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Fri, 8 May 2026 14:38:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OUTC=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=B2=A1=E6=9C=89=E5=AE=9A=E4=B9=89=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=20=E7=AE=97=E6=B3=95=E6=8F=92=E4=BB=B6=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E9=92=AE=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ModuleConsole/src/ParameterEditorModel.cpp | 55 ++++++++++++-------- ModuleConsole/src/WorkflowSceneManager.cpp | 35 +++++++------ WellLogModule/src/PELibraryModule.cpp | 60 +++++++++++++--------- 3 files changed, 87 insertions(+), 63 deletions(-) diff --git a/ModuleConsole/src/ParameterEditorModel.cpp b/ModuleConsole/src/ParameterEditorModel.cpp index 1a8ed83..4df1f86 100644 --- a/ModuleConsole/src/ParameterEditorModel.cpp +++ b/ModuleConsole/src/ParameterEditorModel.cpp @@ -1510,28 +1510,41 @@ bool ParameterEditorModel::slotOnDeleteItem(const QString& strDeleteItemID) pArrayCategory = m_rootItem->GetParameterProperty(pParentItem->GetId()); if(pArrayCategory != NULL) { + CCompositeParameterItem* pCompositeDeleteItem = dynamic_cast (pParentItem); + if(pCompositeDeleteItem != NULL) + { + for(int i=0;iGetChildCount();++i) + { + if(!pCompositeDeleteItem->GetParameterItem(i)) continue; + ParameterProperty* pDeleteProperty = m_rootItem->GetParameterProperty(pCompositeDeleteItem->GetParameterItem(i)->GetId()); + if(pDeleteProperty != NULL) + { + lstDeleteRows.push_back(pDeleteProperty->GetRow());//得到待删除的节点在父节点的索引 + } + } + } //统计待删除对象在父节点中的索引 - CCompositeParameterItem* pCompositeDeleteItem = dynamic_cast (pDeleteItem); - if(pCompositeDeleteItem != NULL) - { - for(int i=0;iGetChildCount();++i) - { - if(!pCompositeDeleteItem->GetParameterItem(i)) continue; - ParameterProperty* pDeleteProperty = m_rootItem->GetParameterProperty(pCompositeDeleteItem->GetParameterItem(i)->GetId()); - if(pDeleteProperty != NULL) - { - lstDeleteRows.push_back(pDeleteProperty->GetRow());//得到待删除的节点在父节点的索引 - } - } - } - else - { - ParameterProperty* pDeleteProperty = m_rootItem->GetParameterProperty(pDeleteItem->GetId()); - if(pDeleteProperty != NULL) - { - lstDeleteRows.push_back(pDeleteProperty->GetRow()); - } - } + //CCompositeParameterItem* pCompositeDeleteItem = dynamic_cast (pDeleteItem); + //if(pCompositeDeleteItem != NULL) + //{ + // for(int i=0;iGetChildCount();++i) + // { + // if(!pCompositeDeleteItem->GetParameterItem(i)) continue; + // ParameterProperty* pDeleteProperty = m_rootItem->GetParameterProperty(pCompositeDeleteItem->GetParameterItem(i)->GetId()); + // if(pDeleteProperty != NULL) + // { + // lstDeleteRows.push_back(pDeleteProperty->GetRow());//得到待删除的节点在父节点的索引 + // } + // } + //} + //else + //{ + // ParameterProperty* pDeleteProperty = m_rootItem->GetParameterProperty(pDeleteItem->GetId()); + // if(pDeleteProperty != NULL) + // { + // lstDeleteRows.push_back(pDeleteProperty->GetRow()); + // } + //} qSort(lstDeleteRows.begin(),lstDeleteRows.end()); } } diff --git a/ModuleConsole/src/WorkflowSceneManager.cpp b/ModuleConsole/src/WorkflowSceneManager.cpp index 58fb1bf..0aedc91 100644 --- a/ModuleConsole/src/WorkflowSceneManager.cpp +++ b/ModuleConsole/src/WorkflowSceneManager.cpp @@ -1350,27 +1350,28 @@ void WorkflowSceneManager::slotAddModule(const QString& moduleName) // pai::objectmodel::PaiWorkflowDataModel* pWorkflow = pModuleConsole->m_pWorkflowDataModel; // ::GetWorkflowConsole()->GetWorkflowWidget()->SetWorkflow(pWorkflow); } + // Plugin ToolBar工具栏 - if (pModuleParamers->m_toolBar_plugin) + if (amodule && amodule->m_listAct.size() > 0) + { + // 从插件里获取QAction 显示在Plugin ToolBar工具栏 + pModuleParamers->m_toolBar_plugin->clear(); + for (int i = 0; i < amodule->m_listAct.size(); i++) + { + QAction* pAct = amodule->m_listAct.at(i); + QString sicon = pAct->property("icon_v").toString(); + QIcon imIcon(::GetImagePath() + sicon); + pAct->setIcon(imIcon); + pModuleParamers->m_toolBar_plugin->addAction(pAct); + } + pModuleParamers->m_toolBar_plugin->show(); + } + else + { pModuleParamers->m_toolBar_plugin->hide(); + } if(amodule&&amodule->parDialog) { - - if (pModuleParamers->m_toolBar_plugin->isHidden()) - { - // 从插件里获取QAction 显示在Plugin ToolBar工具栏 - pModuleParamers->m_toolBar_plugin->clear(); - for (int i = 0; i < amodule->m_listAct.size(); i++) - { - QAction* pAct = amodule->m_listAct.at(i); - QString sicon = pAct->property("icon_v").toString(); - QIcon imIcon(::GetImagePath() + sicon); - pAct->setIcon(imIcon); - pModuleParamers->m_toolBar_plugin->addAction(pAct); - } - pModuleParamers->m_toolBar_plugin->show(); - } - // QRect rt=amodule->parDialog->geometry(); // pModuleParamers->m_pParameterEditor->setVisible(false); // pModuleParamers->m_pDialogLayout->setVisible(true); diff --git a/WellLogModule/src/PELibraryModule.cpp b/WellLogModule/src/PELibraryModule.cpp index e4c0c2a..beab26a 100644 --- a/WellLogModule/src/PELibraryModule.cpp +++ b/WellLogModule/src/PELibraryModule.cpp @@ -1236,7 +1236,7 @@ bool PELibraryModule::validate() bool PELibraryModule::InitModule(QWidget*pWidget) { typedef QDialog *(* LPDDIALOG)(QWidget*pWidget); - typedef void* (*LPD_ACTION_FUNC)(int* count); + typedef void* (*LPD_ACTION_FUNC)(QWidget*pWidget, int* count); typedef int (* LPFNDLLFUNC)(); LPFNDLLFUNC lpfnDllFunc,lpfnInitDllFunc; @@ -1297,19 +1297,6 @@ bool PELibraryModule::InitModule(QWidget*pWidget) if(m_parDialog) { if(errorinf) errorinf->ErrorNo=0; parDialog=m_parDialog(pWidget); - - LPD_ACTION_FUNC ACT_Func = (LPD_ACTION_FUNC)Methodlib.resolve("getAction_CApi"); - if (ACT_Func) - { - int ncount = 0; - QAction** actArr = (QAction**)ACT_Func(&ncount); - for (int i = 0; i < ncount; i++) - { - QAction* pAct = actArr[i]; - QString s = pAct->property("icon_v").toString(); - m_listAct << actArr[i]; - } - } if(errorinf) { if(errorinf->ErrorNo<0) { if(parDialog) { @@ -1329,6 +1316,20 @@ bool PELibraryModule::InitModule(QWidget*pWidget) } } } + + m_listAct.clear(); + LPD_ACTION_FUNC ACT_Func = (LPD_ACTION_FUNC)Methodlib.resolve("getAction_CApi"); + if (ACT_Func) + { + int ncount = 0; + QAction** actArr = (QAction**)ACT_Func(pWidget, &ncount); + for (int i = 0; i < ncount; i++) + { + QAction* pAct = actArr[i]; + QString s = pAct->property("icon_v").toString(); + m_listAct << actArr[i]; + } + } ///////////////// Hd = (struct HD_STRU *)Methodlib.resolve("HD"); Inc = (struct INC_STRU *)Methodlib.resolve("INC"); @@ -1341,17 +1342,26 @@ bool PELibraryModule::InitModule(QWidget*pWidget) // 显示乱码进行字符串转码 if (strlen(Inc->Script)==0&&strlen(Inc->Name)>0)// m_pMemRdWt->ChangeName函数会用Inc->Name生成Inc->Scrip，防止重复转换字符串格式，暂时先这样判断是否转换过格式 { - ToUnicode(Inc->Name); - ToUnicode(Inc->Script); - ToUnicode(Inc->Unit); - ToUnicode(Conc->Name); - ToUnicode(Conc->Script); - ToUnicode(Conc->Unit); - ToUnicode(Conc->Options); - ToUnicode(Conc->ValType); - ToUnicode(Outc->Name); - ToUnicode(Outc->Script); - ToUnicode(Outc->Unit); + if (Inc) + { + ToUnicode(Inc->Name); + ToUnicode(Inc->Script); + ToUnicode(Inc->Unit); + } + if (Conc) + { + ToUnicode(Conc->Name); + ToUnicode(Conc->Script); + ToUnicode(Conc->Unit); + ToUnicode(Conc->Options); + ToUnicode(Conc->ValType); + } + if (Outc) + { + ToUnicode(Outc->Name); + ToUnicode(Outc->Script); + ToUnicode(Outc->Unit); + } } if(paramCardNameInSlf.isEmpty()) { if(Hd){