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

Modularization fixes from WellPathImportSsihub

Browse Source
This commit is contained in:
Magne Sjaastad 2015-07-29 14:41:36 +02:00
parent 57b005cdf2
commit 60c08272ef
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/WellPathImportSsihub/RimOilFieldEntry.h
View File

@ -20,6 +20,7 @@
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafPdmField.h" #include "cafPdmField.h"
#include "cafPdmChildArrayField.h"
#include "RimWellsEntry.h" #include "RimWellsEntry.h"
@ -39,7 +40,7 @@ public:
caf::PdmField<bool> selected; caf::PdmField<bool> selected;
caf::PdmField<QString> wellsFilePath; // Location of the response file from request "/wells" caf::PdmField<QString> wellsFilePath; // Location of the response file from request "/wells"
caf::PdmPointersField<RimWellPathEntry*> wells; caf::PdmChildArrayField<RimWellPathEntry*> wells;
RimWellPathEntry* find(const QString& name, RimWellPathEntry::WellTypeEnum wellPathType); RimWellPathEntry* find(const QString& name, RimWellPathEntry::WellTypeEnum wellPathType);

2
ApplicationCode/WellPathImportSsihub/RimOilRegionEntry.h
View File

@ -43,7 +43,7 @@ public:
caf::PdmField<QString> name; caf::PdmField<QString> name;
caf::PdmField<bool> selected; caf::PdmField<bool> selected;
caf::PdmPointersField<RimOilFieldEntry*> fields; caf::PdmChildArrayField<RimOilFieldEntry*> fields;
}; };

16
ApplicationCode/WellPathImportSsihub/RimWellPathImport.cpp
View File

@ -168,17 +168,17 @@ void RimWellPathImport::updateFieldVisibility()
{ {
if (utmFilterMode == UTM_FILTER_CUSTOM) if (utmFilterMode == UTM_FILTER_CUSTOM)
{ {
north.setUiReadOnly(false); north.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(false);
south.setUiReadOnly(false); south.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(false);
east.setUiReadOnly(false); east.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(false);
west.setUiReadOnly(false); west.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(false);
} }
else else
{ {
north.setUiReadOnly(true); north.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(true);
south.setUiReadOnly(true); south.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(true);
east.setUiReadOnly(true); east.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(true);
west.setUiReadOnly(true); west.capability<caf::PdmUiFieldHandle>()->setUiReadOnly(true);
} }
} }

2
ApplicationCode/WellPathImportSsihub/RimWellPathImport.h
View File

@ -52,7 +52,7 @@ public:
caf::PdmField<double> east; caf::PdmField<double> east;
caf::PdmField<double> west; caf::PdmField<double> west;
caf::PdmPointersField<RimOilRegionEntry*> regions; caf::PdmChildArrayField<RimOilRegionEntry*> regions;
void updateRegions(const QStringList& regions, const QStringList& fields, const QStringList& edmIds); void updateRegions(const QStringList& regions, const QStringList& fields, const QStringList& edmIds);

10
ApplicationCode/WellPathImportSsihub/RiuWellImportWizard.cpp
View File

@ -590,7 +590,7 @@ void RiuWellImportWizard::slotCurrentIdChanged(int currentId)
for (size_t fIdx = 0; fIdx < oilRegion->fields.size(); fIdx++) for (size_t fIdx = 0; fIdx < oilRegion->fields.size(); fIdx++)
{ {
RimOilFieldEntry* oilField = oilRegion->fields[fIdx]; RimOilFieldEntry* oilField = oilRegion->fields[fIdx];
oilField->wells.setUiHidden(hideWells); oilField->wells.capability<caf::PdmUiFieldHandle>()->setUiHidden(hideWells);
} }
} }
} }
@ -775,7 +775,7 @@ FieldSelectionPage::FieldSelectionPage(RimWellPathImport* wellPathImport, QWidge
// Tree view // Tree view
caf::PdmUiTreeView* treeView = new caf::PdmUiTreeView(this); caf::PdmUiTreeView* treeView = new caf::PdmUiTreeView(this);
treeView->setPdmObject(wellPathImport); treeView->setPdmItem(wellPathImport);
layout->addWidget(treeView); layout->addWidget(treeView);
layout->setStretchFactor(treeView, 10); layout->setStretchFactor(treeView, 10);
@ -896,7 +896,7 @@ void WellSelectionPage::buildWellTreeView()
if (oilRegion->selected) if (oilRegion->selected)
{ {
caf::PdmObjectGroup* regGroup = new caf::PdmObjectGroup; caf::PdmObjectGroup* regGroup = new caf::PdmObjectGroup;
regGroup->setUiName(oilRegion->userDescriptionField()->uiValue().toString()); regGroup->setUiName(uiField(oilRegion->userDescriptionField())->uiValue().toString());
m_regionsWithVisibleWells->objects.push_back(regGroup); m_regionsWithVisibleWells->objects.push_back(regGroup);
@ -906,7 +906,7 @@ void WellSelectionPage::buildWellTreeView()
if (oilField->selected) if (oilField->selected)
{ {
caf::PdmObjectGroup* fieldGroup = new caf::PdmObjectGroup; caf::PdmObjectGroup* fieldGroup = new caf::PdmObjectGroup;
fieldGroup->setUiName(oilField->userDescriptionField()->uiValue().toString()); fieldGroup->setUiName(uiField(oilField->userDescriptionField())->uiValue().toString());
regGroup->objects.push_back(fieldGroup); regGroup->objects.push_back(fieldGroup);
@ -920,7 +920,7 @@ void WellSelectionPage::buildWellTreeView()
} }
} }
m_wellSelectionTreeView->setPdmObject(m_regionsWithVisibleWells); m_wellSelectionTreeView->setPdmItem(m_regionsWithVisibleWells);
m_regionsWithVisibleWells->updateConnectedEditors(); m_regionsWithVisibleWells->updateConnectedEditors();
m_wellSelectionTreeView->treeView()->expandAll(); m_wellSelectionTreeView->treeView()->expandAll();