Closes #481

Author: dcwhite

src/Core/Algorithms/Legacy/DataIO/CMakeLists.txt

@@ -33,7 +33,7 @@ SET(Core_Algorithms_Legacy_DataIO_SRCS
   ObjToFieldReader.cc
   VTKToTriSurfReader.cc
   TriSurfSTLBinaryConverter.cc
-  #TriSurfSTLASCIIConverter.cc
+  TriSurfSTLASCIIConverter.cc
   STLUtils.cc
 )
 

src/Core/Algorithms/Legacy/DataIO/TriSurfSTLASCIIConverter.cc

@@ -26,45 +26,47 @@
  DEALINGS IN THE SOFTWARE.
 */
 
-#include <Core/Algorithms/DataIO/Legacy/TriSurfSTLASCIIConverter.h>
-#include <Core/Algorithms/DataIO/Legacy/STLUtils.h>
+#include <Core/Algorithms/Legacy/DataIO/TriSurfSTLASCIIConverter.h>
+#include <Core/Algorithms/Legacy/DataIO/STLUtils.h>
 
-#include <Core/Datatypes/VField.h>
-#include <Core/Datatypes/VMesh.h>
-#include <Core/Datatypes/FieldInformation.h>
-#include <Core/Util/StringUtil.h>
+#include <Core/Datatypes/Legacy/Field/VField.h>
+#include <Core/Datatypes/Legacy/Field/VMesh.h>
+#include <Core/Datatypes/Legacy/Field/FieldInformation.h>
 
 #include <iomanip>
 #include <fstream>
 #include <sstream>
-#include <string>
-#include <vector>
 
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/shared_array.hpp>
 
-#include <sci_debug.h>
+#include <Core/Utils/Legacy/StringUtil.h>
 
-namespace SCIRunAlgo {
+using namespace SCIRun;
+using namespace SCIRun::Core::Algorithms;
+using namespace SCIRun::Core::Logging;
+using namespace SCIRun::Core::Geometry;
 
-namespace ASCII {
+namespace SCIRun {
+namespace Core {
+  namespace Algorithms {
 
-class ConverterPrivate
+class AsciiConverterPrivate
 {
 public:
 //  // point(vertex) lookup table
 //  typedef boost::unordered_map< Point, unsigned int, PointHash > PointTable;
 //  typedef std::list<Facet> FacetList;
 
-  ConverterPrivate(ProgressReporter* pr)
+  explicit AsciiConverterPrivate(LoggerHandle pr)
   : pr_(pr),
     CELL_SIZE(3)
   {}
 
   bool readFile(const std::string& filename, FieldHandle& field);
   bool writeFile(const std::string& filename, VMesh *vmesh);
-  void formatLine(std::string& line)
+  void formatLine(std::string& line) const
   {
     // replace comma's and tabs with white spaces
     for (size_t p = 0; p < line.size(); ++p)
@@ -74,20 +76,21 @@ class ConverterPrivate
   }
 
   // assumes always length 3
-  inline Point vectorToPoint(const std::vector<float>& v)
+  inline Point vectorToPoint(const std::vector<float>& v) const
   {
     return Point( v[0], v[1], v[2] );
   }
 
 private:
-  ProgressReporter* pr_;
+  LoggerHandle pr_;
   const unsigned short CELL_SIZE;
 
   PointTable pointsLookupTable;
 };
+}}}
 
 bool
-ConverterPrivate::readFile(const std::string& filename, FieldHandle& field)
+AsciiConverterPrivate::readFile(const std::string& filename, FieldHandle& field)
 {
   std::ifstream inputfile;
   inputfile.exceptions( std::ifstream::failbit | std::ifstream::badbit );
@@ -108,7 +111,7 @@ ConverterPrivate::readFile(const std::string& filename, FieldHandle& field)
     std::string line;
     unsigned int pointIndex = 0, vertexCounter = 0, lineCounter = 0;
 
-    boost::shared_array< std::vector<float> > vertexArray(new std::vector<float>[CELL_SIZE]);
+    std::vector< std::vector<float> > vertexArray(CELL_SIZE);
     FacetList facetList;
 
     // loop until header
@@ -240,7 +243,7 @@ ConverterPrivate::readFile(const std::string& filename, FieldHandle& field)
 }
 
 bool
-ConverterPrivate::writeFile(const std::string& filename, VMesh *vmesh)
+AsciiConverterPrivate::writeFile(const std::string& filename, VMesh *vmesh)
 {
   std::ofstream outputfile;
   outputfile.exceptions( std::ofstream::failbit | std::ofstream::badbit );
@@ -297,7 +300,7 @@ ConverterPrivate::writeFile(const std::string& filename, VMesh *vmesh)
 
     outputfile.close();
   }
-  catch (std::ifstream::failure e)
+  catch (std::ifstream::failure& e)
   {
     if (this->pr_) this->pr_->error("Could not open and write to file " + filename);
     return false;
@@ -311,13 +314,8 @@ ConverterPrivate::writeFile(const std::string& filename, VMesh *vmesh)
   return true;
 }
 
-}
-
-TriSurfSTLASCIIConverter::TriSurfSTLASCIIConverter(ProgressReporter* pr) :
-  pr_(pr), converter_(new ASCII::ConverterPrivate(pr))
-{}
-
-TriSurfSTLASCIIConverter::~TriSurfSTLASCIIConverter()
+TriSurfSTLASCIIConverter::TriSurfSTLASCIIConverter(LoggerHandle pr) :
+  pr_(pr), converter_(new AsciiConverterPrivate(pr))
 {}
 
 bool
@@ -327,8 +325,7 @@ TriSurfSTLASCIIConverter::read(const std::string& filename, FieldHandle& field)
   FieldInformation fieldInfo("TriSurfMesh", -1, "double");
   field = CreateField(fieldInfo);
 
-  bool result = converter_->readFile(filename, field);
-  return result;
+  return converter_->readFile(filename, field);
 }
 
 bool
@@ -339,12 +336,10 @@ TriSurfSTLASCIIConverter::write(const std::string& filename, const FieldHandle&
   // validate
   if (! vmesh->is_trisurfmesh() )
   {
-    if (this->pr_) this->pr_->error("STL ASCII converter only supports TriSurf mesh fields.");
+    if (pr_)
+      pr_->error("STL ASCII converter only supports TriSurf mesh fields.");
     return false;
   }
 
-  bool result = converter_->writeFile(filename, vmesh);
-  return result;
-}
-
+  return converter_->writeFile(filename, vmesh);
 }

src/Core/Algorithms/Legacy/DataIO/TriSurfSTLASCIIConverter.h

@@ -1,22 +1,22 @@
 /*
  For more information, please see: http://software.sci.utah.edu
- 
+
  The MIT License
- 
+
  Copyright (c) 2014 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
@@ -30,46 +30,37 @@
 #ifndef CORE_ALGORITHMS_DATAIO_TRISURFSTLASCIICONVERTER_H
 #define CORE_ALGORITHMS_DATAIO_TRISURFSTLASCIICONVERTER_H 1
 
-#include <string>
-
-#include <boost/shared_ptr.hpp>
-
-#include <Core/Algorithms/Util/AlgoLibrary.h>
-#include <Core/Datatypes/Field.h> 
-
-#include <Core/Algorithms/DataIO/share.h>
+#include <Core/Datatypes/Legacy/Field/FieldFwd.h>
+#include <Core/Algorithms/Base/AlgorithmBase.h>
+#include <Core/Algorithms/Legacy/DataIO/share.h>
 
 ///
 /// Convert SCIRun TriSurfMesh to STL format
 ///
 /// ASCII STL format (http://en.wikipedia.org/wiki/STL_(file_format))
 ///
-namespace SCIRunAlgo {
-
-using namespace SCIRun;
-
-namespace ASCII {
-
-class ConverterPrivate;
-typedef boost::shared_ptr< ConverterPrivate > ConverterPrivateHandle;
+namespace SCIRun {
+namespace Core {
+  namespace Algorithms {
 
-}
+class AsciiConverterPrivate;
+typedef boost::shared_ptr< AsciiConverterPrivate > AsciiConverterPrivateHandle;
 
-class SCISHARE TriSurfSTLASCIIConverter : public AlgoLibrary
+class SCISHARE TriSurfSTLASCIIConverter : public AlgorithmBase
 {
 public:
-  TriSurfSTLASCIIConverter(ProgressReporter* pr = 0);
-  ~TriSurfSTLASCIIConverter();
-  
+  explicit TriSurfSTLASCIIConverter(Core::Logging::LoggerHandle pr);
+  virtual AlgorithmOutput run(const AlgorithmInput&) const override { throw "not implemented"; }
+
   bool read(const std::string& filename, FieldHandle& field);
   bool write(const std::string& filename, const FieldHandle& field);
-  
+
 private:
-  ProgressReporter* pr_;
-  
-  ASCII::ConverterPrivateHandle converter_;
+  Core::Logging::LoggerHandle pr_;
+
+  AsciiConverterPrivateHandle converter_;
 };
 
-}
+}}}
 
 #endif

src/Core/Algorithms/Legacy/DataIO/TriSurfSTLBinaryConverter.h

@@ -50,6 +50,7 @@ class SCISHARE TriSurfSTLBinaryConverter : public AlgorithmBase
 {
 public:
   explicit TriSurfSTLBinaryConverter(Core::Logging::LoggerHandle pr);
+  virtual AlgorithmOutput run(const AlgorithmInput&) const override { throw "not implemented"; }
 
   bool read(const std::string& filename, FieldHandle& field);
   bool write(const std::string& filename, const FieldHandle& field);

src/Core/IEPlugin/TriSurfField_Plugin.cc

@@ -1098,47 +1098,50 @@ bool SCIRun::TriSurfFieldToExotxtBaseIndexOne_writer(LoggerHandle pr, FieldHandl
   return (true);
 }
 
-FieldHandle SCIRun::TriSurfFieldSTLASCII_reader(ProgressReporter *pr, const char *filename)
+FieldHandle SCIRun::TriSurfFieldSTLASCII_reader(LoggerHandle pr, const char *filename)
 {
-  FieldHandle outputField = 0;
-  SCIRunAlgo::TriSurfSTLASCIIConverter reader(pr);
+  FieldHandle outputField;
+  TriSurfSTLASCIIConverter reader(pr);
 
-  if (! reader.read(filename, outputField) )
+  if (!reader.read(filename, outputField))
   {
-    if (pr) pr->error("Convert ASCII STL file to SCIRun TriSurf field failed.");
-    return FieldHandle(0);
+    if (pr)
+      pr->error("Convert ASCII STL file to SCIRun TriSurf field failed.");
+    return nullptr;
   }
   return outputField;
 }
 
-FieldHandle SCIRun::TriSurfFieldSTLBinary_reader(ProgressReporter *pr, const char *filename)
+FieldHandle SCIRun::TriSurfFieldSTLBinary_reader(LoggerHandle pr, const char *filename)
 {
-  FieldHandle outputField = 0;
-  SCIRunAlgo::TriSurfSTLBinaryConverter reader(pr);
+  FieldHandle outputField;
+  TriSurfSTLBinaryConverter reader(pr);
 
-  if (! reader.read(filename, outputField) )
+  if (!reader.read(filename, outputField))
   {
-    if (pr) pr->error("Convert Binary STL file to SCIRun TriSurf field failed.");
-    return FieldHandle(0);
+    if (pr)
+      pr->error("Convert Binary STL file to SCIRun TriSurf field failed.");
+    return nullptr;
   }
   return outputField;
 }
 
-bool SCIRun::TriSurfFieldSTLASCII_writer(ProgressReporter *pr, FieldHandle fh, const char *filename)
+bool SCIRun::TriSurfFieldSTLASCII_writer(LoggerHandle pr, FieldHandle fh, const char *filename)
 {
-  SCIRunAlgo::TriSurfSTLASCIIConverter writer(pr);
-  if (! writer.write(filename, fh) )
+  TriSurfSTLASCIIConverter writer(pr);
+  if (!writer.write(filename, fh))
   {
-    if (pr) pr->error("Convert SCIRun TriSurf field to ASCII STL file failed.");
+    if (pr)
+      pr->error("Convert SCIRun TriSurf field to ASCII STL file failed.");
     return false;
   }
   return true;
 }
 
-bool SCIRun::TriSurfFieldSTLBinary_writer(ProgressReporter *pr, FieldHandle fh, const char *filename)
+bool SCIRun::TriSurfFieldSTLBinary_writer(LoggerHandle pr, FieldHandle fh, const char *filename)
 {
-  SCIRunAlgo::TriSurfSTLBinaryConverter writer(pr);
-  if (! writer.write(filename, fh) )
+  TriSurfSTLBinaryConverter writer(pr);
+  if (!writer.write(filename, fh))
   {
     if (pr) pr->error("Convert SCIRun TriSurf field to Binary STL file failed.");
     return false;