Merged in changes from maintenance branch

This commit is contained in:
Magne Sjaastad
2016-08-04 11:12:53 +02:00
49 changed files with 849 additions and 196 deletions

View File

@@ -175,15 +175,14 @@ void RiuMainWindow::initializeGuiNewProjectLoaded()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::cleanupGuiBeforeProjectClose()
void RiuMainWindow::cleanupGuiCaseClose()
{
caf::CmdExecCommandManager::instance()->undoStack()->clear();
setPdmRoot(NULL);
setResultInfo("");
m_resultQwtPlot->deleteAllCurves();
if (m_pdmUiPropertyView)
{
m_pdmUiPropertyView->showProperties(NULL);
@@ -200,6 +199,16 @@ void RiuMainWindow::cleanupGuiBeforeProjectClose()
m_processMonitor->startMonitorWorkProcess(NULL);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::cleanupGuiBeforeProjectClose()
{
setPdmRoot(NULL);
cleanupGuiCaseClose();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------