ECGSim to matrix

Author: dcwhite

src/Core/IEPlugin/CMakeLists.txt

@@ -31,7 +31,7 @@ SET(Core_IEPlugin_SRCS
   #CVRTIFileToMatrix_Plugin.cc
   CurveField_Plugin.cc
   #DIF_Plugin.cc
-  #EcgsimFileToMatrix_Plugin.cc
+  EcgsimFileToMatrix_Plugin.cc
   #EcgsimFileToTriSurf_Plugin.cc
   #HexVolField_Plugin.cc
   IEPluginInit.cc
@@ -59,7 +59,7 @@ SET(Core_IEPlugin_HEADERS
   #CVRTIFileToMatrix_Plugin.h
   CurveField_Plugin.h
   #DIF_Plugin.h
-  #EcgsimFileToMatrix_Plugin.h
+  EcgsimFileToMatrix_Plugin.h
   #EcgsimFileToTriSurf_Plugin.h
   #HexVolField_Plugin.h
   #MRC_Plugin.h

src/Core/IEPlugin/EcgsimFileToMatrix_Plugin.cc

@@ -37,24 +37,27 @@
  */
 
 
-// This is a plugin is meant to read simple text files with pure data
-// in ascii format into a SCIRun matrix.
-
+#include <Core/ImportExport/Matrix/MatrixIEPlugin.h>
+#include <Core/IEPlugin/EcgsimFileToMatrix_Plugin.h>
+#include <Core/Datatypes/DenseMatrix.h>
+#include <Core/Datatypes/MatrixTypeConversions.h>
+#include <Core/Utils/Legacy/StringUtil.h>
+#include <Core/Logging/LoggerInterface.h>
 #include <Core/ImportExport/Matrix/MatrixIEPlugin.h>
 #include <Core/Datatypes/DenseMatrix.h>
 
 #include <iostream>
 #include <fstream>
 #include <sstream>
 
-namespace SCIRun {
-
-MatrixHandle EcgsimFileMatrix_reader(ProgressReporter *pr, const char *filename);
-bool EcgsimFileMatrix_writer(ProgressReporter *pr, MatrixHandle matrix, const char *filename);
+using namespace SCIRun;
+using namespace SCIRun::Core;
+using namespace SCIRun::Core::Logging;
+using namespace SCIRun::Core::Datatypes;
 
-MatrixHandle EcgsimFileMatrix_reader(ProgressReporter *pr, const char *filename)
+MatrixHandle SCIRun::EcgsimFileMatrix_reader(LoggerHandle pr, const char *filename)
 {
-  MatrixHandle result;
+  DenseMatrixHandle result;
 
   int ncols = 0;
   int nrows = 0;
@@ -154,14 +157,14 @@ MatrixHandle EcgsimFileMatrix_reader(ProgressReporter *pr, const char *filename)
     std::ifstream inputfile;
     inputfile.exceptions( std::ifstream::badbit );
 
-    result = new DenseMatrix(header_rows,header_cols);
-    if (result.get_rep() == 0)
+    result.reset(new DenseMatrix(header_rows,header_cols));
+    if (!result)
     {
       if (pr) pr->error("Could not allocate matrix");
       return(result);
     }
 
-    double* dataptr = result->get_data_pointer();
+    double* dataptr = result->data();
     int k = 0;
 
     try
@@ -211,23 +214,22 @@ MatrixHandle EcgsimFileMatrix_reader(ProgressReporter *pr, const char *filename)
 }
 
 
-bool EcgsimFileMatrix_writer(ProgressReporter *pr, MatrixHandle matrix, const char *filename)
+bool SCIRun::EcgsimFileMatrix_writer(LoggerHandle pr, MatrixHandle matrixInput, const char *filename)
 {
 
   std::ofstream outputfile;
   outputfile.exceptions( std::ofstream::failbit | std::ofstream::badbit );
 
-  MatrixHandle temp = matrix->dense();
-  matrix = temp;
+  DenseMatrixHandle matrix = matrix_cast::as_dense(matrixInput);
 
-  if (matrix.get_rep() == 0)
+  if (!matrix)
   {
     if (pr) pr->error("Empty matrix detected");
     return(false);
   }
 
-  double* dataptr = matrix->get_data_pointer();
-  if (dataptr == 0)
+  double* dataptr = matrix->data();
+  if (!dataptr)
   {
     if (pr) pr->error("Empty matrix detected");
     return(false);
@@ -261,7 +263,5 @@ bool EcgsimFileMatrix_writer(ProgressReporter *pr, MatrixHandle matrix, const ch
   return (true);
 }
 
-static MatrixIEPlugin EcgsimFileMatrix_plugin("ECGSimFile","", "",EcgsimFileMatrix_reader,EcgsimFileMatrix_writer);
 
-} // end namespace
 

src/Core/IEPlugin/EcgsimFileToMatrix_Plugin.h

@@ -0,0 +1,43 @@
+/*
+  For more information, please see: http://software.sci.utah.edu
+
+  The MIT License
+
+  Copyright (c) 2015 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_ECGSIMFILETOMATRIX_PLUGIN_H__
+#define CORE_IEPLUGIN_ECGSIMFILETOMATRIX_PLUGIN_H__
+
+#include <Core/Logging/LoggerFwd.h>
+#include <Core/Datatypes/DatatypeFwd.h>
+#include <Core/IEPlugin/share.h>
+
+namespace SCIRun 
+{
+  SCISHARE Core::Datatypes::MatrixHandle EcgsimFileMatrix_reader(Core::Logging::LoggerHandle pr, const char *filename);
+
+  SCISHARE bool EcgsimFileMatrix_writer(Core::Logging::LoggerHandle pr, Core::Datatypes::MatrixHandle fh, const char* filename);
+}
+
+#endif

src/Core/IEPlugin/IEPluginInit.cc

@@ -30,6 +30,7 @@
 #include <Core/IEPlugin/NrrdField_Plugin.h>
 #include <Core/IEPlugin/MatlabFiles_Plugin.h>
 #include <Core/IEPlugin/SimpleTextFileToMatrix_Plugin.h>
+#include <Core/IEPlugin/EcgsimFileToMatrix_Plugin.h>
 #include <Core/IEPlugin/PointCloudField_Plugin.h>
 #include <Core/IEPlugin/CurveField_Plugin.h>
 #include <Core/ImportExport/Field/FieldIEPlugin.h>
@@ -60,4 +61,6 @@ void IEPluginManager::Initialize()
   static FieldIEPluginLegacyAdapter PointCloudField_plugin("PointCloudField", "*.pts *.pos *.txt", "", TextToPointCloudField_reader, PointCloudFieldToText_writer);
 
   static FieldIEPluginLegacyAdapter CurveField_plugin("CurveField", "*.pts *.pos *.edge", "", TextToCurveField_reader, CurveFieldToTextBaseIndexZero_writer);
+
+  static MatrixIEPluginLegacyAdapter EcgsimFileMatrix_plugin("ECGSimFile", "", "", EcgsimFileMatrix_reader, EcgsimFileMatrix_writer);
 }