diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index 632422c..d56ef41 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -3718,16 +3718,12 @@ void MainWindowCurve::s_NewGanZhuangTu() return; } - int nW = 4; - QStringList sret = this->insertCol(nW); - if (sret.length() <= 0) - return; - QString strWellName = sret.at(0); - //直接从选中的井获取,data记录slf路径 - QString strSlfName = sret.at(1); + QStringList sret = this->getSelectWell_New(); + if(sret.length() <= 0) + return; - //新建道 - emit CallManage::getInstance()->sig_NewTrack(m_strUuid, strWellName, strSlfName, "GANZHUANG.LINE", "ganzhuangtuObject", nW); + //新建井+道+曲线(首条) + NewWellAndTrack(sret.at(0), sret.at(1), "GANZHUANG.LINE", "ganzhuangtuObject"); } void MainWindowCurve::s_roseAc() @@ -3776,16 +3772,12 @@ void MainWindowCurve::s_Jykt() return; } - int nW = 4; - QStringList sret = this->insertCol(nW); - if (sret.length() <= 0) + QStringList sret = this->getSelectWell_New(); + 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, "JINGYANKUATA.LINE", "JyktObject", nW); + //新建井+道+曲线(首条) + NewWellAndTrack(sret.at(0), sret.at(1), "JINGYANKUATA.LINE", "JyktObject"); } //井斜方位图 @@ -3797,17 +3789,12 @@ void MainWindowCurve::s_Denv() 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) + QStringList sret = this->getSelectWell_New(); + 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, "XIEFANGWEI.LINE", "DenvObject", nW); + //新建井+道+曲线(首条) + NewWellAndTrack(sret.at(0), sret.at(1), "XIEFANGWEI.LINE", "DenvObject"); } //图像 成图 @@ -3889,19 +3876,12 @@ void MainWindowCurve::s_NewMCals() return; } - int nW = 4; - QStringList sret = this->insertCol(nW); - if (sret.length() <= 0) + QStringList sret = this->getSelectWell_New(); + 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, "FCA2", "MCalsObject", nW); - -// //新建井+道+曲线(首条) -// NewWellAndTrack(sret.at(0), sret.at(1), "FCA2", "MCalsObject"); + //新建井+道+曲线(首条) + NewWellAndTrack(sret.at(0), sret.at(1), "FCA2", "MCalsObject"); } //套管组件