From 63be0a8580adcbb6d79f32919e37667ccd99c238 Mon Sep 17 00:00:00 2001
From: jiayulong <jiayulong@hivekion.com>
Date: Wed, 29 Apr 2026 18:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=B7=A5=E5=85=B7=E6=A0=8F?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=9D=86?=
 =?UTF-8?q?=E7=8A=B6=E5=9B=BE=E3=80=81=E5=A4=9A=E8=87=82=E4=BA=95=E5=BE=84?=
 =?UTF-8?q?=E7=AD=89=E9=92=88=E5=AF=B9=E5=A4=9A=E4=BA=95=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logPlus/mainwindowcurve.cpp | 54 ++++++++++++-------------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

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");
 }
 
 //套管组件