diff --git a/Applications/FileIO/GocadIO/GocadAsciiReader.cpp b/Applications/FileIO/GocadIO/GocadAsciiReader.cpp index 0a20e0ea8c144cb7fc55b7a61a4695c91270e12e..a253439eea0062d284c2fe9be2d66046a77dcaa1 100644 --- a/Applications/FileIO/GocadIO/GocadAsciiReader.cpp +++ b/Applications/FileIO/GocadIO/GocadAsciiReader.cpp @@ -70,7 +70,7 @@ bool GocadAsciiReader::readFile( std::ifstream in(file_name.c_str()); if (!in.is_open()) { - ERR("GocadTSurfaceReader::readFile(): Could not open file %s.", + ERR("GocadAsciiReader::readFile(): Could not open file %s.", file_name.c_str()); return false; } @@ -190,7 +190,7 @@ MeshLib::Mesh* GocadAsciiReader::readData(std::ifstream& in, } else { - WARN("GocadTSurfaceReader::readMesh() - Unknown keyword found: %s", + WARN("GocadAsciiReader::readMesh() - Unknown keyword found: %s", line.c_str()); } } @@ -371,7 +371,7 @@ bool GocadAsciiReader::parseLine( } else { - WARN("GocadTSurfaceReader::parseLine() - Unknown keyword found: %s", line.c_str()); + WARN("GocadAsciiReader::parseLine() - Unknown keyword found: %s", line.c_str()); } } ERR("%s", eof_error.c_str()); @@ -417,7 +417,7 @@ bool GocadAsciiReader::parseSurface( } else { - WARN("GocadTSurfaceReader::parseSurface() - Unknown keyword found: %s", line.c_str()); + WARN("GocadAsciiReader::parseSurface() - Unknown keyword found: %s", line.c_str()); } } ERR("%s", eof_error.c_str()); @@ -467,7 +467,7 @@ bool GocadAsciiReader::parseNodes( if (!(line.substr(0, 4) == "VRTX" || line.substr(0, 5) == "PVRTX" || line.substr(0, 4) == "ATOM")) { - WARN("GocadTSurfaceReader::parseNodes() - Unknown keyword found: %s", line.c_str()); + WARN("GocadAsciiReader::parseNodes() - Unknown keyword found: %s", line.c_str()); continue; } diff --git a/Applications/FileIO/GocadIO/GocadAsciiReader.h b/Applications/FileIO/GocadIO/GocadAsciiReader.h index da11c17df261814eb0a655c8205b158ee0b932e6..faa14fc05181a131b480b2c9d18c33c919efb7ee 100644 --- a/Applications/FileIO/GocadIO/GocadAsciiReader.h +++ b/Applications/FileIO/GocadIO/GocadAsciiReader.h @@ -40,11 +40,9 @@ enum class GOCAD_DATA_TYPE class GocadAsciiReader final { public: - /** - * Constructor takes as argument the Gocad .sg text file. - */ explicit GocadAsciiReader(); + /// Constructor taking a specific data type (will only export that type) explicit GocadAsciiReader(GOCAD_DATA_TYPE const t); GocadAsciiReader(GocadAsciiReader&& src) = delete; @@ -62,7 +60,7 @@ private: /// Checks if the current line is a comment bool isCommentLine(std::string const& str) const; - /// Checks if a TSurf identifier is found at the current stream position. + /// Checks if a GoCAD identifier is found at the current stream position. GOCAD_DATA_TYPE datasetFound(std::ifstream& in) const; /// Parses the HEADER section (everything except the name is ignored right now) @@ -122,7 +120,7 @@ private: }; GOCAD_DATA_TYPE _export_type; -}; // end class GocadTSurfaceReader +}; // end class GocadAsciiReader } // end namespace Gocad } // end namespace FileIO