Scan conversion image pixel scale is modified.

developHw.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2024-04-27T11:45:16. -->
+<!-- Written by QtCreator 4.10.0, 2024-04-28T14:15:55. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

hdf5Scenario/hdf5Scenario.cpp

@@ -1071,8 +1071,8 @@ void Hdf5::scanConversionParamsRead(scanConversionParameters &params)
     datasetBranch<float_t>("/swScenarioParameters/scanConversionParameters/rxLineDAz", floatArray);
     params.dx = (floatArray[0]);
 
-    /*** /swScenarioParameters/scanConversionParameters/rxPointDAx ***/
+    /*** /frameParameters/rxPointDAx ***/
-    datasetBranch<float_t>("/swScenarioParameters/scanConversionParameters/rxPointDAx", floatArray);
+    datasetBranch<float_t>("/frameParameters/rxPointDAx", floatArray);
     params.dz = (floatArray[0]);
 
     /*** /swScenarioParameters/scanConversionParameters/rxLineNo ***/
@@ -1081,9 +1081,8 @@ void Hdf5::scanConversionParamsRead(scanConversionParameters &params)
                                                                                                    //width
     params.gridX_size = static_cast<quint32>(floatArray[0]);
 
-    /*** /swScenarioParameters/scanConversionParameters/rxFocusPointNo ***/
+    /*** /frameParameters/rxFocusPointNo ***/
-    datasetBranch<float_t>("/swScenarioParameters/scanConversionParameters/rxFocusPointNo",
+    datasetBranch<float_t>("/frameParameters/rxFocusPointNo", floatArray);                        //input
-                           floatArray);                                                           //input
                                                                                                   //frame
                                                                                                   //depth
     params.gridZ_size = static_cast<quint32>(floatArray[0]);
@@ -1099,7 +1098,7 @@ void Hdf5::scanConversionParamsRead(scanConversionParameters &params)
     params.gridX = gridX;
 
     /*** /swScenarioParameters/scanConversionParameters/scanAx ***/
-    datasetBranch<float_t>("/swScenarioParameters/scanConversionParameters/scanAx", floatArray);
+    datasetBranch<float_t>("/swScenarioParameters/scanConversionParameters/scanAxPreResample", floatArray);
     QList<float> gridZ;
 
     for(quint32 j = 0; j < params.gridZ_size; j++)

mainwindow.cpp

@@ -2248,13 +2248,21 @@ void MainWindow::show3d()
 
         if(_isScanConvDynamicCont)
         {
-            _colorMap->data()->setSize(static_cast<qint32>(scanConversionParams.pixelXNo),
+//_colorMap->data()->setSize(static_cast<qint32>(scanConversionParams.pixelXNo),
-                                       static_cast<qint32>(scanConversionParams.pixelZNo + 1));
+//static_cast<qint32>(scanConversionParams.pixelZNo + 1));
-            _colorMap->data()->setRange(QCPRange(1,
+//_colorMap->data()->setRange(QCPRange(1,
-                                                 static_cast<qint32>(scanConversionParams.pixelXNo)),
+//static_cast<qint32>(scanConversionParams.pixelXNo)),
-                                        QCPRange(1,
+//QCPRange(1,
-                                                 static_cast<qint32>(scanConversionParams.pixelZNo +
+//static_cast<qint32>(scanConversionParams.pixelZNo +
-                                                                     1)));
+//1)));
+            _colorMap->data()->setSize(903, 552);
+            _colorMap->data()->setRange(QCPRange(1, 903), QCPRange(1, 552));
+            quint32 offset = 0;
+            if(903 > scanConversionParams.pixelXNo)
+            {
+                offset = (903 - scanConversionParams.pixelXNo) / 2;
+            }
+
             for(quint32 ln = 0; ln < scanConversionParams.pixelXNo; ln += 1)
             {
                 for(quint32 pnt = 0; pnt < scanConversionParams.pixelZNo + 1; pnt += 1)
@@ -2318,7 +2326,7 @@ void MainWindow::show3d()
                     {
                         scanValue = 255;
                     }
-                    _colorMap->data()->setCell(static_cast<qint32>(ln),
+                    _colorMap->data()->setCell(static_cast<qint32>(ln + offset),
                                                static_cast<qint32>(scanConversionParams.pixelZNo -
                                                                    pnt),
                                                static_cast<double>(scanValue));