From d8e43572aa9b63cab65c2edc4247e0ca7a6d08a0 Mon Sep 17 00:00:00 2001
From: jotpio <jopio@hotmail.de>
Date: Thu, 14 Mar 2019 12:51:49 +0100
Subject: [PATCH] Add process ID to end of export file names
---
.gitignore | 80 +++++++++++++++++++++++++++++++++++++++++++-
Src/Utility/misc.cpp | 8 ++---
Src/Utility/misc.h | 2 ++
3 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 23cbd65..4cc198a 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 f2479db..c98fca0 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 c354ab4..a81e4c8 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{
--
GitLab