开发工具, 校深拼接暂时注释
This commit is contained in:
parent
691e309beb
commit
e4e8509df6
|
|
@ -268,7 +268,7 @@ void MainWindow::initToolBar()
|
||||||
ui->mainToolBar->addSeparator();//添加分隔符
|
ui->mainToolBar->addSeparator();//添加分隔符
|
||||||
//
|
//
|
||||||
ui->mainToolBar->addAction(QIcon( ::GetImagePath() + "wellsectionwindow.png"), tr("&可视解释"), this, SLOT(s_showView()));
|
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, [=]() {
|
QTimer::singleShot(500, this, [=]() {
|
||||||
QString fileFull = GetProjectFolder() + "例子.wwl";
|
QString fileFull = GetProjectFolder() + "例子.wwl";
|
||||||
|
|
|
||||||
|
|
@ -283,8 +283,8 @@ void MainWindowCurve::initMainToolBar()
|
||||||
ui->mainToolBar->addAction(m_fixwellsectionHeaderAc);
|
ui->mainToolBar->addAction(m_fixwellsectionHeaderAc);
|
||||||
//ui->mainToolBar->addAction(m_currtempliteAc);
|
//ui->mainToolBar->addAction(m_currtempliteAc);
|
||||||
ui->mainToolBar->addAction(m_saveastemplateAc);
|
ui->mainToolBar->addAction(m_saveastemplateAc);
|
||||||
ui->mainToolBar->addAction(m_executeDepthShiftAc);
|
//ui->mainToolBar->addAction(m_executeDepthShiftAc);
|
||||||
ui->mainToolBar->addAction(m_joindepthAc);
|
//ui->mainToolBar->addAction(m_joindepthAc);
|
||||||
ui->mainToolBar->addAction(m_ModuleOpenAc);
|
ui->mainToolBar->addAction(m_ModuleOpenAc);
|
||||||
ui->mainToolBar->addAction(m_SaveAsPictureAc);//导出长图
|
ui->mainToolBar->addAction(m_SaveAsPictureAc);//导出长图
|
||||||
ui->mainToolBar->addAction(m_SaveAsPdfAc);//导出PDF
|
ui->mainToolBar->addAction(m_SaveAsPdfAc);//导出PDF
|
||||||
|
|
|
||||||
|
|
@ -1060,8 +1060,9 @@ void QtProjectWidgets::s_NewProject()
|
||||||
//emit CallManage::getInstance()->sig_CloseProject();//关闭tab页
|
//emit CallManage::getInstance()->sig_CloseProject();//关闭tab页
|
||||||
|
|
||||||
// 创建对话框
|
// 创建对话框
|
||||||
CWellLogProjectDialog* dialog = new CWellLogProjectDialog();
|
CWellLogProjectDialog* dialog = new CWellLogProjectDialog(this);
|
||||||
dialog->Init(NULL);
|
dialog->Init(NULL);
|
||||||
|
dialog->setAttribute(Qt::WA_DeleteOnClose, false);
|
||||||
int result = dialog->exec();//对话框
|
int result = dialog->exec();//对话框
|
||||||
if (result == QDialog::Accepted) {
|
if (result == QDialog::Accepted) {
|
||||||
// 处理用户点击了确定按钮的逻辑
|
// 处理用户点击了确定按钮的逻辑
|
||||||
|
|
@ -1080,6 +1081,7 @@ void QtProjectWidgets::s_NewProject()
|
||||||
// 处理其他情况的逻辑
|
// 处理其他情况的逻辑
|
||||||
qDebug() << "other=";
|
qDebug() << "other=";
|
||||||
}
|
}
|
||||||
|
dialog->deleteLater();
|
||||||
}
|
}
|
||||||
|
|
||||||
void QtProjectWidgets::s_OpenProject(QString fileFull)
|
void QtProjectWidgets::s_OpenProject(QString fileFull)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user