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

#5883 Icons : Use framework code to apply an overlay pixmap

Browse Source
This commit is contained in:
Magne Sjaastad 2020-05-06 14:03:35 +02:00
parent 28aafed44b
commit 1557d695b8
3 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/RimCellFilter.cpp
View File

@ -69,20 +69,10 @@ caf::PdmFieldHandle* RimCellFilter::userDescriptionField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellFilter::updateIconState() void RimCellFilter::updateIconState()
{ {
// Reset dynamic icon
this->setUiIcon( caf::QIconProvider() );
// Get static one
caf::QIconProvider iconProvider = this->uiIconProvider(); caf::QIconProvider iconProvider = this->uiIconProvider();
if ( iconProvider.isNull() ) return; if ( iconProvider.isNull() ) return;
QIcon icon = iconProvider.icon();
// Get a pixmap, and modify it
QPixmap icPixmap;
icPixmap = icon.pixmap( 16, 16, QIcon::Normal );
QPixmap sign; QPixmap sign;
if ( filterMode() == INCLUDE ) if ( filterMode() == INCLUDE )
{ {
@ -93,13 +83,9 @@ void RimCellFilter::updateIconState()
sign.load( ":/Minus.png" ); sign.load( ":/Minus.png" );
} }
{ iconProvider.setOverlayPixmap( sign );
QPainter painter( &icPixmap );
painter.drawPixmap( 0, 0, sign );
}
iconProvider.setPixmap( icPixmap );
iconProvider.setActive( isActive && !isActive.uiCapability()->isUiReadOnly() ); iconProvider.setActive( isActive && !isActive.uiCapability()->isUiReadOnly() );
this->setUiIcon( iconProvider ); this->setUiIcon( iconProvider );
} }

15
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -680,24 +680,19 @@ void RimEnsembleCurveSet::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOr
uiTreeOrdering.skipRemainingChildren( true ); uiTreeOrdering.skipRemainingChildren( true );
// Reset dynamic icon
this->setUiIcon( caf::QIconProvider() );
// Get static one
caf::QIconProvider iconProvider = this->uiIconProvider(); caf::QIconProvider iconProvider = this->uiIconProvider();
if ( iconProvider.isNull() ) return; if ( iconProvider.isNull() ) return;
QIcon icon = iconProvider.icon();
RimEnsembleCurveSetCollection* coll = nullptr; RimEnsembleCurveSetCollection* coll = nullptr;
this->firstAncestorOrThisOfType( coll ); this->firstAncestorOrThisOfType( coll );
if ( coll && coll->curveSetForSourceStepping() == this ) if ( coll && coll->curveSetForSourceStepping() == this )
{ {
QPixmap combined = icon.pixmap( 16, 16 );
QPainter painter( &combined );
QPixmap updownpixmap( ":/StepUpDownCorner16x16.png" ); QPixmap updownpixmap( ":/StepUpDownCorner16x16.png" );
painter.drawPixmap( 0, 0, updownpixmap ); iconProvider.setOverlayPixmap( updownpixmap );
iconProvider.setPixmap( combined ); }
else
{
iconProvider.setOverlayPixmap( QPixmap() );
} }
this->setUiIcon( iconProvider ); this->setUiIcon( iconProvider );

16
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -596,9 +596,6 @@ void RimSummaryCurve::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderi
{ {
RimPlotCurve::defineUiTreeOrdering( uiTreeOrdering, uiConfigName ); RimPlotCurve::defineUiTreeOrdering( uiTreeOrdering, uiConfigName );
// Reset dynamic icon
this->setUiIcon( caf::QIconProvider() );
// Get static one
caf::QIconProvider iconProvider = this->uiIconProvider(); caf::QIconProvider iconProvider = this->uiIconProvider();
if ( iconProvider.isNull() ) return; if ( iconProvider.isNull() ) return;
@ -608,13 +605,16 @@ void RimSummaryCurve::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderi
this->firstAncestorOrThisOfType( coll ); this->firstAncestorOrThisOfType( coll );
if ( coll && coll->curveForSourceStepping() == this ) if ( coll && coll->curveForSourceStepping() == this )
{ {
QPixmap combined = icon.pixmap( 16, 16 );
QPainter painter( &combined );
QPixmap updownpixmap( ":/StepUpDownCorner16x16.png" ); QPixmap updownpixmap( ":/StepUpDownCorner16x16.png" );
painter.drawPixmap( 0, 0, updownpixmap );
iconProvider.setPixmap( combined ); iconProvider.setOverlayPixmap( updownpixmap );
setUiIcon( iconProvider );
} }
else
{
iconProvider.setOverlayPixmap( QPixmap() );
}
setUiIcon( iconProvider );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------