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

Compare commits

base: jiayulong:83516b45811459f784c80a697c4ed31305802f0f
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:76261bcea0c61dcdfe3e1d24bc36a7fe8c6e28c8
Branches Tags
jiayulong:main
jiayulong:master

No commits in common. "83516b45811459f784c80a697c4ed31305802f0f" and "76261bcea0c61dcdfe3e1d24bc36a7fe8c6e28c8" have entirely different histories.
83516b4581 ... 76261bcea0

5 changed files with 14 additions and 23 deletions
Show Stats Expand all files Collapse all files

5
ModuleConsole/src/PaiInfoEditor.cpp
View File

@ -423,11 +423,6 @@ 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;

22
ModuleConsole/src/WorkflowSceneManager.cpp
View File

@ -1371,20 +1371,14 @@ 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);
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()));
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);
}
else {
pModuleParamers->m_pParameterEditor->setVisible(true);

2
logPlus/mainwindowcurve.cpp
View File

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

6
logPlus/mainwindowsplitter.cpp
View File

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

2
logPlus/mainwindowsplitter.h
View File

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