mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-27 23:50:19 -05:00
#14889: RFT Ensemble: Additional UI fixes
* #14889: Do not change main window when importing well picks * #14889: Fix clipped bottom of plots in dock windows * #14889: Add Create RFT Correlation Report to Ensemble Correlation Plots menu * #14889: Show imported observed FMU RFT data as table * #14889: Use time step from source RFT plot in RFT correlation report * #14889: Show observed data in RFT cross plot when no RFT samples are available * #14889: Keep RFT plot zoom when toggling formation in RFT correlation report * #14889: Do not change main window when importing formations * #14889: Use general delete for observed data and improve FMU RFT data name
This commit is contained in:
1 parent
fb566f112c
commit
c57864df51
36 files changed
+373
-319
No files matched your search
@@ -19,14 +19,13 @@
|
||||
#include "RimWellFormationsFile.h"
|
||||
|
||||
#include "RiaLogging.h"
|
||||
#include "RifCsvHtmlTableTools.h"
|
||||
|
||||
#include "RimMainPlotCollection.h"
|
||||
#include "RimProject.h"
|
||||
#include "RimWellPath.h"
|
||||
#include "Tools/RimCsvPreviewTools.h"
|
||||
|
||||
#include "cafPdmUiFilePathEditor.h"
|
||||
#include "cafPdmUiTextEditor.h"
|
||||
#include "cafPdmUiTreeOrdering.h"
|
||||
|
||||
#include <QFileInfo>
|
||||
@@ -44,10 +43,7 @@ RimWellFormationsFile::RimWellFormationsFile()
|
||||
m_filePath.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault( &m_contentTable, "ContentTable", "Content" );
|
||||
m_contentTable.uiCapability()->setUiEditorTypeName( caf::PdmUiTextEditor::uiEditorTypeName() );
|
||||
m_contentTable.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::LabelPosition::HIDDEN );
|
||||
m_contentTable.uiCapability()->setUiReadOnly( true );
|
||||
m_contentTable.xmlCapability()->disableIO();
|
||||
RimCsvPreviewTools::initPreviewField( m_contentTable );
|
||||
|
||||
setDeletable( true );
|
||||
}
|
||||
@@ -223,12 +219,7 @@ void RimWellFormationsFile::defineEditorAttribute( const caf::PdmFieldHandle* fi
|
||||
{
|
||||
if ( field == &m_contentTable )
|
||||
{
|
||||
auto myAttr = dynamic_cast<caf::PdmUiTextEditorAttribute*>( attribute );
|
||||
if ( myAttr )
|
||||
{
|
||||
myAttr->wrapMode = caf::PdmUiTextEditorAttribute::NoWrap;
|
||||
myAttr->textMode = caf::PdmUiTextEditorAttribute::HTML;
|
||||
}
|
||||
RimCsvPreviewTools::setPreviewEditorAttribute( attribute );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,15 +250,5 @@ void RimWellFormationsFile::updateUiTreeName()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimWellFormationsFile::updateContentTable()
|
||||
{
|
||||
const int maxRowCount = 1000;
|
||||
|
||||
auto result = RifCsvHtmlTableTools::generateHtmlTableFromFile( filePath(), maxRowCount );
|
||||
if ( result )
|
||||
{
|
||||
m_contentTable = *result;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_contentTable = result.error();
|
||||
}
|
||||
m_contentTable = RimCsvPreviewTools::htmlTableFromFile( filePath() );
|
||||
}
|
||||
Reference in new issue
Block a user