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

#3452 Command execution. Clear cached data before executing new commands

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-10-04 10:40:48 +02:00
parent 273c2912ae
commit ce26437130
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.cpp
View File

@ -61,6 +61,8 @@ void RicfCommandFileExecutor::executeCommands(QTextStream& stream)
RicfMessages messages; RicfMessages messages;
std::vector<RicfCommandObject*> executableCommands; std::vector<RicfCommandObject*> executableCommands;
{ {
clearCachedData();
std::vector<RicfCommandObject*> fileCommands = RicfCommandFileReader::readCommands(stream, caf::PdmDefaultObjectFactory::instance(), &messages); std::vector<RicfCommandObject*> fileCommands = RicfCommandFileReader::readCommands(stream, caf::PdmDefaultObjectFactory::instance(), &messages);
for (auto message : messages.m_messages) for (auto message : messages.m_messages)
{ {
@ -214,3 +216,12 @@ std::vector<RicfCommandObject*> RicfCommandFileExecutor::prepareFileCommandsForE
return executableCommands; return executableCommands;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicfCommandFileExecutor::clearCachedData()
{
m_exportPaths.clear();
m_lastProjectPath.clear();
}

2
ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.h
View File

@ -60,6 +60,8 @@ public:
static std::vector<RicfCommandObject*> prepareFileCommandsForExecution(const std::vector<RicfCommandObject*>& commandsReadFromFile); static std::vector<RicfCommandObject*> prepareFileCommandsForExecution(const std::vector<RicfCommandObject*>& commandsReadFromFile);
private: private:
void clearCachedData();
std::map<ExportType, QString> m_exportPaths; std::map<ExportType, QString> m_exportPaths;
QString m_lastProjectPath; QString m_lastProjectPath;
}; };