diff --git a/LiveScanClient/KinectClient.vcxproj b/LiveScanClient/KinectClient.vcxproj index 4ce212d..4bcab63 100644 --- a/LiveScanClient/KinectClient.vcxproj +++ b/LiveScanClient/KinectClient.vcxproj @@ -13,7 +13,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/LiveScanClient/KinectClient.vcxproj.filters b/LiveScanClient/KinectClient.vcxproj.filters index 8bed42e..a1483aa 100644 --- a/LiveScanClient/KinectClient.vcxproj.filters +++ b/LiveScanClient/KinectClient.vcxproj.filters @@ -54,7 +54,7 @@ Header Files - + Header Files @@ -89,7 +89,7 @@ Source Files - + Source Files diff --git a/LiveScanServer/SettingsForm.cs b/LiveScanServer/SettingsForm.cs index 20c2c9b..9fdae90 100644 --- a/LiveScanServer/SettingsForm.cs +++ b/LiveScanServer/SettingsForm.cs @@ -333,6 +333,7 @@ namespace KinectServer if (!tryParse) oSettings.iCompressionLevel = 0; } + UpdateClients(); } } } diff --git a/bin/LiveScanClient.exe b/bin/LiveScanClient.exe index 967af93..1e51318 100644 Binary files a/bin/LiveScanClient.exe and b/bin/LiveScanClient.exe differ diff --git a/bin/LiveScanServer.exe b/bin/LiveScanServer.exe index 579244c..e7800dc 100644 Binary files a/bin/LiveScanServer.exe and b/bin/LiveScanServer.exe differ diff --git a/include/LiveScanClient/framesFileWriterReader.h b/include/LiveScanClient/frameFileWriterReader.h similarity index 91% rename from include/LiveScanClient/framesFileWriterReader.h rename to include/LiveScanClient/frameFileWriterReader.h index 48a4429..855d2ce 100644 --- a/include/LiveScanClient/framesFileWriterReader.h +++ b/include/LiveScanClient/frameFileWriterReader.h @@ -6,10 +6,10 @@ #include #include "utils.h" -class FramesFileWriterReader +class FrameFileWriterReader { public: - FramesFileWriterReader(); + FrameFileWriterReader(); void openNewFileForWriting(); void openCurrentFileForReading(); @@ -25,7 +25,7 @@ public: void closeFileIfOpened(); - ~FramesFileWriterReader(); + ~FrameFileWriterReader(); private: void resetTimer(); diff --git a/include/LiveScanClient/liveScanClient.h b/include/LiveScanClient/liveScanClient.h index 350a692..51684b5 100644 --- a/include/LiveScanClient/liveScanClient.h +++ b/include/LiveScanClient/liveScanClient.h @@ -20,7 +20,7 @@ #include "calibration.h" #include "utils.h" #include "KinectCapture.h" -#include "framesFileWriterReader.h" +#include "frameFileWriterReader.h" #include #include @@ -57,7 +57,7 @@ private: int m_iCompressionLevel; bool m_bCaptureToFile; // false if capture frames to memory - FramesFileWriterReader m_framesFileWriterReader; + FrameFileWriterReader m_framesFileWriterReader; SocketClient *m_pClientSocket; diff --git a/src/LiveScanClient/framesFileWriterReader.cpp b/src/LiveScanClient/frameFileWriterReader.cpp similarity index 77% rename from src/LiveScanClient/framesFileWriterReader.cpp rename to src/LiveScanClient/frameFileWriterReader.cpp index dfe8482..d13b9ef 100644 --- a/src/LiveScanClient/framesFileWriterReader.cpp +++ b/src/LiveScanClient/frameFileWriterReader.cpp @@ -1,13 +1,13 @@ -#include "framesFileWriterReader.h" +#include "frameFileWriterReader.h" #include -FramesFileWriterReader::FramesFileWriterReader() +FrameFileWriterReader::FrameFileWriterReader() { } -void FramesFileWriterReader::closeFileIfOpened() +void FrameFileWriterReader::closeFileIfOpened() { if (m_pFileHandle == nullptr) return; @@ -18,18 +18,18 @@ void FramesFileWriterReader::closeFileIfOpened() m_bFileOpenedForWriting = false; } -void FramesFileWriterReader::resetTimer() +void FrameFileWriterReader::resetTimer() { recording_start_time = std::chrono::steady_clock::now(); } -int FramesFileWriterReader::getRecordingTimeMilliseconds() +int FrameFileWriterReader::getRecordingTimeMilliseconds() { std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now(); return static_cast(std::chrono::duration_cast(end - recording_start_time).count()); } -void FramesFileWriterReader::openCurrentFileForReading() +void FrameFileWriterReader::openCurrentFileForReading() { closeFileIfOpened(); @@ -39,7 +39,7 @@ void FramesFileWriterReader::openCurrentFileForReading() m_bFileOpenedForWriting = false; } -void FramesFileWriterReader::openNewFileForWriting() +void FrameFileWriterReader::openNewFileForWriting() { closeFileIfOpened(); @@ -56,7 +56,7 @@ void FramesFileWriterReader::openNewFileForWriting() resetTimer(); } -bool FramesFileWriterReader::readFrame(std::vector &outPoints, std::vector &outColors) +bool FrameFileWriterReader::readFrame(std::vector &outPoints, std::vector &outColors) { if (!m_bFileOpenedForReading) openCurrentFileForReading(); @@ -86,7 +86,7 @@ bool FramesFileWriterReader::readFrame(std::vector &outPoints, std::vec } -void FramesFileWriterReader::writeFrame(std::vector points, std::vector colors) +void FrameFileWriterReader::writeFrame(std::vector points, std::vector colors) { if (!m_bFileOpenedForWriting) openNewFileForWriting(); @@ -103,7 +103,7 @@ void FramesFileWriterReader::writeFrame(std::vector points, std::vector fprintf(f, "\n"); } -FramesFileWriterReader::~FramesFileWriterReader() +FrameFileWriterReader::~FrameFileWriterReader() { closeFileIfOpened(); } \ No newline at end of file