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

#2349 Elm Props: Use caf::FilePath instead of QString

Browse Source
This commit is contained in:
Rebecca Cox
2018-01-12 14:39:15 +01:00
parent efaaab1dc6
commit a97dd087d6
3 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@@ -21,6 +21,7 @@
#include "RimCase.h"
#include "cafFilePath.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
@@ -69,7 +70,7 @@ public:
virtual void setFormationNames(RimFormationNames* formationNames) override;
void addElementPropertyFiles(const std::vector<QString>& filenames);
void addElementPropertyFiles(const std::vector<caf::FilePath>& filenames);
// Fields:
caf::PdmChildArrayField<RimGeoMechView*> geoMechViews;
@@ -80,16 +81,20 @@ private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual void updateFormationNamesData() override;
virtual void initAfterRead();
virtual void initAfterRead() override;
static QString subStringOfDigits(const QString& timeStepString, int numberOfDigitsToFind);
private:
cvf::ref<RigGeoMechCaseData> m_geoMechCaseData;
caf::PdmField<QString> m_caseFileName;
caf::PdmField<double> m_cohesion;
caf::PdmField<double> m_frictionAngleDeg;
caf::PdmField<std::vector<QString> > m_elementPropertyFileNames;
cvf::ref<RigGeoMechCaseData> m_geoMechCaseData;
caf::PdmField<QString> m_caseFileName;
caf::PdmField<double> m_cohesion;
caf::PdmField<double> m_frictionAngleDeg;
caf::PdmField<std::vector<caf::FilePath>> m_elementPropertyFileNames;
caf::PdmField<std::vector<QString> > m_elementPropertyFileNameUiSelection;
caf::PdmField<bool> m_closeElementPropertyFileCommand;
caf::PdmField<bool> m_reloadElementPropertyFileCommand;
};