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

#2369 Elm props: Clear cell results on deletion

Browse Source
This commit is contained in:
Rebecca Cox
2018-01-15 14:48:00 +01:00
parent 277bd496f1
commit 4bf8de2787
5 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/RicImportElementPropertyFeature.cpp
View File

@@ -48,9 +48,9 @@ void RicImportElementPropertyFeature::onActionTriggered(bool isChecked)
QString defaultDir = app->lastUsedDialogDirectory("ELM_PROPS");
QStringList fileNames =
QFileDialog::getOpenFileNames(NULL, "Import Element Property Table", defaultDir, "Property Table (*.inp)");
QFileDialog::getOpenFileNames(nullptr, "Import Element Property Table", defaultDir, "Property Table (*.inp)");
if (fileNames.size())
if (!fileNames.empty())
{
defaultDir = QFileInfo(fileNames.last()).absolutePath();
}

9
ApplicationCode/FileInterface/RifElementPropertyReader.cpp
View File

@@ -87,6 +87,13 @@ std::map<std::string, std::vector<std::string>> RifElementPropertyReader::scalar
std::map<std::string, std::vector<float>>
RifElementPropertyReader::readAllElementPropertiesInFileContainingField(const std::string& fieldName)
{
std::map<std::string, std::vector<float>> fieldAndData;
if (m_fieldsMetaData.find(fieldName) == m_fieldsMetaData.end())
{
return fieldAndData;
}
RifElementPropertyTable table;
RifElementPropertyTableReader::readData(&m_fieldsMetaData[fieldName], &table);
@@ -97,8 +104,6 @@ std::map<std::string, std::vector<float>>
CVF_ASSERT(table.data[i].size() == table.elementIds.size());
}
std::map<std::string, std::vector<float>> fieldAndData;
const std::vector<int>& elementIdsFromFile = table.elementIds;
if (elementIdsFromFile == m_elementIdxToId)

7
ApplicationCode/GeoMech/GeoMechDataModel/RigFemResultAddress.h
View File

@@ -29,6 +29,13 @@
class RigFemResultAddress
{
public:
RigFemResultAddress()
{
resultPosType = RIG_NODAL;
fieldName = "";
componentName = "";
}
RigFemResultAddress(RigFemResultPosEnum resPosType,
const std::string& aFieldName,
const std::string& aComponentName)

11
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -561,6 +561,17 @@ void RimGeoMechCase::closeSelectedElementPropertyFiles()
{
geoMechData()->femPartResults()->removeElementPropertyFiles(filesToClose);
}
for (RimGeoMechView* view : geoMechViews())
{
view->cellResult()->setResultAddress(RigFemResultAddress());
for (RimGeoMechPropertyFilter* propertyFilter : view->geoMechPropertyFilterCollection()->propertyFilters())
{
propertyFilter->resultDefinition().p()->setResultAddress(RigFemResultAddress());
}
view->loadDataAndUpdate();
}
}
//--------------------------------------------------------------------------------------------------

10
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilterCollection.h
View File

@@ -45,14 +45,14 @@ public:
caf::PdmChildArrayField<RimGeoMechPropertyFilter*> propertyFilters;
// Methods
bool hasActiveFilters() const;
bool hasActiveDynamicFilters() const;
bool hasActiveFilters() const override;
bool hasActiveDynamicFilters() const override;
bool isUsingFormationNames() const;
void loadAndInitializePropertyFilters();
void updateIconState();
void loadAndInitializePropertyFilters() override;
void updateIconState() override;
protected:
// Overridden methods
virtual void initAfterRead();
virtual void initAfterRead() override;
};