OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

RiuPlotWidget: highlight relevant curves when clicking on an axis.

Browse Source
This commit is contained in:
Kristian Bendiksen 2022-04-04 10:11:21 +02:00
parent 11060078d8
commit 391d13565e
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
View File

@ -793,7 +793,12 @@ void RiuQwtPlotWidget::onAxisSelected( QwtScaleWidget* scale, bool toggleItemInS
QwtAxisId axisId( pos, id ); QwtAxisId axisId( pos, id );
if ( scale == m_plot->axisWidget( axisId ) ) if ( scale == m_plot->axisWidget( axisId ) )
{ {
emit axisSelected( findPlotAxisForQwtAxis( axisId ), toggleItemInSelection ); resetPlotItemHighlighting();
highlightPlotItemsForQwtAxis( axisId );
scheduleReplot();
RiuPlotAxis plotAxis = findPlotAxisForQwtAxis( axisId );
emit axisSelected( plotAxis, toggleItemInSelection );
return; return;
} }
} }
@ -919,7 +924,8 @@ void RiuQwtPlotWidget::selectClosestPlotItem( const QPoint& pos, bool toggleItem
if ( closestItem && distanceFromClick < 20 ) if ( closestItem && distanceFromClick < 20 )
{ {
// TODO: highlight all selected curves // TODO: highlight all selected curves
highlightPlotItem( closestItem ); std::set<const QwtPlotItem*> plotItems = { closestItem };
highlightPlotItems( plotItems );
auto plotItem = std::make_shared<RiuQwtPlotItem>( closestItem ); auto plotItem = std::make_shared<RiuQwtPlotItem>( closestItem );
emit plotItemSelected( plotItem, toggleItemInSelection, distanceFromClick < 10 ? closestCurvePoint : -1 ); emit plotItemSelected( plotItem, toggleItemInSelection, distanceFromClick < 10 ? closestCurvePoint : -1 );
@ -950,7 +956,7 @@ void RiuQwtPlotWidget::replot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::highlightPlotItem( const QwtPlotItem* closestItem ) void RiuQwtPlotWidget::highlightPlotItems( const std::set<const QwtPlotItem*>& closestItems )
{ {
// NB! Create a copy of the item list before the loop to avoid invalidated iterators when iterating the list // NB! Create a copy of the item list before the loop to avoid invalidated iterators when iterating the list
// plotCurve->setZ() causes the ordering of items in the list to change // plotCurve->setZ() causes the ordering of items in the list to change
@ -976,7 +982,7 @@ void RiuQwtPlotWidget::highlightPlotItem( const QwtPlotItem* closestItem )
} }
double zValue = plotCurve->z(); double zValue = plotCurve->z();
if ( plotCurve == closestItem ) if ( closestItems.count( plotCurve ) > 0 )
{ {
plotCurve->setZ( zValue + 100.0 ); plotCurve->setZ( zValue + 100.0 );
} }
@ -998,7 +1004,7 @@ void RiuQwtPlotWidget::highlightPlotItem( const QwtPlotItem* closestItem )
m_originalCurveColors.insert( std::make_pair( plotCurve, curveColors ) ); m_originalCurveColors.insert( std::make_pair( plotCurve, curveColors ) );
m_originalZValues.insert( std::make_pair( plotCurve, zValue ) ); m_originalZValues.insert( std::make_pair( plotCurve, zValue ) );
} }
else if ( plotShapeItem && plotItem == closestItem ) else if ( plotShapeItem && closestItems.count( plotItem ) > 0 )
{ {
QPen pen = plotShapeItem->pen(); QPen pen = plotShapeItem->pen();
pen.setColor( QColor( Qt::green ) ); pen.setColor( QColor( Qt::green ) );
@ -1052,6 +1058,30 @@ void RiuQwtPlotWidget::resetPlotItemHighlighting()
m_originalZValues.clear(); m_originalZValues.clear();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::highlightPlotItemsForQwtAxis( QwtAxisId axisId )
{
std::set<const QwtPlotItem*> plotItems;
auto plotItemList = m_plot->itemList();
for ( QwtPlotItem* plotItem : plotItemList )
{
QwtPlotCurve* plotCurve = dynamic_cast<QwtPlotCurve*>( plotItem );
if ( plotCurve )
{
QwtAxisId xAxis = plotCurve->xAxis();
QwtAxisId yAxis = plotCurve->yAxis();
if ( xAxis == axisId || yAxis == axisId )
{
plotItems.insert( plotItem );
}
}
}
highlightPlotItems( plotItems );
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationLibCode/UserInterface/RiuQwtPlotWidget.h
View File

@ -207,7 +207,8 @@ private:
static int defaultMinimumWidth(); static int defaultMinimumWidth();
void replot() override; void replot() override;
void highlightPlotItem( const QwtPlotItem* closestItem ); void highlightPlotItemsForQwtAxis( QwtAxisId axisId );
void highlightPlotItems( const std::set<const QwtPlotItem*>& closestItems );
void resetPlotItemHighlighting(); void resetPlotItemHighlighting();
void onAxisSelected( QwtScaleWidget* scale, bool toggleItemInSelection ); void onAxisSelected( QwtScaleWidget* scale, bool toggleItemInSelection );
void recalculateAxisExtents( RiuPlotAxis axis ); void recalculateAxisExtents( RiuPlotAxis axis );