同步修改

Toolbox/SimulationSARTool/SARImage/ImageNetOperator.cpp

@@ -480,11 +480,11 @@ void InterploateClipAtiByRefDEM(QString ImageLLPath, QString& ImageDEMPath, QStr
 
 	gdalImage outimgll = CreategdalImageDouble(outImageLLAPath, RowCount, ColCount, 4, true, true); // 经度、纬度、高程、斜距
 
-	long imgheight = outimgll.height;
+	imgheight = outimgll.height;
-	long imgwidth = outimgll.width;
+	imgwidth = outimgll.width;
 
-	Eigen::MatrixXd imglonArr = imgll.getData(minRow, minCol, RowCount, ColCount, 1);
+	imglonArr = imgll.getData(minRow, minCol, RowCount, ColCount, 1);
-	Eigen::MatrixXd imglatArr = imgll.getData(minRow, minCol, RowCount, ColCount, 2);
+	imglatArr = imgll.getData(minRow, minCol, RowCount, ColCount, 2);
 
 	Eigen::MatrixXd demArr = demimg.getData(0, 0, demimg.height, demimg.width, 1);
 
@@ -784,7 +784,16 @@ int  ReflectTable_WGS2Range(QString dem_rc_path,QString outOriSimTiffPath,QStrin
 
 
 
-
+int ResampleEChoDataFromGeoEcho(QString L2echodataPath, QString RangeLooktablePath, QString L1AEchoDataPath) {
+	gdalImageComplex echodata(L2echodataPath);
+	gdalImage looktable(RangeLooktablePath);
+ 
+
+
+
+
+
+}
 
 
 

Toolbox/SimulationSARTool/SARImage/ImageNetOperator.h

@@ -14,4 +14,7 @@ bool GPSPointsNumberEqualCheck(QString& ImageLLPath, QString& InEchoGPSDataPath)
 void InterploateClipAtiByRefDEM(QString ImageLLPath, QString& ImageDEMPath, QString& outImageLLAPath, QString& InEchoGPSDataPath);
 void InterploateAtiByRefDEM(QString& ImageLLPath, QString& ImageDEMPath, QString& outImageLLAPath, QString& InEchoGPSDataPath);
 int  ReflectTable_WGS2Range(QString dem_rc_path, QString outOriSimTiffPath, QString ori_sim_count_tiffPath, long OriHeight, long OriWidth);
+
+int ResampleEChoDataFromGeoEcho(QString L2echodataPath, QString RangeLooktablePath, QString L1AEchoDataPath);
+
 #endif

Toolbox/SimulationSARTool/SARImage/QSARSimulationComplexEchoDataDialog.cpp

@@ -0,0 +1,100 @@
+#include "QSARSimulationComplexEchoDataDialog.h"
+#include "ui_QSARSimulationComplexEchoDataDialog.h"
+#include <QFileDialog>		
+#include <QMessageBox>
+#include "BaseConstVariable.h"
+#include "BaseTool.h"
+#include "ImageNetOperator.h"
+#include <QDebug>
+
+
+QSARSimulationComplexEchoDataDialog::QSARSimulationComplexEchoDataDialog(QWidget *parent)
+	: QDialog(parent)
+	, ui(new Ui::QSARSimulationComplexEchoDataDialogClass)
+{
+	ui->setupUi(this);
+
+
+	connect(ui->pushButtonEchoDataSelect, SIGNAL(clicked()), this, SLOT(onpushButtonEchoDataSelect_clicked()));
+	connect(ui->pushButtonLookTableSelect, SIGNAL(clicked()), this, SLOT(onpushButtonLookTableSelect_clicked()));
+	connect(ui->pushButtonL1AEchoDataSelect, SIGNAL(clicked()), this, SLOT(onpushButtonL1AEchoDataSelect_clicked()));
+	connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(onbuttonBox_accepted()));
+	connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(onbuttonBox_rejected()));
+
+}
+
+QSARSimulationComplexEchoDataDialog::~QSARSimulationComplexEchoDataDialog()
+{
+
+
+}
+
+void QSARSimulationComplexEchoDataDialog::onpushButtonEchoDataSelect_clicked()
+{
+	QString  fileNames = QFileDialog::getOpenFileName(
+		this,                            // 父窗口
+		tr(u8"选择L1A回波数据文件"),               // 标题
+		QString(),                       // 默认路径
+		tr(ENVI_FILE_FORMAT_FILTER)  // 文件过滤器
+	);
+	// 如果用户选择了文件
+	if (!fileNames.isEmpty()) {
+		QString message = "选择的文件有：\n";
+		this->ui->lineEditL1AEchoDataPath->setText(fileNames);
+	}
+	else {
+		QMessageBox::information(this, tr(u8"没有选择文件"), tr(u8"没有选择任何文件。"));
+	}
+}
+
+void QSARSimulationComplexEchoDataDialog::onpushButtonLookTableSelect_clicked()
+{
+	QString  fileNames = QFileDialog::getOpenFileName(
+		this,                            // 父窗口
+		tr(u8"选择L1A回波数据文件"),               // 标题
+		QString(),                       // 默认路径
+		tr(ENVI_FILE_FORMAT_FILTER)  // 文件过滤器
+	);
+	// 如果用户选择了文件
+	if (!fileNames.isEmpty()) {
+		QString message = "选择的文件有：\n";
+		this->ui->lineEditL1AEchoDataPath->setText(fileNames);
+	}
+	else {
+		QMessageBox::information(this, tr(u8"没有选择文件"), tr(u8"没有选择任何文件。"));
+	}
+}
+
+void QSARSimulationComplexEchoDataDialog::onpushButtonL1AEchoDataSelect_clicked()
+{
+	QString  fileNames = QFileDialog::getSaveFileName(
+		this,                            // 父窗口
+		tr(u8"选择L1A回波数据文件"),               // 标题
+		QString(),                       // 默认路径
+		tr(ENVI_FILE_FORMAT_FILTER)  // 文件过滤器
+	);
+	// 如果用户选择了文件
+	if (!fileNames.isEmpty()) {
+		QString message = "选择的文件有：\n";
+		this->ui->lineEditL1AEchoDataPath->setText(fileNames);
+	}
+	else {
+		QMessageBox::information(this, tr(u8"没有选择文件"), tr(u8"没有选择任何文件。"));
+	}
+}
+
+void QSARSimulationComplexEchoDataDialog::onbuttonBox_accepted()
+{
+	QString echoDataPath = this->ui->lineEditEchoDataPath->text().trimmed();
+	QString RangelookTablePath = this->ui->lineEditLookTablePath->text().trimmed();
+	QString l1AEchoDataPath = this->ui->lineEditL1AEchoDataPath->text().trimmed();
+
+
+
+
+}
+
+void QSARSimulationComplexEchoDataDialog::onbuttonBox_rejected()
+{
+	this->close();
+}

Toolbox/SimulationSARTool/SARImage/QSARSimulationComplexEchoDataDialog.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <QDialog>
+
+namespace Ui
+{
+	class QSARSimulationComplexEchoDataDialogClass;	
+}
+
+class QSARSimulationComplexEchoDataDialog : public QDialog
+{
+	Q_OBJECT
+
+public:
+	QSARSimulationComplexEchoDataDialog(QWidget *parent = nullptr);
+	~QSARSimulationComplexEchoDataDialog();
+
+
+public slots:
+	void onpushButtonEchoDataSelect_clicked();
+	void onpushButtonLookTableSelect_clicked();
+	void onpushButtonL1AEchoDataSelect_clicked();
+	void onbuttonBox_accepted();
+	void onbuttonBox_rejected();
+private:
+	Ui::QSARSimulationComplexEchoDataDialogClass* ui;
+};

Toolbox/SimulationSARTool/SARImage/QSARSimulationComplexEchoDataDialog.ui

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QSARSimulationComplexEchoDataDialogClass</class>
+ <widget class="QDialog" name="QSARSimulationComplexEchoDataDialogClass">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>916</width>
+    <height>400</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>QSARSimulationComplexEchoDataDialog</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_4">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>成像文件：</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="lineEditEchoDataPath">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QPushButton" name="pushButtonEchoDataSelect">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>选择</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>查找表：</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="lineEditLookTablePath">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="pushButtonLookTableSelect">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>选择</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>L1A回波：</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="lineEditL1AEchoDataPath">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QPushButton" name="pushButtonL1AEchoDataSelect">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>选择</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>

Toolbox/SimulationSARTool/SimulationSARTool.vcxproj

@@ -219,6 +219,7 @@
     <ClCompile Include="SARImage\ImagePlaneAtiInterpDialog.cpp" />
     <ClCompile Include="SARImage\InitCreateImageXYZDialog.cpp" />
     <ClCompile Include="SARImage\QCreateInSARImagePlaneXYZRDialog.cpp" />
+    <ClCompile Include="SARImage\QSARSimulationComplexEchoDataDialog.cpp" />
     <ClCompile Include="SimulationSAR\QEcoherentAndAdditive.cpp" />
     <ClCompile Include="SimulationSAR\QImageSARRFPC.cpp" />
     <ClCompile Include="SimulationSAR\QSARLookTableSimualtionGUI.cpp" />
@@ -250,6 +251,7 @@
     <ClInclude Include="SARImage\ImageNetOperator.h" />
     <QtMoc Include="SARImage\ImagePlaneAtiInterpDialog.h" />
     <QtMoc Include="SARImage\QCreateInSARImagePlaneXYZRDialog.h" />
+    <QtMoc Include="SARImage\QSARSimulationComplexEchoDataDialog.h" />
     <ClInclude Include="SimulationSARToolAPI.h" />
     <ClInclude Include="simulationsartool_global.h" />
     <QtMoc Include="SimulationSAR\QImageSARRFPC.h" />
@@ -289,6 +291,7 @@
     <QtUic Include="SARImage\ImagePlaneAtiInterpDialog.ui" />
     <QtUic Include="SARImage\InitCreateImageXYZDialog.ui" />
     <QtUic Include="SARImage\QCreateInSARImagePlaneXYZRDialog.ui" />
+    <QtUic Include="SARImage\QSARSimulationComplexEchoDataDialog.ui" />
     <QtUic Include="SimulationSAR\QEcoherentAndAdditive.ui" />
     <QtUic Include="SimulationSAR\QImageSARRFPC.ui" />
     <QtUic Include="SimulationSAR\QSARLookTableSimualtionGUI.ui" />

Toolbox/SimulationSARTool/SimulationSARTool.vcxproj.filters

@@ -80,9 +80,6 @@
     <ClInclude Include="SARImage\GPUBPImageNet.cuh">
       <Filter>SARImage</Filter>
     </ClInclude>
-    <ClInclude Include="PowerSimulationIncoherent\QLookTableResampleFromWGS84ToRange.h">
-      <Filter>PowerSimulationIncoherent</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SimulationSAR\QImageSARRFPC.cpp">
@@ -154,6 +151,9 @@
     <ClCompile Include="PowerSimulationIncoherent\QLookTableResampleFromWGS84ToRange.cpp">
       <Filter>PowerSimulationIncoherent</Filter>
     </ClCompile>
+    <ClCompile Include="SARImage\QSARSimulationComplexEchoDataDialog.cpp">
+      <Filter>SARImage</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtUic Include="SimulationSAR\QImageSARRFPC.ui">
@@ -198,6 +198,9 @@
     <QtUic Include="PowerSimulationIncoherent\QLookTableResampleFromWGS84ToRange.ui">
       <Filter>PowerSimulationIncoherent</Filter>
     </QtUic>
+    <QtUic Include="SARImage\QSARSimulationComplexEchoDataDialog.ui">
+      <Filter>SARImage</Filter>
+    </QtUic>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="SimulationSAR\QImageSARRFPC.h">
@@ -242,6 +245,12 @@
     <QtMoc Include="SimulationSAR\QEcoherentAndAdditive.h">
       <Filter>Header Files</Filter>
     </QtMoc>
+    <QtMoc Include="PowerSimulationIncoherent\QLookTableResampleFromWGS84ToRange.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
+    <QtMoc Include="SARImage\QSARSimulationComplexEchoDataDialog.h">
+      <Filter>SARImage</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <CudaCompile Include="SimulationSAR\GPURFPC.cu">