#6234 Better auto-naming for fracture model template.h

ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.cpp

@@ -20,6 +20,7 @@
 
 #include "RimFracture.h"
 #include "RimFractureModel.h"
+#include "RimFractureModelTemplate.h"
 
 //--------------------------------------------------------------------------------------------------
 ///
@@ -36,3 +37,11 @@ QString RicFractureNameGenerator::nameForNewFractureModel()
 {
     return RicFractureNameGenerator::nameForNewObject<RimFractureModel>( "Fracture Model_%1" );
 }
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RicFractureNameGenerator::nameForNewFractureModelTemplate()
+{
+    return RicFractureNameGenerator::nameForNewObject<RimFractureModelTemplate>( "Fracture Model Template_%1" );
+}

ApplicationCode/Commands/FractureCommands/RicFractureNameGenerator.h

@@ -31,6 +31,7 @@ class RicFractureNameGenerator
 public:
     static QString nameForNewFracture();
     static QString nameForNewFractureModel();
+    static QString nameForNewFractureModelTemplate();
 
 private:
     template <typename T>

ApplicationCode/Commands/FractureCommands/RicNewFractureModelTemplateFeature.cpp

@@ -24,6 +24,8 @@
 #include "RimOilField.h"
 #include "RimProject.h"
 
+#include "RicFractureNameGenerator.h"
+
 #include "Riu3DMainWindowTools.h"
 
 #include "cafSelectionManager.h"
@@ -50,6 +52,8 @@ void RicNewFractureModelTemplateFeature::onActionTriggered( bool isChecked )
     if ( !fracModColl ) return;
 
     RimFractureModelTemplate* fractureModelTemplate = new RimFractureModelTemplate;
+    fractureModelTemplate->setName( RicFractureNameGenerator::nameForNewFractureModelTemplate() );
+
     fracModColl->addFractureModelTemplate( fractureModelTemplate );
     fracModColl->updateConnectedEditors();
     Riu3DMainWindowTools::selectAsCurrentItem( fractureModelTemplate );

ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp

@@ -349,7 +349,7 @@ QList<caf::PdmOptionItemInfo> RimFractureModel::calculateValueOptions( const caf
 
             for ( RimFractureModelTemplate* fracDef : fracDefColl->fractureModelTemplates() )
             {
-                QString displayText = QString( "junk" ); // fracDef->name();
+                QString displayText = fracDef->name();
                 options.push_back( caf::PdmOptionItemInfo( displayText, fracDef ) );
             }
         }
@@ -731,7 +731,10 @@ void RimFractureModel::defineUiOrdering( QString uiConfigName, caf::PdmUiOrderin
     m_thicknessDirectionWellPath.uiCapability()->setUiHidden( true );
     m_barrierAnnotation.uiCapability()->setUiHidden( true );
 
-    uiOrdering.add( nameField() );
+    uiOrdering.add( nameField(), caf::PdmUiOrdering::LayoutOptions( true, 3, 1 ) );
+    uiOrdering.add( &m_fractureModelTemplate, {true, 2, 1} );
+    uiOrdering.add( &m_editFractureModelTemplate, {false, 1, 0} );
+
     uiOrdering.add( &m_MD );
     uiOrdering.add( &m_extractionType );
     uiOrdering.add( &m_anchorPosition );

ApplicationCode/ProjectDataModel/Completions/RimFractureModelTemplate.cpp

@@ -76,7 +76,8 @@ RimFractureModelTemplate::RimFractureModelTemplate()
 {
     CAF_PDM_InitScriptableObject( "FractureModelTemplate", "", "", "" );
 
-    CAF_PDM_InitScriptableField( &m_id, "Id", -1, "Id", "", "", "" );
+    CAF_PDM_InitScriptableField( &m_id, "Id", -1, "ID", "", "", "" );
+    m_id.uiCapability()->setUiReadOnly( true );
 
     CAF_PDM_InitScriptableField( &m_defaultPorosity, "DefaultPorosity", 0.0, "Default Porosity", "", "", "" );
     CAF_PDM_InitScriptableField( &m_defaultPermeability, "DefaultPermeability", 10.0e-6, "Default Permeability", "", "", "" );
@@ -204,6 +205,9 @@ QList<caf::PdmOptionItemInfo>
 //--------------------------------------------------------------------------------------------------
 void RimFractureModelTemplate::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
 {
+    uiOrdering.add( nameField() );
+    uiOrdering.add( &m_id );
+
     caf::PdmUiOrdering* defaultsGroup = uiOrdering.addNewGroup( "Defaults" );
     defaultsGroup->add( &m_defaultPorosity );
     defaultsGroup->add( &m_defaultPermeability );

ApplicationCode/ProjectDataModel/Completions/RimFractureModelTemplate.h

@@ -21,6 +21,8 @@
 #include "RiaEclipseUnitTools.h"
 #include "RiaFractureModelDefines.h"
 
+#include "RimNamedObject.h"
+
 #include "cafPdmChildField.h"
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
@@ -36,7 +38,7 @@ class RimFaciesProperties;
 ///
 ///
 //==================================================================================================
-class RimFractureModelTemplate : public caf::PdmObject
+class RimFractureModelTemplate : public RimNamedObject
 {
     CAF_PDM_HEADER_INIT;