jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加判断，针对空白道的值null

Browse Source
This commit is contained in:
jiayulong 2025-12-31 10:05:54 +08:00
parent 54978a9571
commit 71e7d97178
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
logPlus/formdraw.cpp
View File

@ -489,7 +489,12 @@ void FormDraw::setRowHeight(double dHight, QProgressBar *progressBar, int iSplit
// 获取当前widget的所有子控件
const QObjectList &children = this->children();
//判断为空
int columnCount = children.size();
if(columnCount==0)
{
return;
}
int iSplitCurv = iSplit / columnCount;
int i=0;
// 遍历子控件列表
@ -504,14 +509,17 @@ void FormDraw::setRowHeight(double dHight, QProgressBar *progressBar, int iSplit
//progressBar->setValue(iBeginValue+ i*iSplitCurv); // 更新进度条的值
//
QMyCustomPlot *form = (QMyCustomPlot*)childWidget;
int nw = form->geometry().width();
form->setGeometry(0, 0, nw, (int)dHight);//7500-3184
//深度改变
form->xAxis->setRange(g_iY1, g_iY2);
if(form)
{
int nw = form->geometry().width();
form->setGeometry(0, 0, nw, (int)dHight);//7500-3184
//深度改变
form->xAxis->setRange(g_iY1, g_iY2);
//emit CallManage::getInstance()->sig_ChangeLeftScale(m_strUuid, form->m_strSlfName, m_strWellName, m_strTrackName, form->m_strLineName, form->m_iX1);
//emit CallManage::getInstance()->sig_ChangeLeftScale(m_strUuid, form->m_strSlfName, m_strWellName, m_strTrackName, form->m_strLineName, form->m_iX1);
form->replot();//屏蔽，缩减时间
form->replot();//屏蔽，缩减时间
}
}
}
i++;

13
logPlus/formwell.cpp
View File

@ -275,12 +275,15 @@ void FormWell::setRowHeight(double dHight, QProgressBar *progressBar, int iSplit
if( ui->tableWidget->cellWidget(1, i) != nullptr )
{
auto myWidget = ui->tableWidget->cellWidget(2, i);
//
FormDraw *formDraw = (FormDraw*)myWidget;//获得widget
if(formDraw)
if(myWidget)
{
//progressBar->setValue(iBeginValue+ i*iSplitWell); // 更新进度条的值
formDraw->setRowHeight(dHight, progressBar, iSplitWell);
//
FormDraw *formDraw = (FormDraw*)myWidget;//获得widget
if(formDraw)
{
//progressBar->setValue(iBeginValue+ i*iSplitWell); // 更新进度条的值
formDraw->setRowHeight(dHight, progressBar, iSplitWell);
}
}
}
}

14
logPlus/mainwindowcurve.cpp
View File

@ -803,13 +803,12 @@ void MainWindowCurve::s_NewTrack()
}
QString strWellName = ui->tableWidget_2->item(0, column)->text();
//新建道
emit CallManage::getInstance()->sig_NewTrack(m_strUuid, strWellName, "", "", "");
//int iWidth = ui->tableWidget_2->columnWidth(column);
//设置列宽
ui->tableWidget_2->setColumnWidth(column, iWidth+g_iOneWidth);
}
void MainWindowCurve::s_NewDepth()
@ -1874,11 +1873,14 @@ void MainWindowCurve::slot_time()
if( ui->tableWidget_2->cellWidget(1, i) != nullptr )
{
auto myWidget = ui->tableWidget_2->cellWidget(1, i);
//
FormWell *widgetWell = (FormWell*)myWidget;//获得widget
if(widgetWell)
if(myWidget)
{
widgetWell->setRowHeight(dHight, progressBar, iSplit);
//
FormWell *widgetWell = (FormWell*)myWidget;//获得widget
if(widgetWell)
{
widgetWell->setRowHeight(dHight, progressBar, iSplit);
}
}
}
}