storytold/LiveScan3D
2
0
Fork 0
mirror of https://github.com/storytold/LiveScan3D.git synced 2026-10-17 00:23:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

FramesFileWriterReader renamed to FrameFileWriterReader.

Browse Source
This commit is contained in:
JacekNaruniec
2017-01-17 16:49:49 +01:00
parent 4b25491c9b
commit 54ca7888ae
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LiveScanClient/KinectClient.vcxproj
+2 -2
View File
@@ -13,7 +13,7 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="..\include\LiveScanClient\calibration.h" /> <ClInclude Include="..\include\LiveScanClient\calibration.h" />
<ClInclude Include="..\include\LiveScanClient\filter.h" /> <ClInclude Include="..\include\LiveScanClient\filter.h" />
<ClInclude Include="..\include\LiveScanClient\framesFileWriterReader.h" /> <ClInclude Include="..\include\LiveScanClient\frameFileWriterReader.h" />
<ClInclude Include="..\include\LiveScanClient\iCapture.h" /> <ClInclude Include="..\include\LiveScanClient\iCapture.h" />
<ClInclude Include="..\include\LiveScanClient\imageRenderer.h" /> <ClInclude Include="..\include\LiveScanClient\imageRenderer.h" />
<ClInclude Include="..\include\LiveScanClient\iMarker.h" /> <ClInclude Include="..\include\LiveScanClient\iMarker.h" />
@@ -29,7 +29,7 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\src\LiveScanClient\calibration.cpp" /> <ClCompile Include="..\src\LiveScanClient\calibration.cpp" />
<ClCompile Include="..\src\LiveScanClient\filter.cpp" /> <ClCompile Include="..\src\LiveScanClient\filter.cpp" />
<ClCompile Include="..\src\LiveScanClient\framesFileWriterReader.cpp" /> <ClCompile Include="..\src\LiveScanClient\frameFileWriterReader.cpp" />
<ClCompile Include="..\src\LiveScanClient\iCapture.cpp" /> <ClCompile Include="..\src\LiveScanClient\iCapture.cpp" />
<ClCompile Include="..\src\LiveScanClient\imageRenderer.cpp" /> <ClCompile Include="..\src\LiveScanClient\imageRenderer.cpp" />
<ClCompile Include="..\src\LiveScanClient\iMarker.cpp" /> <ClCompile Include="..\src\LiveScanClient\iMarker.cpp" />
LiveScanClient/KinectClient.vcxproj.filters
+2 -2
View File
@@ -54,7 +54,7 @@
<ClInclude Include="..\include\LiveScanClient\utils.h"> <ClInclude Include="..\include\LiveScanClient\utils.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\LiveScanClient\framesFileWriterReader.h"> <ClInclude Include="..\include\LiveScanClient\frameFileWriterReader.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
@@ -89,7 +89,7 @@
<ClCompile Include="..\src\LiveScanClient\utils.cpp"> <ClCompile Include="..\src\LiveScanClient\utils.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\LiveScanClient\framesFileWriterReader.cpp"> <ClCompile Include="..\src\LiveScanClient\frameFileWriterReader.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
LiveScanServer/SettingsForm.cs
+1
View File
@@ -333,6 +333,7 @@ namespace KinectServer
if (!tryParse) if (!tryParse)
oSettings.iCompressionLevel = 0; oSettings.iCompressionLevel = 0;
} }
UpdateClients();
} }
} }
} }
bin/LiveScanClient.exe
BIN
View File
Binary file not shown.
bin/LiveScanServer.exe
BIN
View File
Binary file not shown.
include/LiveScanClient/framesFileWriterReader.h → include/LiveScanClient/frameFileWriterReader.h
+3 -3
View File
@@ -6,10 +6,10 @@
#include <chrono> #include <chrono>
#include "utils.h" #include "utils.h"
class FramesFileWriterReader class FrameFileWriterReader
{ {
public: public:
FramesFileWriterReader(); FrameFileWriterReader();
void openNewFileForWriting(); void openNewFileForWriting();
void openCurrentFileForReading(); void openCurrentFileForReading();
@@ -25,7 +25,7 @@ public:
void closeFileIfOpened(); void closeFileIfOpened();
~FramesFileWriterReader(); ~FrameFileWriterReader();
private: private:
void resetTimer(); void resetTimer();
include/LiveScanClient/liveScanClient.h
+2 -2
View File
@@ -20,7 +20,7 @@
#include "calibration.h" #include "calibration.h"
#include "utils.h" #include "utils.h"
#include "KinectCapture.h" #include "KinectCapture.h"
#include "framesFileWriterReader.h" #include "frameFileWriterReader.h"
#include <thread> #include <thread>
#include <mutex> #include <mutex>
@@ -57,7 +57,7 @@ private:
int m_iCompressionLevel; int m_iCompressionLevel;
bool m_bCaptureToFile; // false if capture frames to memory bool m_bCaptureToFile; // false if capture frames to memory
FramesFileWriterReader m_framesFileWriterReader; FrameFileWriterReader m_framesFileWriterReader;
SocketClient *m_pClientSocket; SocketClient *m_pClientSocket;
src/LiveScanClient/framesFileWriterReader.cpp → src/LiveScanClient/frameFileWriterReader.cpp
+10 -10
View File
@@ -1,13 +1,13 @@
#include "framesFileWriterReader.h" #include "frameFileWriterReader.h"
#include <ctime> #include <ctime>
FramesFileWriterReader::FramesFileWriterReader() FrameFileWriterReader::FrameFileWriterReader()
{ {
} }
void FramesFileWriterReader::closeFileIfOpened() void FrameFileWriterReader::closeFileIfOpened()
{ {
if (m_pFileHandle == nullptr) if (m_pFileHandle == nullptr)
return; return;
@@ -18,18 +18,18 @@ void FramesFileWriterReader::closeFileIfOpened()
m_bFileOpenedForWriting = false; m_bFileOpenedForWriting = false;
} }
void FramesFileWriterReader::resetTimer() void FrameFileWriterReader::resetTimer()
{ {
recording_start_time = std::chrono::steady_clock::now(); 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(); std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
return static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds >(end - recording_start_time).count()); return static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds >(end - recording_start_time).count());
} }
void FramesFileWriterReader::openCurrentFileForReading() void FrameFileWriterReader::openCurrentFileForReading()
{ {
closeFileIfOpened(); closeFileIfOpened();
@@ -39,7 +39,7 @@ void FramesFileWriterReader::openCurrentFileForReading()
m_bFileOpenedForWriting = false; m_bFileOpenedForWriting = false;
} }
void FramesFileWriterReader::openNewFileForWriting() void FrameFileWriterReader::openNewFileForWriting()
{ {
closeFileIfOpened(); closeFileIfOpened();
@@ -56,7 +56,7 @@ void FramesFileWriterReader::openNewFileForWriting()
resetTimer(); resetTimer();
} }
bool FramesFileWriterReader::readFrame(std::vector<Point3s> &outPoints, std::vector<RGB> &outColors) bool FrameFileWriterReader::readFrame(std::vector<Point3s> &outPoints, std::vector<RGB> &outColors)
{ {
if (!m_bFileOpenedForReading) if (!m_bFileOpenedForReading)
openCurrentFileForReading(); openCurrentFileForReading();
@@ -86,7 +86,7 @@ bool FramesFileWriterReader::readFrame(std::vector<Point3s> &outPoints, std::vec
} }
void FramesFileWriterReader::writeFrame(std::vector<Point3s> points, std::vector<RGB> colors) void FrameFileWriterReader::writeFrame(std::vector<Point3s> points, std::vector<RGB> colors)
{ {
if (!m_bFileOpenedForWriting) if (!m_bFileOpenedForWriting)
openNewFileForWriting(); openNewFileForWriting();
@@ -103,7 +103,7 @@ void FramesFileWriterReader::writeFrame(std::vector<Point3s> points, std::vector
fprintf(f, "\n"); fprintf(f, "\n");
} }
FramesFileWriterReader::~FramesFileWriterReader() FrameFileWriterReader::~FrameFileWriterReader()
{ {
closeFileIfOpened(); closeFileIfOpened();
} }