OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 07:00:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace tree item tags attribute with virtual PdmUiObjectHandle::treeItemTags()

Browse Source
This commit is contained in:
Magne Sjaastad committed 2026-10-17 13:23:22 +02:00
1 parent b4e2cd4126
commit 95bee61f91
47 files changed
+61 -105
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.cpp
-3
View File
@@ -67,9 +67,6 @@ CAF_PDM_SOURCE_INIT( RimEclipsePropertyFilter, "CellPropertyFilter" );
//--------------------------------------------------------------------------------------------------
RimEclipsePropertyFilter::RimEclipsePropertyFilter()
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitScriptableObject( "Cell Property Filter", ":/CellFilter_Values.png" );
CAF_PDM_InitFieldNoDefault( &m_resultDefinition, "ResultDefinition", "Result Definition" );
ApplicationLibCode/ProjectDataModel/CellFilters/RimEclipsePropertyFilter.h
+1 -1
View File
@@ -72,7 +72,7 @@ public:
private:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
int upperBound() const;
void setUpperBound( const int& upperBound );
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurve.cpp
+9 -3
View File
@@ -37,9 +37,6 @@ RimGridCrossPlotCurve::RimGridCrossPlotCurve()
{
CAF_PDM_InitObject( "Cross Plot Points", ":/WellLogCurve16x16.png" );
// The color tag from RimPlotCurve is not used for Grid Cross Plot Curves
uiCapability()->removeAttribute( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS );
setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_NONE );
setSymbol( RiuPlotCurveSymbol::SYMBOL_NONE );
setSymbolSize( 4 );
@@ -164,3 +161,12 @@ void RimGridCrossPlotCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
nameGroup->add( &m_showLegend );
uiOrdering.skipRemainingFields( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
// The color tag from RimPlotCurve is not used for Grid Cross Plot Curves
std::vector<caf::PdmUiTreeViewItemTag> RimGridCrossPlotCurve::treeItemTags()
{
return {};
}
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurve.h
+6 -5
View File
@@ -40,11 +40,12 @@ public:
void setBlackAndWhiteLegendIcons( bool blackAndWhite );
protected:
void determineSymbol();
void updateZoomInParentPlot() override;
QString createCurveAutoName() override;
void onLoadDataAndUpdate( bool updateParentPlot ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void determineSymbol();
void updateZoomInParentPlot() override;
QString createCurveAutoName() override;
void onLoadDataAndUpdate( bool updateParentPlot ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
private:
int m_dataSetIndex;
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotRegressionCurve.cpp
+9 -3
View File
@@ -66,9 +66,6 @@ RimGridCrossPlotRegressionCurve::RimGridCrossPlotRegressionCurve()
{
CAF_PDM_InitObject( "Cross Plot Regression Curve", ":/WellLogCurve16x16.png" );
// The color tag from RimPlotCurve is not used for Grid Cross Plot Curves
uiCapability()->removeAttribute( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS );
CAF_PDM_InitFieldNoDefault( &m_regressionType, "RegressionType", "Type" );
CAF_PDM_InitFieldNoDefault( &m_minExtrapolationRangeX, "MinExtrapolationRangeX", "Min" );
@@ -513,3 +510,12 @@ void RimGridCrossPlotRegressionCurve::updateRectAnnotation()
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
// The color tag from RimPlotCurve is not used for Grid Cross Plot Curves
std::vector<caf::PdmUiTreeViewItemTag> RimGridCrossPlotRegressionCurve::treeItemTags()
{
return {};
}
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotRegressionCurve.h
+7 -6
View File
@@ -57,12 +57,13 @@ public:
void swapAxis();
protected:
void updateZoomInParentPlot() override;
QString createCurveAutoName() override;
void onLoadDataAndUpdate( bool updateParentPlot ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void updateRectAnnotation();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void updateZoomInParentPlot() override;
QString createCurveAutoName() override;
void onLoadDataAndUpdate( bool updateParentPlot ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void updateRectAnnotation();
std::tuple<std::vector<double>, std::vector<double>, QString>
calculateRegression( RimGridCrossPlotRegressionCurve::RegressionType regressionType,
ApplicationLibCode/ProjectDataModel/Jobs/RimEnsembleJob.cpp
-3
View File
@@ -64,9 +64,6 @@ RimEnsembleJob::RimEnsembleJob()
: m_subJobsCompleted( 0 )
, m_subJobsStarted( 0 )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "Ensemble Job", ":/opm.png" );
CAF_PDM_InitFieldNoDefault( &m_inputEnsemble, "Ensemble", "Input Ensemble" );
ApplicationLibCode/ProjectDataModel/Jobs/RimEnsembleJob.h
+1 -1
View File
@@ -73,7 +73,7 @@ protected:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
std::vector<RealizationInfo> setUpSelectedRealizations() const;
std::string outputIteration() const;
ApplicationLibCode/ProjectDataModel/Jobs/RimSingleJob.cpp
-3
View File
@@ -46,9 +46,6 @@ RimSingleJob::RimSingleJob()
, m_warningsDetected( 0 )
, m_process( nullptr )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "Generic Single Job" );
}
ApplicationLibCode/ProjectDataModel/Jobs/RimSingleJob.h
+1 -1
View File
@@ -52,7 +52,7 @@ public:
void setStarted() override;
protected:
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
virtual QStringList command() = 0;
virtual std::map<QString, QString> environment() = 0;
ApplicationLibCode/ProjectDataModel/Polygons/Cloud/RimPolygonCloudAddress.cpp
-3
View File
@@ -45,9 +45,6 @@ CAF_PDM_SOURCE_INIT( RimPolygonCloudAddress, "RimPolygonCloudAddress" );
RimPolygonCloudAddress::RimPolygonCloudAddress()
: objectChanged( this )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "Sumo Polygon Address", ":/CloudBlobs.svg" );
// Inherited fields, redeclared here so this subclass gets its own ui/xml keyword.
ApplicationLibCode/ProjectDataModel/Polygons/Cloud/RimPolygonCloudAddress.h
+1 -1
View File
@@ -89,7 +89,7 @@ public:
protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
private:
RiaSumoConnector* sumoConnector();
ApplicationLibCode/ProjectDataModel/Polygons/RimPolygon.cpp
-3
View File
@@ -49,9 +49,6 @@ RimPolygon::RimPolygon()
: objectChanged( this )
, coordinatesChanged( this )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitScriptableObject( "Polygon", ":/PolylinesFromFile16x16.png" );
CAF_PDM_InitField( &m_isReadOnly, "IsReadOnly", false, "Read Only" );
ApplicationLibCode/ProjectDataModel/Polygons/RimPolygon.h
+1 -1
View File
@@ -77,7 +77,7 @@ public:
private:
void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void childFieldChangedByUi( const caf::PdmFieldHandle* changedChildField ) override;
ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonFile.cpp
-3
View File
@@ -39,9 +39,6 @@ CAF_PDM_SOURCE_INIT( RimPolygonFile, "RimPolygonFileFile" );
RimPolygonFile::RimPolygonFile()
: objectChanged( this )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "PolygonFile", ":/Folder.png" );
// Inherited fields. The polygon items keep the original "Polygons" keyword so
ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonFile.h
+1 -1
View File
@@ -49,7 +49,7 @@ protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
private:
static std::vector<RimPolygon*> importDataFromFile( const QString& fileName );
ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp
-3
View File
@@ -54,9 +54,6 @@ CAF_PDM_SOURCE_INIT( RimPolygonInView, "RimPolygonInView" );
RimPolygonInView::RimPolygonInView()
: m_pickTargetsEventHandler( new RicPolylineTargetsPickEventHandler( this ) )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "Polygon", ":/PolylinesFromFile16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_polygon, "Polygon", "Polygon" );
ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.h
+1 -1
View File
@@ -75,7 +75,7 @@ public:
void onChildrenUpdated( caf::PdmChildArrayFieldHandle* childArray, std::vector<caf::PdmObjectHandle*>& updatedObjects ) override;
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void uiOrderingForLocalPolygon( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
ApplicationLibCode/ProjectDataModel/Rim3dView.cpp
-3
View File
@@ -102,9 +102,6 @@ Rim3dView::Rim3dView()
, m_animationIntervalMillisec( 50 )
, m_animationTimerUsers( 0 )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
RiaPreferences* preferences = RiaPreferences::current();
CAF_ASSERT( preferences );
ApplicationLibCode/ProjectDataModel/Rim3dView.h
+1 -1
View File
@@ -291,7 +291,7 @@ protected:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void setupBeforeSave() override;
ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
-3
View File
@@ -55,9 +55,6 @@ CAF_PDM_SOURCE_INIT( RimGridTimeHistoryCurve, "GridTimeHistoryCurve" );
//--------------------------------------------------------------------------------------------------
RimGridTimeHistoryCurve::RimGridTimeHistoryCurve()
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "Grid Time History Curve", ":/SummaryCurve16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_geometrySelectionText, "GeometrySelectionText", "Cell Reference" );
ApplicationLibCode/ProjectDataModel/RimGridTimeHistoryCurve.h
+1 -1
View File
@@ -83,7 +83,7 @@ protected:
void initAfterRead() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void childFieldChangedByUi( const caf::PdmFieldHandle* changedChildField ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
private:
RigMainGrid* mainGrid();
ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp
-3
View File
@@ -60,9 +60,6 @@ RimPlotAxisProperties::RimPlotAxisProperties()
, m_isRangeSettingsEnabled( true )
, m_isAlwaysRequired( false )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "Axis Properties", ":/LeftAxis16x16.png" );
CAF_PDM_InitField( &m_isActive, "Active", true, "Active" );
ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h
+1 -1
View File
@@ -160,7 +160,7 @@ protected:
private:
void updateOptionSensitivity();
caf::FontTools::FontSize plotFontSize() const;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void onPinnedTagClicked( const caf::SignalEmitter* emitter, size_t index );
private:
ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp
-3
View File
@@ -50,9 +50,6 @@ RimPlotCurve::RimPlotCurve()
, dataChanged( this )
, nameChanged( this )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "Curve", ":/WellLogCurve16x16.png" );
CAF_PDM_InitField( &m_showCurve, "Show", true, "Show curve" );
ApplicationLibCode/ProjectDataModel/RimPlotCurve.h
+1 -1
View File
@@ -193,7 +193,7 @@ protected:
void updateYAxisInPlot( RiuPlotAxis plotAxis );
void updateXAxisInPlot( RiuPlotAxis plotAxis );
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void onColorTagClicked( const SignalEmitter* emitter, size_t index );
ApplicationLibCode/ProjectDataModel/RimReservoirGridEnsemble.cpp
-3
View File
@@ -81,9 +81,6 @@ void caf::AppEnum<RimReservoirGridEnsembleBase::GridModeType>::setUp()
//--------------------------------------------------------------------------------------------------
RimReservoirGridEnsemble::RimReservoirGridEnsemble()
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitScriptableObjectWithNameAndComment( "Reservoir Grid Ensemble",
":/GridCaseGroup16x16.png",
"",
ApplicationLibCode/ProjectDataModel/RimReservoirGridEnsemble.h
+1 -1
View File
@@ -136,7 +136,7 @@ protected:
void appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder ) const override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void createDerivedObjects() override;
void initAfterRead() override;
ApplicationLibCode/ProjectDataModel/RimReservoirGridEnsembleSumo.cpp
-3
View File
@@ -45,9 +45,6 @@ CAF_PDM_SOURCE_INIT( RimReservoirGridEnsembleSumo, "RimReservoirGridEnsembleSumo
//--------------------------------------------------------------------------------------------------
RimReservoirGridEnsembleSumo::RimReservoirGridEnsembleSumo()
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "Sumo Reservoir Grid Ensemble", ":/GridCaseGroup16x16.png" );
CAF_PDM_InitFieldNoDefault( &m_sumoDataSource, "SumoDataSource", "Sumo Data Source" );
ApplicationLibCode/ProjectDataModel/RimReservoirGridEnsembleSumo.h
+1 -1
View File
@@ -79,7 +79,7 @@ public:
protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void createCaseObjects() override;
bool detectGridDimensionEquality() override;
ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
-3
View File
@@ -51,9 +51,6 @@ RimViewWindow::RimViewWindow()
: m_dockWidget( nullptr )
, m_isActiveViewer( false )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitScriptableObjectWithNameAndComment( "View window", "", "", "", "ViewWindow", "The Base Class for all Views and Plots in ResInsight" );
CAF_PDM_InitFieldNoDefault( &m_windowController, "WindowController", "" );
ApplicationLibCode/ProjectDataModel/RimViewWindow.h
+1 -1
View File
@@ -107,7 +107,7 @@ protected:
caf::PdmFieldHandle* objectToggleField() final;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
static QImage internalCaptureSnapshot( ads::CDockWidget* dockWidget, QWidget* widget, int width, int height );
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
-3
View File
@@ -109,9 +109,6 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
, m_realizationHash( 0 )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitScriptableObjectWithNameAndComment( "Ensemble Curve Set",
":/EnsembleCurveSet16x16.png",
"",
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
+1 -1
View File
@@ -223,7 +223,7 @@ private:
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void childFieldChangedByUi( const caf::PdmFieldHandle* changedChildField ) override;
void updatePlotAxis();
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp
-3
View File
@@ -42,9 +42,6 @@ CAF_PDM_ABSTRACT_SOURCE_INIT( RimSummaryCase, "SummaryCase" );
RimSummaryCase::RimSummaryCase()
: nameChanged( this )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitScriptableObject( "Summary Case", ":/SummaryCase.svg", "", "The Base Class for all Summary Cases" );
CAF_PDM_InitScriptableFieldNoDefault( &m_displayName, "ShortName", "Display Name" );
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h
+1 -1
View File
@@ -99,7 +99,7 @@ protected:
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
caf::PdmFieldHandle* userDescriptionField() override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void updateTreeItemName();
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsemble.cpp
-3
View File
@@ -65,9 +65,6 @@ RimSummaryEnsemble::RimSummaryEnsemble()
: caseNameChanged( this )
, caseRemoved( this )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitScriptableObjectWithNameAndComment( "Summary Case Group",
":/SummaryGroup16x16.png",
"",
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsemble.h
+1 -1
View File
@@ -157,7 +157,7 @@ protected:
private:
caf::PdmFieldHandle* userDescriptionField() override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
QString nameAndItemCount() const;
void updateIcon();
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
-3
View File
@@ -92,9 +92,6 @@ CAF_PDM_SOURCE_INIT( RimSummaryTimeAxisProperties, "SummaryTimeAxisProperties" )
RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties()
: requestLoadDataAndUpdate( this )
{
uiCapability()->setAttribute<caf::PdmUiTreeViewEditor::TreeItemTagsFunction>( caf::PdmUiTreeViewEditor::Keys::TREE_ITEM_TAGS,
[this]() { return treeItemTags(); } );
CAF_PDM_InitObject( "Time Axis", ":/BottomAxis16x16.png" );
CAF_PDM_InitField( &m_isActive, "Active", true, "Active" );
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h
+1 -1
View File
@@ -172,7 +172,7 @@ protected:
caf::FontTools::FontSize plotFontSize() const;
private:
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags();
std::vector<caf::PdmUiTreeViewItemTag> treeItemTags() override;
void onPinnedTagClicked( const caf::SignalEmitter* emitter, size_t index );
private: