Refs #5101. Adding masked entry for MaskWorkspace data.

mantidproject · Apr 13, 2012 · 8cb5385 · 8cb5385
1 parent dbc05b9
commit 8cb5385
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt
@@ -750,7 +750,7 @@ include_directories ( src/lib/include )
 include_directories ( src/lib/3rdparty/qtcolorpicker/src )
 include_directories ( ../MantidQt/SliceViewer/inc )
 include_directories ( ../MantidQt/Factory/inc )
-
+include_directories ( ../Framework/DataObjects/inc )
 
 ###########################################################################
 # Application icon files
@@ -776,7 +776,7 @@ add_executable ( MantidPlot ${WIN_CONSOLE} MACOSX_BUNDLE ${ALL_SRC} src/main.cpp
 
 # Library dependencies
 target_link_libraries ( MantidPlot 
-                        ${CORE_MANTIDLIBS}
+                        ${CORE_MANTIDLIBS} DataObjects
                         MantidQtAPI MantidWidgets MantidQtSliceViewer MantidQtFactory
                         QtPropertyBrowser ${QT_LIBRARIES} 
                         ${QWT_LIBRARIES} ${QWTPLOT3D_LIBRARIES}

diff --git a/Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp b/Code/Mantid/MantidPlot/src/Mantid/MantidDock.cpp
@@ -10,6 +10,7 @@
 #include <MantidAPI/FileProperty.h>
 #include <MantidGeometry/MDGeometry/IMDDimension.h>
 #include <MantidQtAPI/InterfaceManager.h>
+#include <MantidDataObjects/MaskWorkspace.h>
 #include "MantidMatrix.h"
 #include <QInputDialog>
 #include <QMessageBox>
@@ -43,6 +44,7 @@
 using namespace Mantid::API;
 using namespace Mantid::Kernel;
 using namespace Mantid::Geometry;
+using namespace Mantid::DataObjects;
 
 Mantid::Kernel::Logger& MantidDockWidget::logObject=Mantid::Kernel::Logger::get("mantidDockWidget");
 Mantid::Kernel::Logger& MantidTreeWidget::logObject=Mantid::Kernel::Logger::get("MantidTreeWidget");
@@ -692,7 +694,17 @@ void MantidDockWidget::populateMatrixWorkspaceData(Mantid::API::MatrixWorkspace_
     excludeItemFromSort(data_item);
     ws_item->addChild(data_item);
   }
-
+  else
+  {
+    if (workspace->id() == "MaskWorkspace")
+    {
+      MaskWorkspace_sptr maskWS = boost::dynamic_pointer_cast<MaskWorkspace>(workspace);
+      data_item = new MantidTreeWidgetItem(QStringList("Masked: "+ QLocale(QLocale::English).toString(double(maskWS->getNumberMasked()), 'd', 0)), m_tree);
+      data_item->setFlags(Qt::NoItemFlags);
+      excludeItemFromSort(data_item);
+      ws_item->addChild(data_item);
+    }
+  }
 
   //Extra stuff for EventWorkspace
   Mantid::API::IEventWorkspace_sptr eventWS = boost::dynamic_pointer_cast<Mantid::API::IEventWorkspace> ( workspace );