From f84620f56bde5cda90c40fa8bd3aafe5cede417e Mon Sep 17 00:00:00 2001 From: jiayulong Date: Thu, 23 Apr 2026 14:02:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9C=A8=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=81=93=E4=B8=8A=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9D=86?= =?UTF-8?q?=E7=8A=B6=E5=9B=BE=E3=80=81=E4=BA=95=E7=9C=BC=E5=9E=AE=E5=A1=8C?= =?UTF-8?q?=E7=9F=A2=E9=87=8F=E5=9B=BE=E3=80=81=E4=BA=95=E6=96=9C=E6=96=B9?= =?UTF-8?q?=E4=BD=8D=E5=9B=BE=E3=80=81=E5=A4=9A=E8=87=82=E4=BA=95=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/mainwindowcurve.cpp | 100 +++++++++++++----------------------- 1 file changed, 35 insertions(+), 65 deletions(-) diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index e50b503..2713c95 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -3578,10 +3578,6 @@ void MainWindowCurve::s_NewCoreImage() //斜井三图一表 void MainWindowCurve::s_NewSantuyibiao() { -// QStringList sret = this->getSelectWell(); -// if(sret.length() <= 0) -// return; - //选中道 if(m_SelectTableItem.m_iTableType==2) { //斜井三图一表 @@ -3600,10 +3596,6 @@ void MainWindowCurve::s_NewSantuyibiao() //裂缝 void MainWindowCurve::s_NewCrack() { -// QStringList sret = this->getSelectWell(); -// if(sret.length() <= 0) -// return; - //选中道 if(m_SelectTableItem.m_iTableType==2) { //新建表格曲线 @@ -3656,8 +3648,16 @@ void MainWindowCurve::s_pinLvAc() emit CallManage::getInstance()->sig_NewCol(dt); } +//杆状图 void MainWindowCurve::s_NewGanZhuangTu() { + //选中道 + if(m_SelectTableItem.m_iTableType==2) { + //新建杆状图 + emit CallManage::getInstance()->sig_AddGanZhuangTu(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "GANZHUANG.LINE"); + return; + } + int nW = 4; QStringList sret = this->insertCol(nW); if (sret.length() <= 0) @@ -3709,6 +3709,13 @@ void MainWindowCurve::s_dcaAc() //井眼垮塌矢量图 void MainWindowCurve::s_Jykt() { + //选中道 + if(m_SelectTableItem.m_iTableType==2) { + //新建井眼垮塌矢量图 + emit CallManage::getInstance()->sig_AddJykt(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "JINGYANKUATA.LINE"); + return; + } + int nW = 4; QStringList sret = this->insertCol(nW); if (sret.length() <= 0) @@ -3724,6 +3731,13 @@ void MainWindowCurve::s_Jykt() //井斜方位图 void MainWindowCurve::s_Denv() { + //选中道 + if(m_SelectTableItem.m_iTableType==2) { + //新建井斜方位图 + emit CallManage::getInstance()->sig_AddDenv(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "XIEFANGWEI.LINE"); + return; + } + int nW = 4; QStringList sret = this->insertCol(nW); if (sret.length() <= 0) @@ -3739,52 +3753,13 @@ void MainWindowCurve::s_Denv() //图像 成图 void MainWindowCurve::s_DrawImage() { -// QString strSlfName = ""; -// QString strLeft = m_leftWidgets->getLeftTreeString(); -// if(strLeft.length() > 0) -// { -// QStringList list = strLeft.split("#@@#");//QString字符串分割函数 -// if (list.size() > 3) -// { -// strSlfName = list[0]; -// } -// } - - if(ui->tableWidget_2->columnCount()==0) - { - return; - } - - int column = ui->tableWidget_2->currentColumn();//列编号从0开始 - if(column<0) - { - //当前没有选中井 - QMessageBox::warning(this, "提示", "当前没有选中井", "确定"); - return; - } - - if(column%2==0) - { - } - else - { - //空白列 - QMessageBox::warning(this, "提示", "当前没有选中井", "确定"); - return; - } - - QStringList sret = this->getSelectWell_New(); - if (sret.length() <= 0) - return; - QString strWellName = sret.at(0); - //直接从选中的井获取，data记录slf路径 - QString strSlfName = sret.at(1); - - int iWidth = ui->tableWidget_2->columnWidth(column); - int nW = 4; - //设置列宽 - ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm+8); + QStringList sret = this->insertCol(nW); + if (sret.length() <= 0) + return; + QString strWellName = sret.at(0); + //直接从选中的井获取，data记录slf路径 + QString strSlfName = sret.at(1); //新建道 emit CallManage::getInstance()->sig_NewTrack(m_strUuid, strWellName, strSlfName, "成像", "DrawImageObject", nW); @@ -3811,10 +3786,6 @@ void MainWindowCurve::s_NewGeoSection() //气测/FMT/射孔/文本 void MainWindowCurve::s_NewJiegutext() { -// QStringList sret = this->getSelectWell(); -// if(sret.length() <= 0) -// return; - //选中道 if(m_SelectTableItem.m_iTableType==2) { //气测/FMT/射孔/文本 @@ -3833,10 +3804,6 @@ void MainWindowCurve::s_NewJiegutext() //沉积相 void MainWindowCurve::s_NewLogface() { -// QStringList sret = this->getSelectWell(); -// if(sret.length() <= 0) -// return; - //选中道 if(m_SelectTableItem.m_iTableType==2) { //沉积相 @@ -3855,6 +3822,13 @@ void MainWindowCurve::s_NewLogface() //多臂井径 void MainWindowCurve::s_NewMCals() { + //选中道 + if(m_SelectTableItem.m_iTableType==2) { + //多臂井径 + emit CallManage::getInstance()->sig_AddMCals(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "FCA2"); + return; + } + QStringList sret = this->getSelectWell(); if(sret.length() <= 0) return; @@ -3866,10 +3840,6 @@ void MainWindowCurve::s_NewMCals() //套管组件 void MainWindowCurve::s_NewTubingstring() { -// QStringList sret = this->getSelectWell(); -// if(sret.length() <= 0) -// return; - //选中道 if(m_SelectTableItem.m_iTableType==2) { //套管组件