修改窗口布局引起的 左侧树拖动到画布拖动事件没有问题。
修改右侧方法模块,点击小按钮崩溃问题。
This commit is contained in:
parent
c7a8392ffd
commit
b0ed30be98
|
|
@ -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<QDialog *>(adlg);
|
||||
Qt::WindowFlags flags = pDlg->windowFlags();
|
||||
flags |= Qt::WindowStaysOnTopHint;
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -35,6 +35,8 @@ MainWindowCurve::MainWindowCurve(QWidget *parent) :
|
|||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
setAcceptDrops(true);
|
||||
|
||||
m_pParentWin = qobject_cast<MainWindowSplitter*>(parent);
|
||||
|
||||
QtCommonClass *qtCommon = new QtCommonClass(this);
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@ MainWindowSplitter::MainWindowSplitter(QWidget *parent) :
|
|||
ui(new Ui::MainWindowSplitter)
|
||||
{
|
||||
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();
|
||||
|
||||
|
|
|
|||
|
|
@ -34,8 +34,6 @@ private:
|
|||
|
||||
public slots:
|
||||
|
||||
|
||||
|
||||
public:
|
||||
|
||||
QtProjectWidgets *m_leftWidgets = NULL; //左侧工程区
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user