Merge pull request #251 from ess-dmsc/issue_249_mutex

Issue 249 mutex
ess-dmsc · Jun 28, 2021 · 5e69f14 · 5e69f14
2 parents b8f5813 + 8951687
commit 5e69f14
Show file tree

Hide file tree

Showing 20 changed files with 94 additions and 63 deletions.
diff --git a/source/daqlite/Configuration.cpp b/source/daqlite/Configuration.cpp
@@ -15,14 +15,15 @@ void Configuration::print() {
   fmt::print("[Geometry]\n");
   fmt::print("  Dimensions ({}, {}, {})\n", Geometry.XDim, Geometry.YDim, Geometry.ZDim);
   fmt::print("[Plot]\n");
+  fmt::print("  WindowTitle {}\n", Plot.WindowTitle);
   fmt::print("  Plot type {}\n", Plot.PlotType);
   fmt::print("  Clear periodically {}\n", Plot.ClearPeriodic);
   fmt::print("  Clear interval (s) {}\n", Plot.ClearEverySeconds);
   fmt::print("  Interpolate image {}\n", Plot.Interpolate);
   fmt::print("  Color gradient {}\n", Plot.ColorGradient);
   fmt::print("  Invert gradient {}\n", Plot.InvertGradient);
   fmt::print("  Log Scale {}\n", Plot.LogScale);
-  fmt::print("  Title {}\n", Plot.Title);
+  fmt::print("  PlotTitle {}\n", Plot.PlotTitle);
   fmt::print("  X Axis {}\n", Plot.XAxis);
   fmt::print("[TOF]\n");
   fmt::print("  Scale {}\n", TOF.Scale);
@@ -80,7 +81,8 @@ try {
     Plot.ColorGradient = j["plot"]["color_gradient"];
     Plot.InvertGradient = j["plot"]["invert_gradient"];
     Plot.LogScale = j["plot"]["log_scale"];
-    Plot.Title = j["plot"]["title"];
+    Plot.WindowTitle = j["plot"]["window_title"];
+    Plot.PlotTitle = j["plot"]["plot_title"];
     Plot.XAxis = j["plot"]["xaxis"];
     Plot.Width = j["plot"]["window_width"];
     Plot.Height = j["plot"]["window_height"];

diff --git a/source/daqlite/Configuration.h b/source/daqlite/Configuration.h
@@ -58,7 +58,8 @@ class Configuration {
     std::string ColorGradient{"hot"};
     bool InvertGradient{false};
     bool LogScale{false};
-    std::string Title;
+    std::string WindowTitle{"Daquiri Lite - Daqlite"};
+    std::string PlotTitle{""};
     std::string XAxis{""};
     int Width{600}; // default window width
     int Height{400}; // default window height

diff --git a/source/daqlite/ESSConsumer.cpp b/source/daqlite/ESSConsumer.cpp
@@ -13,11 +13,12 @@
 #include <unistd.h>
 
 ESSConsumer::ESSConsumer(Configuration &Config) : mConfig(Config) {
+  const int OVERHEAD{1};
   auto & geom = mConfig.Geometry;
   mMaxPixel = geom.XDim * geom.YDim * geom.ZDim;
   assert(mMaxPixel != 0);
-  mHistogram.resize(mMaxPixel);
-  mHistogramTof.resize(mConfig.TOF.BinSize);
+  mHistogram.resize(mMaxPixel + OVERHEAD);
+  mHistogramTof.resize(mConfig.TOF.BinSize + OVERHEAD);
 
   mConsumer = subscribeTopic();
   assert(mConsumer != nullptr);

diff --git a/source/daqlite/ESSConsumer.h b/source/daqlite/ESSConsumer.h
@@ -41,7 +41,6 @@ class ESSConsumer {
   std::vector<uint32_t> mHistogram;
   std::vector<uint32_t> mHistogramTofPlot;
   std::vector<uint32_t> mHistogramTof;
-  uint64_t mCountsPlot{0};
   uint64_t mCounts{0};
 
 

diff --git a/source/daqlite/MainWindow.cpp b/source/daqlite/MainWindow.cpp
@@ -15,7 +15,6 @@ MainWindow::MainWindow(Configuration &Config, QWidget *parent)
   , mConfig(Config) {
 
   ui->setupUi(this);
-  setWindowTitle("Daquiri lite");
 
   if (strcmp(Config.Plot.PlotType.c_str(), "tof") == 0) {
     TOF = true;
@@ -37,7 +36,7 @@ MainWindow::MainWindow(Configuration &Config, QWidget *parent)
     ui->gridLayout->addWidget(PlotTOF, 0, 0, 1, 1);
   }
 
-  ui->lblDescriptionText->setText(mConfig.Plot.Title.c_str());
+  ui->lblDescriptionText->setText(mConfig.Plot.PlotTitle.c_str());
   ui->lblEventRateText->setText("0");
 
   connect(ui->pushButtonQuit, SIGNAL(clicked()), this, SLOT(handleExitButton()));
@@ -66,6 +65,7 @@ void MainWindow::startKafkaConsumerThread() {
 // SLOT
 void MainWindow::handleKafkaData(int EventRate) {
   ui->lblEventRateText->setText(QString::number(EventRate));
+  KafkaConsumerThread->mutex.lock();
   if (!TOF) {
     Plot2DXY->addData(KafkaConsumerThread->consumer()->mHistogramPlot);
     if (mConfig.Geometry.ZDim > 1) {
@@ -75,6 +75,7 @@ void MainWindow::handleKafkaData(int EventRate) {
   } else {
     PlotTOF->addData(KafkaConsumerThread->consumer()->mHistogramTofPlot);
   }
+  KafkaConsumerThread->mutex.unlock();
 }
 
 // SLOT

diff --git a/source/daqlite/WorkerThread.cpp b/source/daqlite/WorkerThread.cpp
@@ -21,9 +21,10 @@ void WorkerThread::run() {
     t2 = std::chrono::high_resolution_clock::now();
     std::chrono::duration<int64_t,std::nano> elapsed = t2 - t1;
     if (elapsed.count() >= 1000000000ULL) {
+      mutex.lock();
       Consumer->mHistogramPlot = Consumer->mHistogram;
       Consumer->mHistogramTofPlot = Consumer->mHistogramTof;
-      Consumer->mCountsPlot = Consumer->mCounts;
+      mutex.unlock();
 
       uint64_t Rate = (uint64_t)((Consumer->mCounts * 1000000000ULL)/elapsed.count());
       emit resultReady(Rate);

diff --git a/source/daqlite/WorkerThread.h b/source/daqlite/WorkerThread.h
@@ -32,6 +32,9 @@ class WorkerThread : public QThread {
   /// \brief Getter for the consumer
   ESSConsumer * consumer() { return Consumer; }
 
+
+  QMutex mutex;
+
 signals:
   void resultReady(uint64_t &val);
 
@@ -41,4 +44,6 @@ class WorkerThread : public QThread {
 
   /// \brief Kafka consumer
   ESSConsumer *Consumer;
+
+
 };
diff --git a/source/daqlite/configs/amor.json b/source/daqlite/configs/amor.json
@@ -17,7 +17,9 @@
   },
 
   "plot": {
-    "title" : "FREIA",
+    "plot_type" : "pixels",
+    "window_title" : "FREIA",
+    "plot_title" : "FREIA",
     "clear_periodic" : false,
     "clear_interval_seconds" : 5,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/dreamoffice.json b/source/daqlite/configs/dreamoffice.json
@@ -17,7 +17,9 @@
   },
 
   "plot": {
-    "title" : "DREAM",
+    "plot_type" : "pixels",
+    "window_title" : "DREAM",
+    "plot_title" : "DREAM",
     "clear_periodic" : false,
     "clear_interval_seconds" : 30,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/lokioffice.json b/source/daqlite/configs/lokioffice.json
@@ -17,7 +17,9 @@
   },
 
   "plot": {
-    "title" : "LOKI",
+    "plot_type" : "pixels",
+    "window_title" : "LOKI",
+    "plot_title" : "LOKI",
     "clear_periodic" : false,
     "clear_interval_seconds" : 30,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/vipcspec2d.json b/source/daqlite/configs/vipcspec2d.json
@@ -17,7 +17,9 @@
   },
 
   "plot": {
-    "title" : "CSPEC 2D - 172.30.242.20 (36 x 800)",
+    "plot_type" : "pixels",
+    "window_title" : "CSPEC 2D - 172.30.242.20",
+    "plot_title" : "(36 x 800)",
     "clear_periodic" : false,
     "clear_interval_seconds" : 5,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/vipcspec3d.json b/source/daqlite/configs/vipcspec3d.json
@@ -17,7 +17,9 @@
   },
 
   "plot": {
-    "title" : "CSPEC 3D - 172.30.242.20 (36 x 40 x 20)",
+    "plot_type" : "pixels",
+    "window_title" : "CSPEC",
+    "plot_title" : "3D (36 x 40 x 20)",
     "clear_periodic" : false,
     "clear_interval_seconds" : 5,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/vipdream.json b/source/daqlite/configs/vipdream.json
@@ -17,7 +17,9 @@
   },
 
   "plot": {
-    "title" : "DREAM",
+    "plot_type" : "pixels",
+    "window_title" : "DREAM",
+    "plot_title" : "DREAM",
     "clear_periodic" : false,
     "clear_interval_seconds" : 30,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/vipfreia.json b/source/daqlite/configs/vipfreia.json
@@ -17,7 +17,9 @@
   },
 
   "plot": {
-    "title" : "FREIA",
+    "plot_type" : "pixels",
+    "window_title" : "FREIA",
+    "plot_title" : "FREIA",
     "clear_periodic" : false,
     "clear_interval_seconds" : 5,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/vipfreiatof.json b/source/daqlite/configs/vipfreiatof.json
@@ -24,7 +24,8 @@
 
   "plot": {
     "plot_type" : "tof",
-    "title" : "FREIA - TOF",
+    "window_title" : "FREIA",
+    "plot_title" : "TOF",
     "clear_periodic" : false,
     "clear_interval_seconds" : 30,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/viploki.json b/source/daqlite/configs/viploki.json
@@ -18,7 +18,8 @@
 
   "plot": {
     "plot_type" : "pixels",
-    "title" : "LOKI",
+    "window_title" : "LOKI",
+    "plot_title" : "pixels",
     "clear_periodic" : false,
     "clear_interval_seconds" : 30,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/viploki4amp.json b/source/daqlite/configs/viploki4amp.json
@@ -24,7 +24,8 @@
 
   "plot": {
     "plot_type" : "tof",
-    "title" : "LOKI - sum of 4 amps",
+    "window_title" : "LOKI",
+    "plot_title" : "sum of 4 amps",
     "clear_periodic" : false,
     "clear_interval_seconds" : 30,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/viplokitof.json b/source/daqlite/configs/viplokitof.json
@@ -18,7 +18,8 @@
 
   "plot": {
     "plot_type" : "tof",
-    "title" : "LOKI - TOF",
+    "window_title" : "LOKI",
+    "plot_title" : "TOF",
     "clear_periodic" : false,
     "clear_interval_seconds" : 30,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/configs/vipnmx.json b/source/daqlite/configs/vipnmx.json
@@ -17,7 +17,9 @@
   },
 
   "plot": {
-    "title" : "NMX - 172.30.242.20 (256 x 256)",
+    "plot_type" : "pixels",
+    "window_title" : "NMX",
+    "plot_title" : "2D (256 x 256)",
     "clear_periodic" : false,
     "clear_interval_seconds" : 5,
     "interpolate_pixels" : false,

diff --git a/source/daqlite/daqlite.cpp b/source/daqlite/daqlite.cpp
@@ -1,42 +1,43 @@
-/* Copyright (C) 2020 European Spallation Source, ERIC. See LICENSE file      */
-//===----------------------------------------------------------------------===//
-///
-/// \file daqlite.cpp
-///
-/// \brief Daquiri Light main application
-///
-/// Handles command line option(s), instantiates GUI
-//===----------------------------------------------------------------------===//
-
-#include <Configuration.h>
-#include <Custom2DPlot.h>
-#include <MainWindow.h>
-#include <WorkerThread.h>
-
-#include <QApplication>
-#include <QPlot/QPlot.h>
-#include <fmt/format.h>
-#include <QCommandLineParser>
-
-int main(int argc, char *argv[]) {
-  QApplication app(argc, argv);
-
-  QCommandLineParser CLI;
-  CLI.setApplicationDescription("Daquiri light - when you're driving home");
-  CLI.addHelpOption();
-
-  QCommandLineOption fileOption("f", "Configuration file", "file");
-  CLI.addOption(fileOption);
-  CLI.process(app);
-
-  Configuration Config;
-  if (CLI.isSet(fileOption)) {
-    std::string FileName = CLI.value(fileOption).toStdString();
-    Config.fromJsonFile(FileName);
-  }
-
-  MainWindow w(Config);
-  w.resize(Config.Plot.Width, Config.Plot.Height);
-
-  return app.exec();
-}
+/* Copyright (C) 2020 European Spallation Source, ERIC. See LICENSE file      */
+//===----------------------------------------------------------------------===//
+///
+/// \file daqlite.cpp
+///
+/// \brief Daquiri Light main application
+///
+/// Handles command line option(s), instantiates GUI
+//===----------------------------------------------------------------------===//
+
+#include <Configuration.h>
+#include <Custom2DPlot.h>
+#include <MainWindow.h>
+#include <WorkerThread.h>
+
+#include <QApplication>
+#include <QPlot/QPlot.h>
+#include <fmt/format.h>
+#include <QCommandLineParser>
+
+int main(int argc, char *argv[]) {
+  QApplication app(argc, argv);
+
+  QCommandLineParser CLI;
+  CLI.setApplicationDescription("Daquiri light - when you're driving home");
+  CLI.addHelpOption();
+
+  QCommandLineOption fileOption("f", "Configuration file", "file");
+  CLI.addOption(fileOption);
+  CLI.process(app);
+
+  Configuration Config;
+  if (CLI.isSet(fileOption)) {
+    std::string FileName = CLI.value(fileOption).toStdString();
+    Config.fromJsonFile(FileName);
+  }
+
+  MainWindow w(Config);
+  w.setWindowTitle(QString::fromStdString(Config.Plot.WindowTitle));
+  w.resize(Config.Plot.Width, Config.Plot.Height);
+
+  return app.exec();
+}