Resolved the conflict. Refs #6881.

mantidproject · Apr 22, 2013 · 3d6bf08 · 3d6bf08
2 parents b427253 + 2e9ca1d
commit 3d6bf08
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.cpp
@@ -47,6 +47,7 @@
 #include <QToolTip>
 #include <QTemporaryFile>
 #include <QGroupBox>
+#include <QCheckBox>
 
 #include "MantidQtAPI/FileDialogHandler.h"
 
@@ -147,13 +148,13 @@ m_userEditing(true)
 
   // Create property browser
 
-    /* Create property managers: they create, own properties, get and set values  */
+  /* Create property managers: they create, own properties, get and set values  */
 
   m_groupManager = new QtGroupPropertyManager(this);
   m_doubleManager = new QtDoublePropertyManager(this);
   connect(m_doubleManager,SIGNAL(propertyChanged(QtProperty*)),this,SLOT(doubleChanged(QtProperty*)));
 
-     /* Create editors and assign them to the managers */
+  /* Create editors and assign them to the managers */
 
   DoubleEditorFactory *doubleEditorFactory = new DoubleEditorFactory(this);
 
@@ -176,6 +177,10 @@ m_userEditing(true)
   m_clear_all->setToolTip("Clear all masking that have not been applied to the data.");
   connect(m_clear_all,SIGNAL(clicked()),this,SLOT(clearMask()));
 
+  m_savegroupdet = new QCheckBox("Grouped Detectors");
+  m_savegroupdet->setToolTip("If checked, then save masked with grouped detectors. ");
+  m_savegroupdet->setChecked(false);
+
   m_save_as_workspace_exclude = new QAction("As Mask to workspace",this);
   m_save_as_workspace_exclude->setToolTip("Save current mask to mask workspace.");
   connect(m_save_as_workspace_exclude,SIGNAL(activated()),this,SLOT(saveMaskToWorkspace()));
@@ -246,6 +251,8 @@ m_userEditing(true)
   buttons->addWidget(m_apply_to_view,0,0,1,2);
   buttons->addWidget(m_saveButton,1,0);
   buttons->addWidget(m_clear_all,1,1);
+  buttons->addWidget(m_savegroupdet, 2, 0, 1, 2);
+
   box->setLayout(buttons);
   layout->addWidget(box);
 
@@ -255,6 +262,7 @@ m_userEditing(true)
   box->setLayout(buttons);
   layout->addWidget(box);
 
+  // layout->addLayout(buttons);
 }
 
 /**
@@ -753,10 +761,14 @@ void InstrumentWindowMaskTab::saveMaskingToFile(bool invertMask)
 
     if (!fileName.isEmpty())
     {
+      // Check option "GroupedDetectors"
+      bool groupeddetectors = m_savegroupdet->isChecked();
+
+      // Call "SaveMask()"
       Mantid::API::IAlgorithm_sptr alg = Mantid::API::AlgorithmManager::Instance().create("SaveMask",-1);
       alg->setProperty("InputWorkspace",boost::dynamic_pointer_cast<Mantid::API::Workspace>(outputWS));
       alg->setPropertyValue("OutputFile",fileName.toStdString());
-      alg->setProperty("GroupedDetectors",true);
+      alg->setProperty("GroupedDetectors", groupeddetectors);
       alg->execute();
     }
     Mantid::API::AnalysisDataService::Instance().remove( outputWS->name() );

diff --git a/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.h b/Code/Mantid/MantidPlot/src/Mantid/InstrumentWidget/InstrumentWindowMaskTab.h
@@ -128,6 +128,8 @@ protected slots:
   QPushButton* m_apply_to_view;
   QPushButton* m_clear_all;
   QPushButton* m_saveButton;
+  QCheckBox* m_savegroupdet;
+
 
   QMenu* m_saveMask;
   QAction* m_save_as_workspace_include;