Hook up matlab readers to Read/WriteField

Author: dcwhite

src/Core/Datatypes/Legacy/Nrrd/NrrdData.h

@@ -42,12 +42,13 @@
 
 #include <Core/Datatypes/Datatype.h>
 #include <Core/GeometryPrimitives/GeomFwd.h>
+#include <Core/Datatypes/PropertyManagerExtensions.h>
 #include <teem/nrrd.h>
 #include <Core/Datatypes/Legacy/Nrrd/share.h>
 
 namespace SCIRun {
 
-class SCISHARE NrrdData : public Core::Datatypes::Datatype
+class SCISHARE NrrdData : public Core::Datatypes::Datatype, public Core::Datatypes::HasPropertyManager
 {
 public:
   NrrdData();

src/Core/Datatypes/Matrix.h

@@ -32,6 +32,7 @@
 
 #include <Core/Datatypes/Datatype.h>
 #include <Core/Datatypes/MatrixFwd.h>
+#include <Core/Datatypes/PropertyManagerExtensions.h>
 #include <iosfwd>
 #include <Core/Datatypes/share.h>
 
@@ -65,7 +66,7 @@ namespace Datatypes {
   };
 
   template <typename T>
-  class MatrixBase : public MatrixIOBase
+  class MatrixBase : public MatrixIOBase, public Core::Datatypes::HasPropertyManager
   {
   public:
     virtual size_t nrows() const = 0;

src/Core/IEPlugin/CMakeLists.txt

@@ -37,7 +37,7 @@ SET(Core_IEPlugin_SRCS
   IEPluginInit.cc
   #MRC_Plugin.cc
   #MTextFileToTriSurf_Plugin.cc
-  #MatlabFiles_Plugin.cc
+  MatlabFiles_Plugin.cc
   NrrdField_Plugin.cc
   #NrrdToMatrix_Plugin.cc
   ObjToField_Plugin.cc
@@ -64,7 +64,7 @@ SET(Core_IEPlugin_HEADERS
   #HexVolField_Plugin.h
   #MRC_Plugin.h
   #MTextFileToTriSurf_Plugin.h
-  #MatlabFiles_Plugin.h
+  MatlabFiles_Plugin.h
   NrrdField_Plugin.h
   #NrrdToMatrix_Plugin.h
   ObjToField_Plugin.h
@@ -91,7 +91,7 @@ TARGET_LINK_LIBRARIES(Core_IEPlugin
   #Core_Geometry
   #Core_Math
   #Core_Util
-  #Core_Matlab
+  Core_Matlab
   Core_Datatypes
   Core_Datatypes_Legacy_Field
   Core_ImportExport

src/Core/IEPlugin/IEPluginInit.cc

@@ -28,7 +28,9 @@
 
 #include <Core/IEPlugin/ObjToField_Plugin.h>
 #include <Core/IEPlugin/NrrdField_Plugin.h>
+#include <Core/IEPlugin/MatlabFiles_Plugin.h>
 #include <Core/ImportExport/Field/FieldIEPlugin.h>
+#include <Core/ImportExport/Matrix/MatrixIEPlugin.h>
 #include <Core/IEPlugin/IEPluginInit.h>
 
 using namespace SCIRun;
@@ -37,6 +39,7 @@ using namespace SCIRun::Core::Logging;
 namespace SCIRun
 {
   template class GenericIEPluginManager<Field>;
+  template class GenericIEPluginManager<Core::Datatypes::Matrix>;
 }
 
 void IEPluginManager::Initialize()
@@ -48,4 +51,9 @@ void IEPluginManager::Initialize()
   static FieldIEPluginLegacyAdapter ModalNrrdToField_plugin("NrrdFile[DataOnElements]","*.nhdr *.nrrd", "", Modal_NrrdToField_reader, 0);
   static FieldIEPluginLegacyAdapter IPNodalNrrdToField_plugin("NrrdFile[DataOnNodes,InvertParity]","*.nhdr *.nrrd", "", IPNodal_NrrdToField_reader, 0);
   static FieldIEPluginLegacyAdapter IPModalNrrdToField_plugin("NrrdFile[DataOnElements,InvertParity]","*.nhdr *.nrrd", "", IPModal_NrrdToField_reader, 0);
+
+  static MatrixIEPluginLegacyAdapter MatlabMatrix_plugin("Matlab Matrix",".mat", "*.mat", MatlabMatrix_reader, MatlabMatrix_writer);
+  static FieldIEPluginLegacyAdapter MatlabField_plugin("Matlab Field", "*.mat", "*.mat", MatlabField_reader, MatlabField_writer);   
+  //TODO
+  //static NrrdIEPluginLegacyAdapter MatlabNrrd_plugin("Matlab Matrix",".mat", "*.mat",MatlabNrrd_reader,MatlabNrrd_writer);     
 }

src/Core/IEPlugin/MatlabFiles_Plugin.cc

@@ -26,25 +26,26 @@
   DEALINGS IN THE SOFTWARE.
 */
 
-#include <Core/ImportExport/Matrix/MatrixIEPlugin.h>
-#include <Core/ImportExport/Field/FieldIEPlugin.h>
-#include <Core/ImportExport/Nrrd/NrrdIEPlugin.h>
+#include <Core/IEPlugin/MatlabFiles_Plugin.h>
 #include <Core/Matlab/matlabfile.h>
 #include <Core/Matlab/matlabarray.h>
 #include <Core/Matlab/matlabconverter.h>
-
+#include <Core/Datatypes/Matrix.h>
+#include <Core/Datatypes/Legacy/Field/Field.h>
+#include <Core/Datatypes/Legacy/Nrrd/NrrdData.h>
+#include <Core/Datatypes/Legacy/Base/PropertyManager.h>
 
 // This file contains plugins to read and write files in MathWork's Matlab
 // file format.
 
-
-namespace SCIRun {
-
-using namespace MatlabIO;
+using namespace SCIRun;
+using namespace SCIRun::MatlabIO;
+using namespace SCIRun::Core::Logging;
+using namespace SCIRun::Core::Datatypes;
 
 // Write a matrix as matlab object
 MatrixHandle
-MatlabMatrix_reader(ProgressReporter *pr, const char *filename)
+SCIRun::MatlabMatrix_reader(LoggerHandle pr, const char *filename)
 {
   // Create a matlab file object, which will be linked to input file
   matlabfile mf;
@@ -90,7 +91,7 @@ MatlabMatrix_reader(ProgressReporter *pr, const char *filename)
 }
 
 bool
-MatlabMatrix_writer(ProgressReporter *pr,
+SCIRun::MatlabMatrix_writer(LoggerHandle pr,
 			   MatrixHandle mh, const char *filename)
 {
   matlabfile mf;
@@ -106,7 +107,7 @@ MatlabMatrix_writer(ProgressReporter *pr,
     // Convert the matrix into a matlab object
     mc.sciMatrixTOmlArray(mh,ma);
     // If the SCIRun object has a name, use it
-    mh->get_property("name",name);
+    mh->properties().get_property("name",name);
     // Set a default name if none was supplied
     if ((name=="")||(!mc.isvalidmatrixname(name))) name = "scirunmatrix";
     // Open the file
@@ -126,7 +127,7 @@ MatlabMatrix_writer(ProgressReporter *pr,
 
 
 NrrdDataHandle
-MatlabNrrd_reader(ProgressReporter *pr, const char *filename)
+SCIRun::MatlabNrrd_reader(LoggerHandle pr, const char *filename)
 {
   matlabfile mf;
   matlabconverter mc(pr);
@@ -168,8 +169,8 @@ MatlabNrrd_reader(ProgressReporter *pr, const char *filename)
 }
 
 bool
-MatlabNrrd_writer(ProgressReporter *pr,
-			   NrrdDataHandle mh, const char *filename)
+SCIRun::MatlabNrrd_writer(LoggerHandle pr,
+			   NrrdDataHandle nrrd, const char *filename)
 {
   matlabfile mf;
   matlabconverter mc(pr);
@@ -178,12 +179,12 @@ MatlabNrrd_writer(ProgressReporter *pr,
 
   try
   {
-    // Make sure we make it into a numeric array, no annotion and headers
+    // Make sure we make it into a numeric array, no annotation and headers
     mc.converttonumericmatrix();
     // Convert the object
-    mc.sciNrrdDataTOmlArray(mh,ma);
+    mc.sciNrrdDataTOmlArray(nrrd,ma);
     // Check if the object has a name
-    mh->get_property("name",name);
+    nrrd->properties().get_property("name",name);
     // if no name available give it one
     if ((name=="")||(!mc.isvalidmatrixname(name))) name = "scirunnrrd";
     // Open the file
@@ -203,7 +204,7 @@ MatlabNrrd_writer(ProgressReporter *pr,
 
 
 FieldHandle
-MatlabField_reader(ProgressReporter *pr, const char *filename)
+SCIRun::MatlabField_reader(LoggerHandle pr, const char *filename)
 {
   matlabfile mf;
   // Make sure that errors are forwarded in the conversion process
@@ -248,8 +249,8 @@ MatlabField_reader(ProgressReporter *pr, const char *filename)
 }
 
 bool
-MatlabField_writer(ProgressReporter *pr,
-			   FieldHandle mh, const char *filename)
+SCIRun::MatlabField_writer(LoggerHandle pr,
+			   FieldHandle field, const char *filename)
 {
   matlabfile mf;
   // Make sure that errors are forwarded in the conversion process
@@ -262,9 +263,9 @@ MatlabField_writer(ProgressReporter *pr,
     // We want all the annotation. A field without annotation is hard to use
     mc.converttostructmatrix();
     // Convert the object
-    mc.sciFieldTOmlArray(mh,ma);
+    mc.sciFieldTOmlArray(field,ma);
     // Get the name
-    mh->get_property("name",name);
+    field->properties().get_property("name",name);
     // If no name, set a default
     if ((name=="")||(!mc.isvalidmatrixname(name))) name = "scirunfield";
     // Write the object to the file
@@ -280,9 +281,3 @@ MatlabField_writer(ProgressReporter *pr,
   return(true);
 }
 
-static MatrixIEPlugin MatlabMatrix_plugin("Matlab Matrix",".mat", "*.mat", MatlabMatrix_reader, MatlabMatrix_writer);
-static FieldIEPlugin MatlabField_plugin("Matlab Field",".mat", "*.mat",MatlabField_reader,MatlabField_writer);   
-static NrrdIEPlugin MatlabNrrd_plugin("Matlab Matrix",".mat", "*.mat",MatlabNrrd_reader,MatlabNrrd_writer);     
-  
-} // end namespace SCIRun
-

src/Core/IEPlugin/MatlabFiles_Plugin.h

@@ -0,0 +1,48 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2009 Scientific Computing and Imaging Institute,
+  University of Utah.
+
+  
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+*/
+
+#ifndef CORE_IEPLUGIN_MATLABFILES_PLUGIN_H__
+#define CORE_IEPLUGIN_MATLABFILES_PLUGIN_H__
+
+#include <Core/Logging/LoggerFwd.h>
+#include <Core/Datatypes/DatatypeFwd.h>
+#include <Core/Datatypes/Legacy/Field/FieldFwd.h>
+#include <Core/IEPlugin/share.h>
+
+namespace SCIRun 
+{
+  SCISHARE Core::Datatypes::MatrixHandle MatlabMatrix_reader(Core::Logging::LoggerHandle pr, const char *filename);
+  SCISHARE NrrdDataHandle MatlabNrrd_reader(Core::Logging::LoggerHandle pr, const char *filename);
+  SCISHARE FieldHandle MatlabField_reader(Core::Logging::LoggerHandle pr, const char *filename);
+
+  SCISHARE bool MatlabMatrix_writer(Core::Logging::LoggerHandle pr, Core::Datatypes::MatrixHandle fh, const char* filename);
+  SCISHARE bool MatlabNrrd_writer(Core::Logging::LoggerHandle pr, NrrdDataHandle fh, const char* filename);
+  SCISHARE bool MatlabField_writer(Core::Logging::LoggerHandle pr, FieldHandle fh, const char* filename);
+}
+
+#endif