diff --git a/logPlus/mainwindow.cpp b/logPlus/mainwindow.cpp index 26f7510..2b4f78e 100644 --- a/logPlus/mainwindow.cpp +++ b/logPlus/mainwindow.cpp @@ -268,8 +268,8 @@ void MainWindow::initToolBar() ui->mainToolBar->addSeparator();//添加分隔符 // ui->mainToolBar->addAction(QIcon( ::GetImagePath() + "wellsectionwindow.png"), tr("&可视解释"), this, SLOT(s_showView())); - ui->mainToolBar->addAction(QIcon( ::GetImagePath() + "development.png"), tr("&开发工具"), this, SLOT(s_development())); - + //ui->mainToolBar->addAction(QIcon( ::GetImagePath() + "development.png"), tr("&开发工具"), this, SLOT(s_development())); + QTimer::singleShot(500, this, [=]() { QString fileFull = GetProjectFolder() + "例子.wwl"; QFileInfo fileInfo(fileFull); diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index acb86eb..fad7603 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -283,8 +283,8 @@ void MainWindowCurve::initMainToolBar() ui->mainToolBar->addAction(m_fixwellsectionHeaderAc); //ui->mainToolBar->addAction(m_currtempliteAc); ui->mainToolBar->addAction(m_saveastemplateAc); - ui->mainToolBar->addAction(m_executeDepthShiftAc); - ui->mainToolBar->addAction(m_joindepthAc); + //ui->mainToolBar->addAction(m_executeDepthShiftAc); + //ui->mainToolBar->addAction(m_joindepthAc); ui->mainToolBar->addAction(m_ModuleOpenAc); ui->mainToolBar->addAction(m_SaveAsPictureAc);//导出长图 ui->mainToolBar->addAction(m_SaveAsPdfAc);//导出PDF diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index 0aa8c17..9113f67 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -332,7 +332,7 @@ void QMyCustomPlot::initWave(QString strSlfName, QString strWaveName) DifBase = (m_MaxRange - m_Base) / 1; } if (fabs(DifBase) <= 1e-6) DifBase = 1; - + yscale = m_nWaveHei + DifBase; yscale = yscale / DifBase; } diff --git a/logPlus/qtprojectwidgets.cpp b/logPlus/qtprojectwidgets.cpp index a0d864a..ff376f6 100644 --- a/logPlus/qtprojectwidgets.cpp +++ b/logPlus/qtprojectwidgets.cpp @@ -1060,8 +1060,9 @@ void QtProjectWidgets::s_NewProject() //emit CallManage::getInstance()->sig_CloseProject();//关闭tab页 // 创建对话框 - CWellLogProjectDialog* dialog = new CWellLogProjectDialog(); + CWellLogProjectDialog* dialog = new CWellLogProjectDialog(this); dialog->Init(NULL); + dialog->setAttribute(Qt::WA_DeleteOnClose, false); int result = dialog->exec();//对话框 if (result == QDialog::Accepted) { // 处理用户点击了确定按钮的逻辑 @@ -1080,6 +1081,7 @@ void QtProjectWidgets::s_NewProject() // 处理其他情况的逻辑 qDebug() << "other="; } + dialog->deleteLater(); } void QtProjectWidgets::s_OpenProject(QString fileFull)