diff --git a/.gitignore b/.gitignore index 23cbd6548bc20270afe1023aa80271c14285497d..4cc198aa93a5d73f67b64eb04e8f606bccb2ac17 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,82 @@ build /.gitattributes /*.opendb /*.db -/*.sln \ No newline at end of file +/*.sln + +*_autogen +*.dir +*.stamp +*.stamp.depend + +GeneratedFiles/ +desktop.ini +*.swp +*.opensdf +*.sdf +*.suo +*.exe +*.psess +*.vsp +*.ipch +*.sln +*.vcxproj +*.vcxproj.filters +*.vcxproj.vspscc +.gitignore.swp +*.bak_* +*.ini + +# ignore editor ~ files +.tags* +Doxyfile +Makefile +cmake_install.cmake +doxygen_sqlite3.db +*~ +.idea/ + +/CMakeFiles +/doc +/html +/Debug +/Release +/build* +/Build* +/.vscode +*.kate-swp + +# astyle original files +*.orig +*.user +*.obj +*.dll +*.qm +*.avi +*moc_* +*.tlog +*.log +*.ilk + +*.lib +*.lastbuildstate +*.stamp +*.depend +*.pdb +*.exp +*.db +*.opendb +CMakeFiles +/BioTracker/*.vspx +*.cache +*.csv +build +bst_workspace.code-workspace +*.dll +*.qm +*.ilk +*.pdb +*.lib +*.json +*.ini +*.xml +*.csv \ No newline at end of file diff --git a/Src/Utility/misc.cpp b/Src/Utility/misc.cpp index f2479db89d2fca6497b96eab27700a24a5377aeb..c98fca01fcb03d027765a444d21cc237963973ff 100644 --- a/Src/Utility/misc.cpp +++ b/Src/Utility/misc.cpp @@ -2,7 +2,7 @@ #include <QPoint> // QPoint #include <QString> -#include <QStringList> +#include <QStringList> int BioTrackerUtilsMisc::split(std::string &txt, std::vector<std::string> &strs, char ch) { @@ -37,9 +37,6 @@ std::string BioTrackerUtilsMisc::getTimeAndDate(std::string prefix, std::string // timeInfo += suffix; // return timeInfo; - - - time_t rawtime; struct tm * timeinfo; @@ -54,6 +51,9 @@ std::string BioTrackerUtilsMisc::getTimeAndDate(std::string prefix, std::string std::string timeStampF(t); out += timeStampF; + out += "_"; + out += std::to_string(_getpid()); + out += suffix; return out; diff --git a/Src/Utility/misc.h b/Src/Utility/misc.h index c354ab41ac0f36b304b31e37253f550de9f3a11e..a81e4c86864b52e713591da309671326d483b261 100644 --- a/Src/Utility/misc.h +++ b/Src/Utility/misc.h @@ -3,6 +3,8 @@ #include <string> #include <time.h> #include <cv.h> +#include <stdio.h> +#include <process.h> #include <QPoint> namespace BioTrackerUtilsMisc{