diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 25ed164..bd946cd 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -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++; diff --git a/logPlus/formwell.cpp b/logPlus/formwell.cpp index 44ba18e..455f877 100644 --- a/logPlus/formwell.cpp +++ b/logPlus/formwell.cpp @@ -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); + } } } } diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index aa45c3e..d920910 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -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); + } } } }