* Moved nsx header-writing code into its own file. Not sure this was …

…a great idea, may move it back * Updated matlab helper functions. * Removed vestigial code from when SystemTime was in NSxHeader. Same code is now in systemtime.h
mrkrause · Jan 16, 2019 · c5a52bc · c5a52bc
1 parent cbeea4d
commit c5a52bc
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 50 deletions.
diff --git a/MatFile.cpp b/MatFile.cpp
@@ -36,7 +36,9 @@ MATFile::MATFile(const std::string& _filename, const std::string& _mode) {
 }
 
 MATFile::~MATFile() {
-  MW::matClose(mfp);
+  if(mode) {
+    MW::matClose(mfp);
+  }
 }
 
 void MATFile::close() {

diff --git a/MatFile.h b/MatFile.h
@@ -1,13 +1,6 @@
-//
-//  MatFile.h
-//  
-//
-//  Created by Matthew Krause on 6/16/15.
-//
-//
-
-#ifndef ____MatFile__
-#define ____MatFile__
+#pragma once
+#ifndef MATFILE_H_INCLUDED
+#define MATFILE_H_INCLUDED
 
 #include <iostream>
 #include <string>

diff --git a/NSxHeader.cpp b/NSxHeader.cpp
@@ -55,18 +55,6 @@ std::ostream& operator<<(std::ostream& out, const NSxHeader& h) // output
     return out;
 }
 
-std::ostream& operator<<(std::ostream& out, const SystemTime& t) {
-    out << t.year << '-' << t.month << '-' << t.day << ' ' << t.hour << ':' << t.minute << ':' << t.second << '.' << t.millisecond;
-    return out;
-}
-
-std::string SystemTime::str() {
-    std::ostringstream s;
-
-    s << *this;
-    return(s.str());
-
-}
 
 double NSxHeader::getSamplingFreq() const {
     return double(timeResolution)/double(samplingPeriod);

diff --git a/nsx2mat.cpp b/nsx2mat.cpp
@@ -7,12 +7,12 @@
 //
 
 #include "NSxFile.h"
-#include "Config.h"
+#include "NSxConfig.h"
 
 MW::mxArray* filterToMxArray(const Filter &f);
 
 
-void NSxFile::writeMatHeader(const Config& config) {
+void NSxFile::writeMatHeader(const NSxConfig& config) {
 
     MATFile m(config.matlabHeaderFilename(), "wz");
 

diff --git a/nsx2mat.h b/nsx2mat.h
@@ -0,0 +1,14 @@
+//
+//  nsx2mat.h
+//  
+//
+//  Created by Matthew Krause on 6/22/15.
+//
+//
+
+#ifndef ____nsx2mat__
+#define ____nsx2mat__
+
+#include <stdio.h>
+
+#endif /* defined(____nsx2mat__) */
diff --git a/nsx2txt.cpp b/nsx2txt.cpp
@@ -6,10 +6,10 @@
 //
 //
 #include "NSxFile.h"
-#include "Config.h"
+#include "NSxConfig.h"
 #include <fstream>
 
-void NSxFile::writeTxtHeader(const Config& config) {
+void NSxFile::writeTxtHeader(const NSxConfig& config) {
 
     std::string filename = config.textHeaderFilename();
     std::ofstream txtfile(filename, std::ofstream::out | std::ofstream::trunc);
@@ -47,4 +47,4 @@ void NSxFile::writeTxtHeader(const Config& config) {
 
     }
 
-}
+}
diff --git a/typeHelper.cpp b/typeHelper.cpp
@@ -1,11 +1,3 @@
-//
-//  typeHelper.cpp
-//  
-//
-//  Created by Matthew Krause on 6/21/15.
-//
-//
-
 #include "typeHelper.h"
 
 

diff --git a/typeHelper.h b/typeHelper.h
@@ -1,13 +1,6 @@
-//
-//  typeHelper.h
-//  
-//
-//  Created by Matthew Krause on 6/21/15.
-//
-//
-
-#ifndef _typeHelper_h
-#define _typeHelper_h
+#pragma once
+#ifndef TYPEHELPER_H_INCLUDED
+#define TYPEHELPER_H_INCLUDED
 
 #include <typeinfo>
 #include <string>
@@ -16,10 +9,11 @@
 #include <iostream>
 #include <cstdint>
 
+
 namespace MW {
-    // These are the original header files from the MathWorks.
-#include "mat.h"
-#include "matrix.h"
+  // These are the original header files from the MathWorks.
+  #include "mat.h"
+  #include "matrix.h"
 };
 
 
@@ -31,7 +25,7 @@ MW::mxClassID typeHelper() {
 }
 
 template <>
-MW::mxClassID typeHelper<std::uint8_t>();
+MW::mxClassID typeHelper<std::uint8_t>(); 
 
 template <>
 MW::mxClassID typeHelper<std::int8_t>();