From 27fbcdf2eca02bb91fa2cab299d780a4411beacf Mon Sep 17 00:00:00 2001 From: jonjenssen Date: Mon, 19 Oct 2026 12:46:36 +0200 Subject: [PATCH] Build fixes after rebase/merge --- .../Application/RiaPreferencesBatch.cpp | 22 +--- .../Application/RiaPreferencesBatch.h | 3 - .../ProjectDataModel/Jobs/RimSingleJob.cpp | 106 +++++++++--------- 3 files changed, 56 insertions(+), 75 deletions(-) diff --git a/ApplicationLibCode/Application/RiaPreferencesBatch.cpp b/ApplicationLibCode/Application/RiaPreferencesBatch.cpp index 415f645c40..c0ff085ab8 100644 --- a/ApplicationLibCode/Application/RiaPreferencesBatch.cpp +++ b/ApplicationLibCode/Application/RiaPreferencesBatch.cpp @@ -43,6 +43,10 @@ RiaPreferencesBatch::RiaPreferencesBatch() caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_exclusive ); CAF_PDM_InitFieldNoDefault( &m_queueName, "queueName", "Default queue/partition name" ); + m_queueName.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() ); + m_queueName.uiCapability()->setAttribute( caf::PdmUiComboBoxEditor::Keys::ENABLE_EDITABLE_CONTENT, true ); + m_queueName.uiCapability()->setAttribute( caf::PdmUiComboBoxEditor::Keys::ENABLE_AUTO_COMPLETE, false ); + m_queueName.uiCapability()->setAttribute( caf::PdmUiComboBoxEditor::Keys::ADJUST_WIDTH_TO_CONTENTS, true ); CAF_PDM_InitFieldNoDefault( &m_additionalLsfOptions, "additionalLsfOptions", "" ); CAF_PDM_InitFieldNoDefault( &m_additionalSlurmOptions, "additionalSlurmOptions", "" ); @@ -97,24 +101,6 @@ void RiaPreferencesBatch::appendItems( caf::PdmUiOrdering& uiOrdering ) } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RiaPreferencesBatch::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) -{ - if ( field == &m_queueName ) - { - auto attr = dynamic_cast( attribute ); - if ( attr ) - { - attr->enableEditableContent = true; - attr->enableAutoComplete = false; - attr->adjustWidthToContents = true; - attr->notifyWhenTextIsEdited = false; - } - } -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Application/RiaPreferencesBatch.h b/ApplicationLibCode/Application/RiaPreferencesBatch.h index 258514d026..16e54afbb9 100644 --- a/ApplicationLibCode/Application/RiaPreferencesBatch.h +++ b/ApplicationLibCode/Application/RiaPreferencesBatch.h @@ -45,9 +45,6 @@ public: static QString selectQueue( RiaDefines::BatchSchedulerType scheduler, QString currentQueue ); -protected: - void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ); - private: caf::PdmField m_maxParallelJobs; caf::PdmField> m_batchScheduler; diff --git a/ApplicationLibCode/ProjectDataModel/Jobs/RimSingleJob.cpp b/ApplicationLibCode/ProjectDataModel/Jobs/RimSingleJob.cpp index be58cbc878..a74efdd7ea 100644 --- a/ApplicationLibCode/ProjectDataModel/Jobs/RimSingleJob.cpp +++ b/ApplicationLibCode/ProjectDataModel/Jobs/RimSingleJob.cpp @@ -174,8 +174,10 @@ void RimSingleJob::setStarted() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSingleJob::defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) +std::vector RimSingleJob::treeItemTags() { + std::vector tagsToReturn; + static auto warnColor = QColor( RiaColorTools::toQColor( cvf::Color3f( cvf::Color3f::DARK_YELLOW ) ) ); static auto contrastWarnColor = QColor( RiaColorTools::toQColor( RiaColorTools::contrastColor( cvf::Color3f( cvf::Color3f::DARK_YELLOW ) ) ) ); @@ -184,71 +186,67 @@ void RimSingleJob::defineObjectEditorAttribute( QString uiConfigName, caf::PdmUi static auto contrastWaitColor = QColor( RiaColorTools::toQColor( RiaColorTools::contrastColor( cvf::Color3f( cvf::Color3f::LIGHT_GRAY ) ) ) ); - if ( auto* treeItemAttribute = dynamic_cast( attribute ) ) + if ( state() == JobState::Failed ) { - if ( state() == JobState::Failed ) - { - auto txt = m_errorsDetected > 0 ? QString( "[%1]" ).arg( m_errorsDetected ) : "!!!"; - auto tag = - caf::PdmUiTreeViewItemAttribute::createTag( QColor( Qt::red ), RiuGuiTheme::getColorByVariableName( "backgroundColor1" ), txt ); - treeItemAttribute->tags.push_back( std::move( tag ) ); - } - else if ( state() == JobState::Queued ) - { - auto tag = caf::PdmUiTreeViewItemAttribute::createTag(); - tag->text = "Waiting..."; - tag->bgColor = waitColor; - tag->fgColor = contrastWaitColor; - treeItemAttribute->tags.push_back( std::move( tag ) ); - } - else if ( ( state() == JobState::Running ) || ( state() == JobState::Completed ) ) - { - auto tag = caf::PdmUiTreeViewItemAttribute::createTag(); + auto txt = m_errorsDetected > 0 ? QString( "[%1]" ).arg( m_errorsDetected ) : "!!!"; + auto tag = caf::PdmUiTreeViewItemTag::create( QColor( Qt::red ), RiuGuiTheme::getColorByVariableName( "backgroundColor1" ), txt ); + tagsToReturn.push_back( std::move( tag ) ); + } + else if ( state() == JobState::Queued ) + { + auto tag = caf::PdmUiTreeViewItemTag::create(); + tag.text = "Waiting..."; + tag.bgColor = waitColor; + tag.fgColor = contrastWaitColor; + tagsToReturn.push_back( std::move( tag ) ); + } + else if ( ( state() == JobState::Running ) || ( state() == JobState::Completed ) ) + { + auto tag = caf::PdmUiTreeViewItemTag::create(); - if ( state() == JobState::Running ) + if ( state() == JobState::Running ) + { + if ( m_percentageDone == 0.0 ) { - if ( m_percentageDone == 0.0 ) - { - tag->text = "Submitted"; - } - else - { - tag->text = QString( "%1 %" ).arg( m_percentageDone, 0, 'f', 1 ); - } + tag.text = "Submitted"; } else { - tag->text = "Done"; - } - - double factor = m_percentageDone / 100.0; - - cvf::Color3f viewColor = cvf::Color3f( cvf::Color3f::GREEN ); - viewColor.set( viewColor.r() * factor, viewColor.g() * factor, viewColor.b() * factor ); - cvf::Color3f viewTextColor = RiaColorTools::contrastColor( viewColor ); - tag->bgColor = QColor( RiaColorTools::toQColor( viewColor ) ); - tag->fgColor = QColor( RiaColorTools::toQColor( viewTextColor ) ); - treeItemAttribute->tags.push_back( std::move( tag ) ); - - if ( ( state() == JobState::Running ) && !isChildJob() ) - { - auto timeTag = caf::PdmUiTreeViewItemAttribute::createTag( QColor( Qt::black ), - QColor( Qt::white ), - runTimeString().toUtf8().constData() ); - treeItemAttribute->tags.push_back( std::move( timeTag ) ); + tag.text = QString( "%1 %" ).arg( m_percentageDone, 0, 'f', 1 ); } } - if ( m_warningsDetected > 0 ) + else { - auto warnTxt = QString( "[%1]" ).arg( m_warningsDetected ); + tag.text = "Done"; + } - auto warnTag = caf::PdmUiTreeViewItemAttribute::createTag( warnColor, contrastWarnColor, warnTxt ); - treeItemAttribute->tags.push_back( std::move( warnTag ) ); - auto iconTag = caf::PdmUiTreeViewItemAttribute::createTag(); - iconTag->icon = caf::IconProvider( ":/warning.png" ); - treeItemAttribute->tags.push_back( std::move( iconTag ) ); + double factor = m_percentageDone / 100.0; + + cvf::Color3f viewColor = cvf::Color3f( cvf::Color3f::GREEN ); + viewColor.set( viewColor.r() * factor, viewColor.g() * factor, viewColor.b() * factor ); + cvf::Color3f viewTextColor = RiaColorTools::contrastColor( viewColor ); + tag.bgColor = QColor( RiaColorTools::toQColor( viewColor ) ); + tag.fgColor = QColor( RiaColorTools::toQColor( viewTextColor ) ); + tagsToReturn.push_back( std::move( tag ) ); + + if ( ( state() == JobState::Running ) && !isChildJob() ) + { + auto timeTag = caf::PdmUiTreeViewItemTag::create( QColor( Qt::black ), QColor( Qt::white ), runTimeString().toUtf8().constData() ); + tagsToReturn.push_back( std::move( timeTag ) ); } } + if ( m_warningsDetected > 0 ) + { + auto warnTxt = QString( "[%1]" ).arg( m_warningsDetected ); + + auto warnTag = caf::PdmUiTreeViewItemTag::create( warnColor, contrastWarnColor, warnTxt ); + tagsToReturn.push_back( std::move( warnTag ) ); + auto iconTag = caf::PdmUiTreeViewItemTag::create(); + iconTag.icon = caf::IconProvider( ":/warning.png" ); + tagsToReturn.push_back( std::move( iconTag ) ); + } + + return tagsToReturn; } //--------------------------------------------------------------------------------------------------