#6007 Minor ui tweaks.

ApplicationCode/Commands/CompletionCommands/RicNewFractureModelPlotFeature.cpp

@@ -27,6 +27,8 @@
 
 #include "RigWellPath.h"
 
+#include "RimColorLegend.h"
+#include "RimColorLegendCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
 #include "RimFaciesPropertiesCurve.h"
@@ -115,8 +117,6 @@ RimFractureModelPlot*
         plot->setLegendsHorizontal( true );
         plot->setDepthType( RiaDefines::DepthTypeEnum::TRUE_VERTICAL_DEPTH );
         plot->setAutoScaleDepthEnabled( true );
-
-        // RicNewWellLogPlotFeatureImpl::updateAfterCreation( plot );
         plot->loadDataAndUpdate();
     }
 
@@ -197,6 +197,13 @@ void RicNewFractureModelPlotFeature::createFaciesTrack( RimFractureModelPlot* pl
     faciesTrack->setFormationCase( eclipseCase );
     faciesTrack->setAnnotationType( RiuPlotAnnotationTool::RegionAnnotationType::RESULT_PROPERTY_ANNOTATIONS );
     faciesTrack->setRegionPropertyResultType( RiaDefines::ResultCatType::INPUT_PROPERTY, defaultProperty );
+
+    RimColorLegend* faciesColors = RimProject::current()->colorLegendCollection()->findByName( "Facies colors" );
+    if ( faciesColors )
+    {
+        faciesTrack->setColorShadingLegend( faciesColors );
+    }
+
     faciesTrack->setVisibleXRange( 0.0, 0.0 );
     faciesTrack->setColSpan( RimPlot::ONE );
 
@@ -246,9 +253,10 @@ void RicNewFractureModelPlotFeature::createParametersTrack( RimFractureModelPlot
     plotTrack->setVisibleXRange( 0.0, 2.0 );
     plotTrack->setAutoScaleXEnabled( true );
     plotTrack->setTickIntervals( 1.0, 0.2 );
-    plotTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR_AND_MINOR );
+    plotTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR );
     plotTrack->setShowRegionLabels( true );
     plotTrack->setShowWindow( true );
+    plotTrack->setLogarithmicScale( false );
 
     caf::ColorTable                             colors     = RiaColorTables::contrastCategoryPaletteColors();
     std::vector<RiuQwtPlotCurve::LineStyleEnum> lineStyles = {RiuQwtPlotCurve::STYLE_SOLID,
@@ -296,10 +304,10 @@ void RicNewFractureModelPlotFeature::createFaciesPropertiesTrack( RimFractureMod
     plotTrack->setVisibleXRange( 0.0, 2.0 );
     plotTrack->setAutoScaleXEnabled( true );
     plotTrack->setTickIntervals( 1.0, 0.2 );
-    plotTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR_AND_MINOR );
+    plotTrack->setXAxisGridVisibility( RimWellLogPlot::AXIS_GRID_MAJOR );
+    plotTrack->setLogarithmicScale( false );
     plotTrack->setShowRegionLabels( true );
     plotTrack->setShowWindow( true );
-
     caf::ColorTable                             colors     = RiaColorTables::contrastCategoryPaletteColors();
     std::vector<RiuQwtPlotCurve::LineStyleEnum> lineStyles = { RiuQwtPlotCurve::STYLE_SOLID,
                                                                RiuQwtPlotCurve::STYLE_DASH,

ApplicationCode/Commands/RicImportFaciesPropertiesFeature.cpp

@@ -59,16 +59,16 @@ void RicImportFaciesPropertiesFeature::onActionTriggered( bool isChecked )
 
     // Open dialog box to select files
     RiaApplication* app        = RiaApplication::instance();
-    QString         defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" );
+    QString         defaultDir = app->lastUsedDialogDirectory( "FACIES_DIR" );
-    QStringList     filePaths  = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+    QString         filePath   = QFileDialog::getOpenFileName( Riu3DMainWindowTools::mainWindowWidget(),
-                                                           "Import Facies Properties",
+                                                     "Import Facies Properties",
-                                                           defaultDir,
+                                                     defaultDir,
-                                                           "Facies Properties (*.csv);;All Files (*.*)" );
+                                                     "Facies Properties (*.csv);;All Files (*.*)" );
 
-    if ( filePaths.size() < 1 ) return;
+    if ( filePath.isNull() ) return;
 
     // Remember the path to next time
-    app->setLastUsedDialogDirectory( "WELLPATH_DIR", QFileInfo( filePaths.last() ).absolutePath() );
+    app->setLastUsedDialogDirectory( "FACIES_DIR", QFileInfo( filePath ).absolutePath() );
 
     typedef std::tuple<QString, QString, QString> FaciesKey;
 
@@ -76,6 +76,8 @@ void RicImportFaciesPropertiesFeature::onActionTriggered( bool isChecked )
     std::vector<RifFaciesProperties> rifFaciesProperties;
     try
     {
+        QStringList filePaths;
+        filePaths << filePath;
         RifFaciesPropertiesReader::readFaciesProperties( rifFaciesProperties, filePaths );
     }
     catch ( FileParseException& exception )
@@ -130,7 +132,9 @@ void RicImportFaciesPropertiesFeature::onActionTriggered( bool isChecked )
         rimFaciesProperties->setPropertiesForFacies( key, rigFaciesProperties );
     }
 
+    rimFaciesProperties->setFilePath( filePath );
     fractureModel->setFaciesProperties( rimFaciesProperties );
+    fractureModel->updateConnectedEditors();
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp

@@ -106,6 +106,8 @@ RimFractureModel::RimFractureModel()
     CAF_PDM_InitField( &m_boundingBoxVertical, "BoundingBoxVertical", 100.0, "Bounding Box Vertical", "", "", "" );
 
     CAF_PDM_InitFieldNoDefault( &m_faciesProperties, "FaciesProperties", "Facies Properties", "", "", "" );
+    m_faciesProperties.uiCapability()->setUiHidden( true );
+    m_faciesProperties.uiCapability()->setUiTreeHidden( true );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimFaciesProperties.cpp

@@ -38,6 +38,9 @@ RimFaciesProperties::RimFaciesProperties()
     m_propertiesTable.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );
     m_propertiesTable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
     m_propertiesTable.uiCapability()->setUiReadOnly( true );
+    m_propertiesTable.xmlCapability()->disableIO();
+
+    setUiName( "Facies Properties" );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -119,10 +122,10 @@ QString RimFaciesProperties::generatePropertiesTable()
                     "      <th>Formation</th>"
                     "      <th>Facies</th>"
                     "      <th>Porosity</th>"
-                    "      <th>Young's Modulus</th>"
+                    "      <th>Young's<br>Modulus</th>"
-                    "      <th>Poisson's Ratio</th>"
+                    "      <th>Poisson's<br>Ratio</th>"
                     "      <th>K-Ic</th>"
-                    "      <th>Proppant Embedment</th>"
+                    "      <th>Proppant<br>Embedment</th>"
                     "    </tr>"
                     "  </thead>"
                     "  <tbody>" );

ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp

@@ -1496,6 +1496,14 @@ void RimWellLogTrack::setXAxisGridVisibility( RimWellLogPlot::AxisGridVisibility
     m_xAxisGridVisibility = gridLines;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimWellLogTrack::setColorShadingLegend( RimColorLegend* colorLegend )
+{
+    m_colorShadingLegend = colorLegend;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimWellLogTrack.h

@@ -166,6 +166,7 @@ public:
     void setAnnotationType( RiuPlotAnnotationTool::RegionAnnotationType annotationType );
     void setAnnotationDisplay( RiuPlotAnnotationTool::RegionDisplay annotationDisplay );
     void setAnnotationTransparency( int percent );
+    void setColorShadingLegend( RimColorLegend* colorLegend );
 
     RiuPlotAnnotationTool::RegionAnnotationType annotationType() const;
     RiuPlotAnnotationTool::RegionDisplay        annotationDisplay() const;