# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
DESKTOP-450PEFP\mainc 2026-03-16 09:25:44 +08:00
commit 382f654d52

View File

@ -5973,17 +5973,6 @@ void QMyCustomPlot::s_changeJiegutextTitle(QString strUuid, QString strSlfName,
//重新加载 //重新加载
//QString strAliasName = "气测-FMT-射孔-文本"; //QString strAliasName = "气测-FMT-射孔-文本";
LoadFromSLF_Jiegutext(m_strSlfName, m_strLineName, strAliasName); LoadFromSLF_Jiegutext(m_strSlfName, m_strLineName, strAliasName);
//设置所有title供用户选择
FormInfo* pInfo = m_formTrack->getFormInfoByParameters(m_strUuid, m_strWellName, m_strTrackName, m_strLineName);
if (pInfo == NULL)
{
return;
}
//
pInfo->m_strAliasName = strAliasName;
pInfo->m_FieldNameList.clear();
pInfo->m_FieldNameList.append(this->m_FieldNameList);
pInfo->update();
} }
//改变录井剖面属性 //改变录井剖面属性
@ -6474,6 +6463,19 @@ bool QMyCustomPlot::LoadFromSLF_Jiegutext(QString strSlfName, QString csCurve, Q
delete m_pResult; delete m_pResult;
} }
delete logio; delete logio;
//设置所有title供用户选择
FormInfo* pInfo = m_formTrack->getFormInfoByParameters(m_strUuid, m_strWellName, m_strTrackName, m_strLineName);
if (pInfo == NULL)
{
return true;
}
//
pInfo->m_strAliasName = strAliasName;
pInfo->m_FieldNameList.clear();
pInfo->m_FieldNameList.append(this->m_FieldNameList);
pInfo->update();
return true; return true;
} }