Merge branch 'release/2.8.0'

josevcm · May 29, 2022 · 0f88180 · 0f88180
2 parents 405c0d4 + 8d46ebe
commit 0f88180
Show file tree

Hide file tree

Showing 38 changed files with 1,594 additions and 637 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.17)
 
-project(nfc-lab VERSION 2.6.8)
+project(nfc-lab VERSION 2.8.0)
 
 set(CMAKE_C_FLAGS_DEBUG "-g -msse -msse3 -mno-avx -fno-math-errno -falign-functions=32 -falign-loops=32" CACHE INTERNAL "" FORCE)
 set(CMAKE_CXX_FLAGS_DEBUG "-g -msse -msse3 -mno-avx -fno-math-errno -falign-functions=32 -falign-loops=32" CACHE INTERNAL "" FORCE)

diff --git a/src/nfc-app/app-qt/CMakeLists.txt b/src/nfc-app/app-qt/CMakeLists.txt
@@ -33,7 +33,9 @@ add_executable(nfc-lab WIN32
  src/main/cpp/graph/QCPAxisTickerFrequency.cpp
  src/main/cpp/graph/QCPAxisRangeMarker.cpp
  src/main/cpp/graph/QCPAxisCursorMarker.cpp
+ src/main/cpp/graph/QCPGraphMarkerList.cpp
  src/main/cpp/graph/QCPGraphValueMarker.cpp
+ src/main/cpp/model/StreamFilter.cpp
  src/main/cpp/model/StreamModel.cpp
  src/main/cpp/model/ParserModel.cpp
  src/main/cpp/parser/ParserNfc.cpp

diff --git a/src/nfc-app/app-qt/src/main/cpp/QtConfig.h b/src/nfc-app/app-qt/src/main/cpp/QtConfig.h
@@ -2,7 +2,7 @@
  * Auto-generated file
  */
 #define NFC_LAB_VERSION_MAJOR 2
-#define NFC_LAB_VERSION_MINOR 6
-#define NFC_LAB_VERSION_PATCH 8
-#define NFC_LAB_VERSION_STRING "2.6.8"
-#define NFC_LAB_VENDOR_STRING "NFC laboratory 2.6.8, Jose Vicente Campos Martinez - [email protected]"
+#define NFC_LAB_VERSION_MINOR 8
+#define NFC_LAB_VERSION_PATCH 0
+#define NFC_LAB_VERSION_STRING "2.8.0"
+#define NFC_LAB_VENDOR_STRING "NFC laboratory 2.8.0 - [email protected]"
diff --git a/src/nfc-app/app-qt/src/main/cpp/QtConfig.h.in b/src/nfc-app/app-qt/src/main/cpp/QtConfig.h.in
@@ -5,4 +5,4 @@
 #define NFC_LAB_VERSION_MINOR @nfc-lab_VERSION_MINOR@
 #define NFC_LAB_VERSION_PATCH @nfc-lab_VERSION_PATCH@
 #define NFC_LAB_VERSION_STRING "@nfc-lab_VERSION@"
-#define NFC_LAB_VENDOR_STRING "NFC laboratory @nfc-lab_VERSION@, Jose Vicente Campos Martinez - [email protected]"
+#define NFC_LAB_VENDOR_STRING "NFC laboratory @nfc-lab_VERSION@ - [email protected]"
diff --git a/src/nfc-app/app-qt/src/main/cpp/QtDecoder.cpp b/src/nfc-app/app-qt/src/main/cpp/QtDecoder.cpp
@@ -372,12 +372,12 @@ struct QtDecoder::Impl
  cache->clear();
 
  // clear storage queue
- taskStorageClear();
-
- // start decoder and...
- taskDecoderStart([=] {
- // enable receiver
- taskReceiverStart();
+ taskStorageClear([=] {
+ // start decoder and...
+  taskDecoderStart([=] {
+  // enable receiver
+  taskReceiverStart();
+ });
  });
  }
 
@@ -395,14 +395,14 @@ struct QtDecoder::Impl
  cache->clear();
 
  // clear storage queue
- taskStorageClear();
-
- // start recorder and...
- taskRecorderWrite(json, [=] {
- // start decoder and...
- taskDecoderStart([=] {
- // enable receiver
- taskReceiverStart();
+ taskStorageClear([=] {
+ // start recorder and...
+  taskRecorderWrite(json, [=] {
+  // start decoder and...
+  taskDecoderStart([=] {
+  // enable receiver
+  taskReceiverStart();
+ });
  });
  });
  }
@@ -412,10 +412,14 @@ struct QtDecoder::Impl
  */
  void doStopDecode(DecoderControlEvent *event) const
  {
- // stop all taks
- taskDecoderStop();
- taskReceiverStop();
- taskRecorderStop();
+ // stop receiver task
+ taskReceiverStop([=] {
+ // stop recorder task
+ taskRecorderStop([=] {
+ // stop decoder task
+ taskDecoderStop();
+ });
+ });
  }
 
  /*
@@ -535,22 +539,21 @@ struct QtDecoder::Impl
  if (fileName.endsWith(".wav"))
  {
  // clear storage queue
- taskStorageClear();
-
- // start decoder and...
- taskDecoderStart([=] {
-
- // read file
- taskRecorderRead(json);
+ taskStorageClear([=] {
+ // start decoder and...
+ taskDecoderStart([=] {
+ // read file
+ taskRecorderRead(json);
+ });
  });
  }
  else if (fileName.endsWith(".xml") || fileName.endsWith(".json"))
  {
  // clear storage queue
- taskStorageClear();
-
- // start XML file read
- taskStorageRead(json);
+ taskStorageClear([=] {
+ // start XML file read
+  taskStorageRead(json);
+ });
  }
  }