From 1de478f461dd1d890cef480d60b357d0a1ccf5d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Mal=C3=BD?= Date: Sat, 7 Dec 2013 20:42:28 +0100 Subject: [PATCH] Allow bypassing of sanity checks of FFB effect parameters. --- FFBChecker.pro | 6 ++- ffbconditioneffect.cpp | 117 +++++++++++++++++++++-------------------- ffbconstanteffect.cpp | 32 +++++++---- ffbeffect.cpp | 4 ++ ffbperiodiceffect.cpp | 73 +++++++++++++------------ ffbrampeffect.cpp | 44 +++++++++------- globalsettings.cpp | 25 +++++++++ globalsettings.h | 17 ++++++ main.cpp | 19 +++++++ mainwindow.cpp | 4 ++ mainwindow.ui | 19 +++++++ 11 files changed, 237 insertions(+), 123 deletions(-) create mode 100644 globalsettings.cpp create mode 100644 globalsettings.h diff --git a/FFBChecker.pro b/FFBChecker.pro index 5556cd3..b55c41a 100644 --- a/FFBChecker.pro +++ b/FFBChecker.pro @@ -34,7 +34,8 @@ SOURCES += main.cpp\ ffbconditioneffect.cpp \ rampeffectsettings.cpp \ ffbrampeffectparameters.cpp \ - ffbrampeffect.cpp + ffbrampeffect.cpp \ + globalsettings.cpp HEADERS += mainwindow.h \ deviceprober.h \ @@ -59,7 +60,8 @@ HEADERS += mainwindow.h \ ffbconditioneffect.h \ rampeffectsettings.h \ ffbrampeffectparameters.h \ - ffbrampeffect.h + ffbrampeffect.h \ + globalsettings.h FORMS += mainwindow.ui \ constanteffectsettings.ui \ diff --git a/ffbconditioneffect.cpp b/ffbconditioneffect.cpp index b6cce69..a0dbf4f 100644 --- a/ffbconditioneffect.cpp +++ b/ffbconditioneffect.cpp @@ -1,4 +1,5 @@ #include "ffbconditioneffect.h" +#include "globalsettings.h" FFBConditionEffect::FFBConditionEffect() : FFBEffect(FFBEffectTypes::CONDITION) @@ -61,63 +62,65 @@ bool FFBConditionEffect::setParameters(const std::shared_ptrcenter[FFBConditionEffectParameters::Axis::X], -0x7FFF, 0x7FFF)) { - reportError("Center X out of bounds,"); - return false; - } - if (!checkBoundsInclusive(params->center[FFBConditionEffectParameters::Axis::Y], -0x7FFF, 0x7FFF)) { - reportError("Center Y out of bounds,"); - return false; - } - - if (!checkBoundsInclusive(params->deadband[FFBConditionEffectParameters::Axis::X], 0, 0xFFFF)) { - reportError("Deadband X out of bounds."); - return false; - } - if (!checkBoundsInclusive(params->deadband[FFBConditionEffectParameters::Axis::Y], 0, 0xFFFF)) { - reportError("Deadband Y out of bounds."); - return false; - } - - if (!checkBoundsInclusive(params->leftCoeff[FFBConditionEffectParameters::Axis::X], -0x7FFF, 0x7FFF)) { - reportError("Left coefficient X out of bounds."); - return false; - } - if (!checkBoundsInclusive(params->leftCoeff[FFBConditionEffectParameters::Axis::Y], -0x7FFF, 0x7FFF)) { - reportError("Left coefficient Y out of bounds."); - return false; - } - - if (!checkBoundsInclusive(params->rightCoeff[FFBConditionEffectParameters::Axis::X], -0x7FFF, 0x7FFF)) { - reportError("Right coefficient X out of bounds."); - return false; - } - if (!checkBoundsInclusive(params->rightCoeff[FFBConditionEffectParameters::Axis::Y], -0x7FFF, 0x7FFF)) { - reportError("Right coefficient Y out of bounds."); - return false; - } - - if (!checkBoundsInclusive(params->leftSat[FFBConditionEffectParameters::Axis::X], 0, 0xFFFF)) { - reportError("Left saturation X out of bounds."); - return false; - } - if (!checkBoundsInclusive(params->leftSat[FFBConditionEffectParameters::Axis::Y], 0, 0xFFFF)) { - reportError("Left saturation Y out of bounds."); - return false; - } - - if (!checkBoundsInclusive(params->rightSat[FFBConditionEffectParameters::Axis::X], 0, 0xFFFF)) { - reportError("Right saturation X out of bounds."); - return false; - } - if (!checkBoundsInclusive(params->rightSat[FFBConditionEffectParameters::Axis::Y], 0, 0xFFFF)) { - reportError("Right saturation Y out of bounds."); - return false; - } - - if (params->subtype == ConditionSubtypes::NONE) { - reportError("Invalid subtype"); - return false; + if (GlobalSettings::GS()->doSanityChecks) { + if (!checkBoundsInclusive(params->center[FFBConditionEffectParameters::Axis::X], -0x7FFF, 0x7FFF)) { + reportError("Center X out of bounds,"); + return false; + } + if (!checkBoundsInclusive(params->center[FFBConditionEffectParameters::Axis::Y], -0x7FFF, 0x7FFF)) { + reportError("Center Y out of bounds,"); + return false; + } + + if (!checkBoundsInclusive(params->deadband[FFBConditionEffectParameters::Axis::X], 0, 0xFFFF)) { + reportError("Deadband X out of bounds."); + return false; + } + if (!checkBoundsInclusive(params->deadband[FFBConditionEffectParameters::Axis::Y], 0, 0xFFFF)) { + reportError("Deadband Y out of bounds."); + return false; + } + + if (!checkBoundsInclusive(params->leftCoeff[FFBConditionEffectParameters::Axis::X], -0x7FFF, 0x7FFF)) { + reportError("Left coefficient X out of bounds."); + return false; + } + if (!checkBoundsInclusive(params->leftCoeff[FFBConditionEffectParameters::Axis::Y], -0x7FFF, 0x7FFF)) { + reportError("Left coefficient Y out of bounds."); + return false; + } + + if (!checkBoundsInclusive(params->rightCoeff[FFBConditionEffectParameters::Axis::X], -0x7FFF, 0x7FFF)) { + reportError("Right coefficient X out of bounds."); + return false; + } + if (!checkBoundsInclusive(params->rightCoeff[FFBConditionEffectParameters::Axis::Y], -0x7FFF, 0x7FFF)) { + reportError("Right coefficient Y out of bounds."); + return false; + } + + if (!checkBoundsInclusive(params->leftSat[FFBConditionEffectParameters::Axis::X], 0, 0xFFFF)) { + reportError("Left saturation X out of bounds."); + return false; + } + if (!checkBoundsInclusive(params->leftSat[FFBConditionEffectParameters::Axis::Y], 0, 0xFFFF)) { + reportError("Left saturation Y out of bounds."); + return false; + } + + if (!checkBoundsInclusive(params->rightSat[FFBConditionEffectParameters::Axis::X], 0, 0xFFFF)) { + reportError("Right saturation X out of bounds."); + return false; + } + if (!checkBoundsInclusive(params->rightSat[FFBConditionEffectParameters::Axis::Y], 0, 0xFFFF)) { + reportError("Right saturation Y out of bounds."); + return false; + } + + if (params->subtype == ConditionSubtypes::NONE) { + reportError("Invalid subtype"); + return false; + } } m_params = params; diff --git a/ffbconstanteffect.cpp b/ffbconstanteffect.cpp index e713009..c9616b4 100644 --- a/ffbconstanteffect.cpp +++ b/ffbconstanteffect.cpp @@ -1,4 +1,5 @@ #include "ffbconstanteffect.h" +#include "globalsettings.h" FFBConstantEffect::FFBConstantEffect() : FFBEffect(FFBEffectTypes::CONSTANT) @@ -37,18 +38,27 @@ bool FFBConstantEffect::setParameters(const std::shared_ptrattackLength, 0, 0xFFFF)) - return false; - if (!checkBoundsInclusive(params->attackLevel, 0, 0xFFFF)) - return false; - if (!checkBoundsInclusive(params->fadeLevel, 0, 0xFFFF)) - return false; - if (!checkBoundsInclusive(params->fadeLevel, 0, 0xFFFF)) - return false; + if (GlobalSettings::GS()->doSanityChecks) { + if (!checkBoundsInclusive(params->attackLength, 0, 0xFFFF)){ + reportError("Attack length out of bounds"); + return false; + } + if (!checkBoundsInclusive(params->attackLevel, 0, 0xFFFF)) { + reportError("Attack level out of bounds"); + return false; + } if (!checkBoundsInclusive(params->fadeLength, 0, 0xFFFF)) { + reportError("Fade length out of bounds"); + return false; + } + if (!checkBoundsInclusive(params->fadeLevel, 0, 0xFFFF)) { + reportError("Fade level out of bounds"); + return false; + } - if (!checkBoundsInclusive(params->level, -0x7FFF, 0x7FFF)) { - reportError("Level out of bounds."); - return false; + if (!checkBoundsInclusive(params->level, -0x7FFF, 0x7FFF)) { + reportError("Level out of bounds."); + return false; + } } m_params = params; diff --git a/ffbeffect.cpp b/ffbeffect.cpp index e0493fc..98a49b8 100644 --- a/ffbeffect.cpp +++ b/ffbeffect.cpp @@ -1,4 +1,5 @@ #include "ffbeffect.h" +#include "globalsettings.h" #include FFBEffect::FFBEffect(FFBEffectTypes type) @@ -28,6 +29,9 @@ void FFBEffect::reportError(const QString& errorMsg) const bool FFBEffect::checkGenericParameters(const std::shared_ptr params) { + if (!GlobalSettings::GS()->doSanityChecks) + return true; + if (!checkBoundsInclusive(params->direction, 0, 0xFFFF)) { reportError("Direction out of bounds."); return false; diff --git a/ffbperiodiceffect.cpp b/ffbperiodiceffect.cpp index 62898df..c9ff718 100644 --- a/ffbperiodiceffect.cpp +++ b/ffbperiodiceffect.cpp @@ -1,4 +1,5 @@ #include "ffbperiodiceffect.h" +#include "globalsettings.h" #include FFBPeriodicEffect::FFBPeriodicEffect() : @@ -62,49 +63,51 @@ bool FFBPeriodicEffect::setParameters(const std::shared_ptrattackLength, 0, 0xFFFF)) { - reportError("Attack length out of bounds."); - return false; - } + if (GlobalSettings::GS()->doSanityChecks) { + if (!checkBoundsInclusive(params->attackLength, 0, 0xFFFF)) { + reportError("Attack length out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->attackLevel, 0, 0xFFFF)) { - reportError("Attack level out of bounds."); - return false; - } + if (!checkBoundsInclusive(params->attackLevel, 0, 0xFFFF)) { + reportError("Attack level out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->fadeLength, 0, 0xFFFF)) { - reportError("Fade length out of bounds."); - return false; - } + if (!checkBoundsInclusive(params->fadeLength, 0, 0xFFFF)) { + reportError("Fade length out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->fadeLevel, 0, 0xFFFF)) { - reportError("Fade level out of bounds."); - return false; - } + if (!checkBoundsInclusive(params->fadeLevel, 0, 0xFFFF)) { + reportError("Fade level out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->magnitude, -0x7FFF, 0x7FFF)) { - reportError("Magnitude out of bounds."); - return false; - } + if (!checkBoundsInclusive(params->magnitude, -0x7FFF, 0x7FFF)) { + reportError("Magnitude out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->offset, -0x7FFF, 0x7FFF)) { - reportError("Offset out of bounds."); - return false; - } + if (!checkBoundsInclusive(params->offset, -0x7FFF, 0x7FFF)) { + reportError("Offset out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->period, 0, 0xFFFF)) { - reportError("Period out of bounds."); - return false; - } + if (!checkBoundsInclusive(params->period, 0, 0xFFFF)) { + reportError("Period out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->phase, 0, 0xFFFF)) { - reportError("Phase out of bounds."); - return false; - } + if (!checkBoundsInclusive(params->phase, 0, 0xFFFF)) { + reportError("Phase out of bounds."); + return false; + } - if (params->waveform == PeriodicWaveforms::NONE) { - reportError("Invalid waveform type."); - return false; + if (params->waveform == PeriodicWaveforms::NONE) { + reportError("Invalid waveform type."); + return false; + } } m_params = params; diff --git a/ffbrampeffect.cpp b/ffbrampeffect.cpp index 54d19f7..97c3afe 100644 --- a/ffbrampeffect.cpp +++ b/ffbrampeffect.cpp @@ -1,4 +1,5 @@ #include "ffbrampeffect.h" +#include "globalsettings.h" FFBRampEffect::FFBRampEffect() : FFBEffect(FFBEffectTypes::RAMP) @@ -40,29 +41,36 @@ bool FFBRampEffect::setParameters(const std::shared_ptr if (!checkGenericParameters(params)) return false; - if (!checkBoundsInclusive(params->attackLength, 0, 0xFFFF)) { - reportError("Attack length out of bounds."); - return false; - } + if (GlobalSettings::GS()->doSanityChecks) { + if (!checkBoundsInclusive(params->attackLength, 0, 0xFFFF)) { + reportError("Attack length out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->attackLevel, 0, 0xFFFF)) { - reportError("Attack level out of bounds."); - return false; - } + if (!checkBoundsInclusive(params->attackLevel, 0, 0xFFFF)) { + reportError("Attack level out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->fadeLength, 0, 0xFFFF)) { - reportError("Fade length out of bounds."); - return false; - } + if (!checkBoundsInclusive(params->fadeLength, 0, 0xFFFF)) { + reportError("Fade length out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->endLevel, -0x7FFF, 0x7FFF)) { - reportError("End level out of bounds"); - return false; - } + if (!checkBoundsInclusive(params->fadeLevel, 0, 0xFFFF)) { + reportError("Fade level out of bounds."); + return false; + } - if (!checkBoundsInclusive(params->startLevel, -0x7FFF, 0x7FFF)) { - reportError("Start level out of bounds"); + if (!checkBoundsInclusive(params->endLevel, -0x7FFF, 0x7FFF)) { + reportError("End level out of bounds"); return false; + } + + if (!checkBoundsInclusive(params->startLevel, -0x7FFF, 0x7FFF)) { + reportError("Start level out of bounds"); + return false; + } } m_params = params; diff --git a/globalsettings.cpp b/globalsettings.cpp new file mode 100644 index 0000000..6fe3eea --- /dev/null +++ b/globalsettings.cpp @@ -0,0 +1,25 @@ +#include "globalsettings.h" + +GlobalSettings* GlobalSettings::s_instance(nullptr); + +void GlobalSettings::init(bool doSanityChecks) +{ + if (s_instance == nullptr) { + s_instance = new GlobalSettings; + + s_instance->doSanityChecks = doSanityChecks; + } +} + +const GlobalSettings* GlobalSettings::GS() { + return s_instance; +} + +GlobalSettings::GlobalSettings() +{} + +GlobalSettings::~GlobalSettings() +{ + delete s_instance; + s_instance = nullptr; +} diff --git a/globalsettings.h b/globalsettings.h new file mode 100644 index 0000000..08c98b1 --- /dev/null +++ b/globalsettings.h @@ -0,0 +1,17 @@ +#ifndef GLOBALSETTINGS_H +#define GLOBALSETTINGS_H + +class GlobalSettings { +public: + static void init(bool doSanityChecks); + static const GlobalSettings* GS(); + explicit GlobalSettings(); + ~GlobalSettings(); + + bool doSanityChecks; + +private: + static GlobalSettings* s_instance; +}; + +#endif // GLOBALSETTINGS_H diff --git a/main.cpp b/main.cpp index 4d8e1fa..e1a8b8b 100644 --- a/main.cpp +++ b/main.cpp @@ -1,12 +1,31 @@ #include "deviceprober.h" +#include "globalsettings.h" #include "mainwindow.h" #include +#include + +const QString NO_CHECKS_ARG("--no-checks"); + int main(int argc, char** argv) { QApplication myApp(argc, argv); const QString VERSION_STRING = QString(APP_NAME) + " " + QString::number(APP_VERSION_MAJOR) + "." + QString::number(APP_VERSION_MINOR) + QString(APP_VERSION_REL); + + /* Setup global settings */ + { + bool doSanityChecks; + QStringList cmdArgs = QCoreApplication::arguments(); + if (cmdArgs.contains(NO_CHECKS_ARG)) { + doSanityChecks = false; + qDebug() << "Disabling effect parameters sanity checks"; + } else + doSanityChecks = true; + + GlobalSettings::init(doSanityChecks); + } + std::shared_ptr prober(new DeviceProber); MainWindow* mWin = new MainWindow(prober, VERSION_STRING); diff --git a/mainwindow.cpp b/mainwindow.cpp index d7d84bd..f5ae49c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,3 +1,4 @@ +#include "globalsettings.h" #include "mainwindow.h" #include "ui_mainwindow.h" #include @@ -26,6 +27,9 @@ MainWindow::MainWindow(std::shared_ptr prober, const QString& titl ui->qstw_effectSpecifics->addWidget(m_periodicEffSet); ui->qstw_effectSpecifics->addWidget(m_rampEffSet); + if (GlobalSettings::GS()->doSanityChecks) + ui->ql_noChecksWarning->setHidden(true); + fillDeviceList(); connect(ui->cbox_devices, SIGNAL(activated(const QString&)), this, SLOT(onDeviceSelected(const QString&))); connect(ui->cbox_effectSlots, SIGNAL(activated(const int)), this, SLOT(onEffectSlotSelected(const int))); diff --git a/mainwindow.ui b/mainwindow.ui index 7183eae..2292c7f 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -208,6 +208,25 @@ + + + + + 0 + 0 + + + + WARNING: Sanity checks disabled! + + + Qt::PlainText + + + Qt::AlignCenter + + + -- 2.43.5