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

Merge remote-tracking branch 'origin/dev' into pre-proto

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-08-08 14:24:42 +02:00
parent 6c5f974d8e 39c3338024
commit eee4a65497
16 changed files with 493 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Application/RiaApplication.h
View File

@@ -143,7 +143,6 @@ public:
void addWellPathsToModel(QList<QString> wellPathFilePaths);
void addWellLogsToModel(const QList<QString>& wellLogFilePaths);
void saveSnapshotForAllViews(const QString& snapshotFolderName);
void runMultiCaseSnapshots(const QString& templateProjectFileName, std::vector<QString> gridFileNames, const QString& snapshotFolderName);
void runRegressionTest(const QString& testRootPath);
@@ -208,12 +207,12 @@ public:
static std::vector<QString> readFileListFromTextFile(QString listFileName);
void clearViewsScheduledForUpdate();
private:
void onProjectOpenedOrClosed();
void setWindowCaptionFromAppState();
void clearViewsScheduledForUpdate();
void createMainPlotWindow();
void deleteMainPlotWindow();