OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#9630 Fix import of well data from SSIHUB

Browse Source
This commit is contained in:
Magne Sjaastad
2023-01-06 14:56:41 +01:00
committed by GitHub
parent fe181ed60e
commit f46516ac85
5 changed files with 87 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.cpp
View File

@@ -25,6 +25,7 @@
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "cafPdmUiCheckBoxEditor.h"
#include "cafPdmUiTreeAttributes.h"
#include "cafPdmUiTreeViewEditor.h"
@@ -53,7 +54,10 @@ RimWellPathImport::RimWellPathImport()
CAF_PDM_InitObject( "RimWellPathImport" );
CAF_PDM_InitField( &wellTypeSurvey, "WellTypeSurvey", true, "Survey" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &wellTypeSurvey );
CAF_PDM_InitField( &wellTypePlans, "WellTypePlans", true, "Plans" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &wellTypePlans );
caf::AppEnum<RimWellPathImport::UtmFilterEnum> defaultUtmMode = UTM_FILTER_OFF;
CAF_PDM_InitField( &utmFilterMode, "UtmMode", defaultUtmMode, "Utm Filter" );
@@ -213,6 +217,22 @@ void RimWellPathImport::defineObjectEditorAttribute( QString uiConfigName, caf::
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellPathImport::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
// NOTE: If the default uiOrdering is used, the first checkbox is not possible to interact with using the mouse
// (only keyboard). This is a workaround to make the first checkbox work.
//
// Related issue, but with an opposite fix
// https://github.com/OPM/ResInsight/commit/51443d7aa33abebfaa179e645c729fde19a64666
//
auto group = uiOrdering.addNewGroup( "Well Types" );
group->add( &wellTypeSurvey );
group->add( &wellTypePlans );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationLibCode/Commands/SsiHubImportCommands/RimWellPathImport.h
View File

@@ -57,6 +57,7 @@ public:
void initAfterRead() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void updateFieldVisibility();

45
ApplicationLibCode/Commands/SsiHubImportCommands/RiuWellImportWizard.cpp
View File

@@ -416,21 +416,16 @@ void RiuWellImportWizard::updateFieldsModel()
if ( caf::Utils::fileExists( fileName ) )
{
QStringList regions;
QStringList fields;
QStringList edmIds;
ResInsightInternalJson::JsonReader jsonReader;
QMap<QString, QVariant> jsonMap = jsonReader.decodeFile( fileName );
QStringList regions;
QStringList fields;
QStringList edmIds;
QMapIterator<QString, QVariant> it( jsonMap );
while ( it.hasNext() )
QMap<QString, QVariant> jsonMap = jsonReader.decodeFile( fileName );
QVariantList variantList = ResInsightInternalJson::JsonReader::getVariantList( jsonMap );
for ( const auto& listItem : variantList )
{
it.next();
// If we have an array, skip to next node
if ( it.key() == "length" ) continue;
QMap<QString, QVariant> fieldMap = it.value().toMap();
QMap<QString, QVariant> fieldMap = listItem.toMap();
regions.push_back( fieldMap["region"].toString() );
fields.push_back( fieldMap["name"].toString() );
@@ -641,17 +636,11 @@ void RiuWellImportWizard::parseWellsResponse( RimOilFieldEntry* oilFieldEntry )
if ( caf::Utils::fileExists( oilFieldEntry->wellsFilePath ) )
{
ResInsightInternalJson::JsonReader jsonReader;
QMap<QString, QVariant> jsonMap = jsonReader.decodeFile( oilFieldEntry->wellsFilePath );
QMapIterator<QString, QVariant> it( jsonMap );
while ( it.hasNext() )
QMap<QString, QVariant> jsonMap = jsonReader.decodeFile( oilFieldEntry->wellsFilePath );
QVariantList variantList = ResInsightInternalJson::JsonReader::getVariantList( jsonMap );
for ( const auto& listItem : variantList )
{
it.next();
// If we have an array, skip to next node
if ( it.key() == "length" ) continue;
QMap<QString, QVariant> rootMap = it.value().toMap();
QMap<QString, QVariant> rootMap = listItem.toMap();
if ( m_wellPathImportObject->wellTypeSurvey )
{
@@ -865,6 +854,7 @@ WellSelectionPage::WellSelectionPage( RimWellPathImport* wellPathImport, QWidget
m_regionsWithVisibleWells = new ObjectGroupWithHeaders;
m_regionsWithVisibleWells->objects.uiCapability()->setUiHidden( true );
m_regionsWithVisibleWells->objects.uiCapability()->setUiTreeHidden( true );
}
//--------------------------------------------------------------------------------------------------
@@ -911,6 +901,7 @@ void WellSelectionPage::buildWellTreeView()
{
caf::PdmObjectCollection* regGroup = new caf::PdmObjectCollection;
regGroup->objects.uiCapability()->setUiHidden( true );
regGroup->objects.uiCapability()->setUiTreeHidden( true );
regGroup->setUiName( oilRegion->userDescriptionField()->uiCapability()->uiValue().toString() );
@@ -923,6 +914,7 @@ void WellSelectionPage::buildWellTreeView()
{
caf::PdmObjectCollection* fieldGroup = new caf::PdmObjectCollection;
fieldGroup->objects.uiCapability()->setUiHidden( true );
fieldGroup->objects.uiCapability()->setUiTreeHidden( true );
fieldGroup->setUiName( oilField->userDescriptionField()->uiCapability()->uiValue().toString() );
@@ -932,7 +924,8 @@ void WellSelectionPage::buildWellTreeView()
{
RimWellPathEntry* wellPathEntry = oilField->wells[wIdx];
// Create a copy of the PdmObject, as it is not supported to have multiple parents of any objects
// Create a copy of the PdmObject, as it is not supported to have multiple parents of any
// objects
QString objStr = wellPathEntry->writeObjectToXmlString();
RimWellPathEntry* wellPathCopy = new RimWellPathEntry;
@@ -1026,8 +1019,8 @@ void WellSelectionPage::customMenuRequested( const QPoint& pos )
menuBuilder.appendToMenu( &menu );
// Qt doc: QAbstractScrollArea and its subclasses that map the context menu event to coordinates of the viewport().
// Since we might get this signal from different treeViews, we need to map the position accordingly.
// Qt doc: QAbstractScrollArea and its subclasses that map the context menu event to coordinates of the
// viewport(). Since we might get this signal from different treeViews, we need to map the position accordingly.
QObject* senderObj = this->sender();
QTreeView* treeView = dynamic_cast<QTreeView*>( senderObj );
if ( treeView )