Re #5822. Fixes to the attribute methods

mantidproject · Sep 7, 2012 · b85b736 · b85b736
1 parent ac45146
commit b85b736
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/TabulatedFunction.h b/Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/TabulatedFunction.h
@@ -84,7 +84,7 @@ class DLLExport TabulatedFunction : public API::ParamFunction, public API::IFunc
   /// Set a value to attribute attName
   void setAttribute(const std::string& attName,const IFunction::Attribute& value);
   /// Check if attribute attName exists
-  bool hasAttribute(const std::string& attName)const{return attName == "FileName";}
+  bool hasAttribute(const std::string& attName)const;
 
 private:
 

diff --git a/Code/Mantid/Framework/CurveFitting/src/TabulatedFunction.cpp b/Code/Mantid/Framework/CurveFitting/src/TabulatedFunction.cpp
@@ -121,7 +121,9 @@ void TabulatedFunction::clear()
 /// Returns a list of attribute names
 std::vector<std::string> TabulatedFunction::getAttributeNames()const
 {
-  std::vector<std::string> res(1,"FileName");
+  std::vector<std::string> res(2);
+  res[0] = "FileName";
+  res[1] = "Workspace";
   return res;
 }
 
@@ -175,6 +177,17 @@ IFunction::Attribute TabulatedFunction::getAttribute(const std::string& attName)
   return IFunction::getAttribute( attName );
 }
 
+/**
+ * Check if attribute attName exists
+ * @param attName :: A name to check.
+ */
+bool TabulatedFunction::hasAttribute(const std::string& attName)const
+{
+  std::string aName( attName );
+  std::transform(aName.begin(),aName.end(),aName.begin(),toupper);
+  return aName == "FILENAME" || aName == "WORKSPACE";
+}
+
 /**
  * Decide whether to load the file as an ASCII file or as a Nexus file.
  * @param fname :: The file name

diff --git a/Code/Mantid/Framework/CurveFitting/test/TabulatedFunctionTest.h b/Code/Mantid/Framework/CurveFitting/test/TabulatedFunctionTest.h
@@ -163,6 +163,17 @@ class TabulatedFunctionTest : public CxxTest::TestSuite
     AnalysisDataService::Instance().clear();
   }
 
+  void test_Attributes()
+  {
+    TabulatedFunction fun;
+    auto names = fun.getAttributeNames();
+    TS_ASSERT_EQUALS( names.size(), 2 );
+    TS_ASSERT_EQUALS( names[0], "FileName" );
+    TS_ASSERT_EQUALS( names[1], "Workspace" );
+    TS_ASSERT( fun.hasAttribute("FileName") );
+    TS_ASSERT( fun.hasAttribute("Workspace") );
+  }
+
 private:
   const std::string m_asciiFileName;
   const std::string m_nexusFileName;