Move emitted signals from hantekdsocontrol constructor into startSampling to fix available record length and other missed signals. clang-format everything.

Author: David Graeff

.clang-format

@@ -10,4 +10,4 @@ insert_final_newline = true
 
 # Tab indentation (no size specified)
 [*.cpp,*.h]
-indent_style = tab
+indent_style = space

.editorconfig

@@ -32,8 +32,6 @@ endif()
 
 # Add auxiliary files to the project, so that these files appear in VisualStudio/QtCreator
 add_custom_target(readme SOURCES readme.md)
-add_custom_target(format SOURCES ".clang-format"
-    COMMAND "clang-format" "-style=.clang-format" "-i" "-sort-includes" ${SRC} ${HEADERS})
 
 # Add "cppcheck" command
 add_custom_target(cppcheck COMMAND "cppcheck --enable=all -I \"${CMAKE_CURRENT_LIST_DIR}/openhantek/src\" -q ${SRC} --template=\"{file}:{line}: {severity}: {message}\"")

CMakeLists.txt

@@ -17,6 +17,9 @@ file(GLOB_RECURSE SRC "src/*.cpp")
 file(GLOB_RECURSE HEADERS "src/*.h")
 file(GLOB_RECURSE QRC "res/*.qrc")
 
+add_custom_target(format SOURCES ".clang-format"
+    COMMAND "clang-format" "-style=file" "-i" "-sort-includes" ${SRC} ${HEADERS})
+
 add_subdirectory(translations)
 add_subdirectory(res)
 

openhantek/CMakeLists.txt

@@ -4,14 +4,14 @@
 
 #include <vector>
 
-#include <QThread>
 #include <QMutex>
+#include <QThread>
 #include <memory>
 
-#include "definitions.h"
-#include "utils/printutils.h"
 #include "dataanalyzerresult.h"
+#include "definitions.h"
 #include "dsosamples.h"
+#include "utils/printutils.h"
 
 struct DsoSettingsScope;
 
@@ -21,28 +21,28 @@ struct DsoSettingsScope;
 /// Calculates the spectrum and various data about the signal and saves the
 /// time-/frequencysteps between two values.
 class DataAnalyzer : public QObject {
-  Q_OBJECT
+    Q_OBJECT
 
-public:
-    void applySettings(DsoSettingsScope* scope);
-    void setSourceData(const DSOsamples* data);
+  public:
+    void applySettings(DsoSettingsScope *scope);
+    void setSourceData(const DSOsamples *data);
     std::unique_ptr<DataAnalyzerResult> getNextResult();
     /**
      * Call this if the source data changed.
      */
     void samplesAvailable();
-private:
+
+  private:
     static std::unique_ptr<DataAnalyzerResult> convertData(const DSOsamples *data, const DsoSettingsScope *scope);
-    static void spectrumAnalysis(DataAnalyzerResult* result,
-                                 Dso::WindowFunction &lastWindow,
-                                 unsigned int lastRecordLength,
-                                 const DsoSettingsScope* scope);
-private:
-    DsoSettingsScope* scope;
-    unsigned int lastRecordLength=0; ///< The record length of the previously analyzed data
-    Dso::WindowFunction lastWindow=(Dso::WindowFunction)-1; ///< The previously used dft window function
-    const DSOsamples *sourceData=nullptr;
+    static void spectrumAnalysis(DataAnalyzerResult *result, Dso::WindowFunction &lastWindow,
+                                 unsigned int lastRecordLength, const DsoSettingsScope *scope);
+
+  private:
+    DsoSettingsScope *scope;
+    unsigned int lastRecordLength = 0;                        ///< The record length of the previously analyzed data
+    Dso::WindowFunction lastWindow = (Dso::WindowFunction)-1; ///< The previously used dft window function
+    const DSOsamples *sourceData = nullptr;
     std::unique_ptr<DataAnalyzerResult> lastResult;
-signals:
-  void analyzed();
+  signals:
+    void analyzed();
 };

openhantek/src/analyse/dataanalyzer.cpp

@@ -1,44 +1,33 @@
 #include "dataanalyzerresult.h"
 #include <stdexcept>
 
-DataAnalyzerResult::DataAnalyzerResult(unsigned int channelCount)
-{
-    analyzedData.resize(channelCount);
-}
+DataAnalyzerResult::DataAnalyzerResult(unsigned int channelCount) { analyzedData.resize(channelCount); }
 
 /// \brief Returns the analyzed data.
 /// \param channel Channel, whose data should be returned.
 /// \return Analyzed data as AnalyzedData struct.
 const DataChannel *DataAnalyzerResult::data(int channel) const {
-  if (channel >= (int)this->analyzedData.size())
-    return 0;
+    if (channel >= (int)this->analyzedData.size()) return 0;
 
-  return &this->analyzedData[(size_t)channel];
+    return &this->analyzedData[(size_t)channel];
 }
 
 DataChannel *DataAnalyzerResult::modifyData(int channel) {
-  if (channel >= (int)this->analyzedData.size())
-    throw new std::runtime_error("If you modfiy the DataAnalyzerResult, you need to set the channels first!");
+    if (channel >= (int)this->analyzedData.size())
+        throw new std::runtime_error("If you modfiy the DataAnalyzerResult, you "
+                                     "need to set the channels first!");
 
-  return &this->analyzedData[(size_t)channel];
+    return &this->analyzedData[(size_t)channel];
 }
 
 /// \brief Returns the sample count of the analyzed data.
 /// \return The maximum sample count of the last analyzed data.
 unsigned int DataAnalyzerResult::sampleCount() const { return this->maxSamples; }
 
-unsigned int DataAnalyzerResult::channelCount() const
-{
-    return analyzedData.size();
-}
+unsigned int DataAnalyzerResult::channelCount() const { return analyzedData.size(); }
 
-void DataAnalyzerResult::challengeMaxSamples(unsigned int newMaxSamples)
-{
-    if (newMaxSamples > this->maxSamples)
-        this->maxSamples = newMaxSamples;
+void DataAnalyzerResult::challengeMaxSamples(unsigned int newMaxSamples) {
+    if (newMaxSamples > this->maxSamples) this->maxSamples = newMaxSamples;
 }
 
-unsigned int DataAnalyzerResult::getMaxSamples() const
-{
-    return maxSamples;
-}
+unsigned int DataAnalyzerResult::getMaxSamples() const { return maxSamples; }

openhantek/src/analyse/dataanalyzer.h

@@ -8,37 +8,38 @@
 /// \struct SampleValues                                          dataanalyzer.h
 /// \brief Struct for a array of sample values.
 struct SampleValues {
-  std::vector<double> sample; ///< Vector holding the sampling data
-  double interval=0.0;            ///< The interval between two sample values
+    std::vector<double> sample; ///< Vector holding the sampling data
+    double interval = 0.0;      ///< The interval between two sample values
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 /// \struct AnalyzedData                                          dataanalyzer.h
 /// \brief Struct for the analyzed data.
 struct DataChannel {
-    SampleValues voltage;  ///< The time-domain voltage levels (V)
-    SampleValues spectrum; ///< The frequency-domain power levels (dB)
-    double amplitude = 0.0;   ///< The amplitude of the signal
-    double frequency = 0.0;   ///< The frequency of the signal
+    SampleValues voltage;   ///< The time-domain voltage levels (V)
+    SampleValues spectrum;  ///< The frequency-domain power levels (dB)
+    double amplitude = 0.0; ///< The amplitude of the signal
+    double frequency = 0.0; ///< The frequency of the signal
 };
 
-class DataAnalyzerResult
-{
-public:
+class DataAnalyzerResult {
+  public:
     DataAnalyzerResult(unsigned int channelCount);
     const DataChannel *data(int channel) const;
     DataChannel *modifyData(int channel);
     unsigned int sampleCount() const;
     unsigned int channelCount() const;
-    double *window = nullptr;                 ///< The array for the dft window factors
+    double *window = nullptr; ///< The array for the dft window factors
 
     /**
-     * Applies a new maximum samples value, if the given value is higher than the already stored one
+     * Applies a new maximum samples value, if the given value is higher than the
+     * already stored one
      * @param newMaxSamples Maximum samples value
      */
     void challengeMaxSamples(unsigned int newMaxSamples);
     unsigned int getMaxSamples() const;
-private:
-    std::vector<DataChannel> analyzedData;          ///< The analyzed data for each channel
-    unsigned int maxSamples = 0; ///< The maximum record length of the analyzed data
+
+  private:
+    std::vector<DataChannel> analyzedData; ///< The analyzed data for each channel
+    unsigned int maxSamples = 0;           ///< The maximum record length of the analyzed data
 };

openhantek/src/analyse/dataanalyzerresult.cpp

@@ -2,33 +2,27 @@
 
 #include "DsoConfigAnalysisPage.h"
 
-DsoConfigAnalysisPage::DsoConfigAnalysisPage(DsoSettings *settings,
-                                             QWidget *parent)
+DsoConfigAnalysisPage::DsoConfigAnalysisPage(DsoSettings *settings, QWidget *parent)
     : QWidget(parent), settings(settings) {
     // Initialize lists for comboboxes
     QStringList windowFunctionStrings;
-    windowFunctionStrings << tr("Rectangular") << tr("Hamming") << tr("Hann")
-                          << tr("Cosine") << tr("Lanczos") << tr("Bartlett")
-                          << tr("Triangular") << tr("Gauss")
-                          << tr("Bartlett-Hann") << tr("Blackman")
-                             //<< tr("Kaiser")
-                          << tr("Nuttall") << tr("Blackman-Harris")
-                          << tr("Blackman-Nuttall") << tr("Flat top");
+    windowFunctionStrings << tr("Rectangular") << tr("Hamming") << tr("Hann") << tr("Cosine") << tr("Lanczos")
+                          << tr("Bartlett") << tr("Triangular") << tr("Gauss") << tr("Bartlett-Hann") << tr("Blackman")
+                          //<< tr("Kaiser")
+                          << tr("Nuttall") << tr("Blackman-Harris") << tr("Blackman-Nuttall") << tr("Flat top");
 
     // Initialize elements
     windowFunctionLabel = new QLabel(tr("Window function"));
     windowFunctionComboBox = new QComboBox();
     windowFunctionComboBox->addItems(windowFunctionStrings);
-    windowFunctionComboBox->setCurrentIndex(
-                settings->scope.spectrumWindow);
+    windowFunctionComboBox->setCurrentIndex(settings->scope.spectrumWindow);
 
     referenceLevelLabel = new QLabel(tr("Reference level"));
     referenceLevelSpinBox = new QDoubleSpinBox();
     referenceLevelSpinBox->setDecimals(1);
     referenceLevelSpinBox->setMinimum(-40.0);
     referenceLevelSpinBox->setMaximum(100.0);
-    referenceLevelSpinBox->setValue(
-                settings->scope.spectrumReference);
+    referenceLevelSpinBox->setValue(settings->scope.spectrumReference);
     referenceLevelUnitLabel = new QLabel(tr("dBm"));
     referenceLevelLayout = new QHBoxLayout();
     referenceLevelLayout->addWidget(referenceLevelSpinBox);
@@ -65,9 +59,7 @@ DsoConfigAnalysisPage::DsoConfigAnalysisPage(DsoSettings *settings,
 
 /// \brief Saves the new settings.
 void DsoConfigAnalysisPage::saveSettings() {
-    settings->scope.spectrumWindow =
-            (Dso::WindowFunction)windowFunctionComboBox->currentIndex();
-    settings->scope.spectrumReference =
-            referenceLevelSpinBox->value();
+    settings->scope.spectrumWindow = (Dso::WindowFunction)windowFunctionComboBox->currentIndex();
+    settings->scope.spectrumReference = referenceLevelSpinBox->value();
     settings->scope.spectrumLimit = minimumMagnitudeSpinBox->value();
 }