diff --git a/developHw.pro.user b/developHw.pro.user index d91df48..572f438 100644 --- a/developHw.pro.user +++ b/developHw.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/include/model/hardware/core/lowLevelApi/register/Register.h b/include/model/hardware/core/lowLevelApi/register/Register.h index a04ed59..b9ff1ac 100644 --- a/include/model/hardware/core/lowLevelApi/register/Register.h +++ b/include/model/hardware/core/lowLevelApi/register/Register.h @@ -3,6 +3,7 @@ #include "model/hardware/core/lowLevelApi/register/Field.h" #include "model/hardware/device/SonoDevice.h" +#include "QDebug" class Register { diff --git a/include/model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.h b/include/model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.h index 8b2a43c..fb748ba 100644 --- a/include/model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.h +++ b/include/model/hardware/core/lowLevelApi/register/beamFormer/BeamFormer.h @@ -16,7 +16,7 @@ #include "registerDefinition/PulseLut.h" #include "registerDefinition/AfeLut.h" -#define APODIZATION_PARAMS_OFFSET 0x8 +#define APODIZATION_PARAMS_OFFSET 0x20 #define ELEMENT_POSITION_OFFSET 0x400 #define APODIZATION_OFFSET 0x4000 diff --git a/include/model/scenarioGenerator/core/general/Calculation.h b/include/model/scenarioGenerator/core/general/Calculation.h index 6bf134c..d6d0983 100644 --- a/include/model/scenarioGenerator/core/general/Calculation.h +++ b/include/model/scenarioGenerator/core/general/Calculation.h @@ -46,9 +46,9 @@ public: QList shotWeight); static QVector qntzr(QVector data, - quint32 sign, - quint32 wordlength, - quint32 fractionalLength, + float sign, + float wordlength, + float fractionalLength, float maxLevel, bool integerOutput, bool useRound = true, diff --git a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp index 989c707..841c1c1 100644 --- a/src/model/hardware/core/lowLevelApi/TrxBoard.cpp +++ b/src/model/hardware/core/lowLevelApi/TrxBoard.cpp @@ -760,6 +760,7 @@ void TrxBoard::setScenario(ScenGenHardwareOutput_t& scenGenHw) { throw SonoException("Apodization parameters is out of range"); } + _scenParams->hwRegister->apodizationParams.clear(); foreach(auto temp, scenGenHw.hwRegister.apodizationParams) { diff --git a/src/model/scenarioGenerator/core/general/Calculation.cpp b/src/model/scenarioGenerator/core/general/Calculation.cpp index d056d62..55692b9 100644 --- a/src/model/scenarioGenerator/core/general/Calculation.cpp +++ b/src/model/scenarioGenerator/core/general/Calculation.cpp @@ -274,9 +274,9 @@ QVector > Calculation::blendCoeff(ScenGenUserParameters_t input, */ /*************************************************************************************************/ QVector Calculation::qntzr(QVector data, - quint32 sign, - quint32 wordLength, - quint32 fractionalLength, + float sign, + float wordLength, + float fractionalLength, float maxLevel, bool integerOutput, bool useRound,