解释结论视图,追加层号
This commit is contained in:
parent
2f7415d543
commit
3180ad415d
|
|
@ -168,8 +168,11 @@ public:
|
||||||
//mItemTitle->position->setCoords(0.5, 0.5);
|
//mItemTitle->position->setCoords(0.5, 0.5);
|
||||||
// 设置父锚点,定位点
|
// 设置父锚点,定位点
|
||||||
//mItemTitle->position->setParentAnchor(mRect->bottom);
|
//mItemTitle->position->setParentAnchor(mRect->bottom);
|
||||||
|
//mItemTitle->position->setCoords((mRect->topLeft->coords().x() + mRect->bottomRight->coords().x())/2,
|
||||||
|
// (mRect->topLeft->coords().y() + mRect->bottomRight->coords().y())/2); // 设置文本在矩形中心位置
|
||||||
|
|
||||||
mItemTitle->position->setCoords((mRect->topLeft->coords().x() + mRect->bottomRight->coords().x())/2,
|
mItemTitle->position->setCoords((mRect->topLeft->coords().x() + mRect->bottomRight->coords().x())/2,
|
||||||
(mRect->topLeft->coords().y() + mRect->bottomRight->coords().y())/2); // 设置文本在矩形中心位置
|
lY2 + lY2/2);
|
||||||
|
|
||||||
//mRect->topLeft->setCoords(left, mPlot->yAxis->range().upper);
|
//mRect->topLeft->setCoords(left, mPlot->yAxis->range().upper);
|
||||||
//mRect->bottomRight->setCoords(right, mPlot->yAxis->range().lower);
|
//mRect->bottomRight->setCoords(right, mPlot->yAxis->range().lower);
|
||||||
|
|
|
||||||
|
|
@ -1577,7 +1577,7 @@ bool FormDraw::LoadFromSLF_Result(QMyCustomPlot *widget, QString strSlfName, QSt
|
||||||
float m_MDepth8;
|
float m_MDepth8;
|
||||||
float m_MDepth9;
|
float m_MDepth9;
|
||||||
float m_MDepth10;
|
float m_MDepth10;
|
||||||
QString Zone;
|
QString strZone = QString::number(atoi(m_Result->Zone));
|
||||||
QString Description1;
|
QString Description1;
|
||||||
QString Description2;
|
QString Description2;
|
||||||
QString Description3;
|
QString Description3;
|
||||||
|
|
@ -1709,10 +1709,11 @@ bool FormDraw::LoadFromSLF_Result(QMyCustomPlot *widget, QString strSlfName, QSt
|
||||||
{
|
{
|
||||||
if(m_Result->MDepth1!=0)
|
if(m_Result->MDepth1!=0)
|
||||||
{
|
{
|
||||||
widget->addResultToPlot(-m_Result->MDepth1, -m_Result->StartDepth, result, strUuid);
|
//第一个加Zone解释层号
|
||||||
|
widget->addResultToPlot(-m_Result->MDepth1, -m_Result->StartDepth, result, strUuid, strZone);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
widget->addResultToPlot(-m_Result->EndDepth, -m_Result->StartDepth, result, strUuid);
|
widget->addResultToPlot(-m_Result->EndDepth, -m_Result->StartDepth, result, strUuid, strZone);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -265,7 +265,7 @@ void QMyCustomPlot::addTextToPlot(double left_Low, double right_Hight, const QSt
|
||||||
m_mapDraggableRect[strUuid] = dragRect;
|
m_mapDraggableRect[strUuid] = dragRect;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QMyCustomPlot::addResultToPlot(double left_Low, double right_Hight, QString myResult, QString &strUuid)
|
void QMyCustomPlot::addResultToPlot(double left_Low, double right_Hight, QString myResult, QString &strUuid, QString strText)
|
||||||
{
|
{
|
||||||
//获取上方Rect
|
//获取上方Rect
|
||||||
TransparentDraggableResult *upDragRect = nullptr;
|
TransparentDraggableResult *upDragRect = nullptr;
|
||||||
|
|
@ -287,6 +287,7 @@ void QMyCustomPlot::addResultToPlot(double left_Low, double right_Hight, QStrin
|
||||||
//最小宽度
|
//最小宽度
|
||||||
dragRect->setMinWidth(0.1);
|
dragRect->setMinWidth(0.1);
|
||||||
dragRect->setResult(myResult);
|
dragRect->setResult(myResult);
|
||||||
|
dragRect->setTitle(strText);
|
||||||
|
|
||||||
m_mapDraggable_Result[strUuid] = dragRect;
|
m_mapDraggable_Result[strUuid] = dragRect;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ public:
|
||||||
|
|
||||||
void addTextToPlot(double left_Low, double right_Hight, const QString strText);
|
void addTextToPlot(double left_Low, double right_Hight, const QString strText);
|
||||||
|
|
||||||
void addResultToPlot(double left_Low, double right_Hight, QString myResult, QString &strUuid);
|
void addResultToPlot(double left_Low, double right_Hight, QString myResult, QString &strUuid, QString strText="");
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void s_LineClicked(int index);
|
void s_LineClicked(int index);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user