From 54ca7888aeaa7614dfea05080690a170d5d07085 Mon Sep 17 00:00:00 2001 From: JacekNaruniec Date: Tue, 17 Jan 2017 16:49:49 +0100 Subject: [PATCH] FramesFileWriterReader renamed to FrameFileWriterReader. --- LiveScanClient/KinectClient.vcxproj | 4 ++-- LiveScanClient/KinectClient.vcxproj.filters | 4 ++-- LiveScanServer/SettingsForm.cs | 1 + bin/LiveScanClient.exe | Bin 111616 -> 111616 bytes bin/LiveScanServer.exe | Bin 60928 -> 60928 bytes ...WriterReader.h => frameFileWriterReader.h} | 6 +++--- include/LiveScanClient/liveScanClient.h | 4 ++-- ...erReader.cpp => frameFileWriterReader.cpp} | 20 +++++++++--------- 8 files changed, 20 insertions(+), 19 deletions(-) rename include/LiveScanClient/{framesFileWriterReader.h => frameFileWriterReader.h} (91%) rename src/LiveScanClient/{framesFileWriterReader.cpp => frameFileWriterReader.cpp} (77%) 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 967af9367492a3c55cd479a810c7347a02bf2b66..1e5131843c269a83e340f2f846ff069db4cf0bac 100644 GIT binary patch delta 84 zcmZp8!PfACZG!|O^LER+W@*Ol(u|BR<>Y~!2nHZv0%A8HeqhbW@IajrB*Xxe+pes@ gc#vK2%f9tN+qkq`Hgle_@%mqQo^ktEbw=(U0R1u#Ajnibi-Cb9UyYH0i;GQ{kEuEh z$Q7&A1CrVWy0LiVG2$E}LkO1=zOaiNvxWNRHGl9x& zREuC;#_$C$XT!9Dfu(*j#L#@MNsKEQf}y-}E*8dB3<*%)Iw5DKRSZ>7-gY4mrqv7! zpu9suzD#Qvrhs`989u2gbFE`=n1Zl=J;QDk-g5|#;f_!W(|QK3sk{*DUkhb3ZDP=w z{IX9odBHT0*ffT#qAJY083d+-c+FtH>|u}q^ColHiJ3C*VF-lsg2b$Wya*^SPRtR= zO91nxaWsiVFz;ok1@qd#rtD=%-(1>%-CZF6%a-EARg8|!x94}Pp7e-!bIkP!9^EyT zbrB#dnSfY^k%8d~Fg09x%)k&7>=IlOUS7t`rsvuq)X}h76SuIz8WI~7Z;l@FH?0I zkSkWJ2PC!FB#fZ~5)gsOzx|Ci8wYH*t=Gu|>Ss8@@SSBQ!%_wxFt3r}KT9aXGKMGp zAh|Y%T6PdGU;>2K3Fd78^BNgAI6!g>CW7P|86?2G9h1N+C2lZ*<0^&-C~uvRGt(-DA}DXWkO$Lhh8a-aAt7I; zH4Hsq-b98^YRX*e7%ZkBtY6Qt8HINr!eh82l)|*0foUo)#KPA?*-V=lR3?Ay(@dT* z4J0;=;i{+#^KJ%?=^$P+*e`n+1i-w>9Cl)+%zGF-p}Zh5YalNG%8L_o1o9%lylEUw zViC-H8A`#tHn1ss8R9qB_Fs1wX!n&r{B{kC^D6rbQVbImr)*BS9>Jr#TCy$zWF-?2 z%P=x9oB<|+GmjY #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