同步了bug修复

BaseCommonLibrary/BaseTool/EchoDataFormat.cpp

@@ -432,12 +432,10 @@ ErrorCode EchoL0Dataset::loadFromXml() {
         if (xmlReader.isStartElement()) {
             QString elementName = xmlReader.name().toString();
             if (elementName == "BandWidth") {
-                this->bandwidth = xmlReader.readElementText().toLong();
+                this->bandwidth = xmlReader.readElementText().toDouble();
-                PluseCountflag = true;
             }
             else if (elementName == "PluseCount") {
                 this->PluseCount = xmlReader.readElementText().toLong();
-                PluseCountflag = true;
             }
             else if (elementName == "PlusePoints") {
                 this->PlusePoints = xmlReader.readElementText().toLong();

BaseCommonLibrary/BaseTool/SARSimulationImageL1.cpp

@@ -955,6 +955,15 @@ void SARSimulationImageL1Dataset::setLatitudeBottomRight(double value) { latitud
 double SARSimulationImageL1Dataset::getLongitudeBottomRight()   { return longitude_bottomRight; }
 void SARSimulationImageL1Dataset::setLongitudeBottomRight(double value) { longitude_bottomRight = value; }
 
+double SARSimulationImageL1Dataset::getdrange() { return this->dr; }
+void SARSimulationImageL1Dataset::setdrange(double idr) { this->dr = idr; }
+
+double SARSimulationImageL1Dataset::getdAz() { return this->dAz; }
+void SARSimulationImageL1Dataset::setdAz(double idAz) { this->dAz = idAz; }
+
+
+
+
 DemBox SARSimulationImageL1Dataset::getExtend()
 {
     double minlon = 0, maxlon = 0;

BaseCommonLibrary/BaseTool/SARSimulationImageL1.h

@@ -195,5 +195,16 @@ public:
 	void setLongitudeBottomRight(double value);
 public:
 	DemBox getExtend();
+
+
+public:
+	double getdrange();
+	void setdrange(double dr);
+
+	double getdAz();
+	void setdAz(double dAz);
+private:
+	double dr, dAz;
+
 };
 

Toolbox/SimulationSARTool/SimulationSAR/QSimulationBPImage.ui

@@ -45,7 +45,7 @@
          </size>
         </property>
         <property name="text">
-         <string>D:\Programme\vs2022\RasterMergeTest\LAMPCAE_SCANE\GF3_Simulation.xml</string>
+         <string>D:\Programme\vs2022\RasterMergeTest\LAMPCAE_SCANE-all-scane\GF3_Simulation.xml</string>
         </property>
        </widget>
       </item>
@@ -96,7 +96,7 @@
          </size>
         </property>
         <property name="text">
-         <string>D:\Programme\vs2022\RasterMergeTest\LAMPCAE_SCANE_TBPImage\GF3BPImage</string>
+         <string>D:\Programme\vs2022\RasterMergeTest\LAMPCAE_SCANE-all-scane\BPImage\GF3BPImage</string>
         </property>
        </widget>
       </item>

Toolbox/SimulationSARTool/SimulationSAR/TBPImageAlgCls.cpp

@@ -110,7 +110,7 @@ void CreatePixelXYZ(std::shared_ptr<EchoL0Dataset> echoL0ds, QString outPixelXYZ
 		xyzRaster.saveImage(demy, 0, startcolidx, 2);
 		xyzRaster.saveImage(demz, 0, startcolidx, 3);
 	}
-
+	
 }
 
 void TBPImageProcess(QString echofile, QString outImageFolder, QString imagePlanePath,long num_thread)
@@ -243,6 +243,7 @@ ErrorCode TBPImageAlgCls::ProcessGPU()
 	qDebug() << "colCount:\t" << colCount;
 	qDebug() << "PRFCount:\t" << PRFCount;
 	qDebug() << "PlusePoints:\t" << PlusePoints;
+	qDebug() << "bandwidth:\t" << bandwidth;
 	
 	// 反方向计算起始相位
 	
@@ -250,7 +251,7 @@ ErrorCode TBPImageAlgCls::ProcessGPU()
 	double startfreq = freq - bandwidth / 2;
 	
 	double startlamda = LIGHTSPEED / startfreq;
-
+	qDebug() << "deltaF:\t" << deltaF;
 
 
 	std::shared_ptr<double>  Pxs (new double[this->L0ds->getPluseCount()]);
@@ -274,9 +275,13 @@ ErrorCode TBPImageAlgCls::ProcessGPU()
 		}
 		antpos.reset();
 	}
+
+
+
+
 	// 计算成像的基本参数
 	// 距离向分辨率
-	double dr = LIGHTSPEED / 2.0 / (PRFCount * deltaF);
+	double dr = sqrt(pow(Pxs.get()[2]- Pxs.get()[1],2)+pow(Pys.get()[2] - Pys.get()[1],2)+pow(Pzs.get()[2] - Pzs.get()[1],2));
 	qDebug() << "-------  resolution ----------------------------------";
 	qDebug() << "Range Resolution (m):\t" << dx ;
 	qDebug() << "Cross Resolution (m):\t" << dr;