diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 1dae78a..5a1f30d 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -2896,6 +2896,8 @@ QMyCustomPlot* FormDraw::addTableLine(QString strUuid, QString strSlfName, QStri } else if (strLineName == "RESULT") { + curv->setRowGridVisible(false); + curv->setColGridVisible(false); //解释结论 initResult(curv, strSlfName, strLineName); } diff --git a/logPlus/forminfo.cpp b/logPlus/forminfo.cpp index 88370a1..d8743e1 100644 --- a/logPlus/forminfo.cpp +++ b/logPlus/forminfo.cpp @@ -791,8 +791,8 @@ void FormInfo::paintEvent(QPaintEvent* event) } } //painter.setBrush(QBrush(Qt::red, Qt::SolidPattern)); - QRect rectRound(rect.left()+2,rect.top()+4, rect.width()-4, rect.height()-8); - painter.setPen(QPen(m_lineColor, m_dWidth, m_lineStyle)); + //QRect rectRound(rect.left() + 2, rect.top() + 4, rect.width() - 4, rect.height() - 8); + //painter.setPen(QPen(m_lineColor, m_dWidth, m_lineStyle)); //painter.drawRoundRect(rectRound);//利用画刷(颜色/岩性图片),画框 //painter.drawRect(rectRound); @@ -965,15 +965,17 @@ void FormInfo::paintEvent(QPaintEvent* event) { QRect rt = rect; QString text = ""; + bool bVer = false; if (!m_bVerticaDrawing) { - rt.setX(rect.left()); - rt.setY(rect.top() + rect.height() / 3); - rt.setWidth(rect.width()); - rt.setHeight(rect.height() / 3); - text = strShowTxt; + QFontMetrics fm1(m_curveNameFont); + QRect textRect = fm1.boundingRect(strShowTxt); + if (textRect.width() > rt.width()) + { + bVer = true; + } } - else + if (m_bVerticaDrawing || bVer) { for (int i = 0; i < strShowTxt.size(); i++) { if (!i)text += strShowTxt.at(i); @@ -983,6 +985,14 @@ void FormInfo::paintEvent(QPaintEvent* event) } } } + else + { + rt.setX(rect.left()); + rt.setY(rect.top() + rect.height() / 3); + rt.setWidth(rect.width()); + rt.setHeight(rect.height() / 3); + text = strShowTxt; + } if (m_nRotationAngle != 0) { diff --git a/logPlus/formwell.cpp b/logPlus/formwell.cpp index 2b65ebf..5eec6b7 100644 --- a/logPlus/formwell.cpp +++ b/logPlus/formwell.cpp @@ -218,9 +218,10 @@ QVector FormWell::new_track(QStringList listdt, QString strTrackName) //曲线名称栏 formTrack = new FormTrack(this, strWellName, strTrackName); - formTrack->setBorderFlags(BorderFlags(BottomBorder | RightBorder)); + formTrack->setBorderFlags(BorderFlags(BottomBorder |RightBorder)); + formTrack->setFixedWidth(dW * g_dPixelPerCm); // if ("curveObject" == strType) -// formTrack->setFixedWidth(nW / 2); + //formTrack->setFixedWidth(20); vec << formTrack; formTrack->m_strUuid = m_strUuid; formTrack->show(); @@ -580,7 +581,21 @@ int FormWell::setColWidth(int iCurrentCol, float fWidth) // FormDraw *formDraw = qobject_cast(myWidget);//获得widget if(formDraw) - { + { + if (formDraw->m_formTrack) + { + formDraw->m_formTrack->setFixedWidth(iNewWidth); +// QRect rt = formDraw->m_formTrack->geometry(); +// rt.setWidth(iNewWidth); +// formDraw->m_formTrack->setGeometry(rt); + +// const QVector& vecIfo = formDraw->m_formTrack->getVecFormInfo(); +// for (FormInfo *pinfo : vecIfo) { +// QRect rt = pinfo->geometry(); +// rt.setWidth(iNewWidth); +// pinfo->setGeometry(rt); +// } + } formDraw->setColWidth(iNewWidth); } } diff --git a/logPlus/formwell.ui b/logPlus/formwell.ui index b653466..684f076 100644 --- a/logPlus/formwell.ui +++ b/logPlus/formwell.ui @@ -18,7 +18,7 @@ 2 - 2 + 0 2 diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index 0455a31..81b304c 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -10192,6 +10192,24 @@ void QMyCustomPlot::drawGrid(bool b) } } +void QMyCustomPlot::setRowGridVisible(bool bvis) +{ + m_bRowGridVisible = bvis; + for (int i = 0; i < m_vecRowGrid.size(); i++) + { + m_vecRowGrid.at(i)->setVisible(bvis); + } +} + +void QMyCustomPlot::setColGridVisible(bool bvis) +{ + m_bColGridVisible = bvis; + for (int i = 0; i < m_vecColGrid.size(); i++) + { + m_vecColGrid.at(i)->setVisible(bvis); + } +} + //道宽改变后,避免井壁取心等组件变形,需要重新刷新 void QMyCustomPlot::resetPosition() { diff --git a/logPlus/qmycustomplot.h b/logPlus/qmycustomplot.h index 02d0a7c..dc7a23c 100644 --- a/logPlus/qmycustomplot.h +++ b/logPlus/qmycustomplot.h @@ -100,6 +100,8 @@ public: //绘制网格 void drawGrid(bool b = false); + void setRowGridVisible(bool bvis); + void setColGridVisible(bool bvis); protected: