From b0ed30be980c58192c26af118af4b734a0499c6d Mon Sep 17 00:00:00 2001 From: "DESKTOP-450PEFP\\mainc" Date: Fri, 20 Mar 2026 20:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AA=97=E5=8F=A3=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E5=BC=95=E8=B5=B7=E7=9A=84=20=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E6=A0=91=E6=8B=96=E5=8A=A8=E5=88=B0=E7=94=BB=E5=B8=83=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E4=BA=8B=E4=BB=B6=E6=B2=A1=E6=9C=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82=20=E4=BF=AE=E6=94=B9=E5=8F=B3=E4=BE=A7=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E6=A8=A1=E5=9D=97=EF=BC=8C=E7=82=B9=E5=87=BB=E5=B0=8F?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ModuleConsole/src/PaiInfoEditor.cpp | 5 +++++ ModuleConsole/src/WorkflowSceneManager.cpp | 22 ++++++++++++++-------- logPlus/mainwindowcurve.cpp | 2 ++ logPlus/mainwindowsplitter.cpp | 6 ++---- logPlus/mainwindowsplitter.h | 2 -- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ModuleConsole/src/PaiInfoEditor.cpp b/ModuleConsole/src/PaiInfoEditor.cpp index 9eaeb7d..b71e49f 100644 --- a/ModuleConsole/src/PaiInfoEditor.cpp +++ b/ModuleConsole/src/PaiInfoEditor.cpp @@ -423,6 +423,11 @@ void CPaiInfoEditor::slotShowLoadingAnimate() IDialogFactory& afactory=CDialogFactory::GetFatory(); QUuid classID = QUuid(GetClassID_ChooseCurveDlg()); CDialogFactory* adlg=afactory.CreateObject(classID); + if (adlg == NULL) + { + return; + } + QDialog * pDlg = dynamic_cast(adlg); Qt::WindowFlags flags = pDlg->windowFlags(); flags |= Qt::WindowStaysOnTopHint; diff --git a/ModuleConsole/src/WorkflowSceneManager.cpp b/ModuleConsole/src/WorkflowSceneManager.cpp index 35e02c0..58fb1bf 100644 --- a/ModuleConsole/src/WorkflowSceneManager.cpp +++ b/ModuleConsole/src/WorkflowSceneManager.cpp @@ -1371,14 +1371,20 @@ void WorkflowSceneManager::slotAddModule(const QString& moduleName) pModuleParamers->m_toolBar_plugin->show(); } - QRect rt=amodule->parDialog->geometry(); - pModuleParamers->m_pParameterEditor->setVisible(false); - pModuleParamers->m_pDialogLayout->setVisible(true); - amodule->parDialog->setMinimumHeight(rt.height()); - pModuleParamers->m_pDialogLayout->setWidget(amodule->parDialog); - disconnect(pModuleParamers->m_pbtnRun,SIGNAL(clicked()),pModuleParamers,SLOT(slotRunCurrentZone())); - pModuleParamers->m_pbtnRun->setVisible(false); - pModuleParamers->m_pbtnRun->setEnabled(false); +// QRect rt=amodule->parDialog->geometry(); +// pModuleParamers->m_pParameterEditor->setVisible(false); +// pModuleParamers->m_pDialogLayout->setVisible(true); +// amodule->parDialog->setMinimumHeight(rt.height()); +// pModuleParamers->m_pDialogLayout->setWidget(amodule->parDialog); +// disconnect(pModuleParamers->m_pbtnRun,SIGNAL(clicked()),pModuleParamers,SLOT(slotRunCurrentZone())); +// pModuleParamers->m_pbtnRun->setVisible(false); +// pModuleParamers->m_pbtnRun->setEnabled(false); + pModuleParamers->m_pParameterEditor->setVisible(true); + pModuleParamers->m_pDialogLayout->setVisible(false); + pModuleParamers->m_pbtnRun->setVisible(true); + pModuleParamers->m_pbtnRun->setEnabled(true); + disconnect(pModuleParamers->m_pbtnRun, SIGNAL(clicked()), pModuleParamers, SLOT(slotRunCurrentZone())); + connect(pModuleParamers->m_pbtnRun, SIGNAL(clicked()), pModuleParamers, SLOT(slotRunCurrentZone())); } else { pModuleParamers->m_pParameterEditor->setVisible(true); diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index f6479a2..bc0469c 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -35,6 +35,8 @@ MainWindowCurve::MainWindowCurve(QWidget *parent) : { ui->setupUi(this); + setAcceptDrops(true); + m_pParentWin = qobject_cast(parent); QtCommonClass *qtCommon = new QtCommonClass(this); diff --git a/logPlus/mainwindowsplitter.cpp b/logPlus/mainwindowsplitter.cpp index 0d51986..105074e 100644 --- a/logPlus/mainwindowsplitter.cpp +++ b/logPlus/mainwindowsplitter.cpp @@ -7,9 +7,7 @@ MainWindowSplitter::MainWindowSplitter(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindowSplitter) { - ui->setupUi(this); - - + ui->setupUi(this); } MainWindowSplitter::~MainWindowSplitter() @@ -29,7 +27,7 @@ void MainWindowSplitter::setSplitterWidget(QtProjectWidgets *pWidgets) SetWorkflowConsole(pModuleConsole); pModuleConsole->g_mModuleParamers = pDialog; pModuleConsole->m_pWorkflowDataModel = new CWellLogWorkflowDataModel(); - //pDialog->m_CurrentSLFFileName = strSlfName; + pDialog->m_CurrentSLFFileName = pWidgets->m_strSlfName; pDialog->m_toolBar_plugin = m_PluginToolBar; pDialog->CreatParamControlWidget(); diff --git a/logPlus/mainwindowsplitter.h b/logPlus/mainwindowsplitter.h index 4823119..658cbe5 100644 --- a/logPlus/mainwindowsplitter.h +++ b/logPlus/mainwindowsplitter.h @@ -34,8 +34,6 @@ private: public slots: - - public: QtProjectWidgets *m_leftWidgets = NULL; //左侧工程区