QT/Serial-Studio
1
0
Fork 0
mirror of https://github.com/Serial-Studio/Serial-Studio.git synced 2025-01-15 05:22:53 +08:00
Code Issues Projects Releases Wiki Activity

We do not need to check JFI validity if JSON document is valid

Browse Source
This commit is contained in:
Alex Spataru 2021-09-24 17:58:53 -05:00
parent c5a651a8b7
commit 749cc48cd7
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CSV/Export.cpp
View File

@ -297,6 +297,5 @@ void Export::registerFrame(const JFI_Object &info)
return; return;
// Update JSON list // Update JSON list
if (JFI_Valid(info)) m_jsonList.append(info);
m_jsonList.append(info);
} }

9
src/JSON/FrameInfo.cpp
View File

@ -22,15 +22,6 @@
#include "FrameInfo.h" #include "FrameInfo.h"
/**
* Returns @c true if the given JFI @info structure has a non-empty JSON document and a
* valid frame number.
*/
bool JFI_Valid(const JFI_Object &info)
{
return info.frameNumber >= 0 && !info.jsonDocument.isEmpty();
}
/** /**
* Orders the given JFI @c list from least recent (first item) to most recent (last item) * Orders the given JFI @c list from least recent (first item) to most recent (last item)
* using a simple Bubble-Sort algorithm. * using a simple Bubble-Sort algorithm.

2
src/JSON/FrameInfo.h
View File

@ -35,9 +35,7 @@ typedef struct
} JFI_Object; } JFI_Object;
Q_DECLARE_METATYPE(JFI_Object) Q_DECLARE_METATYPE(JFI_Object)
extern bool JFI_Valid(const JFI_Object &info);
extern void JFI_SortList(QList<JFI_Object> *list); extern void JFI_SortList(QList<JFI_Object> *list);
extern JFI_Object JFI_Empty(const quint64 n = 0); extern JFI_Object JFI_Empty(const quint64 n = 0);
extern JFI_Object JFI_CreateNew(const quint64 n, const QDateTime &t, extern JFI_Object JFI_CreateNew(const quint64 n, const QDateTime &t,
const QJsonDocument &d); const QJsonDocument &d);