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

#2989 Clean up errors between runs of command files.

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-09-19 13:30:38 +02:00
parent 54cb35232a
commit 477b7dd018
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.cpp
View File

@ -57,10 +57,11 @@ RicfCommandFileExecutor::~RicfCommandFileExecutor()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicfCommandFileExecutor::executeCommands(QTextStream& stream) void RicfCommandFileExecutor::executeCommands(QTextStream& stream)
{ {
RicfMessages messages;
std::vector<RicfCommandObject*> executableCommands; std::vector<RicfCommandObject*> executableCommands;
{ {
std::vector<RicfCommandObject*> fileCommands = RicfCommandFileReader::readCommands(stream, caf::PdmDefaultObjectFactory::instance(), &m_messages); std::vector<RicfCommandObject*> fileCommands = RicfCommandFileReader::readCommands(stream, caf::PdmDefaultObjectFactory::instance(), &messages);
for (auto message : m_messages.m_messages) for (auto message : messages.m_messages)
{ {
if (message.first == RicfMessages::MESSAGE_WARNING) if (message.first == RicfMessages::MESSAGE_WARNING)
{ {

2
ApplicationCode/CommandFileInterface/RicfCommandFileExecutor.h
View File

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