mirror of
https://github.com/storytold/LiveScan3D.git
synced 2026-10-09 00:09:58 +00:00
FramesFileWriterReader renamed to FrameFileWriterReader.
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\include\LiveScanClient\calibration.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\imageRenderer.h" />
|
||||
<ClInclude Include="..\include\LiveScanClient\iMarker.h" />
|
||||
@@ -29,7 +29,7 @@
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\LiveScanClient\calibration.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\imageRenderer.cpp" />
|
||||
<ClCompile Include="..\src\LiveScanClient\iMarker.cpp" />
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
<ClInclude Include="..\include\LiveScanClient\utils.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\include\LiveScanClient\framesFileWriterReader.h">
|
||||
<ClInclude Include="..\include\LiveScanClient\frameFileWriterReader.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
@@ -89,7 +89,7 @@
|
||||
<ClCompile Include="..\src\LiveScanClient\utils.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\LiveScanClient\framesFileWriterReader.cpp">
|
||||
<ClCompile Include="..\src\LiveScanClient\frameFileWriterReader.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
|
||||
@@ -333,6 +333,7 @@ namespace KinectServer
|
||||
if (!tryParse)
|
||||
oSettings.iCompressionLevel = 0;
|
||||
}
|
||||
UpdateClients();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
+3
-3
@@ -6,10 +6,10 @@
|
||||
#include <chrono>
|
||||
#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();
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "calibration.h"
|
||||
#include "utils.h"
|
||||
#include "KinectCapture.h"
|
||||
#include "framesFileWriterReader.h"
|
||||
#include "frameFileWriterReader.h"
|
||||
#include <thread>
|
||||
#include <mutex>
|
||||
|
||||
@@ -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;
|
||||
|
||||
+10
-10
@@ -1,13 +1,13 @@
|
||||
#include "framesFileWriterReader.h"
|
||||
#include "frameFileWriterReader.h"
|
||||
|
||||
#include <ctime>
|
||||
|
||||
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<int>(std::chrono::duration_cast<std::chrono::milliseconds >(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<Point3s> &outPoints, std::vector<RGB> &outColors)
|
||||
bool FrameFileWriterReader::readFrame(std::vector<Point3s> &outPoints, std::vector<RGB> &outColors)
|
||||
{
|
||||
if (!m_bFileOpenedForReading)
|
||||
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)
|
||||
openNewFileForWriting();
|
||||
@@ -103,7 +103,7 @@ void FramesFileWriterReader::writeFrame(std::vector<Point3s> points, std::vector
|
||||
fprintf(f, "\n");
|
||||
}
|
||||
|
||||
FramesFileWriterReader::~FramesFileWriterReader()
|
||||
FrameFileWriterReader::~FrameFileWriterReader()
|
||||
{
|
||||
closeFileIfOpened();
|
||||
}
|
||||
Reference in New Issue
Block a user