#3479 Input Case : Missing entry in tree view for imported properties

This commit is contained in:
Magne Sjaastad
2018-10-10 09:35:01 +02:00
parent c7f6c74869
commit e1b1e3e898
4 changed files with 39 additions and 18 deletions

View File

@@ -45,22 +45,21 @@ public:
RimEclipseInputCase();
virtual ~RimEclipseInputCase();
// Fields
caf::PdmChildField<RimEclipseInputPropertyCollection*> m_inputPropertyCollection;
// File open methods
bool openDataFileSet(const QStringList& fileNames);
void loadAndSyncronizeInputProperties();
RimEclipseInputPropertyCollection* inputPropertyCollection();
// RimCase overrides
virtual bool openEclipseGridFile(); // Find grid file among file set. Read, Find read and validate property date. Syncronize child property sets.
virtual void reloadEclipseGridFile();
bool openEclipseGridFile() override;
void reloadEclipseGridFile() override;
// Overrides from RimCase
virtual QString locationOnDisc() const;
virtual QString gridFileName() const { return m_gridFileName();}
QString locationOnDisc() const override;
QString gridFileName() const override { return m_gridFileName();}
virtual void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath);
void updateFilePathsFromProjectPath(const QString& projectPath, const QString& oldProjectPath) override;
void updateAdditionalFileFolder(const QString& newFolder);
@@ -69,11 +68,14 @@ private:
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
private:
cvf::ref<RifReaderInterface> createMockModel(QString modelName);
private:
// Fields
caf::PdmChildField<RimEclipseInputPropertyCollection*> m_inputPropertyCollection;
caf::PdmField<QString> m_gridFileName;
caf::PdmProxyValueField< std::vector<QString> > m_additionalFiles;