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

10214 ensemble appearance

Browse Source 
* Regression Analysis: Use only positive values for Power Fit regression.

* Add visible tag short cut for changning curve color.
* #10214 Ensemble Curve Set: Fix color mode text.
* #10214 Ensemble: Switch P10 and P90 symbols to point towards mean.
* Cache hit rects for tree item tags.
* #10214 Ensemble curve set: allow reordering with tree view tag
* #10214 Keep curve legend text when ensemble curves are hidden
This commit is contained in:
Kristian Bendiksen
2023-05-23 08:10:35 +02:00
committed by GitHub
parent 329a199863
commit 94f7bd3c1a
10 changed files with 92 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeAttributes.h
View File

@@ -69,6 +69,7 @@ public:
QColor bgColor;
QColor fgColor;
bool selectedOnly;
QRect rect;
caf::Signal<size_t> clicked;

44
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewItemDelegate.cpp
View File

@@ -101,48 +101,12 @@ QRect PdmUiTreeViewItemDelegate::tagRect( const QRect& itemRect, QModelIndex ind
auto it = m_tags.find( index );
if ( it == m_tags.end() ) return QRect();
if ( it->second.size() == 1 )
if ( tagIndex < it->second.size() )
{
const PdmUiTreeViewItemAttribute::Tag* tag = it->second[0].get();
if ( !tag->icon.valid() && tag->position == PdmUiTreeViewItemAttribute::Tag::Position::AT_END )
{
// Special case for single tag at end, which is not an icon
QPoint bottomRight = itemRect.bottomRight();
QPoint topLeft = itemRect.topRight() - QPoint( itemRect.height() * 1.5, 0 );
return QRect( topLeft, bottomRight );
}
const PdmUiTreeViewItemAttribute::Tag* tag = it->second[tagIndex].get();
return tag->rect;
}
QSize fullSize = itemRect.size();
QPoint offset( 0, 0 );
for ( size_t i = 0; i < it->second.size(); ++i )
{
const PdmUiTreeViewItemAttribute::Tag* tag = it->second[i].get();
if ( tag->icon.valid() )
{
auto icon = tag->icon.icon();
QSize iconSize = icon->actualSize( fullSize );
QRect iconRect;
if ( tag->position == PdmUiTreeViewItemAttribute::Tag::Position::AT_END )
{
QPoint bottomRight = itemRect.bottomRight() - offset;
QPoint topLeft = bottomRight - QPoint( iconSize.width(), iconSize.height() );
iconRect = QRect( topLeft, bottomRight );
}
else
{
QPoint topLeft = itemRect.topLeft() + offset;
QPoint bottomRight = topLeft + QPoint( iconSize.width(), iconSize.height() );
iconRect = QRect( topLeft, bottomRight );
}
offset += QPoint( iconSize.width() + 2, 0 );
if ( i == tagIndex ) return iconRect;
}
}
return QRect();
}
@@ -189,6 +153,7 @@ void PdmUiTreeViewItemDelegate::paint( QPainter* painter, const QStyleOptionView
}
offset += QPoint( iconSize.width() + 2, 0 );
icon->paint( painter, iconRect );
tag->rect = iconRect;
}
else
{
@@ -246,6 +211,7 @@ void PdmUiTreeViewItemDelegate::paint( QPainter* painter, const QStyleOptionView
painter->setPen( fgColor );
painter->drawText( textRect, Qt::AlignCenter, text );
tag->rect = tagRect;
}
}
// Restore painter