refs #4328 Default directory preference.

mantidproject · Jan 16, 2012 · 15003c8 · 15003c8
1 parent 2810084
commit 15003c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/CreateMDWorkspace.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/CreateMDWorkspace.cpp
@@ -542,12 +542,7 @@ void CreateMDWorkspace::createMDWorkspaceClicked()
   QString otherDimensions = algDlg.getOtherDimensions();
   QString preProcessedDetectors = algDlg.getPreprocessedDetectors();
   QString location = algDlg.getLocation();
-  if(location.isEmpty())
-  {
-    runConfirmation("Output location is mandatory. Please start again and enter one.");
-    return;
-  }
-
+
   //2) Run ConvertToMDEvents on each workspace.
   QString fileNames;
   for(WorkspaceMementoCollection::size_type i = 0; i < m_data.size(); i++)
@@ -591,6 +586,7 @@ void CreateMDWorkspace::createMDWorkspaceClicked()
       fileNames += ",";
     }
     fileNames += location + "/" + id + "_md.nxs";
+
     currentMemento->cleanUp();
   }
 
@@ -611,7 +607,9 @@ void CreateMDWorkspace::createMDWorkspaceClicked()
       runConfirmation("Aborted during merge. See log messages.");
     }
   }
-
+  //Report successful conversion.
+  std::string msg = "Success. Ouput MD files have been written to : " + algDlg.getLocation();
+  runConfirmation(msg);
 }
 
 

diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/CreateMDWorkspaceAlgDialog.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/CreateMDWorkspaceAlgDialog.cpp
@@ -1,4 +1,5 @@
 #include "MantidQtCustomInterfaces/CreateMDWorkspaceAlgDialog.h"
+#include "MantidKernel/ConfigService.h"
 #include <QComboBox>
 #include <QLineEdit>
 #include <QCheckBox>
@@ -18,6 +19,8 @@ CreateMDWorkspaceAlgDialog::CreateMDWorkspaceAlgDialog()
   m_uiForm.combo_analysis_mode->addItem("Direct");
   m_uiForm.combo_analysis_mode->addItem("Elastic");
   m_uiForm.combo_analysis_mode->addItem("Indirect");
+
+  m_location = QString(Mantid::Kernel::ConfigService::Instance().getTempDir().c_str());
 
   this->setWindowTitle("Set MDWorkspace Creation Parameters");
 }