Probe depend params api modified.

developHw.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2024-12-14T13:52:16. -->
+<!-- Written by QtCreator 4.10.0, 2024-12-14T16:32:40. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

hdf5Scenario/hdf5Scenario.cpp

@@ -988,13 +988,10 @@ void Hdf5::scenarioRead(ScenHardware& scenParams)
     /**************** /registerParameters/hvb *****************/
     datasetBranch<float_t>("/registerParameters/hvb", floatArray);
     scenParams.hvb = floatArray[0];
-}
 
-void Hdf5::prbDependParamsRead(ScenPrbDepHardwareParam& prbDepParams)
-{
     /**************** /registerParameters/apodizationLut ********************/
     datasetBranch<float_t>("/registerParameters/apodizationLut", floatArray);
-    prbDepParams.prbDepParams.apodizationLut.clear();
+    scenParams.apodizationLut.clear();
     QList<quint32> tempApodization;
 
     for(quint32 i = 0; i < 4; i++)
@@ -1004,7 +1001,7 @@ void Hdf5::prbDependParamsRead(ScenPrbDepHardwareParam& prbDepParams)
         {
             tempApodization.push_back(static_cast<quint32>(floatArray[j + i * 3057]));
         }
-        prbDepParams.prbDepParams.apodizationLut.push_back(tempApodization);
+        scenParams.apodizationLut.push_back(tempApodization);
     }
 
     /************ /registerParameters/aTgcParameters/aTgcLut ****************/
@@ -1036,15 +1033,17 @@ void Hdf5::prbDependParamsRead(ScenPrbDepHardwareParam& prbDepParams)
     }
 
     /************** /registerParameters/aTgcParameters/aTgc ******************/
-    prbDepParams.prbDepParams.atgcLut.clear();
+    scenParams.atgcLut.clear();
     for(qint8 i = 0; i < 4; i++)
     {
         Atgc atgcObj;
         atgcObj.clear();
         atgcObj.atgcLut = atgcLut.at(i);
         atgcObj.atgcCompensateLut = atgcCompensationLut.at(i);
-        prbDepParams.prbDepParams.atgcLut.push_back(atgcObj);
+        scenParams.atgcLut.push_back(atgcObj);
     }
+
+
 }
 
 QVector<quint32> Hdf5::stbRead()

hdf5Scenario/hdf5Scenario.h

@@ -26,7 +26,6 @@ public:
     void hdf5Path (const string &h5Path);
 
     void scenarioRead (ScenHardware &scenParams);
-    void prbDependParamsRead (ScenPrbDepHardwareParam &prbDepParams);
 
     QVector<quint32> stbRead (void);
     QVector<float> lineFilterRead (void);

include/model/hardware/core/lowLevelApi/TrxBoard.h

@@ -147,6 +147,9 @@ private:
 		quint32 scenarioStartIndex;
 		quint32 scenarioEndIndex;
 
+        QList<Atgc> atgcLut;
+        QList<QList<quint32> > apodizationLut;
+
         ScenHwRegister* hwRegister;
 		SramIndex* indexParams;
 		SramRx* rxParams;

include/model/hardware/core/lowLevelApi/TrxBoardUtils/PreProcessorDef.h

@@ -2,6 +2,6 @@
 #define PREPROCESSORDEF_H
 
 #define MPS_BOARD
-#define DEVELOP_UI
+//#define DEVELOP_UI
 
 #endif //PREPROCESSORDEF_H

include/model/hardware/core/lowLevelApi/TrxBoardUtils/TrxBoardStructures.h

@@ -60,16 +60,9 @@ struct ConnectedPrbInfo
     QByteArray prbD;
 };
 
-struct ScenPrbDepHwRegister
-{
-    QList<Atgc> atgcLut;
-    QList<QList<quint32> > apodizationLut;
-};
-
 struct ScenPrbDepHardwareParam
 {
     AfeConfig afeCfg;
-    ScenPrbDepHwRegister prbDepParams;
 };
 
 struct Pulse
@@ -233,6 +226,9 @@ struct ScenHardware
     quint8 frameType;
     float hva, hvb;
 
+    QList<Atgc> atgcLut;
+    QList<QList<quint32> > apodizationLut;
+
     HwRegister hwRegister;
     HwSramIndex indexParams;
     HwSramRx rxParams;

mainwindow.cpp

@@ -3078,7 +3078,6 @@ void MainWindow::setScenario(const QString& h5Path)
         hdf.hdf5Path(h5Path.toStdString());
 
         hdf.scenarioRead(scenParams);
-        hdf.prbDependParamsRead(prbDepParams);
         prbDepParams.afeCfg = afeConfigObj;
 
         stbLut = hdf.stbRead();

src/model/hardware/core/lowLevelApi/TrxBoard.cpp

@@ -652,25 +652,9 @@ void TrxBoard::mcsRead(const QString path) const
 
 void TrxBoard::setProbeDependParams(ScenPrbDepHardwareParam& prbDepParams)
 {
-    /////////////////////////// DSP setting ///////////////////////////
-    if(prbDepParams.prbDepParams.apodizationLut.size() != APODIZATIONLUT_LUT_MAX)
-    {
-        throw HardwareException(SCN_ERROR, "Apodization lut is out of range.");
-    }
-    this->_beamFormerSlave0->apodizationLut(prbDepParams.prbDepParams.apodizationLut);
-    this->_beamFormerSlave1->apodizationLut(prbDepParams.prbDepParams.apodizationLut);
-    this->_beamFormerSlave2->apodizationLut(prbDepParams.prbDepParams.apodizationLut);
-    scenParamsFilling(set);
-
-    if(prbDepParams.prbDepParams.atgcLut.size() != ATGC_LUT_MAX)
-    {
-        throw HardwareException(SCN_ERROR, "Atgc lut is out of range.");
-    }
-    this->_dsp->atgcLut(prbDepParams.prbDepParams.atgcLut);
-
     /////////////////////////// AFE setting ///////////////////////////
     setAfeConfig(prbDepParams.afeCfg);
-    setAfesPwr(afePwrdnEnable);
+//    setAfesPwr(afePwrdnEnable);
 //    setAfesFastPwr(afePwrdnEnable);
 }
 
@@ -970,6 +954,18 @@ void TrxBoard::setScenario(ScenHardware& scenGenHw)
     _scenParams->rxParams->rxR0CenterActiveElementNumber =
 		scenGenHw.rxParams.rxR0CenterActiveElementNumber;
 
+    if(scenGenHw.apodizationLut.size() != APODIZATIONLUT_LUT_MAX)
+    {
+        throw HardwareException(SCN_ERROR, "Apodization lut is out of range.");
+    }
+    _scenParams->apodizationLut = scenGenHw.apodizationLut;
+
+    if(scenGenHw.atgcLut.size() != ATGC_LUT_MAX)
+    {
+        throw HardwareException(SCN_ERROR, "Atgc lut is out of range.");
+    }
+    _scenParams->atgcLut = scenGenHw.atgcLut;
+
     this->setScenario(_scenParams);
 }
 
@@ -1152,6 +1148,13 @@ void TrxBoard::setScenario (ScenGenHardwareParam* _scenParams)
 
     this->_dsp->dualPathWeight(_scenParams->hwRegister->dualPathWeight);
 
+    this->_beamFormerSlave0->apodizationLut(_scenParams->apodizationLut);
+    this->_beamFormerSlave1->apodizationLut(_scenParams->apodizationLut);
+    this->_beamFormerSlave2->apodizationLut(_scenParams->apodizationLut);
+    scenParamsFilling(set);
+
+    this->_dsp->atgcLut(_scenParams->atgcLut);
+
 	///////////////////////////////// Sram setting ///////////////////////////////
     this->_sram->setSramIndex(_scenParams->totalTxShotNumber, _scenParams->indexParams);