hide not yet implemented feature 'NewDeviceModelFromExisting'; clean …

…up 'cppcheck' findings Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
OpenHantek · Dec 6, 2019 · a7c9eb6 · a7c9eb6
1 parent ed3839d
commit a7c9eb6
Show file tree

Hide file tree

Showing 30 changed files with 223 additions and 233 deletions.
diff --git a/openhantek/src/OH_BUILD.h b/openhantek/src/OH_BUILD.h
@@ -1,2 +1,2 @@
 // Do not edit, will be re-created at each commit!
-#define OH_BUILD "20191204 build 567"
+#define OH_BUILD "20191206 build 568"
diff --git a/openhantek/src/exporting/exporterprocessor.h b/openhantek/src/exporting/exporterprocessor.h
@@ -7,7 +7,7 @@ class ExporterRegistry;
 class ExporterProcessor : public Processor
 {
 public:
-    ExporterProcessor(ExporterRegistry* registry);
+    explicit ExporterProcessor(ExporterRegistry* registry);
     void process(PPresult *) override;
 private:
     ExporterRegistry* registry;

diff --git a/openhantek/src/glscopegraph.cpp b/openhantek/src/glscopegraph.cpp
@@ -25,7 +25,7 @@ void Graph::writeData(PPresult *data, QOpenGLShaderProgram *program, int vertexL
     int offset = 0;
     vaoVoltage.resize(data->vaChannelVoltage.size());
     vaoSpectrum.resize(data->vaChannelSpectrum.size());
-    for (ChannelID channel = 0; channel < vaoVoltage.size(); ++channel) {
+    for (ChannelID channel = 0; channel < std::max( vaoVoltage.size(), vaoSpectrum.size() ); ++channel) {
         int dataSize;
 
         // Voltage channel

diff --git a/openhantek/src/hantekdso/controlsettings.h b/openhantek/src/hantekdso/controlsettings.h
@@ -54,6 +54,8 @@ struct ControlSettingsVoltage {
 struct ControlSettings {
     ControlSettings(const ControlSamplerateLimits *limits, size_t channelCount);
     ~ControlSettings();
+    ControlSettings( const ControlSettings& ) = delete;
+    ControlSettings operator=( const ControlSettings& ) = delete;
     ControlSettingsSamplerate samplerate;        ///< The samplerate settings
     std::vector<ControlSettingsVoltage> voltage; ///< The amplification settings
     ControlSettingsTrigger trigger;              ///< The trigger settings

diff --git a/openhantek/src/hantekdso/controlspecification.h b/openhantek/src/hantekdso/controlspecification.h
@@ -40,7 +40,7 @@ struct FixedSampleRate {
 
 /// \brief Stores the specifications of the currently connected device.
 struct ControlSpecification {
-    ControlSpecification(unsigned channels);
+    explicit ControlSpecification( unsigned channels );
     const ChannelID channels;
 
     // Limits

diff --git a/openhantek/src/hantekdso/enums.cpp b/openhantek/src/hantekdso/enums.cpp
@@ -6,6 +6,7 @@ namespace Dso {
     Enum<Dso::Slope, Dso::Slope::Positive, Dso::Slope::Both> SlopeEnum;
     Enum<Dso::GraphFormat, Dso::GraphFormat::TY, Dso::GraphFormat::XY> GraphFormatEnum;
 
+#if 0
     /// \brief Return string representation of the given channel mode.
     /// \param mode The ::ChannelMode that should be returned as string.
     /// \return The string that should be used in labels etc., empty when invalid.
@@ -18,6 +19,7 @@ namespace Dso {
         }
         return QString();
     }
+#endif
 
     /// \brief Return string representation of the given graph format.
     /// \param format The ::GraphFormat that should be returned as string.
@@ -88,6 +90,7 @@ namespace Dso {
         }
     }
 
+#if 0
     /// \brief Return string representation of the given graph interpolation mode.
     /// \param interpolation The ::InterpolationMode that should be returned as
     /// string.
@@ -104,4 +107,6 @@ namespace Dso {
             return QString();
         }
     }
+#endif
+
 }
diff --git a/openhantek/src/hantekdso/enums.h b/openhantek/src/hantekdso/enums.h
@@ -55,12 +55,12 @@ enum InterpolationMode {
     INTERPOLATION_COUNT    ///< Total number of interpolation modes
 };
 
-QString channelModeString(ChannelMode mode);
+// QString channelModeString(ChannelMode mode);
 QString graphFormatString(GraphFormat format);
 QString couplingString(Coupling coupling);
 QString triggerModeString(TriggerMode mode);
 QString slopeString(Slope slope);
-QString interpolationModeString(InterpolationMode interpolation);
+// QString interpolationModeString(InterpolationMode interpolation);
 }
 
 Q_DECLARE_METATYPE(Dso::TriggerMode)

diff --git a/openhantek/src/hantekdso/hantekdsocontrol.cpp b/openhantek/src/hantekdso/hantekdsocontrol.cpp
@@ -42,7 +42,7 @@ void HantekDsoControl::enableSampling(bool enabled) {
 
 const USBDevice *HantekDsoControl::getDevice() const { return device; }
 
-const DSOsamples &HantekDsoControl::getLastSamples() { return result; }
+// const DSOsamples &HantekDsoControl::getLastSamples() { return result; }
 
 
 HantekDsoControl::HantekDsoControl(USBDevice *device)
@@ -69,7 +69,7 @@ HantekDsoControl::~HantekDsoControl() {
     }
 }
 
-
+#if 0
 unsigned HantekDsoControl::getChannelCount() const { return specification->channels; }
 
 
@@ -95,6 +95,7 @@ double HantekDsoControl::getMaxSamplerate() const {
         return specification->samplerate.single.max;
     }
 }
+#endif
 
 
 bool HantekDsoControl::isSampling() const { return sampling; }
@@ -832,6 +833,7 @@ void HantekDsoControl::run() {
 }
 
 
+#if 0
 int HantekDsoControl::getConnectionSpeed() const {
     int errorCode;
     ControlGetSpeed response;
@@ -855,3 +857,4 @@ int HantekDsoControl::getPacketSize() const {
         return s;
     return 0;
 }
+#endif
diff --git a/openhantek/src/hantekdso/hantekdsocontrol.h b/openhantek/src/hantekdso/hantekdsocontrol.h
@@ -38,7 +38,7 @@ class HantekDsoControl : public QObject {
      * if run() is called.
      * @param device The usb device. This object does not take ownership.
      */
-    HantekDsoControl(USBDevice *device);
+    explicit HantekDsoControl( USBDevice *device );
 
     /// \brief Cleans up
     ~HantekDsoControl();
@@ -49,6 +49,7 @@ class HantekDsoControl : public QObject {
     /// there.
     void run();
 
+#if 0
     /// \brief Gets the physical channel count for this oscilloscope.
     /// \return The number of physical channels.
     unsigned getChannelCount() const;
@@ -68,6 +69,7 @@ class HantekDsoControl : public QObject {
     /// \brief Get maximum samplerate for this oscilloscope.
     /// \return The maximum samplerate for the current configuration in S/s.
     double getMaxSamplerate() const;
+#endif
 
     double getSamplerate() const;
 
@@ -78,6 +80,7 @@ class HantekDsoControl : public QObject {
     /// Return the associated usb device.
     const USBDevice *getDevice() const;
 
+#if 0
     /// \brief Gets the speed of the connection.
     /// \return The ::ConnectionSpeed of the USB connection.
     int getConnectionSpeed() const;
@@ -88,6 +91,7 @@ class HantekDsoControl : public QObject {
 
     /// Return the last sample set
     const DSOsamples &getLastSamples();
+#endif
 
     /// \brief Sends control commands directly.
     /// <p>

diff --git a/openhantek/src/hantekprotocol/controlStructs.cpp b/openhantek/src/hantekprotocol/controlStructs.cpp
@@ -17,7 +17,7 @@ ControlBeginCommand::ControlBeginCommand(CommandIndex index)
 
 ControlGetSpeed::ControlGetSpeed() : ControlCommand(Hantek::ControlCode::CONTROL_GETSPEED, 10) { }
 
-ConnectionSpeed ControlGetSpeed::getSpeed() { return (ConnectionSpeed)data()[0]; }
+// ConnectionSpeed ControlGetSpeed::getSpeed() { return (ConnectionSpeed)data()[0]; }
 
 
 ControlSetVoltDIV_CH1::ControlSetVoltDIV_CH1() : ControlCommand(ControlCode::CONTROL_SETVOLTDIV_CH1, 1) {

diff --git a/openhantek/src/hantekprotocol/controlStructs.h b/openhantek/src/hantekprotocol/controlStructs.h
@@ -28,7 +28,7 @@ class ControlBeginCommand : public ControlCommand {
   public:
     /// \brief Sets the command index to the given value.
     /// \param index The CommandIndex for the command.
-    ControlBeginCommand(CommandIndex index = COMMANDINDEX_0);
+    explicit ControlBeginCommand( CommandIndex index = COMMANDINDEX_0 );
 };
 
 /// \brief The CONTROL_GETSPEED parser.
@@ -37,7 +37,7 @@ class ControlGetSpeed : public ControlCommand {
     ControlGetSpeed();
     /// \brief Gets the speed of the connection.
     /// \return The speed level of the USB connection.
-    ConnectionSpeed getSpeed();
+//     ConnectionSpeed getSpeed();
 };
 
 struct ControlSetVoltDIV_CH1 : public ControlCommand {

diff --git a/openhantek/src/post/mathchannelgenerator.cpp b/openhantek/src/post/mathchannelgenerator.cpp
@@ -19,7 +19,6 @@ void MathChannelGenerator::process(PPresult *result) {
     DataChannel *const channelData = result->modifyData(physicalChannels);
     std::vector<double> &resultData = channelData->voltage.sample;
 
-    unsigned src = 0;
     const double sign = scope->voltage[physicalChannels].inverted ? -1.0 : 1.0;
 
     if ( Dso::getMathMode( scope->voltage[physicalChannels] ) < Dso::MathMode::AC_CH1 ) { // binary operations
@@ -56,6 +55,7 @@ void MathChannelGenerator::process(PPresult *result) {
             *it = sign * calculate( *ch1Iterator++, *ch2Iterator++ );
         }
     } else { // unary operators (calculate "AC coupling")
+        unsigned src = 0;
         if ( Dso::getMathMode( scope->voltage[physicalChannels] ) == Dso::MathMode::AC_CH1 )
             src = 0;
         else if ( Dso::getMathMode( scope->voltage[physicalChannels] ) == Dso::MathMode::AC_CH2 )

diff --git a/openhantek/src/post/postprocessing.h b/openhantek/src/post/postprocessing.h
@@ -21,7 +21,7 @@ class PostProcessing : public QObject {
     Q_OBJECT
 
   public:
-    PostProcessing(unsigned channelCount);
+    explicit PostProcessing( unsigned channelCount );
     /**
      * Adds a new processor that is called when a new input arrived. The order of the processors is
      * imporant. The first added processor will be called first. This class does not take ownership

diff --git a/openhantek/src/post/postprocessingsettings.cpp b/openhantek/src/post/postprocessingsettings.cpp
@@ -28,6 +28,8 @@ QString mathModeString(MathMode mode) {
     }
     return QString();
 }
+
+#if 0
 /// \brief Return string representation of the given dft window function.
 /// \param window The ::WindowFunction that should be returned as string.
 /// \return The string that should be used in labels etc.
@@ -66,4 +68,6 @@ QString windowFunctionString(WindowFunction window) {
     }
     return QString();
 }
+#endif
+
 }
diff --git a/openhantek/src/post/postprocessingsettings.h b/openhantek/src/post/postprocessingsettings.h
@@ -36,7 +36,7 @@ enum class WindowFunction : int {
 extern Enum<Dso::WindowFunction, Dso::WindowFunction::RECTANGULAR, Dso::WindowFunction::FLATTOP> WindowFunctionEnum;
 
 QString mathModeString(MathMode mode);
-QString windowFunctionString(WindowFunction window);
+// QString windowFunctionString(WindowFunction window);
 }
 
 Q_DECLARE_METATYPE(Dso::MathMode)

diff --git a/openhantek/src/post/ppresult.h b/openhantek/src/post/ppresult.h
@@ -35,7 +35,7 @@ typedef std::vector<ChannelGraph> ChannelsGraphs;
 /// Post processing results
 class PPresult {
   public:
-    PPresult(unsigned int channelCount);
+    explicit PPresult(unsigned int channelCount);
 
     /// \brief Returns the analyzed data.
     /// \param channel Channel, whose data should be returned.

diff --git a/openhantek/src/post/spectrumgenerator.cpp b/openhantek/src/post/spectrumgenerator.cpp
@@ -84,9 +84,8 @@ void SpectrumGenerator::process(PPresult *result) {
                 break;
             case Dso::WindowFunction::GAUSS: {
                 const double sigma = 0.5;
-                double w;
                 for (unsigned int windowPosition = 0; windowPosition < lastRecordLength; ++windowPosition) {
-                    w = ( (double)windowPosition - lastRecordLength / 2.0 ) / ( sigma * lastRecordLength / 2.0 );
+                    double w = ( (double)windowPosition - lastRecordLength / 2.0 ) / ( sigma * lastRecordLength / 2.0 );
                     w *= w;
                     weight += *(lastWindowBuffer + windowPosition) = exp( -w );
                 }

diff --git a/openhantek/src/selectdevice/devicelistentry.h b/openhantek/src/selectdevice/devicelistentry.h
@@ -10,8 +10,8 @@
 struct DeviceListEntry {
     UniqueUSBid id;
     QString name;
-    bool canConnect;
-    bool needFirmware;
+    bool canConnect = false;
+    bool needFirmware = false;
     QString errorMessage;
     QString getStatus() const {
         return errorMessage.size()? errorMessage : (canConnect?"Ready":(needFirmware?"Firmware upload":"Cannot connect"));

diff --git a/openhantek/src/selectdevice/deviceslistmodel.h b/openhantek/src/selectdevice/deviceslistmodel.h
@@ -12,7 +12,7 @@ class FindDevices;
  */
 class DevicesListModel: public QAbstractTableModel {
 public:
-    DevicesListModel(FindDevices* findDevices);
+    explicit DevicesListModel( FindDevices* findDevices );
     // QAbstractItemModel interface
     int rowCount(const QModelIndex &parent) const override;
     int columnCount(const QModelIndex &parent) const override;

diff --git a/openhantek/src/selectdevice/newdevicemodelfromexisting.cpp b/openhantek/src/selectdevice/newdevicemodelfromexisting.cpp
@@ -61,6 +61,7 @@ NewDeviceModelFromExisting::NewDeviceModelFromExisting(QWidget *parent) :
     }
 }
 
+#if 0
 void NewDeviceModelFromExisting::setUSBcontext(libusb_context *context)
 {
     this->context = context;
@@ -70,6 +71,7 @@ RawDeviceListEntry *NewDeviceModelFromExisting::getSelectedEntry()
 {
     return (RawDeviceListEntry*) ui->cmbUSBdevices->currentData(RawDevicesListModel::EntryPointerRole).value<void*>();
 }
+#endif
 
 void NewDeviceModelFromExisting::accept()
 {

diff --git a/openhantek/src/selectdevice/newdevicemodelfromexisting.h b/openhantek/src/selectdevice/newdevicemodelfromexisting.h
@@ -18,8 +18,8 @@ class NewDeviceModelFromExisting : public QDialog
 
 public:
     explicit NewDeviceModelFromExisting(QWidget *parent = 0);
-    void setUSBcontext(libusb_context* context);
-    RawDeviceListEntry* getSelectedEntry();
+//     void setUSBcontext(libusb_context* context);
+//     RawDeviceListEntry* getSelectedEntry();
 private:
     std::unique_ptr<Ui::NewDeviceModelFromExisting> ui;
     libusb_context* context = nullptr;

diff --git a/openhantek/src/selectdevice/selectsupporteddevice.cpp b/openhantek/src/selectdevice/selectsupporteddevice.cpp
@@ -17,7 +17,9 @@ SelectSupportedDevice::SelectSupportedDevice( QWidget *parent ) :
     QDialog( parent ), ui( new Ui::SelectSupportedDevice )
 {
     ui->setupUi(this);
+#ifdef NEW_DEVICE_FROM_EXISTING_DIALOG
     newDeviceFromExistingDialog = new NewDeviceModelFromExisting(this);
+#endif
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     qRegisterMetaType<UniqueUSBid>("UniqueUSBid");
     connect(ui->buttonBox, &QDialogButtonBox::accepted, [this]() {
@@ -29,15 +31,18 @@ SelectSupportedDevice::SelectSupportedDevice( QWidget *parent ) :
     connect(ui->buttonBox, &QDialogButtonBox::helpRequested, [this]() {
         QDesktopServices::openUrl(QUrl("https://github.com/OpenHantek/OpenHantek6022"));
     });
+#ifdef NEW_DEVICE_FROM_EXISTING_DIALOG
     connect(ui->btnAddDevice, &QPushButton::clicked, [this]() {
         newDeviceFromExistingDialog->setModal(true);
         newDeviceFromExistingDialog->show();
     });
+#endif
+
 }
 
 std::unique_ptr<USBDevice> SelectSupportedDevice::showSelectDeviceModal(libusb_context *context)
 {
-    newDeviceFromExistingDialog->setUSBcontext(context);
+//     newDeviceFromExistingDialog->setUSBcontext(context);
     std::unique_ptr<FindDevices> findDevices = std::unique_ptr<FindDevices>(new FindDevices(context));
     std::unique_ptr<DevicesListModel> model = std::unique_ptr<DevicesListModel>(new DevicesListModel(findDevices.get()));
     ui->cmbDevices->setModel(model.get());
@@ -114,7 +119,9 @@ std::unique_ptr<USBDevice> SelectSupportedDevice::showSelectDeviceModal(libusb_c
 void SelectSupportedDevice::showLibUSBFailedDialogModel(int error)
 {
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+#ifdef NEW_DEVICE_FROM_EXISTING_DIALOG
     ui->btnAddDevice->setEnabled(false);
+#endif
     ui->labelReadyState->setText(tr("Can't initalize USB: %1").arg(libUsbErrorString(error)));
     show();
     QCoreApplication::instance()->exec();

diff --git a/openhantek/src/selectdevice/selectsupporteddevice.h b/openhantek/src/selectdevice/selectsupporteddevice.h
@@ -11,6 +11,9 @@
 struct libusb_context;
 class NewDeviceModelFromExisting;
 
+// define if this tab is also designed in "selectsupporteddevice.ui"
+// #define NEW_DEVICE_FROM_EXISTING_DIALOG
+
 /**
  * Offers the user a device selection dialog. If you call any of the -Modal methods,
  * the method will block and show a dialog for selection or for a usb error
@@ -32,5 +35,7 @@ class SelectSupportedDevice : public QDialog
     void updateSupportedDevices();
     std::unique_ptr<Ui::SelectSupportedDevice> ui;
     UniqueUSBid selectedDevice = 0;
+#ifdef NEW_DEVICE_FROM_EXISTING_DIALOG
     NewDeviceModelFromExisting* newDeviceFromExistingDialog;
+#endif
 };