Skip to content

Commit

Permalink
Graph panel widget: improved boundingRect() and boundingLogRect() met…
Browse files Browse the repository at this point in the history 
…hods (#1523).
  • Loading branch information
@agarny
agarny committed Jan 31, 2018
1 parent 6cbc358 commit 3f62ff9
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 62 deletions.
152 changes: 91 additions & 61 deletions src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ GraphPanelPlotGraph * GraphPanelPlotGraphRun::owner() const

//==============================================================================

static const QRectF NoBoundingLogRect = QRectF(0.0, 0.0, -1.0, -1.0);
static const QRectF InvalidRect = QRectF(0.0, 0.0, -1.0, -1.0);

//==============================================================================

Expand All @@ -199,7 +199,10 @@ GraphPanelPlotGraph::GraphPanelPlotGraph(void *pParameterX, void *pParameterY) :
mFileName(QString()),
mParameterX(pParameterX),
mParameterY(pParameterY),
mBoundingLogRect(NoBoundingLogRect),
mBoundingRect(InvalidRect),
mBoundingRects(QMap<GraphPanelPlotGraphRun *, QRectF>()),
mBoundingLogRect(InvalidRect),
mBoundingLogRects(QMap<GraphPanelPlotGraphRun *, QRectF>()),
mPlot(0),
mRuns(GraphPanelPlotGraphRuns())
{
Expand Down Expand Up @@ -522,25 +525,41 @@ void GraphPanelPlotGraph::setData(double *pDataX, double *pDataY,

mRuns.last()->setRawSamples(pDataX, pDataY, pSize);

// Reset our cache version of our log data rectangle
// Reset the cached version of our bounding rectangles

mBoundingLogRect = NoBoundingLogRect;
mBoundingRect = InvalidRect;
mBoundingLogRect = InvalidRect;

mBoundingRects.remove(mRuns.last());
mBoundingLogRects.remove(mRuns.last());
}

//==============================================================================

QRectF GraphPanelPlotGraph::boundingRect() const
QRectF GraphPanelPlotGraph::boundingRect()
{
// Return our bounding rectangle
// Return the cached version of our bounding rectangle, if we have one, or
// compute it and return it

QRectF res = QRectF();
if ((mBoundingRect == InvalidRect) && !mRuns.isEmpty()) {
mBoundingRect = QRectF();

foreach (GraphPanelPlotGraphRun *run, mRuns) {
if (run->dataSize())
res |= run->boundingRect();
foreach (GraphPanelPlotGraphRun *run, mRuns) {
if (run->dataSize()) {
QRectF boundingRect = mBoundingRects.value(run, InvalidRect);

if (boundingRect == InvalidRect) {
boundingRect = run->boundingRect();

mBoundingRects.insert(run, boundingRect);
}

mBoundingRect |= boundingRect;
}
}
}

return res;
return mBoundingRect;
}

//==============================================================================
Expand All @@ -550,60 +569,74 @@ QRectF GraphPanelPlotGraph::boundingLogRect()
// Return the cached version of our bounding log rectangle, if we have one,
// or compute it and return it

if ((mBoundingLogRect == NoBoundingLogRect) && !mRuns.isEmpty()) {
bool needInitMinX = true;
bool needInitMaxX = true;
bool needInitMinY = true;
bool needInitMaxY = true;
double minX = 1.0;
double maxX = 1.0;
double minY = 1.0;
double maxY = 1.0;
if ((mBoundingLogRect == InvalidRect) && !mRuns.isEmpty()) {
mBoundingLogRect = QRectF();

foreach (GraphPanelPlotGraphRun *run, mRuns) {
for (size_t i = 0, iMax = run->dataSize(); i < iMax; ++i) {
QPointF sample = run->data()->sample(i);

if (sample.x() > 0.0) {
if (needInitMinX) {
minX = sample.x();

needInitMinX = false;
} else if (sample.x() < minX) {
minX = sample.x();
if (run->dataSize()) {
QRectF boundingLogRect = mBoundingLogRects.value(run, InvalidRect);

if (boundingLogRect == InvalidRect) {
bool needInitMinX = true;
bool needInitMaxX = true;
bool needInitMinY = true;
bool needInitMaxY = true;
double minX = 1.0;
double maxX = 1.0;
double minY = 1.0;
double maxY = 1.0;

for (size_t i = 0, iMax = run->dataSize(); i < iMax; ++i) {
QPointF sample = run->data()->sample(i);

if (sample.x() > 0.0) {
if (needInitMinX) {
minX = sample.x();

needInitMinX = false;
} else if (sample.x() < minX) {
minX = sample.x();
}

if (needInitMaxX) {
maxX = sample.x();

needInitMaxX = false;
} else if (sample.x() > maxX) {
maxX = sample.x();
}
}

if (sample.y() > 0.0) {
if (needInitMinY) {
minY = sample.y();

needInitMinY = false;
} else if (sample.y() < minY) {
minY = sample.y();
}

if (needInitMaxY) {
maxY = sample.y();

needInitMaxY = false;
} else if (sample.y() > maxY) {
maxY = sample.y();
}
}
}

if (needInitMaxX) {
maxX = sample.x();
if (!needInitMinX && !needInitMaxX && !needInitMinY && !needInitMaxY) {
boundingLogRect = QRectF(minX, minY, maxX-minX, maxY-minY);

needInitMaxX = false;
} else if (sample.x() > maxX) {
maxX = sample.x();
mBoundingLogRects.insert(run, boundingLogRect);
}
}

if (sample.y() > 0.0) {
if (needInitMinY) {
minY = sample.y();

needInitMinY = false;
} else if (sample.y() < minY) {
minY = sample.y();
}

if (needInitMaxY) {
maxY = sample.y();

needInitMaxY = false;
} else if (sample.y() > maxY) {
maxY = sample.y();
}
}
if (boundingLogRect != InvalidRect)
mBoundingLogRect |= boundingLogRect;
}
}

if (!needInitMinX && !needInitMaxX && !needInitMinY && !needInitMaxY)
mBoundingLogRect = QRectF(minX, minY, maxX-minX, maxY-minY);
}

return mBoundingLogRect;
Expand Down Expand Up @@ -1048,6 +1081,7 @@ void GraphPanelPlotLegendWidget::renderLegend(QPainter *pPainter,
// with the layout when it has its expanding directions set to
// horizontal. More information on this issue can be found at
// http://www.qtcentre.org/threads/68983-Problem-with-QwtDynGridLayout-layoutItems()...
qDebug("[%p] %s", this, isVisible()?"YES":"NO");

if (!mActive)
return;
Expand Down Expand Up @@ -2377,13 +2411,9 @@ bool GraphPanelPlotWidget::dataLogRect(QRectF &pDataLogRect) const

foreach (GraphPanelPlotGraph *graph, mGraphs) {
if (graph->isValid() && graph->isSelected() && graph->hasData()) {
QRectF boundingLogRect = graph->boundingLogRect();

if (boundingLogRect != NoBoundingLogRect) {
pDataLogRect |= boundingLogRect;
pDataLogRect |= graph->boundingLogRect();

res = true;
}
res = true;
}
}

Expand Down
6 changes: 5 additions & 1 deletion src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class GRAPHPANELWIDGET_EXPORT GraphPanelPlotGraph
QwtSeriesData<QPointF> *data() const;
void setData(double *pDataX, double *pDataY, const int &pSize);

QRectF boundingRect() const;
QRectF boundingRect();
QRectF boundingLogRect();

private:
Expand All @@ -185,7 +185,11 @@ class GRAPHPANELWIDGET_EXPORT GraphPanelPlotGraph
void *mParameterX;
void *mParameterY;

QRectF mBoundingRect;
QMap<GraphPanelPlotGraphRun *, QRectF> mBoundingRects;

QRectF mBoundingLogRect;
QMap<GraphPanelPlotGraphRun *, QRectF> mBoundingLogRects;

GraphPanelPlotWidget *mPlot;

Expand Down

0 comments on commit 3f62ff9

Please sign in to comment.