diff --git a/logPlus/mainwindow.cpp b/logPlus/mainwindow.cpp index 9d993a9..0c066c2 100644 --- a/logPlus/mainwindow.cpp +++ b/logPlus/mainwindow.cpp @@ -188,40 +188,46 @@ void MainWindow::initToolBar() QSize toolIconSize(18, 18); ui->mainToolBar->setIconSize(toolIconSize); //设置工具栏图标大小 - QIcon newFileIcon(":/image/new.png"); - QIcon openFileIcon(":/image/open.png"); - QIcon compileIcon(":/image/compile.png"); - QIcon runIcon(":/image/capacity.png"); - QIcon debugIcon(":/image/anaysis.png"); - QIcon grepIcon(":/image/grab.png"); - QIcon loadIcon(":/image/export.png"); + QIcon newprojectIcon(::GetImagePath()+"newproject.png"); + QIcon openprojectIcon(::GetImagePath()+"openproject.png"); + QIcon saveprojectIcon(::GetImagePath()+"saveproject.png"); + // + QIcon wellogIcon(::GetImagePath()+"wellog.png"); + QIcon outcurvesIcon(::GetImagePath()+"outcurves.png"); + // + QIcon wellsectionwindowIcon(::GetImagePath()+"wellsectionwindow.png"); + QIcon developmentIcon(::GetImagePath()+"development.png"); - m_newAc = new QAction(newFileIcon, "新建项目", this); - m_openAc = new QAction(openFileIcon, "打开项目", this); - m_grepAc = new QAction(grepIcon, "可视解释", this);//启用缩放 - m_compileAc = new QAction(compileIcon, "新建道", this); - m_runAc = new QAction(runIcon, "保存图像", this); - m_debugAc = new QAction(debugIcon, "画图", this); - m_loadAc = new QAction(loadIcon, "画线", this); + m_newprojectAc = new QAction(newprojectIcon, "新建项目", this); + m_openprojectAc = new QAction(openprojectIcon, "打开项目", this); + m_saveprojectAc = new QAction(saveprojectIcon, "保存项目", this); + m_wellsectionwindowAc = new QAction(wellsectionwindowIcon, "可视解释", this); + m_wellogAc = new QAction(wellogIcon, "数据导入", this); + m_outcurvesAc = new QAction(outcurvesIcon, "数据导出", this); + m_developmentAc = new QAction(developmentIcon, "开发工具", this); ui->mainToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); //此种方式为文字显示在图标右侧 //add QAction to Widget. - ui->mainToolBar->addAction(m_newAc); - ui->mainToolBar->addAction(m_openAc); - ui->mainToolBar->addAction(m_grepAc); - ui->mainToolBar->addAction(m_compileAc); - ui->mainToolBar->addAction(m_runAc); - ui->mainToolBar->addAction(m_debugAc); - ui->mainToolBar->addAction(m_loadAc); + ui->mainToolBar->addAction(m_newprojectAc); + ui->mainToolBar->addAction(m_openprojectAc); + ui->mainToolBar->addAction(m_saveprojectAc); + ui->mainToolBar->addSeparator();//添加分隔符 + // + ui->mainToolBar->addAction(m_wellogAc); + ui->mainToolBar->addAction(m_outcurvesAc); + ui->mainToolBar->addSeparator();//添加分隔符 + // + ui->mainToolBar->addAction(m_wellsectionwindowAc); + ui->mainToolBar->addAction(m_developmentAc); - connect(m_newAc, &QAction::triggered, this, &MainWindow::s_New); - connect(m_openAc, &QAction::triggered, this, &MainWindow::s_Open); - connect(m_grepAc, &QAction::triggered, this, &MainWindow::s_showView);//s_Risize - connect(m_compileAc, &QAction::triggered, this, &MainWindow::s_AddOne); - connect(m_runAc, &QAction::triggered, this, &MainWindow::s_SaveImage); - connect(m_debugAc, &QAction::triggered, this, &MainWindow::s_DrawImg); - connect(m_loadAc, &QAction::triggered, this, &MainWindow::s_DrawLine); + connect(m_newprojectAc, &QAction::triggered, this, &MainWindow::s_New); + connect(m_openprojectAc, &QAction::triggered, this, &MainWindow::s_Open); + connect(m_wellsectionwindowAc, &QAction::triggered, this, &MainWindow::s_showView);//s_Risize +// connect(m_compileAc, &QAction::triggered, this, &MainWindow::s_AddOne); +// connect(m_runAc, &QAction::triggered, this, &MainWindow::s_SaveImage); +// connect(m_debugAc, &QAction::triggered, this, &MainWindow::s_DrawImg); +// connect(m_loadAc, &QAction::triggered, this, &MainWindow::s_DrawLine); } //左侧 diff --git a/logPlus/mainwindow.h b/logPlus/mainwindow.h index 602944f..ca3e520 100644 --- a/logPlus/mainwindow.h +++ b/logPlus/mainwindow.h @@ -36,13 +36,14 @@ private: public: //工具栏 - QAction* m_newAc = nullptr; //新建 - QAction* m_openAc = nullptr; //打开 - QAction* m_compileAc = nullptr; // - QAction* m_runAc = nullptr;// - QAction* m_debugAc = nullptr; // - QAction* m_grepAc = nullptr; // - QAction* m_loadAc = nullptr; //加载 + QAction* m_newprojectAc = nullptr; //新建 + QAction* m_openprojectAc = nullptr; //打开 + QAction* m_saveprojectAc = nullptr; //保存 + // + QAction* m_wellogAc = nullptr; //数据导入 + QAction* m_outcurvesAc = nullptr; //数据导出 + QAction* m_wellsectionwindowAc = nullptr;//可视解释 + QAction* m_developmentAc = nullptr; //开发工具 //停靠栏 QStackedWidget *m_stackedWidget_Center = nullptr;//中间工作区stack diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index dd946da..31b40f0 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -157,51 +157,51 @@ void MainWindowCurve::initMainToolBar() QSize toolIconSize(18, 18); ui->mainToolBar->setIconSize(toolIconSize); //设置工具栏图标大小 - QIcon newFileIcon(":/image/new.png"); + QIcon fixwellsectionHeaderIcon(::GetImagePath()+"icon/fixwellsectionHeader.png"); + QIcon currtempliteIcon(::GetImagePath()+"icon/currtemplite.png"); + QIcon saveastemplateIcon(::GetImagePath()+"icon/saveastemplate.png"); QIcon openFileIcon(":/image/open.png"); - QIcon compileIcon(":/image/compile.png"); QIcon runIcon(":/image/capacity.png"); QIcon debugIcon(":/image/anaysis.png"); - QIcon grepIcon(":/image/grab.png"); QIcon loadIcon(":/image/export.png"); //Main工具栏 - QAction* m_saveAc = nullptr; //保存 + QAction* m_fixwellsectionHeaderAc = nullptr; //锁头 + QAction* m_currtempliteAc = nullptr; //加载图文件 + QAction* m_saveastemplateAc = nullptr; //另存为图文件 //QAction* m_openAc = nullptr; //打开 - QAction* m_compileAc = nullptr; // - QAction* m_runAc = nullptr;// - QAction* m_debugAc = nullptr; // - QAction* m_grepAc = nullptr; // - QAction* m_loadAc = nullptr; //加载 +// QAction* m_runAc = nullptr;// +// QAction* m_debugAc = nullptr; // +// QAction* m_loadAc = nullptr; //加载 - m_saveAc = new QAction(newFileIcon, "保存", this); + m_fixwellsectionHeaderAc = new QAction(fixwellsectionHeaderIcon, "锁头", this); + m_currtempliteAc = new QAction(currtempliteIcon, "加载图文件", this); + m_saveastemplateAc = new QAction(saveastemplateIcon, "另存为图文件", this); +// m_runAc = new QAction(runIcon, "设置井", this); +// m_debugAc = new QAction(debugIcon, "撤销", this); +// m_loadAc = new QAction(loadIcon, "重做", this); //m_openAc = new QAction(openFileIcon, "打开", this); - m_grepAc = new QAction(grepIcon, "图头", this); - m_compileAc = new QAction(compileIcon, "加载图文件", this); - m_runAc = new QAction(runIcon, "设置井", this); - m_debugAc = new QAction(debugIcon, "撤销", this); - m_loadAc = new QAction(loadIcon, "重做", this); ui->mainToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); //此种方式为文字显示在图标右侧 //add QAction to Widget. - ui->mainToolBar->addAction(m_saveAc); + ui->mainToolBar->addAction(m_fixwellsectionHeaderAc); + ui->mainToolBar->addAction(m_currtempliteAc); + ui->mainToolBar->addAction(m_saveastemplateAc); +// ui->mainToolBar->addAction(m_runAc); +// ui->mainToolBar->addAction(m_debugAc); +// ui->mainToolBar->addAction(m_loadAc); //ui->mainToolBar->addAction(m_openAc); - ui->mainToolBar->addAction(m_grepAc); - ui->mainToolBar->addAction(m_compileAc); - ui->mainToolBar->addAction(m_runAc); - ui->mainToolBar->addAction(m_debugAc); - ui->mainToolBar->addAction(m_loadAc); - connect(m_saveAc, &QAction::triggered, this, &MainWindowCurve::s_Save); - //connect(m_openAc, &QAction::triggered, this, &MainWindowCurve::s_Open); - connect(m_grepAc, &QAction::triggered, this, &MainWindowCurve::s_showHeadTable); + connect(m_saveastemplateAc, &QAction::triggered, this, &MainWindowCurve::s_Save); + connect(m_fixwellsectionHeaderAc, &QAction::triggered, this, &MainWindowCurve::s_showHeadTable); // connect(m_grepAc, &QAction::triggered, this, &MainWindow::s_Risize); // connect(m_compileAc, &QAction::triggered, this, &MainWindow::s_AddOne); // connect(m_runAc, &QAction::triggered, this, &MainWindow::s_SaveImage); // connect(m_debugAc, &QAction::triggered, this, &MainWindow::s_DrawImg); // connect(m_loadAc, &QAction::triggered, this, &MainWindow::s_DrawLine); + //connect(m_openAc, &QAction::triggered, this, &MainWindowCurve::s_Open); } //初始化工具栏 void MainWindowCurve::initToolBar() @@ -209,59 +209,164 @@ void MainWindowCurve::initToolBar() QSize toolIconSize(18, 18); ui->toolBar->setIconSize(toolIconSize); //设置工具栏图标大小 - QIcon newFileIcon(":/image/new.png"); - QIcon openFileIcon(":/image/open.png"); - QIcon compileIcon(":/image/compile.png"); - QIcon runIcon(":/image/capacity.png"); - QIcon debugIcon(":/image/anaysis.png"); - QIcon grepIcon(":/image/grab.png"); - QIcon loadIcon(":/image/export.png"); + QIcon blankTrackIcon(::GetImagePath()+"icon/BlankTrack.png"); + QIcon depthIcon(::GetImagePath()+"icon/depth.png"); + QIcon logsIcon(::GetImagePath()+"icon/logs.png"); + QIcon waveIcon(::GetImagePath()+"icon/wave.png"); + QIcon OGResultIcon(::GetImagePath()+"icon/OGResult.png"); + QIcon gujingIcon(::GetImagePath()+"icon/gujing.png"); + QIcon sidecoreIcon(::GetImagePath()+"icon/sidecore.png"); + // + QIcon coreIcon(::GetImagePath()+"icon/Core.png"); + QIcon mudloggingIcon(::GetImagePath()+"icon/mudlogging.png"); + QIcon txtIcon(::GetImagePath()+"icon/txt.png"); + QIcon coreimageIcon(::GetImagePath()+"icon/coreimage.png"); + QIcon santuyibiaoIcon(::GetImagePath()+"icon/santuyibiao.png"); + QIcon crackIcon(::GetImagePath()+"icon/crack.png"); + QIcon showdipIcon(::GetImagePath()+"icon/showdip.png"); + QIcon pinlvIcon(::GetImagePath()+"icon/pinlv.png"); + QIcon ganzhuangtuIcon(::GetImagePath()+"icon/ganzhuangtu.png"); + QIcon roseIcon(::GetImagePath()+"icon/rose.png"); + QIcon collapseIcon(::GetImagePath()+"icon/collapse.png"); + QIcon deviIcon(::GetImagePath()+"icon/devi.png"); + QIcon electric_imagingIcon(::GetImagePath()+"icon/electric_imaging.png"); + QIcon DCAIcon(::GetImagePath()+"icon/DCA.png"); + QIcon GeoSectionIcon(::GetImagePath()+"icon/GeoSection.png"); + QIcon jiegutextIcon(::GetImagePath()+"icon/jiegutext.png"); + QIcon mcalsIcon(::GetImagePath()+"icon/mcals.png"); + QIcon logfaceIcon(::GetImagePath()+"icon/logface.png"); + QIcon TubingstringIcon(::GetImagePath()+"icon/Tubingstring.png"); + QIcon TDTIcon(::GetImagePath()+"icon/TDT.png"); + QIcon LogMudIcon(::GetImagePath()+"icon/LogMud.png"); //工具栏 - QAction* m_newAc2 = nullptr; //新建 - QAction* m_openAc2 = nullptr; //打开 - QAction* m_compileAc2 = nullptr; // - QAction* m_runAc2 = nullptr;// - QAction* m_debugAc2 = nullptr; // - QAction* m_grepAc2 = nullptr; // - QAction* m_loadAc2 = nullptr; //加载 + QAction* m_blankTrackAc = nullptr; + QAction* m_depthAc = nullptr; + QAction* m_logsAc = nullptr; + QAction* m_waveAc = nullptr; + QAction* m_OGResultAc = nullptr; + QAction* m_gujingAc = nullptr; + QAction* m_sidecoreAc = nullptr; + // + QAction* m_coreAc = nullptr; + QAction* m_mudloggingAc = nullptr; + QAction* m_txtAc = nullptr; + QAction* m_coreimageAc = nullptr; + QAction* m_santuyibiaoAc = nullptr; + QAction* m_crackAc = nullptr; + QAction* m_showdipAc = nullptr; + QAction* m_pinlvAc = nullptr; + QAction* m_ganzhuangtuAc = nullptr; + QAction* m_roseAc = nullptr; + QAction* m_collapseAc = nullptr; + QAction* m_deviAc = nullptr; + QAction* m_electric_imagingAc = nullptr; + QAction* m_DCAAc = nullptr; + QAction* m_GeoSectionAc = nullptr; + QAction* m_jiegutextAc = nullptr; + QAction* m_mcalsAc = nullptr; + QAction* m_logfaceAc = nullptr; + QAction* m_TubingstringAc = nullptr; + QAction* m_TDTAc = nullptr; + QAction* m_LogMudAc = nullptr; - QAction* _depth = new QAction(QIcon(":/image/fail.png"), "", this); //深度 - _depth->setToolTip("深度"); + m_blankTrackAc = new QAction(blankTrackIcon, "", this); + m_depthAc = new QAction(depthIcon, "", this); + m_logsAc = new QAction(logsIcon, "", this); + m_waveAc = new QAction(waveIcon, "", this); + m_OGResultAc = new QAction(OGResultIcon, "", this); + m_gujingAc = new QAction(gujingIcon, "", this); + m_sidecoreAc = new QAction(sidecoreIcon, "", this); + // + m_coreAc = new QAction(coreIcon, "", this); + m_mudloggingAc = new QAction(mudloggingIcon, "", this); + m_txtAc = new QAction(txtIcon, "", this); + m_coreimageAc = new QAction(coreimageIcon, "", this); + m_santuyibiaoAc = new QAction(santuyibiaoIcon, "", this); + m_crackAc = new QAction(crackIcon, "", this); + m_showdipAc = new QAction(showdipIcon, "", this); + m_pinlvAc = new QAction(pinlvIcon, "", this); + m_ganzhuangtuAc = new QAction(ganzhuangtuIcon, "", this); + m_roseAc = new QAction(roseIcon, "", this); + m_collapseAc = new QAction(collapseIcon, "", this); + m_deviAc = new QAction(deviIcon, "", this); + m_electric_imagingAc = new QAction(electric_imagingIcon, "", this); + m_DCAAc = new QAction(DCAIcon, "", this); + m_GeoSectionAc = new QAction(GeoSectionIcon, "", this); + m_jiegutextAc = new QAction(jiegutextIcon, "", this); + m_mcalsAc = new QAction(mcalsIcon, "", this); + m_logfaceAc = new QAction(logfaceIcon, "", this); + m_TubingstringAc = new QAction(TubingstringIcon, "", this); + m_TDTAc = new QAction(TDTIcon, "", this); + m_LogMudAc = new QAction(LogMudIcon, "", this); - m_newAc2 = new QAction(newFileIcon, "", this); - m_openAc2 = new QAction(openFileIcon, "", this); - m_grepAc2 = new QAction(grepIcon, "", this); - m_compileAc2 = new QAction(compileIcon, "", this); - m_runAc2 = new QAction(runIcon, "", this); - m_debugAc2 = new QAction(debugIcon, "", this); - m_loadAc2 = new QAction(loadIcon, "", this); - m_newAc2->setToolTip("井"); - m_openAc2->setToolTip("道"); - m_grepAc2->setToolTip("曲线"); - m_compileAc2->setToolTip("波列"); - m_runAc2->setToolTip("解释结论道"); - m_debugAc2->setToolTip("固井结论道"); - m_loadAc2->setToolTip("井壁取心"); - ui->toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly); //此种方式为文字显示在图标右侧 + m_blankTrackAc->setToolTip("道"); + m_depthAc->setToolTip("深度"); + m_logsAc->setToolTip("曲线"); + m_waveAc->setToolTip("波列"); + m_OGResultAc->setToolTip("解释结论道"); + m_gujingAc->setToolTip("固井结论道"); + m_sidecoreAc->setToolTip("井壁取心"); + // + m_coreAc->setToolTip("岩心分析"); + m_mudloggingAc->setToolTip("录井剖面"); + m_txtAc->setToolTip("岩性描述"); + m_coreimageAc->setToolTip("岩心照片"); + m_santuyibiaoAc->setToolTip("斜井三图一表"); + m_crackAc->setToolTip("裂缝"); + m_showdipAc->setToolTip("蝌蚪图"); + m_pinlvAc->setToolTip("频率统计图"); + m_ganzhuangtuAc->setToolTip("杆状图"); + m_roseAc->setToolTip("玫瑰图"); + m_collapseAc->setToolTip("井眼垮塌矢量图"); + m_deviAc->setToolTip("井斜方位图"); + m_electric_imagingAc->setToolTip("图像"); + m_DCAAc->setToolTip("裂缝DCA分析"); + m_GeoSectionAc->setToolTip("地质层位道"); + m_jiegutextAc->setToolTip("气测/管柱/文本/FMT/射孔"); + m_mcalsAc->setToolTip("多臂井径"); + m_logfaceAc->setToolTip("沉积相"); + m_TubingstringAc->setToolTip("套管组件"); + m_TDTAc->setToolTip("TDT"); + m_LogMudAc->setToolTip("LogMud"); + + //此种方式为文字显示在图标右侧 + ui->toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly); //add QAction to Widget. - ui->toolBar->addAction(m_newAc2); - ui->toolBar->addAction(m_openAc2); - - ui->toolBar->addAction(_depth); - - ui->toolBar->addAction(m_grepAc2); - ui->toolBar->addAction(m_compileAc2); - ui->toolBar->addAction(m_runAc2); - ui->toolBar->addAction(m_debugAc2); - ui->toolBar->addAction(m_loadAc2); + ui->toolBar->addAction(m_blankTrackAc); + ui->toolBar->addAction(m_depthAc); + ui->toolBar->addAction(m_logsAc); + ui->toolBar->addAction(m_waveAc); + ui->toolBar->addAction(m_OGResultAc); + ui->toolBar->addAction(m_gujingAc); + ui->toolBar->addAction(m_sidecoreAc); + // + ui->toolBar->addAction(m_coreAc); + ui->toolBar->addAction(m_mudloggingAc); + ui->toolBar->addAction(m_txtAc); + ui->toolBar->addAction(m_coreimageAc); + ui->toolBar->addAction(m_santuyibiaoAc); + ui->toolBar->addAction(m_crackAc); + ui->toolBar->addAction(m_showdipAc); + ui->toolBar->addAction(m_pinlvAc); + ui->toolBar->addAction(m_ganzhuangtuAc); + ui->toolBar->addAction(m_roseAc); + ui->toolBar->addAction(m_collapseAc); + ui->toolBar->addAction(m_deviAc); + ui->toolBar->addAction(m_electric_imagingAc); + ui->toolBar->addAction(m_DCAAc); + ui->toolBar->addAction(m_GeoSectionAc); + ui->toolBar->addAction(m_jiegutextAc); + ui->toolBar->addAction(m_mcalsAc); + ui->toolBar->addAction(m_logfaceAc); + ui->toolBar->addAction(m_TubingstringAc); + ui->toolBar->addAction(m_TDTAc); + ui->toolBar->addAction(m_LogMudAc); //connect(m_newAc2, &QAction::triggered, this, &MainWindowCurve::s_NewWell); - connect(m_openAc2, &QAction::triggered, this, &MainWindowCurve::s_NewTrack); - - connect(_depth, &QAction::triggered, this, &MainWindowCurve::s_NewDepth); + connect(m_depthAc, &QAction::triggered, this, &MainWindowCurve::s_NewDepth); // connect(m_compileAc, &QAction::triggered, this, &MainWindow::s_AddOne); // connect(m_runAc, &QAction::triggered, this, &MainWindow::s_SaveImage); // connect(m_debugAc, &QAction::triggered, this, &MainWindow::s_DrawImg); diff --git a/logPlus/qtprojectwidgets.cpp b/logPlus/qtprojectwidgets.cpp index 33e2e34..e326d1e 100644 --- a/logPlus/qtprojectwidgets.cpp +++ b/logPlus/qtprojectwidgets.cpp @@ -35,7 +35,7 @@ QtProjectWidgets::QtProjectWidgets(QWidget *parent) QFont font("微软雅黑", 12, QFont::Bold, false); QColor _fontColor = QColor(220, 220, 220); QtCommonClass *qtCommon = new QtCommonClass(this); - qtCommon->setButtonIconWithText(ui->btnFind, ":/image/find.png", "", font, _fontColor); + qtCommon->setButtonIconWithText(ui->btnFind, ::GetImagePath()+"crossplot/search.png", "", font, _fontColor); //initTreeWidget("", "wwer");