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

修改窗口布局引起的 左侧树拖动到画布拖动事件没有问题。

Browse Source 
修改右侧方法模块，点击小按钮崩溃问题。
This commit is contained in:
DESKTOP-450PEFP\mainc 2026-03-20 20:13:31 +08:00
parent c7a8392ffd
commit b0ed30be98
5 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ModuleConsole/src/PaiInfoEditor.cpp
View File

@ -423,6 +423,11 @@ void CPaiInfoEditor::slotShowLoadingAnimate()
IDialogFactory& afactory=CDialogFactory::GetFatory(); IDialogFactory& afactory=CDialogFactory::GetFatory();
QUuid classID = QUuid(GetClassID_ChooseCurveDlg()); QUuid classID = QUuid(GetClassID_ChooseCurveDlg());
CDialogFactory* adlg=afactory.CreateObject(classID); CDialogFactory* adlg=afactory.CreateObject(classID);
if (adlg == NULL)
{
return;
}
QDialog * pDlg = dynamic_cast<QDialog *>(adlg); QDialog * pDlg = dynamic_cast<QDialog *>(adlg);
Qt::WindowFlags flags = pDlg->windowFlags(); Qt::WindowFlags flags = pDlg->windowFlags();
flags |= Qt::WindowStaysOnTopHint; flags |= Qt::WindowStaysOnTopHint;

22
ModuleConsole/src/WorkflowSceneManager.cpp
View File

@ -1371,14 +1371,20 @@ void WorkflowSceneManager::slotAddModule(const QString& moduleName)
pModuleParamers->m_toolBar_plugin->show(); pModuleParamers->m_toolBar_plugin->show();
} }
QRect rt=amodule->parDialog->geometry(); // QRect rt=amodule->parDialog->geometry();
pModuleParamers->m_pParameterEditor->setVisible(false); // pModuleParamers->m_pParameterEditor->setVisible(false);
pModuleParamers->m_pDialogLayout->setVisible(true); // pModuleParamers->m_pDialogLayout->setVisible(true);
amodule->parDialog->setMinimumHeight(rt.height()); // amodule->parDialog->setMinimumHeight(rt.height());
pModuleParamers->m_pDialogLayout->setWidget(amodule->parDialog); // pModuleParamers->m_pDialogLayout->setWidget(amodule->parDialog);
disconnect(pModuleParamers->m_pbtnRun,SIGNAL(clicked()),pModuleParamers,SLOT(slotRunCurrentZone())); // disconnect(pModuleParamers->m_pbtnRun,SIGNAL(clicked()),pModuleParamers,SLOT(slotRunCurrentZone()));
pModuleParamers->m_pbtnRun->setVisible(false); // pModuleParamers->m_pbtnRun->setVisible(false);
pModuleParamers->m_pbtnRun->setEnabled(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 { else {
pModuleParamers->m_pParameterEditor->setVisible(true); pModuleParamers->m_pParameterEditor->setVisible(true);

2
logPlus/mainwindowcurve.cpp
View File

@ -35,6 +35,8 @@ MainWindowCurve::MainWindowCurve(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
setAcceptDrops(true);
m_pParentWin = qobject_cast<MainWindowSplitter*>(parent); m_pParentWin = qobject_cast<MainWindowSplitter*>(parent);
QtCommonClass *qtCommon = new QtCommonClass(this); QtCommonClass *qtCommon = new QtCommonClass(this);

6
logPlus/mainwindowsplitter.cpp
View File

@ -7,9 +7,7 @@ MainWindowSplitter::MainWindowSplitter(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindowSplitter) ui(new Ui::MainWindowSplitter)
{ {
ui->setupUi(this); ui->setupUi(this);
} }
MainWindowSplitter::~MainWindowSplitter() MainWindowSplitter::~MainWindowSplitter()
@ -29,7 +27,7 @@ void MainWindowSplitter::setSplitterWidget(QtProjectWidgets *pWidgets)
SetWorkflowConsole(pModuleConsole); SetWorkflowConsole(pModuleConsole);
pModuleConsole->g_mModuleParamers = pDialog; pModuleConsole->g_mModuleParamers = pDialog;
pModuleConsole->m_pWorkflowDataModel = new CWellLogWorkflowDataModel(); pModuleConsole->m_pWorkflowDataModel = new CWellLogWorkflowDataModel();
//pDialog->m_CurrentSLFFileName = strSlfName; pDialog->m_CurrentSLFFileName = pWidgets->m_strSlfName;
pDialog->m_toolBar_plugin = m_PluginToolBar; pDialog->m_toolBar_plugin = m_PluginToolBar;
pDialog->CreatParamControlWidget(); pDialog->CreatParamControlWidget();

2
logPlus/mainwindowsplitter.h
View File

@ -34,8 +34,6 @@ private:
public slots: public slots:
public: public:
QtProjectWidgets *m_leftWidgets = NULL; //左侧工程区 QtProjectWidgets *m_leftWidgets = NULL; //左侧工程区