OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-14 01:55:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Workflow UI: Support conditional branches

Browse Source 
Support taskmaestro conditional branches in the workflow editor:
- Read and write `when` guards and `first_of` alternatives in workflow definitions
- Validate guards, switch branch coverage and alternative types
- Draw switch tasks as diamonds, guards as control edges and skipped tasks greyed out
- Edit guards with Run When..., add alternatives when dropping on a connected input
- Report skipped tasks from the run helper
This commit is contained in:
Kristian Bendiksen committed 2026-10-30 16:17:03 +01:00
1 parent d9f74dfbab
commit bb0acbed56
33 files changed
+3401 -94
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Workflow/RimWorkflowTaskInput.cpp
+13 -5
View File
@@ -25,6 +25,7 @@
#include "RimWorkflowFloatBinding.h"
#include "RimWorkflowIntBinding.h"
#include "RimWorkflowMappingBinding.h"
#include "RimWorkflowSchemaTools.h"
#include "RimWorkflowStringBinding.h"
#include "RimWorkflowVec3Binding.h"
#include "RimWorkflowViewBinding.h"
@@ -185,16 +186,22 @@ void RimWorkflowTaskInput::syncFromSchema( const QJsonArray& configFields, QMap<
{
const QJsonValue current = binding->toJsonValue();
// Keep a cleared value cleared instead of restoring the default
if ( current.isNull() )
if ( current.isNull() && !binding->isExplicitNull() )
schema.remove( "default" );
else
schema["default"] = current;
schema[RimWorkflowSchemaTools::explicitNullKey()] = binding->isExplicitNull();
}
else
{
binding = createBinding( schema );
const QString key = detachedKey( field, keyword );
if ( detachedValues.contains( key ) ) schema["default"] = detachedValues.take( key );
if ( detachedValues.contains( key ) )
{
// Only values that were set are detached, so a null is an entered None
schema["default"] = detachedValues.take( key );
schema[RimWorkflowSchemaTools::explicitNullKey()] = schema["default"].isNull();
}
}
binding->applySchema( schema );
addItem( binding );
@@ -204,7 +211,8 @@ void RimWorkflowTaskInput::syncFromSchema( const QJsonArray& configFields, QMap<
{
if ( !removed ) continue;
const QJsonValue value = removed->toJsonValue();
if ( !value.isNull() ) detachedValues.insert( detachedKey( removed->fieldName(), removed->classKeyword() ), value );
if ( !value.isNull() || removed->isExplicitNull() )
detachedValues.insert( detachedKey( removed->fieldName(), removed->classKeyword() ), value );
delete removed;
}
}
@@ -218,7 +226,7 @@ QJsonObject RimWorkflowTaskInput::jsonValues() const
for ( const RimWorkflowFieldBinding* binding : items() )
{
const QJsonValue value = binding->toJsonValue();
if ( !value.isNull() ) values.insert( binding->fieldName(), value );
if ( !value.isNull() || binding->isExplicitNull() ) values.insert( binding->fieldName(), value );
}
return values;
}
@@ -233,7 +241,7 @@ QJsonObject RimWorkflowTaskInput::literalValues() const
{
if ( binding->isObjectReference() ) continue;
const QJsonValue value = binding->toJsonValue();
if ( !value.isNull() ) values.insert( binding->fieldName(), value );
if ( !value.isNull() || binding->isExplicitNull() ) values.insert( binding->fieldName(), value );
}
return values;
}