[MAINT] Utils library Qt-less refactor (Part 1 of many)

examples/ex_hpiFit/main.cpp

@@ -272,6 +272,6 @@ int main(int argc, char *argv[])
             << "Average Duration:" << matPosition.col(9).mean() << "ms";
 
     if(bSave) {
-        IOUtils::write_eigen_matrix(matPosition, QCoreApplication::applicationDirPath() + "/MNE-sample-data/" + sNameOut);
+        IOUtils::write_eigen_matrix(matPosition, QString(QCoreApplication::applicationDirPath() + "/MNE-sample-data/" + sNameOut));
     }
 }

examples/ex_read_fwd/main.cpp

@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
     qDebug() << "col_names:";
     qDebug() << t_clusteredFwd.sol->col_names;
     qDebug() << "write fwd data to ./test_fwd.txt ...";
-    IOUtils::write_eigen_matrix(t_clusteredFwd.sol->data,"./test_fwd.txt");
+    IOUtils::write_eigen_matrix(t_clusteredFwd.sol->data, QString("./test_fwd.txt"));
     qDebug() << "[done]";
 
     return app.exec();

examples/ex_spectral/main.cpp

@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
     }
 
     //Generate hanning window
-    QPair<MatrixXd, VectorXd> tapers = Spectral::generateTapers(iNSamples, "hanning");
+    QPair<MatrixXd, VectorXd> tapers = Spectral::generateTapers(iNSamples, QString("hanning"));
     MatrixXd matTaps = tapers.first;
     VectorXd vecTapWeights = tapers.second;
 

libraries/utils/file.cpp

@@ -39,11 +39,7 @@
 #include "file.h"
 #include <fstream>
 
-#if __cplusplus >= 201703L
-#include <filesystem>
-#else
 #include <cstdio>
-#endif
 
 //=============================================================================================================
 // USED NAMESPACES
@@ -57,12 +53,8 @@ using namespace UTILSLIB;
 
 bool File::exists(const char* filePath)
 {
-#if __cplusplus >= 201703L
-    return std::filesystem::exists(filePath);
-#else
     std::ifstream infile(filePath);
     return infile.good();
-#endif
 }
 
 //=============================================================================================================
@@ -79,11 +71,6 @@ bool File::copy(const char* sourcePath, const char* destPath)
     if (!exists(sourcePath) || exists(destPath)){
         return false;
     }
-
-#if __cplusplus >= 201703L
-    std::filesystem::copy(sourcePath, destPath);
-    return exists(destPath);
-#else
     std::ifstream source(sourcePath, std::ios::binary);
     std::ofstream destination(destPath, std::ios::binary);
 
@@ -92,7 +79,6 @@ bool File::copy(const char* sourcePath, const char* destPath)
     } else {
         return false;
     }
-#endif
 }
 
 //=============================================================================================================
@@ -109,13 +95,7 @@ bool File::rename(const char* sourcePath, const char* destPath)
     if (!exists(sourcePath) || exists(destPath)){
         return false;
     }
-
-#if __cplusplus >= 201703L
-    std::filesystem::rename(sourcePath, destPath);
-    return (!exists(sourcePath) && exists(destPath));
-#else
     return !std::rename(sourcePath, destPath); //std::rename returns 0 upon success
-#endif
 }
 
 //=============================================================================================================
@@ -133,12 +113,7 @@ bool File::remove(const char* filePath)
         return false;
     }
 
-#if __cplusplus >= 201703L
-    std::filesystem::remove(filePath);
-    return !exists(filePath);
-#else
     return !std::remove(filePath); //std::remove returns 0 upon success
-#endif
 }
 
 //=============================================================================================================

libraries/utils/generics/observerpattern.cpp

@@ -73,6 +73,9 @@ void Subject::notify()
         t_Observers::const_iterator it = m_Observers.begin();
         for( ; it != m_Observers.end(); ++it)
             (*it)->update(this);
+//        for(auto observer : m_Observers){
+//            observer->update(this);
+//        }
     }
 }
 

libraries/utils/generics/observerpattern.h

@@ -41,6 +41,7 @@
 //=============================================================================================================
 
 #include "../utils_global.h"
+#include <set>
 
 //=============================================================================================================
 // QT INCLUDES
@@ -147,6 +148,14 @@ class UTILSSHARED_EXPORT Subject
      */
     inline t_Observers& observers();
 
+//    //=========================================================================================================
+//    /**
+//     * Returns attached observers.
+
+//     * @return attached observers.
+//     */
+//    inline std::set<IObserver*>& observers();
+
     //=========================================================================================================
     /**
      * Returns number of attached observers.
@@ -165,6 +174,7 @@ class UTILSSHARED_EXPORT Subject
 
 private:
     t_Observers                 m_Observers;    /**< Holds the attached observers.*/
+//    std::set<IObserver*>        m_Observers;    /**< Holds the attached observers.*/
 };
 
 //=============================================================================================================
@@ -176,6 +186,11 @@ inline Subject::t_Observers& Subject::observers()
     return m_Observers;
 }
 
+//inline std::set<IObserver*>& Subject::observers()
+//{
+//    return m_Observers;
+//}
+
 } // Namespace
 
 #endif // OBSERVERPATTERN_H

libraries/utils/ioutils.cpp

@@ -2,13 +2,14 @@
 /**
  * @file     ioutils.cpp
  * @author   Lorenz Esch <[email protected]>;
- *           Christoph Dinh <[email protected]>
+ *           Christoph Dinh <[email protected]>;
+ *           Gabriel Motta <[email protected]>
  * @since    0.1.0
  * @date     March, 2013
  *
  * @section  LICENSE
  *
- * Copyright (C) 2013, Lorenz Esch, Christoph Dinh. All rights reserved.
+ * Copyright (C) 2013, Lorenz Esch, Christoph Dinh, Gabriel Motta. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are permitted provided that
  * the following conditions are met:
@@ -38,6 +39,8 @@
 //=============================================================================================================
 
 #include "ioutils.h"
+#include <algorithm>
+#include <regex>
 
 //=============================================================================================================
 // QT INCLUDES
@@ -73,6 +76,17 @@ qint32 IOUtils::fread3(QDataStream &p_qStream)
 
 //=============================================================================================================
 
+qint32 IOUtils::fread3(std::iostream& stream)
+{
+    char* bytes = new char[3];
+    stream.read(bytes, 3);
+    qint32 int3 = (((unsigned char) bytes[0]) << 16) + (((unsigned char) bytes[1]) << 8) + ((unsigned char) bytes[2]);
+    delete[] bytes;
+    return int3;
+}
+
+//=============================================================================================================
+
 VectorXi IOUtils::fread3_many(QDataStream &p_qStream, qint32 count)
 {
     VectorXi res(count);
@@ -83,6 +97,18 @@ VectorXi IOUtils::fread3_many(QDataStream &p_qStream, qint32 count)
     return res;
 }
 
+//=============================================================================================================
+
+VectorXi IOUtils::fread3_many(std::iostream& stream, qint32 count)
+{
+    VectorXi res(count);
+
+    for(qint32 i = 0; i < count; ++i)
+        res[i] = IOUtils::fread3(stream);
+
+    return res;
+}
+
 //=============================================================================================================
 //fiff_combat
 qint16 IOUtils::swap_short(qint16 source)
@@ -253,6 +279,20 @@ QStringList IOUtils::get_new_chnames_conventions(const QStringList& chNames)
 
 //=============================================================================================================
 
+std::vector<std::string> IOUtils::get_new_chnames_conventions(const std::vector<std::string>& chNames)
+{
+    std::vector<std::string> result;
+
+    for(auto channelName : chNames){
+        std::remove(channelName.begin(), channelName.end(), ' ');
+        result.push_back(std::move(channelName));
+    }
+
+    return result;
+}
+
+//=============================================================================================================
+
 QStringList IOUtils::get_old_chnames_conventions(const QStringList& chNames)
 {
     QStringList result, xList;
@@ -276,6 +316,20 @@ QStringList IOUtils::get_old_chnames_conventions(const QStringList& chNames)
 
 //=============================================================================================================
 
+std::vector<std::string> IOUtils::get_old_chnames_conventions(const std::vector<std::string>& chNames)
+{
+    std::vector<std::string> result;
+
+    for(auto channelName : chNames){
+        std::regex_replace(channelName, std::regex("[0-9]{1,100}"), " $&");
+        result.push_back(std::move(channelName));
+    }
+
+    return result;
+}
+
+//=============================================================================================================
+
 bool IOUtils::check_matching_chnames_conventions(const QStringList& chNamesA, const QStringList& chNamesB, bool bCheckForNewNamingConvention)
 {
     bool bMatching = false;
@@ -322,3 +376,39 @@ bool IOUtils::check_matching_chnames_conventions(const QStringList& chNamesA, co
 
     return bMatching;
 }
+
+//=============================================================================================================
+
+bool IOUtils::check_matching_chnames_conventions(const std::vector<std::string>& chNamesA, const std::vector<std::string>& chNamesB, bool bCheckForNewNamingConvention)
+{
+    if(chNamesA.empty()){
+        qWarning("Warning in IOUtils::check_matching_chnames_conventions - chNamesA list is empty. Nothing to compare");
+    }
+    if(chNamesB.empty()){
+        qWarning("Warning in IOUtils::check_matching_chnames_conventions - chNamesB list is empty. Nothing to compare");
+    }
+
+    bool bMatching = false;
+
+    for(size_t i = 0 ; i < chNamesA.size(); ++i){
+        if (std::find(chNamesB.begin(), chNamesB.end(), chNamesA.at(i)) != chNamesB.end()){
+            bMatching = true;
+        } else if(bCheckForNewNamingConvention){
+            std::string replaceStringNewConv{chNamesA.at(i)};
+            std::remove(replaceStringNewConv.begin(), replaceStringNewConv.end(), ' ');
+
+            if(std::find(chNamesB.begin(), chNamesB.end(), replaceStringNewConv) != chNamesB.end()){
+                bMatching = true;
+            } else {
+                std::string replaceStringOldConv{chNamesA.at(i)};
+                std::regex_replace(replaceStringOldConv, std::regex("[0-9]{1,100}"), " $&");
+                if(std::find(chNamesB.begin(), chNamesB.end(), replaceStringNewConv) != chNamesB.end() || std::find(chNamesB.begin(), chNamesB.end(), replaceStringOldConv) != chNamesB.end()){
+                    bMatching = true;
+                } else {
+                    bMatching = false;
+                }
+            }
+        }
+    }
+    return bMatching;
+}