diff --git a/src/MainWidgets/DialogVTKTransform.cpp b/src/MainWidgets/DialogVTKTransform.cpp
index e9e9da1..e53c215 100644
--- a/src/MainWidgets/DialogVTKTransform.cpp
+++ b/src/MainWidgets/DialogVTKTransform.cpp
@@ -58,8 +58,12 @@ void MainWidget::DialogVTKTransform::accept()
 		return;
 
 	QString componentIds, rotate, moveLocation, scale;
-	for (auto component : _components)
+	for (auto component : _components) {
 		componentIds.append(QString(",%1").arg(component->getID()));
+		qDebug()<<"generateDisplayDataSet "<< component->getID();
+		meshData->getMeshSetByID(component->getID())->generateDisplayDataSet();
+	}
+
 	componentIds.remove(0, 1);
 
 	rotate.append(_ui->rotateAngleDSB->text() + ",");
@@ -75,6 +79,8 @@ void MainWidget::DialogVTKTransform::accept()
 	moveLocation = _ui->directionXDSB->text() + ',' + _ui->directionYDSB->text() + ',' + _ui->directionZDSB->text();
 	scale = _ui->scaleXDSB->text() + ',' + _ui->scaleYDSB->text() + ',' + _ui->scaleZDSB->text();
 
+
+
 	QString code = QString("MainWindow.createVTKTransform(\"%1\",\"%2\",\"%3\",\"%4\")").arg(componentIds).arg(rotate).arg(moveLocation).arg(scale);
 	Py::PythonAgent::getInstance()->submit(code);
 	QFDialog::accept();
diff --git a/src/MainWindow/MainWindow.cpp b/src/MainWindow/MainWindow.cpp
index e818873..3e4b978 100644
--- a/src/MainWindow/MainWindow.cpp
+++ b/src/MainWindow/MainWindow.cpp
@@ -616,6 +616,16 @@ namespace GUI {
 		}
 	}
 
+	void MainWindow::importMesh(QString fileName,QString aSuffix,int modelID){
+		if(fileName.isEmpty())
+			return;
+		QString pyCode = QString("MainWindow.importMesh(\"%1\",\"%2\",%3)")
+							 .arg(fileName)
+							 .arg(aSuffix)
+							 .arg(modelID);
+		Py::PythonAgent::getInstance()->submit(pyCode);
+	}
+
 	void MainWindow::on_importMesh()
 	{
 		QStringList suffixlist = IO::IOConfigure::getMeshImporters();
@@ -665,6 +675,17 @@ namespace GUI {
 		Py::PythonAgent::getInstance()->submit(pyCode);
 	}
 
+
+	void MainWindow::importPcl(QString fileName,QString aSuffix,int modelID){
+		if(fileName.isEmpty())
+			return;
+		QString pyCode = QString("MainWindow.importPcl(\"%1\",\"%2\",%3)")
+							 .arg(fileName)
+							 .arg(aSuffix)
+							 .arg(modelID);
+		Py::PythonAgent::getInstance()->submit(pyCode);
+	}
+
 	void MainWindow::on_importPcl()
 	{
 		QStringList suffixlist = IO::IOConfigure::getPclImporters();
diff --git a/src/MainWindow/MainWindow.h b/src/MainWindow/MainWindow.h
index 5724abb..1334951 100644
--- a/src/MainWindow/MainWindow.h
+++ b/src/MainWindow/MainWindow.h
@@ -153,6 +153,12 @@ namespace GUI {
 		// Ribbon Customize
 		SARibbonActionsManager*			 getActionManager();
 
+		// 导入mesh
+		void importMesh(QString filepath,QString aSuffix,int modelID);
+		/// 导入点云
+		void importPcl(QString filepath,QString aSuffix,int modelID);
+
+
 	signals:
 		/*更新注册接口*/
 		void updateInterfaces();
@@ -473,6 +479,11 @@ namespace GUI {
 		//
 		void setPostAnimationToolBar(bool ribbon);
 
+		// 关闭未开发完功能，将来准备适配的功能，包括三维结构渲染，影像处理模块
+
+
+
+
 	private:
 		/**
 		 * @brief ui
diff --git a/src/PluginMeshDataExchange/CMakeLists.txt b/src/PluginMeshDataExchange/CMakeLists.txt
index 126a6be..38bb6d9 100644
--- a/src/PluginMeshDataExchange/CMakeLists.txt
+++ b/src/PluginMeshDataExchange/CMakeLists.txt
@@ -119,6 +119,7 @@ list(APPEND _runtimes_libraries
 		VTK::CommonColor VTK::CommonComputationalGeometry VTK::CommonCore VTK::CommonDataModel VTK::CommonExecutionModel VTK::CommonMath VTK::CommonMisc VTK::CommonSystem VTK::CommonTransforms VTK::DICOMParser VTK::FiltersCore VTK::FiltersGeneral VTK::FiltersGeometry VTK::FiltersHybrid VTK::FiltersModeling VTK::FiltersSources VTK::IOCore VTK::IOChemistry VTK::IOGeometry VTK::IOImage VTK::IOLegacy VTK::ImagingCore VTK::ImagingSources VTK::RenderingCore VTK::RenderingLOD VTK::doubleconversion VTK::jpeg VTK::jsoncpp VTK::lz4 VTK::lzma VTK::metaio VTK::png VTK::pugixml VTK::sys VTK::tiff VTK::zlib
 )
 
+
 #-----------------------------------------------------------------------------
 # 链接依赖库
 #-----------------------------------------------------------------------------
@@ -126,6 +127,10 @@ target_link_libraries(PluginMeshDataExchange PRIVATE
 	${_runtimes_libraries}
 	${_depend_library}
 	${PCL_LIBRARIES}
+		unofficial::sqlite3::sqlite3
+		GDAL::GDAL
+		FFTW3::fftw3
+		GSL::gsl GSL::gslcblas
 )
 
 #-----------------------------------------------------------------------------
diff --git a/src/PluginMeshDataExchange/VTKdataExchange.cpp b/src/PluginMeshDataExchange/VTKdataExchange.cpp
index 4b982c1..9dcc779 100644
--- a/src/PluginMeshDataExchange/VTKdataExchange.cpp
+++ b/src/PluginMeshDataExchange/VTKdataExchange.cpp
@@ -14,7 +14,7 @@
 #include <QFileInfo>
 #include <QTextCodec>
 #include <vtkSTLWriter.h>
-
+#include <vtkGeometryFilter.h>
 
 namespace MeshData
 {
@@ -136,7 +136,7 @@ namespace MeshData
 		QString name = info.fileName();
 		QString path = info.filePath();
 		QString suffix = info.suffix().toLower();
-
+		qDebug()<<"suffix : "<<suffix;
 		if (suffix == "vtk")
 		{
 			return writeVTK();
@@ -160,11 +160,13 @@ namespace MeshData
 		{
 		case MESH_READ:
 			emit showInformation(tr("Import VTK Mesh File From \"%1\"").arg(_fileName));
+			qDebug()<<"Import VTK Mesh File From "<<_fileName;
 			result = read();
 			setReadResult(result);
 			break;
 		case MESH_WRITE:
 			emit showInformation(tr("Export VTK Mesh File To \"%1\"").arg(_fileName));
+			qDebug()<<"Export VTK Mesh File To "<<_fileName;
 			result = write();
 			setWriteResult(result);
 			break;
@@ -214,9 +216,10 @@ namespace MeshData
 	}
 	bool VTKdataExchange::writeSTL()
 	{
+
 		QTextCodec *codec = QTextCodec::codecForName("GB18030");
 		QByteArray ba = codec->fromUnicode(_fileName);
-		vtkUnstructuredGrid *ungird = vtkUnstructuredGrid::New();
+
 		vtkSmartPointer<vtkAppendFilter> filter = vtkSmartPointer<vtkAppendFilter>::New();
 		if (_modelId > 0)
 		{
@@ -245,12 +248,35 @@ namespace MeshData
 			}
 		}
 		filter->Update();
+		vtkUnstructuredGrid *ungird = vtkUnstructuredGrid::New();
 		ungird->CopyStructure(filter->GetOutput());
+
+		vtkSmartPointer<vtkGeometryFilter> geometryFilter = vtkSmartPointer<vtkGeometryFilter>::New();
+		geometryFilter->SetInputData(ungird); // Set input data
+
+		// Perform the conversion to vtkPolyData
+		geometryFilter->Update();
+
+		// Get the output (vtkPolyData)
+		vtkPolyData* polyData = geometryFilter->GetOutput();
+		vtkDataSet* dataset =vtkDataSet::SafeDownCast(polyData); // 默认完成 vtkpolydata --> vtkdataset
+
+
+		qDebug()<<"cell count !!! : "<<dataset->GetNumberOfCells();
 		vtkSmartPointer<vtkSTLWriter> writer = vtkSmartPointer<vtkSTLWriter>::New();
-		writer->SetInputData(ungird);
+		writer->SetInputData(dataset);
 		writer->SetFileTypeToBinary();
 		writer->SetFileName(ba);
 		writer->Write();
+
+		QFile file(ba);
+		if(file.exists()){
+			qDebug()<<"file  exists !!! : "<< ba;
+		}else{
+			qDebug()<<"file not exists !!! : "<< ba;
+		}
+
+		qDebug()<<"writer stl sucessfully !!! : "<< ba;
 		return true;
 	}
 	bool VTKdataExchange::writeTecplot()
diff --git a/src/PluginMeshDataExchange/meshDataExchangePlugin.cpp b/src/PluginMeshDataExchange/meshDataExchangePlugin.cpp
index f8e96dd..a9ecd08 100644
--- a/src/PluginMeshDataExchange/meshDataExchangePlugin.cpp
+++ b/src/PluginMeshDataExchange/meshDataExchangePlugin.cpp
@@ -180,6 +180,7 @@ bool VTK_DAT_STL_importMesh(QString AbFileName, int modelId)
 
 bool VTK_DAT_STL_exportMesh(QString AbFileName, int modelId)
 {
+	qDebug()<<"VTK_DAT_STL_exportMesh  stl sucessfully !!! : "<<AbFileName;
 	auto VTK_DAT_STL_writer = new MeshData::VTKdataExchange(
 		AbFileName, MeshData::MESH_WRITE, MeshData::MeshDataExchangePlugin::getMWpt(), modelId);
 	ModuleBase::ThreadControl* tc = new ModuleBase::ThreadControl(VTK_DAT_STL_writer);
diff --git a/src/PluginMeshDataExchange/meshDataExchangePlugin.h b/src/PluginMeshDataExchange/meshDataExchangePlugin.h
index d91dd74..2de6abd 100644
--- a/src/PluginMeshDataExchange/meshDataExchangePlugin.h
+++ b/src/PluginMeshDataExchange/meshDataExchangePlugin.h
@@ -3,7 +3,7 @@
 
 #include "meshDataExchangePluginAPI.h"
 #include "PluginManager/pluginBase.h"
-
+#include <QDebug>
 namespace MeshData
 {
 	enum MeshOperation
diff --git a/src/PluginWBFZExchangePlugin/AllHead.cpp b/src/PluginWBFZExchangePlugin/AllHead.cpp
index 79a8cea..1c15b46 100644
--- a/src/PluginWBFZExchangePlugin/AllHead.cpp
+++ b/src/PluginWBFZExchangePlugin/AllHead.cpp
@@ -22,7 +22,7 @@
 QString   getOpenFilePath(QWidget* parent, const QString& caption, const QString& filter)
 {
     QSettings* setting = getQSetting();
-    QString curpath = u8".";
+    QString curpath = Setting::BusAPI::instance()->getWorkingDir();
     if (setting->contains("FileSelectPath")) {
         curpath = setting->value("FileSelectPath").toString();
     }
@@ -41,7 +41,7 @@ QString   getOpenFilePath(QWidget* parent, const QString& caption, const QString
 QString   getSaveFilePath(QWidget* parent, const QString& caption, const QString& filter)
 {
     QSettings* setting = getQSetting();
-    QString curpath = u8".";
+    QString curpath =  Setting::BusAPI::instance()->getWorkingDir();
     if (setting->contains("FileSelectPath")) {
         curpath = setting->value("FileSelectPath").toString();
     }
@@ -59,6 +59,7 @@ QString   getSaveFilePath(QWidget* parent, const QString& caption, const QString
 bool AddOrRemoveScatterAntModel(GUI::MainWindow* _mainWindows, Geometry::GeometryData* _geoData,
 							   Geometry::GeometrySet* set, bool flag)
 {
+	return false;
 	if(_mainWindows==nullptr || _geoData==nullptr|| set== nullptr){
 		return false;
 	}else{}
@@ -73,6 +74,7 @@ bool AddOrRemoveScatterAntModel(GUI::MainWindow* _mainWindows, Geometry::Geometr
 	}
 	else {
  		int id=Geometry::GeometryData::getInstance()->getIndexByGeoometrySet(set);
+		if(id<0){return true;}
 		//auto				   geo = Geometry::GeometryData::getInstance()->getGeometrySetByID(set);
 		Geometry::GeometryData::getInstance()->removeGeometrySet(id);
 		emit _mainWindows->updateActionStatesSig();
diff --git a/src/PluginWBFZExchangePlugin/AllHead.h b/src/PluginWBFZExchangePlugin/AllHead.h
index 0bf2166..ee6190c 100644
--- a/src/PluginWBFZExchangePlugin/AllHead.h
+++ b/src/PluginWBFZExchangePlugin/AllHead.h
@@ -316,6 +316,10 @@
 #include "WBFZExchangePluginAPI.h"
 
 
+//==============
+// LAMPCAE
+//=============
+#include "Settings/BusAPI.h"
 
 enum TaskStatusEnum {
 	wait,
@@ -353,7 +357,7 @@ class QObject;
 //=======================================================
 //  常用基础函数
 //======================================================= ]
-  QSettings*   getQSetting();
+QSettings*   getQSetting();
 
 QString   getOpenFilePath(QWidget* parent = nullptr,	const QString& caption = QString(),	const QString& filter = QString());
 
diff --git a/src/PluginWBFZExchangePlugin/DialogPCLGPMesh.cpp b/src/PluginWBFZExchangePlugin/DialogPCLGPMesh.cpp
index cfd8b98..90a6f62 100644
--- a/src/PluginWBFZExchangePlugin/DialogPCLGPMesh.cpp
+++ b/src/PluginWBFZExchangePlugin/DialogPCLGPMesh.cpp
@@ -159,8 +159,8 @@ namespace MainWidget {
 								MaximumSurfaceAngle, MaximumAngle, MinimumAngle);
 		ModuleBase::ThreadControl* tc = new ModuleBase::ThreadControl(pclremesh);
 		emit					   tc->threadStart(); // emit MSHwriter->start();
-
-		QFDialog::accept();
+		qDebug() << "wait for run GP";
+		//QFDialog::accept();
 	}
 
 	void DialogPCLGPMesh::selectedComponentsSlot(QList<MeshData::MeshSet*> components)
@@ -226,23 +226,14 @@ namespace WBFZ {
 			ModuleBase::Message msg;
 			if(_operation == POINTCLOUD_FILTER || _operation == POINTCLOUD_MESH) {
 				if(_success) {
-					emit _mainwindow->updateMeshTreeSig();
-					emit _mainwindow->updateSetTreeSig();
-					emit _mainwindow->updateActionStatesSig();
-					//					emit _mainwindow->updateActionsStatesSig();
-					emit _mainwindow->getSubWindowManager()->openPreWindowSig();
-					emit _mainwindow->updatePreMeshActorSig();
-					information = QString("Successful Import Mesh From \"%1\"").arg(_fileName);
-					msg.type	= Common::Message::Normal;
-					msg.message = information;
-					auto	  meshdata = MeshData::MeshData::getInstance();
-					//					meshdata->generateDisplayDataSet();
-					const int nk	   = meshdata->getKernalCount();
-					if(nk <= 0)
-						return;
-					auto k = meshdata->getKernalAt(nk - 1);
-					if(k != nullptr)
-						k->setPath(_fileName);
+					information = QString("GP sucessfully,  From \"%1\"").arg(_fileName);
+					QFileInfo info(_fileName);
+					QString	  name	  = info.fileName();
+					QString	  path	  = info.filePath();
+					QString	  aSuffix = info.suffix().toLower();
+
+					//_mainwindow->importMesh(path,aSuffix,-1);
+
 				} else {
 					information = QString("Failed Filter  From \"%1\"").arg(_fileName);
 					msg.type	= Common::Message::Error;
@@ -250,11 +241,11 @@ namespace WBFZ {
 				}
 			} else {
 			}
+			//emit showInformation(information);
+			//emit _mainwindow->printMessageToMessageWindow(msg);
 		}
-		// 		emit showInformation(information);
-		// 		emit _mainwindow->printMessageToMessageWindow(msg);
 		ModuleBase::ThreadTask::threadTaskFinished();
-		Py::PythonAgent::getInstance()->unLock();
+		//Py::PythonAgent::getInstance()->unLock();
 	}
 	void PCLGPMesh::setThreadRunState(bool flag)
 	{
@@ -352,7 +343,8 @@ namespace WBFZ {
 		gp3.setMinimumAngle(MinimumAngle); // 设置三角化后得到三角形内角的最小角度
 		gp3.setMaximumAngle(MaximumAngle); // 设置三角化后得到三角形内角的最大角度
 		gp3.setNormalConsistency(false);   // 设置该参数保证法线朝向一致
-		// qDebug() << "[GP] start reconstruct :" << cloud_in->points.size();
+		qDebug() << "[GP] start reconstruct :" << cloud_with_rgba->points.size();
+		qDebug() << "[GP] norm :" << cloud_with_normals->points.size();
 		//  Get result
 		DebugInfo("setInputCloud  point count : %d \n", cloud_with_normals->size());
 		gp3.setInputCloud(cloud_with_normals); // 设置输入点云为有向点云
@@ -364,10 +356,8 @@ namespace WBFZ {
 		// 转换处理结果
 		vtkPolyData* polydata	= vtkPolyData::New(); // 创建新的指针，智能指针会释放
 		size_t		 pointcount = PointCloudOperator::PointCloudCommon::mesh2vtk(*mesh, polydata);
-		DebugInfo("remesh over ,conver over polydata  %d  , pointcount %d\n", polydata == nullptr,
-				  pointcount);
-		vtkDataSet* dataset =
-			vtkDataSet::SafeDownCast(polydata); // 默认完成 vtkpolydata --> vtkdataset
+		DebugInfo("remesh over ,conver over polydata  %d  , pointcount %d\n", polydata == nullptr,  pointcount);
+		vtkDataSet* dataset =vtkDataSet::SafeDownCast(polydata); // 默认完成 vtkpolydata --> vtkdataset
 		// outpolyData->Delete();					// 释放指针 ,
 		// 千万不能释放这个指针，不然程序回调时，会直接内存崩溃
 		DebugInfo("PCLGPMeshAlg successfully!!  wait for writing file  \n");
@@ -379,22 +369,26 @@ namespace WBFZ {
 
 		// 加载文件
 		QFileInfo	info(filepath);
-		QString		name		= info.fileName();
-		QString		path		= info.filePath();
-		QString		suffix		= info.suffix().toLower();
-		QTextCodec* codec		= QTextCodec::codecForName("GB18030");
-		QByteArray	ba			= codec->fromUnicode(filepath);
+		QString		name   = info.fileName();
+		QString		path   = info.filePath();
+		QString		suffix = info.suffix().toLower();
+		QTextCodec* codec  = QTextCodec::codecForName("GB18030");
+		QByteArray	ba	   = codec->fromUnicode(filepath);
+		QFile		file(filepath);
+		if(file.exists()) {
+			file.remove();
+		}
 
 		std::string outFileName = ba.data();
 		DebugInfo("writing %s  suffix %s !!  \n", ba.data(), suffix.toStdString().c_str());
 		if(suffix == "vtk") {
-			vtkSmartPointer<vtkUnstructuredGridWriter> writer =
-				vtkSmartPointer<vtkUnstructuredGridWriter>::New();
+			vtkSmartPointer<vtkUnstructuredGridWriter> writer =	vtkSmartPointer<vtkUnstructuredGridWriter>::New();
 			writer->SetInputData(dataset);
 			writer->SetFileTypeToBinary();
 			writer->SetFileName(ba);
 			writer->Write();
-			DebugInfo("writing vtk !!  \n");
+			writer = nullptr;
+			DebugInfo("writing vtk !! over \n");
 		} else if(suffix == "stl") {
 			QTextCodec*					  codec	 = QTextCodec::codecForName("GB18030");
 			QByteArray					  ba	 = codec->fromUnicode(_fileName);
@@ -404,43 +398,17 @@ namespace WBFZ {
 			writer->SetFileTypeToBinary();
 			writer->SetFileName(ba);
 			writer->Write();
-			DebugInfo("writing stl !!  \n");
+			writer = nullptr;
+			DebugInfo("writing stl over!!  \n");
 		} else {
+			return false;
 		}
-
-		DebugInfo("writing finish !!  %d \n", dataset == nullptr);
-
-		// 回调函数
-		DebugInfo("remeshtaskProcess   !!  %d \n", dataset == nullptr);
-
-		//	QFileInfo info(_fileName);
-		//	QString name = info.fileName();
-		//	QString path = info.filePath();
-		//	QString suffix = info.suffix().toLower();
-		DebugInfo("dataset %d _fileName %s \n", dataset == nullptr,
-				  _fileName.toStdString().c_str());
-		// 保存流程文件
-		if(dataset != nullptr) {
-			DebugInfo("load result in meshKernal \n");
-			auto* k = new MeshData::MeshKernal;
-			k->setName(name);
-			k->setPath(path);
-			auto meshData = MeshData::MeshData::getInstance();
-			int	 nKernal  = meshData->getKernalCount();
-			for(int iKernal = 0; iKernal < nKernal; ++iKernal) {
-				MeshData::MeshKernal* temp = meshData->getKernalAt(iKernal);
-				if(temp->getPath() == path) { ///< MG same file update
-					meshData->removeKernalAt(iKernal);
-					break;
-				}
-			}
-
-			k->setMeshData(dataset);
-			meshData->appendMeshKernal(k);
-			DebugInfo("load result in meshKernal \n");
-
+		QFile file2(_fileName);
+		if(file2.exists()) {
+			DebugInfo("writing finish !!  %d \n", dataset == nullptr);
 			return true;
 		} else {
+			DebugInfo("writing finish fail !!  %d \n", 1);
 			return false;
 		}
 
diff --git a/src/PluginWBFZExchangePlugin/DialogPCLStatisticalRemoveFilter.cpp b/src/PluginWBFZExchangePlugin/DialogPCLStatisticalRemoveFilter.cpp
index eda4897..b31b350 100644
--- a/src/PluginWBFZExchangePlugin/DialogPCLStatisticalRemoveFilter.cpp
+++ b/src/PluginWBFZExchangePlugin/DialogPCLStatisticalRemoveFilter.cpp
@@ -202,7 +202,6 @@ namespace WBFZ{
 		, _componentIds(componentIds)
 		, _MeanK(MeanK)
 		, _StddevThresh(StddevThresh)
-
 	{
 
 	}
@@ -286,6 +285,7 @@ namespace WBFZ{
 			pcl::io::savePLYFileBinary(outFileName,*cloud_filtered);
 		}
 		else{}
+		DebugInfo("outpolyData over !!!!");
 		return dataset;
 	}
 	vtkDataSet* PCLStatisticalRemoveFilter::filter()
diff --git a/src/PluginWBFZExchangePlugin/EchoTableEditWindow.cpp b/src/PluginWBFZExchangePlugin/EchoTableEditWindow.cpp
index caf0637..ea9c2d7 100644
--- a/src/PluginWBFZExchangePlugin/EchoTableEditWindow.cpp
+++ b/src/PluginWBFZExchangePlugin/EchoTableEditWindow.cpp
@@ -391,4 +391,10 @@ int EchoTableEditWindow::SaveAsDialog()
 		QString::fromUtf8(u8"csv文件 (*.csv)"));//多组扩展名用双分号";;"隔开
 	this->model->saveAsFilePath(filepath);
 	return 0;
+}
+void EchoTableEditWindow::calBackSCatter() {
+
+
+
+
 }
diff --git a/src/PluginWBFZExchangePlugin/EchoTableEditWindow.h b/src/PluginWBFZExchangePlugin/EchoTableEditWindow.h
index dcf3c41..7d3e6ad 100644
--- a/src/PluginWBFZExchangePlugin/EchoTableEditWindow.h
+++ b/src/PluginWBFZExchangePlugin/EchoTableEditWindow.h
@@ -63,7 +63,7 @@ private:
 
 public slots:
 
-
+	void calBackSCatter();
     // tableview 右键菜单
     void ShowTableViewContextMenu(QPoint p);
     void tableView_CopyAction();
diff --git a/src/PluginWBFZExchangePlugin/EchoTableEditWindow.ui b/src/PluginWBFZExchangePlugin/EchoTableEditWindow.ui
index 04f9a5a..93a5e03 100644
--- a/src/PluginWBFZExchangePlugin/EchoTableEditWindow.ui
+++ b/src/PluginWBFZExchangePlugin/EchoTableEditWindow.ui
@@ -103,7 +103,7 @@
      <x>0</x>
      <y>0</y>
      <width>752</width>
-     <height>26</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu">
@@ -121,17 +121,11 @@
     <addaction name="actionFEKOCheck"/>
     <addaction name="actionEchoSplitExport"/>
     <addaction name="actionEchoCalibration"/>
-   </widget>
-   <widget class="QMenu" name="menu_2">
-    <property name="title">
-     <string>定标工具</string>
-    </property>
     <addaction name="actionCalibrationConst"/>
     <addaction name="actionImportCalibrationCons"/>
    </widget>
    <addaction name="menu"/>
    <addaction name="menu_4"/>
-   <addaction name="menu_2"/>
   </widget>
   <action name="actionOpen">
    <property name="text">
@@ -264,14 +258,26 @@
    </property>
   </action>
   <action name="actionCalibrationConst">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>计算定标常数</string>
    </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionImportCalibrationCons">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>导入定标常数表</string>
    </property>
+   <property name="visible">
+    <bool>false</bool>
+   </property>
   </action>
  </widget>
  <resources/>
diff --git a/src/PluginWBFZExchangePlugin/FEKOBaseToolClass.cpp b/src/PluginWBFZExchangePlugin/FEKOBaseToolClass.cpp
index 5cc0915..80a4dd2 100644
--- a/src/PluginWBFZExchangePlugin/FEKOBaseToolClass.cpp
+++ b/src/PluginWBFZExchangePlugin/FEKOBaseToolClass.cpp
@@ -935,7 +935,7 @@ bool   FEKOBase::FBPImage_FREQ(QString& restiffpath, Eigen::MatrixXcd& echoData,
 
 
 #ifdef __IMAGEWINDOWSPROCESS // 加窗处理
-	Eigen::MatrixXd normw = WINDOWFun(echoData, winfun);
+	//Eigen::MatrixXd normw = WINDOWFun(echoData, winfun);
 #endif
 
 #ifdef __IMAGEPARALLEL 
diff --git a/src/PluginWBFZExchangePlugin/FileOperator.cpp b/src/PluginWBFZExchangePlugin/FileOperator.cpp
index 0059d18..7df9a65 100644
--- a/src/PluginWBFZExchangePlugin/FileOperator.cpp
+++ b/src/PluginWBFZExchangePlugin/FileOperator.cpp
@@ -165,20 +165,24 @@ unsigned long    convertToULong(const QString& input) {
 	return result;
 }
 
-
-
-void    copyFile(const QString& sourcePath, const QString& destinationPath) {
+void   copyFile(const QString& sourcePath, const QString& destinationPath) {
 	QFile sourceFile(sourcePath);
 	QFile destinationFile(destinationPath);
-
+	qDebug() << QString("copy file ready !! from ") + sourcePath+"  to  "+destinationPath ;
 	if (sourceFile.exists()) {
 		if (sourceFile.copy(destinationPath)) {
+			qDebug() << QString("copy file sucessfully !! from ") + sourcePath+"  to  "+destinationPath ;
 			// 复制成功
 			//QMessageBox::information(nullptr, u8"成功", u8"文件复制成功");
 		}
 		else {
 			// 复制失败
-			QMessageBox::critical(nullptr, QObject::tr("error"), QObject::tr("file copy error"));
+			if(sourceFile.exists()){
+				QMessageBox::critical(nullptr, QObject::tr("error"), QObject::tr("The file already exists !!"));
+			}
+			else{
+				QMessageBox::critical(nullptr, QObject::tr("error"), QObject::tr("file copy error"));
+			}
 		}
 	}
 	else {
diff --git a/src/PluginWBFZExchangePlugin/ImageShowDialogClass.cpp b/src/PluginWBFZExchangePlugin/ImageShowDialogClass.cpp
index ad1be76..c1578eb 100644
--- a/src/PluginWBFZExchangePlugin/ImageShowDialogClass.cpp
+++ b/src/PluginWBFZExchangePlugin/ImageShowDialogClass.cpp
@@ -3,6 +3,7 @@
 ImageShowDialogClass ::ImageShowDialogClass(QWidget *parent)
 	: QDialog(parent)
 {
+	ui=new Ui::ImageShowDialogClass;
 	ui->setupUi(this);
 	ui->m_plot->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
 	connect(this->ui->m_plot, SIGNAL(mouseMove(QMouseEvent*)), this, SLOT(updateCursor(QMouseEvent*)));
diff --git a/src/PluginWBFZExchangePlugin/LAMP_ScatterSettingClass.cpp b/src/PluginWBFZExchangePlugin/LAMP_ScatterSettingClass.cpp
index ef7f260..5ffd0e4 100644
--- a/src/PluginWBFZExchangePlugin/LAMP_ScatterSettingClass.cpp
+++ b/src/PluginWBFZExchangePlugin/LAMP_ScatterSettingClass.cpp
@@ -25,11 +25,12 @@ LAMP_ScatterSettingClass::LAMP_ScatterSettingClass(QWidget* parent)
 	this->ui->checkBox_A1->setChecked(true);
 	this->ui->checkBox_A2->setChecked(true);
 
-	this->ui->radioButton_nearfield->setVisible(false);
-	this->ui->radioButton_nearfield->setChecked(false);
-	this->ui->radioButton_nearfield->setEnabled(false);
+	this->ui->radioButton_nearfield->setVisible(true);
+	this->ui->radioButton_nearfield->setChecked(true);
+	this->ui->radioButton_nearfield->setEnabled(true);
 
 	this->ui->radioButton_farfield->setCheckable(true);
+	this->ui->radioButton_farfield->setChecked(true);
 
 	this->ui->radioButton_S1	 ->setEnabled(this->ui->checkBox_AllScatter->isChecked());
 	this->ui->radioButton_S3	 ->setEnabled(this->ui->checkBox_AllScatter->isChecked());
@@ -92,10 +93,12 @@ LAMP_ScatterSettingClass::LAMP_ScatterSettingClass(QWidget* parent)
 
 LAMP_ScatterSettingClass::~LAMP_ScatterSettingClass()
 {
+	// 其他组件析构
+
+
+
 	delete this->ui;
 	this->ui=nullptr;
-
-
 }
 
 void LAMP_ScatterSettingClass::loadxml(QString xmlpath)
@@ -105,7 +108,6 @@ void LAMP_ScatterSettingClass::loadxml(QString xmlpath)
 	this->workpsace = getParantFromPath(xmlpath);
 	this->settingobj->loadxml(xmlpath);
 	this->renderSettingObj();
-
 }
 
 void LAMP_ScatterSettingClass::savexml()
@@ -348,13 +350,37 @@ void LAMP_ScatterSettingClass::initAntModelSettingParams()
 	AntffePathDict["F9"] = QCoreApplication::applicationDirPath() + "/ScattingAntParams/" + setting->value("ant_F9").toString();
 	AntffePathDict["F10"] = QCoreApplication::applicationDirPath() + "/ScattingAntParams/" + setting->value("ant_F10").toString();
 	AntffePathDict["F11"] = QCoreApplication::applicationDirPath() + "/ScattingAntParams/" + setting->value("ant_F11").toString();
-	AntffePathDict["F12"] = QCoreApplication::applicationDirPath() + "/ScattingAntParams/" + setting->value("ant_F12").toString(); 
+	AntffePathDict["F12"] = QCoreApplication::applicationDirPath() + "/ScattingAntParams/" + setting->value("ant_F12").toString();
+
+	qDebug() << "================= scatter setting ant init =====================================";
+	qDebug() << QString("A1") + ":\t" + AntffePathDict["A1"];
+	qDebug() << QString("A2") + ":\t" + AntffePathDict["A2"];
+	qDebug() << QString("S1") + ":\t" + AntffePathDict["S1"];
+	qDebug() << QString("S3") + ":\t" + AntffePathDict["S3"];
+	qDebug() << QString("S5") + ":\t" + AntffePathDict["S5"];
+	qDebug() << QString("S8") + ":\t" + AntffePathDict["S8"];
+	qDebug() << QString("S10") + ":\t" + AntffePathDict["S10"];
+	qDebug() << QString("S12") + ":\t" + AntffePathDict["S12"];
+	qDebug() << QString("F1") + ":\t" + AntffePathDict["F1"];
+	qDebug() << QString("F2") + ":\t" + AntffePathDict["F2"];
+	qDebug() << QString("F3") + ":\t" + AntffePathDict["F3"];
+	qDebug() << QString("F4") + ":\t" + AntffePathDict["F4"];
+	qDebug() << QString("F5") + ":\t" + AntffePathDict["F5"];
+	qDebug() << QString("F6") + ":\t" + AntffePathDict["F6"];
+	qDebug() << QString("F7") + ":\t" + AntffePathDict["F7"];
+	qDebug() << QString("F8") + ":\t" + AntffePathDict["F8"];
+	qDebug() << QString("F9") + ":\t" + AntffePathDict["F9"];
+	qDebug() << QString("F10") + ":\t" + AntffePathDict["F10"];
+	qDebug() << QString("F11") + ":\t" + AntffePathDict["F11"];
+	qDebug() << QString("F12") + ":\t" + AntffePathDict["F12"];
+	qDebug() << "================================================================================";
 }
 
 void LAMP_ScatterSettingClass::closeWindows()
 {
 
 	for (map<std::string,  Geometry::GeometrySet* >::iterator iter = DataAISMap.begin(); iter != DataAISMap.end(); ++iter) {
+		//Geometry::GeometrySet* _geoData=iter->second;
 		AddOrRemoveScatterAntModel(_mainWindows,_geoData,iter->second,false);
 //		this->myContext->Erase(iter->second);
 //		this->myContext->Remove(iter->second);
@@ -383,6 +409,12 @@ void LAMP_ScatterSettingClass::createFEKOLua()
 	progressDialog.setMinimum(0);
 	progressDialog.show();
 
+	this->on_lineEdit_A1_incAngle_editingFinished();
+	this->on_lineEdit_A2_incAngle_editingFinished();
+	this->on_lineEdit_freqPoints_editingFinished();
+	this->on_lineEdit_startFreq_editingFinished();
+	this->on_lineEdit_endfreq_editingFinished();
+
 
 	this->sycnSettingObj();
 	std::map<QString, QString> antfarfiledatastr;
@@ -412,8 +444,6 @@ void LAMP_ScatterSettingClass::createFEKOLua()
 		if (isExists(this->workpsace)) {}
 		else { return; }
 	}
-	
-
 
 	// 创建脚本
 	QString luascript = QString(u8"--- create feko task :%1\n--- mode:Scatter\n\n").arg(this->settingobj->taskName);
@@ -1245,9 +1275,12 @@ void LAMP_ScatterSettingClass::createFEKOLua()
 			luascript = luascript + QString(u8"A1_temp_source_workplane.Origin.Z = 0\n");
 			luascript = luascript + QString(u8"\n");
 
-			luascript = luascript + QString(u8"A1_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+			luascript = luascript + QString(u8"A1_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 			luascript = luascript + QString(u8"A1_farFieldRequest.Label =\"%1\"\n").arg("A1");
-			luascript = luascript + QString(u8"A1_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n");
+			luascript = luascript + QString(u8"A1_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n");
+			luascript = luascript + QString(u8"A1_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+			luascript = luascript + QString(u8"A1_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+			luascript = luascript + QString(u8"A1_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 			luascript = luascript + QString(u8"\n");
 		}
 		else {}
@@ -1262,146 +1295,173 @@ void LAMP_ScatterSettingClass::createFEKOLua()
 			luascript = luascript + QString(u8"A2_temp_source_workplane.Origin.Z = 0\n");
 			luascript = luascript + QString(u8"\n");
 
-			luascript = luascript + QString(u8"A2_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+			luascript = luascript + QString(u8"A2_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 			luascript = luascript + QString(u8"A2_farFieldRequest.Label =\"%1\"\n").arg("A2");
-			luascript = luascript + QString(u8"A2_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n");
+			luascript = luascript + QString(u8"A2_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n");
+			luascript = luascript + QString(u8"A2_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+			luascript = luascript + QString(u8"A2_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+			luascript = luascript + QString(u8"A2_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 			luascript = luascript + QString(u8"\n");
 		}
 		else {}
 		if (this->settingobj->enableScatter) {
 			if (this->settingobj->S1) {
 				SphericalCoordinates p = AntSettingdict["S1"];
-				luascript = luascript + QString(u8"S1_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
-				luascript = luascript + QString(u8"S1_temp_source.Label = \"%1\"\n").arg("S1");
-				luascript = luascript + QString(u8"S1_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"S1_temp_source_workplane = S1_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"S1_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"S1_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"S1_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
+//				luascript = luascript + QString(u8"S1_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"S1_temp_source.Label = \"%1\"\n").arg("S1");
+//				luascript = luascript + QString(u8"S1_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"S1_temp_source_workplane = S1_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"S1_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"S1_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"S1_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
 
-				luascript = luascript + QString(u8"S1_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				luascript = luascript + QString(u8"S1_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"S1_farFieldRequest.Label =\"%1\"\n").arg("S1");
-				luascript = luascript + QString(u8"S1_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"S1_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"S1_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"S1_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"S1_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 				luascript = luascript + QString(u8"\n");
 			}
 			else {}
 			if (this->settingobj->S3) { // 仿照S1 ,构建 S3 的创建
-				SphericalCoordinates p_S3 = AntSettingdict["S3"];
-				luascript = luascript + QString(u8"S3_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_S3.theta)).arg(QString::number(p_S3.phi));
-				luascript = luascript + QString(u8"S3_temp_source.Label = \"%1\"\n").arg("S3");
-				luascript = luascript + QString(u8"S3_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"S3_temp_source_workplane = S3_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"S3_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"S3_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"S3_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
-				luascript = luascript + QString(u8"S3_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				SphericalCoordinates p = AntSettingdict["S3"];
+//				luascript = luascript + QString(u8"S3_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"S3_temp_source.Label = \"%1\"\n").arg("S3");
+//				luascript = luascript + QString(u8"S3_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"S3_temp_source_workplane = S3_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"S3_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"S3_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"S3_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
+				luascript = luascript + QString(u8"S3_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"S3_farFieldRequest.Label =\"%1\"\n").arg("S3");
-				luascript = luascript + QString(u8"S3_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"S3_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"S3_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"S3_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"S3_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 				luascript = luascript + QString(u8"\n");
 
 			}
 			else {}
 			if (this->settingobj->S5) {
-				SphericalCoordinates p_S5 = AntSettingdict["S5"];
-				luascript = luascript + QString(u8"S5_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_S5.theta)).arg(QString::number(p_S5.phi));
-				luascript = luascript + QString(u8"S5_temp_source.Label = \"%1\"\n").arg("S5");
-				luascript = luascript + QString(u8"S5_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"S5_temp_source_workplane = S5_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"S5_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"S5_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"S5_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
+				SphericalCoordinates p = AntSettingdict["S5"];
+//				luascript = luascript + QString(u8"S5_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"S5_temp_source.Label = \"%1\"\n").arg("S5");
+//				luascript = luascript + QString(u8"S5_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"S5_temp_source_workplane = S5_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"S5_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"S5_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"S5_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
 
-				luascript = luascript + QString(u8"S5_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				luascript = luascript + QString(u8"S5_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"S5_farFieldRequest.Label =\"%1\"\n").arg("S5");
-				luascript = luascript + QString(u8"S5_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"S5_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"S5_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"S5_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"S5_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 				luascript = luascript + QString(u8"\n");
 
 			}
 			else {}
 			if (this->settingobj->S8) {
-				SphericalCoordinates p_S8 = AntSettingdict["S8"];
-				luascript = luascript + QString(u8"S8_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_S8.theta)).arg(QString::number(p_S8.phi));
-				luascript = luascript + QString(u8"S8_temp_source.Label = \"%1\"\n").arg("S8");
-				luascript = luascript + QString(u8"S8_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"S8_temp_source_workplane = S8_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"S8_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"S8_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"S8_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
-				luascript = luascript + QString(u8"S8_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				SphericalCoordinates p = AntSettingdict["S8"];
+//				luascript = luascript + QString(u8"S8_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"S8_temp_source.Label = \"%1\"\n").arg("S8");
+//				luascript = luascript + QString(u8"S8_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"S8_temp_source_workplane = S8_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"S8_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"S8_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"S8_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
+				luascript = luascript + QString(u8"S8_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"S8_farFieldRequest.Label =\"%1\"\n").arg("S8");
-				luascript = luascript + QString(u8"S8_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"S8_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"S8_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"S8_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"S8_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 				luascript = luascript + QString(u8"\n");
 
 			}
 			else {}
 			if (this->settingobj->S10) {
-				SphericalCoordinates p_S10 = AntSettingdict["S10"];
-				luascript = luascript + QString(u8"S10_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_S10.theta)).arg(QString::number(p_S10.phi));
-				luascript = luascript + QString(u8"S10_temp_source.Label = \"%1\"\n").arg("S10");
-				luascript = luascript + QString(u8"S10_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"S10_temp_source_workplane = S10_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"S10_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"S10_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"S10_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
-				luascript = luascript + QString(u8"S10_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				SphericalCoordinates p = AntSettingdict["S10"];
+//				luascript = luascript + QString(u8"S10_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"S10_temp_source.Label = \"%1\"\n").arg("S10");
+//				luascript = luascript + QString(u8"S10_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"S10_temp_source_workplane = S10_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"S10_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"S10_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"S10_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
+				luascript = luascript + QString(u8"S10_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"S10_farFieldRequest.Label =\"%1\"\n").arg("S10");
-				luascript = luascript + QString(u8"S10_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"S10_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"S10_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"S10_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"S10_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 				luascript = luascript + QString(u8"\n");
 
 			}
 			else {}
 			if (this->settingobj->S12) {
-				SphericalCoordinates p_S12 = AntSettingdict["S12"];
-				luascript = luascript + QString(u8"S12_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_S12.theta)).arg(QString::number(p_S12.phi));
-				luascript = luascript + QString(u8"S12_temp_source.Label = \"%1\"\n").arg("S12");
-				luascript = luascript + QString(u8"S12_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"S12_temp_source_workplane = S12_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"S12_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"S12_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"S12_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
-				luascript = luascript + QString(u8"S12_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				SphericalCoordinates p = AntSettingdict["S12"];
+//				luascript = luascript + QString(u8"S12_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"S12_temp_source.Label = \"%1\"\n").arg("S12");
+//				luascript = luascript + QString(u8"S12_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"S12_temp_source_workplane = S12_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"S12_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"S12_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"S12_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
+				luascript = luascript + QString(u8"S12_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"S12_farFieldRequest.Label =\"%1\"\n").arg("S12");
-				luascript = luascript + QString(u8"S12_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"S12_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"S12_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"S12_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"S12_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 				luascript = luascript + QString(u8"\n");
 
 			}
 			else {}
 			if (this->settingobj->F1) {
-				SphericalCoordinates p_F1 = AntSettingdict["F1"];
-				luascript = luascript + QString(u8"F1_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F1.theta)).arg(QString::number(p_F1.phi));
-				luascript = luascript + QString(u8"F1_temp_source.Label = \"%1\"\n").arg("F1");
-				luascript = luascript + QString(u8"F1_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F1_temp_source_workplane = F1_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F1_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F1_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F1_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
-				luascript = luascript + QString(u8"F1_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				SphericalCoordinates p = AntSettingdict["F1"];
+//				luascript = luascript + QString(u8"F1_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F1_temp_source.Label = \"%1\"\n").arg("F1");
+//				luascript = luascript + QString(u8"F1_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F1_temp_source_workplane = F1_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F1_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F1_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F1_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
+				luascript = luascript + QString(u8"F1_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F1_farFieldRequest.Label =\"%1\"\n").arg("F1");
-				luascript = luascript + QString(u8"F1_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"F1_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F1_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F1_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F1_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 				luascript = luascript + QString(u8"\n");
 
 			}
 			else {}
 			if (this->settingobj->F2) {
-				SphericalCoordinates p_F2 = AntSettingdict["F2"];
-				luascript = luascript + QString(u8"F2_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F2.theta)).arg(QString::number(p_F2.phi));
-				luascript = luascript + QString(u8"F2_temp_source.Label = \"%1\"\n").arg("F2");
-				luascript = luascript + QString(u8"F2_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F2_temp_source_workplane = F2_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F2_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F2_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F2_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
-				luascript = luascript + QString(u8"F2_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				SphericalCoordinates p = AntSettingdict["F2"];
+//				luascript = luascript + QString(u8"F2_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F2_temp_source.Label = \"%1\"\n").arg("F2");
+//				luascript = luascript + QString(u8"F2_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F2_temp_source_workplane = F2_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F2_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F2_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F2_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
+				luascript = luascript + QString(u8"F2_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F2_farFieldRequest.Label =\"%1\"\n").arg("F2");
-				luascript = luascript + QString(u8"F2_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"F2_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F2_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F2_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F2_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 
 				luascript = luascript + QString(u8"\n");
@@ -1409,18 +1469,22 @@ void LAMP_ScatterSettingClass::createFEKOLua()
 			}
 			else {}
 			if (this->settingobj->F3) {
-				SphericalCoordinates p_F3 = AntSettingdict["F3"];
-				luascript = luascript + QString(u8"F3_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F3.theta)).arg(QString::number(p_F3.phi));
-				luascript = luascript + QString(u8"F3_temp_source.Label = \"%1\"\n").arg("F3");
-				luascript = luascript + QString(u8"F3_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F3_temp_source_workplane = F3_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F3_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F3_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F3_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
-				luascript = luascript + QString(u8"F3_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				SphericalCoordinates p = AntSettingdict["F3"];
+//				luascript = luascript + QString(u8"F3_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F3_temp_source.Label = \"%1\"\n").arg("F3");
+//				luascript = luascript + QString(u8"F3_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F3_temp_source_workplane = F3_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F3_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F3_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F3_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
+				
+				luascript = luascript + QString(u8"F3_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F3_farFieldRequest.Label =\"%1\"\n").arg("F3");
-				luascript = luascript + QString(u8"F3_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"F3_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F3_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F3_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F3_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 
 				luascript = luascript + QString(u8"\n");
@@ -1428,174 +1492,195 @@ void LAMP_ScatterSettingClass::createFEKOLua()
 			}
 			else {}
 			if (this->settingobj->F4) {
-				SphericalCoordinates p_F4 = AntSettingdict["F4"];
-				luascript = luascript + QString(u8"F4_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F4.theta)).arg(QString::number(p_F4.phi));
-				luascript = luascript + QString(u8"F4_temp_source.Label = \"%1\"\n").arg("F4");
-				luascript = luascript + QString(u8"F4_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F4_temp_source_workplane = F4_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F4_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F4_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F4_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
-				luascript = luascript + QString(u8"F4_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				SphericalCoordinates p = AntSettingdict["F4"];
+//				luascript = luascript + QString(u8"F4_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F4_temp_source.Label = \"%1\"\n").arg("F4");
+//				luascript = luascript + QString(u8"F4_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F4_temp_source_workplane = F4_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F4_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F4_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F4_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
+				
+				luascript = luascript + QString(u8"F4_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F4_farFieldRequest.Label =\"%1\"\n").arg("F4");
-				luascript = luascript + QString(u8"F4_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
-
+				luascript = luascript + QString(u8"F4_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F4_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F4_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F4_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 
 				luascript = luascript + QString(u8"\n");
 			}
 			else {}
 			if (this->settingobj->F5) {
-				SphericalCoordinates p_F5 = AntSettingdict["F5"];
-				luascript = luascript + QString(u8"F5_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F5.theta)).arg(QString::number(p_F5.phi));
-				luascript = luascript + QString(u8"F5_temp_source.Label = \"%1\"\n").arg("F5");
-				luascript = luascript + QString(u8"F5_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F5_temp_source_workplane = F5_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F5_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F5_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F5_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
+				SphericalCoordinates p = AntSettingdict["F5"];
+//				luascript = luascript + QString(u8"F5_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F5_temp_source.Label = \"%1\"\n").arg("F5");
+//				luascript = luascript + QString(u8"F5_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F5_temp_source_workplane = F5_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F5_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F5_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F5_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
 
-				luascript = luascript + QString(u8"F5_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				luascript = luascript + QString(u8"F5_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F5_farFieldRequest.Label =\"%1\"\n").arg("F5");
-				luascript = luascript + QString(u8"F5_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"F5_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
 
+				luascript = luascript + QString(u8"F5_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F5_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F5_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 				luascript = luascript + QString(u8"\n");
 
 			}
 			else {}
 			if (this->settingobj->F6) {
-				SphericalCoordinates p_F6 = AntSettingdict["F6"];
-				luascript = luascript + QString(u8"F6_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F6.theta)).arg(QString::number(p_F6.phi));
-				luascript = luascript + QString(u8"F6_temp_source.Label = \"%1\"\n").arg("F6");
-				luascript = luascript + QString(u8"F6_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F6_temp_source_workplane = F6_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F6_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F6_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F6_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
+				SphericalCoordinates p = AntSettingdict["F6"];
+//				luascript = luascript + QString(u8"F6_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F6_temp_source.Label = \"%1\"\n").arg("F6");
+//				luascript = luascript + QString(u8"F6_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F6_temp_source_workplane = F6_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F6_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F6_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F6_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
 
-				luascript = luascript + QString(u8"F6_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				luascript = luascript + QString(u8"F6_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F6_farFieldRequest.Label =\"%1\"\n").arg("F6");
-				luascript = luascript + QString(u8"F6_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
+				luascript = luascript + QString(u8"F6_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F6_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F6_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F6_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 
 				luascript = luascript + QString(u8"\n");
 			}
 			else {}
 			if (this->settingobj->F7) {
-				SphericalCoordinates p_F7 = AntSettingdict["F7"];
-				luascript = luascript + QString(u8"F7_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F7.theta)).arg(QString::number(p_F7.phi));
-				luascript = luascript + QString(u8"F7_temp_source.Label = \"%1\"\n").arg("F7");
-				luascript = luascript + QString(u8"F7_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F7_temp_source_workplane = F7_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F7_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F7_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F7_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
+				SphericalCoordinates p = AntSettingdict["F7"];
+//				luascript = luascript + QString(u8"F7_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F7_temp_source.Label = \"%1\"\n").arg("F7");
+//				luascript = luascript + QString(u8"F7_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F7_temp_source_workplane = F7_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F7_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F7_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F7_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
 
-				luascript = luascript + QString(u8"F7_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				luascript = luascript + QString(u8"F7_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F7_farFieldRequest.Label =\"%1\"\n").arg("F7");
-				luascript = luascript + QString(u8"F7_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
-
+				luascript = luascript + QString(u8"F7_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F7_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F7_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F7_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 				luascript = luascript + QString(u8"\n");
 			}
 			else {}
 			if (this->settingobj->F8) {
-				SphericalCoordinates p_F8 = AntSettingdict["F8"];
-				luascript = luascript + QString(u8"F8_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F8.theta)).arg(QString::number(p_F8.phi));
-				luascript = luascript + QString(u8"F8_temp_source.Label = \"%1\"\n").arg("F8");
-				luascript = luascript + QString(u8"F8_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F8_temp_source_workplane = F8_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F8_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F8_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F8_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
+				SphericalCoordinates p = AntSettingdict["F8"];
+//				luascript = luascript + QString(u8"F8_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F8_temp_source.Label = \"%1\"\n").arg("F8");
+//				luascript = luascript + QString(u8"F8_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F8_temp_source_workplane = F8_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F8_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F8_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F8_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
 
-				luascript = luascript + QString(u8"F8_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				luascript = luascript + QString(u8"F8_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F8_farFieldRequest.Label =\"%1\"\n").arg("F8");
-				luascript = luascript + QString(u8"F8_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
-
+				luascript = luascript + QString(u8"F8_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F8_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F8_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F8_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 				luascript = luascript + QString(u8"\n");
 			}
 			else {}
 			if (this->settingobj->F9) {
-				SphericalCoordinates p_F9 = AntSettingdict["F9"];
-				luascript = luascript + QString(u8"F9_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F9.theta)).arg(QString::number(p_F9.phi));
-				luascript = luascript + QString(u8"F9_temp_source.Label = \"%1\"\n").arg("F9");
-				luascript = luascript + QString(u8"F9_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F9_temp_source_workplane = F9_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F9_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F9_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F9_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
+				SphericalCoordinates p = AntSettingdict["F9"];
+//				luascript = luascript + QString(u8"F9_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F9_temp_source.Label = \"%1\"\n").arg("F9");
+//				luascript = luascript + QString(u8"F9_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F9_temp_source_workplane = F9_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F9_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F9_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F9_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
 
-				luascript = luascript + QString(u8"F9_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				luascript = luascript + QString(u8"F9_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F9_farFieldRequest.Label =\"%1\"\n").arg("F9");
-				luascript = luascript + QString(u8"F9_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
-
+				luascript = luascript + QString(u8"F9_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F9_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F9_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F9_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 				luascript = luascript + QString(u8"\n");
 			}
 
 			else {}
 			if (this->settingobj->F10) {
-				SphericalCoordinates p_F10 = AntSettingdict["F10"];
-				luascript = luascript + QString(u8"F10_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F10.theta)).arg(QString::number(p_F10.phi));
-				luascript = luascript + QString(u8"F10_temp_source.Label = \"%1\"\n").arg("F10");
-				luascript = luascript + QString(u8"F10_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F10_temp_source_workplane = F10_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F10_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F10_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F10_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
+				SphericalCoordinates p = AntSettingdict["F10"];
+//				luascript = luascript + QString(u8"F10_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F10_temp_source.Label = \"%1\"\n").arg("F10");
+//				luascript = luascript + QString(u8"F10_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F10_temp_source_workplane = F10_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F10_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F10_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F10_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
 
-				luascript = luascript + QString(u8"F10_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				luascript = luascript + QString(u8"F10_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F10_farFieldRequest.Label =\"%1\"\n").arg("F10");
-				luascript = luascript + QString(u8"F10_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
-
+				luascript = luascript + QString(u8"F10_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F10_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F10_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F10_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 				luascript = luascript + QString(u8"\n");
 			}
 			else {}
 			if (this->settingobj->F11) {
-				SphericalCoordinates p_F11 = AntSettingdict["F11"];
-				luascript = luascript + QString(u8"F11_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F11.theta)).arg(QString::number(p_F11.phi));
-				luascript = luascript + QString(u8"F11_temp_source.Label = \"%1\"\n").arg("F11");
-				luascript = luascript + QString(u8"F11_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F11_temp_source_workplane = F11_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F11_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F11_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F11_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n");
-				luascript = luascript + QString(u8"F11_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				SphericalCoordinates p = AntSettingdict["F11"];
+//				luascript = luascript + QString(u8"F11_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F11_temp_source.Label = \"%1\"\n").arg("F11");
+//				luascript = luascript + QString(u8"F11_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F11_temp_source_workplane = F11_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F11_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F11_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F11_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n");
+				luascript = luascript + QString(u8"F11_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F11_farFieldRequest.Label =\"%1\"\n").arg("F11");
-				luascript = luascript + QString(u8"F11_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
-
+				luascript = luascript + QString(u8"F11_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
 
+				luascript = luascript + QString(u8"F11_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F11_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F11_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 
 				luascript = luascript + QString(u8"\n");
 			}
 			else {}
 			if (this->settingobj->F12) {
-				SphericalCoordinates p_F12 = AntSettingdict["F12"];
-				luascript = luascript + QString(u8"F12_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p_F12.theta)).arg(QString::number(p_F12.phi));
-				luascript = luascript + QString(u8"F12_temp_source.Label = \"%1\"\n").arg("F12");
-				luascript = luascript + QString(u8"F12_temp_source.PolarisationAngle = 0\n");
-				luascript = luascript + QString(u8"F12_temp_source_workplane = F12_temp_source.LocalWorkplane\n");
-				luascript = luascript + QString(u8"F12_temp_source_workplane.Origin.X = 0\n");
-				luascript = luascript + QString(u8"F12_temp_source_workplane.Origin.Y = 0\n");
-				luascript = luascript + QString(u8"F12_temp_source_workplane.Origin.Z = 0\n");
-				luascript = luascript + QString(u8"\n"); 
+				SphericalCoordinates p = AntSettingdict["F12"];
+//				luascript = luascript + QString(u8"F12_temp_source = temp_standardConfiguration.Sources:AddPlaneWave(%1, %2)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi));
+//				luascript = luascript + QString(u8"F12_temp_source.Label = \"%1\"\n").arg("F12");
+//				luascript = luascript + QString(u8"F12_temp_source.PolarisationAngle = 0\n");
+//				luascript = luascript + QString(u8"F12_temp_source_workplane = F12_temp_source.LocalWorkplane\n");
+//				luascript = luascript + QString(u8"F12_temp_source_workplane.Origin.X = 0\n");
+//				luascript = luascript + QString(u8"F12_temp_source_workplane.Origin.Y = 0\n");
+//				luascript = luascript + QString(u8"F12_temp_source_workplane.Origin.Z = 0\n");
+//				luascript = luascript + QString(u8"\n"); 
 
-				luascript = luascript + QString(u8"F12_farFieldRequest = temp_standardConfiguration.FarFields:Add(0,0,0,0,1,1)\n");
+				luascript = luascript + QString(u8"F12_farFieldRequest = temp_standardConfiguration.FarFields:Add(%1,%2,%3,%4,1,1)\n").arg(QString::number(p.theta)).arg(QString::number(p.phi),QString::number(p.theta)).arg(QString::number(p.phi));
 				luascript = luascript + QString(u8"F12_farFieldRequest.Label =\"%1\"\n").arg("F12");
-				luascript = luascript + QString(u8"F12_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.FromPlaneWave\n\n");
-
+				luascript = luascript + QString(u8"F12_farFieldRequest.CalculationDirection=cf.Enums.FarFieldCalculationDirectionEnum.AsSpecified\n\n");
+				luascript = luascript + QString(u8"F12_farFieldRequest.Advanced.ExportSettings.ASCIIEnabled=true\n");
+				luascript = luascript + QString(u8"F12_farFieldRequest.Advanced.ExportSettings.OutFileEnabled=true\n");
+				luascript = luascript + QString(u8"F12_farFieldRequest.Advanced.OnlyScatteredPartCalculationEnabled=true    \n");
 				luascript = luascript + QString(u8"\n");
 			}
 			else {}
@@ -1807,6 +1892,10 @@ void LAMP_ScatterSettingClass::on_checkBox_AllScatter_toggled(bool flag)
 
 void LAMP_ScatterSettingClass::on_lineEdit_A1_incAngle_editingFinished()
 {
+	if(this->ui->checkBox_A1->isChecked()==false){
+		return;
+	}
+
 	DebugInfo("_mainWindows %d ; DataAISMap[\"A1\"] %d  \n",_mainWindows== nullptr,DataAISMap["A1"] ==nullptr);
 	if(_mainWindows== nullptr){return;}
 
@@ -1839,6 +1928,10 @@ void LAMP_ScatterSettingClass::on_lineEdit_A1_incAngle_editingFinished()
 }
 void LAMP_ScatterSettingClass::on_lineEdit_A2_incAngle_editingFinished()
 {
+	if(this->ui->checkBox_A2->isChecked()==false){
+		return;
+	}
+
 	DebugInfo("_mainWindows %d ; DataAISMap[\"A2\"] %d  \n",_mainWindows== nullptr,DataAISMap["A2"] ==nullptr);
 	if(_mainWindows== nullptr){return;}
 	// 根据坐标计算
@@ -2027,105 +2120,133 @@ void LAMP_ScatterSettingXmlClass::loadxml(QString fileName)
 
 	while (!xmlReader.atEnd() && !xmlReader.hasError()) {
 		QXmlStreamReader::TokenType token = xmlReader.readNext();
-
-		if (token == QXmlStreamReader::StartElement) {
+		//qDebug() << xmlReader.name().toString() <<u8" : "<< xmlReader.text().toString();
+		if (xmlReader.isStartElement() ) {
 			QString name= xmlReader.name().toString();
+			xmlReader.readNext();
 			qDebug() << name<<u8" : "<< xmlReader.text().toString();
-
-			if (xmlReader.name().toString() == "TaskName") {
-
+			if (name == "TaskName") {
 				taskName = xmlReader.text().toString();
 			}
-			else if (xmlReader.name().toString() == "Startfre") {
+			else if (name == "Startfre") {
 				startfre = xmlReader.text().toString().toDouble();
 			}
-			else if (xmlReader.name().toString() == "Endfre") {
+			else if (name == "Endfre") {
 				endfre = xmlReader.text().toString().toDouble();
 			}
-			else if (xmlReader.name().toString() == "Freponts") {
+			else if (name == "Freponts") {
 				freponts = xmlReader.text().toString().toDouble();
 			}
-			else if (xmlReader.name().toString() == "Farfield") {
+			else if (name == "Farfield") {
 				farfield = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "Nearfield") {
+			else if (name == "Nearfield") {
 				nearfield = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "A1") {
+			else if (name == "A1") {
 				A1 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "Incidence_A1") {
+			else if (name == "Incidence_A1") {
 				incidence_A1 = xmlReader.text().toString().toDouble();
 			}
-			else if (xmlReader.name().toString() == "A2") {
+			else if (name == "A2") {
 				A2 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "Incidence_A2") {
+			else if (name == "Incidence_A2") {
 				incidence_A2 = xmlReader.text().toString().toDouble();
 			}
-			else if (xmlReader.name().toString() == "EnableScatter") {
+			else if (name == "EnableScatter") {
 				enableScatter = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "S1") {
+			else if (name == "S1") {
 				S1 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "S3") {
+			else if (name == "S3") {
 				S3 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "S5") {
+			else if (name == "S5") {
 				S5 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "S8") {
+			else if (name == "S8") {
 				S8 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "S10") {
+			else if (name == "S10") {
 				S10 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "S12") {
+			else if (name == "S12") {
 				S12 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F1") {
+			else if (name == "F1") {
 				F1 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F2") {
+			else if (name == "F2") {
 				F2 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F3") {
+			else if (name == "F3") {
 				F3 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F4") {
+			else if (name == "F4") {
 				F4 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F5") {
+			else if (name == "F5") {
 				F5 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F6") {
+			else if (name == "F6") {
 				F6 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F7") {
+			else if (name == "F7") {
 				F7 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F8") {
+			else if (name == "F8") {
 				F8 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F9") {
+			else if (name == "F9") {
 				F9 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F10") {
+			else if (name == "F10") {
 				F10 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F11") {
+			else if (name == "F11") {
 				F11 = (xmlReader.text().toString().toLower() == "true");
 			}
-			else if (xmlReader.name().toString() == "F12") {
+			else if (name == "F12") {
 				F12 = (xmlReader.text().toString().toLower() == "true");
-			} 
+			}
 		}
 	}
 	if (xmlReader.hasError()) {
 		QMessageBox::warning(nullptr, u8"警告", u8"XML文件解析错误");
 	}
 	file.close();
+	qDebug()<<"============ scatter params xml read result  ===============";
+	qDebug() << "Task Name: " << taskName;
+	qDebug() << "Start Frequency: " << startfre;
+	qDebug() << "End Frequency: " << endfre;
+	qDebug() << "Frequency Points: " << freponts;
+	qDebug() << "Far Field: " << farfield;
+	qDebug() << "Near Field: " << nearfield;
+	qDebug() << "A1: " << A1 << ", Incidence A1: " << incidence_A1;
+	qDebug() << "A2: " << A2 << ", Incidence A2: " << incidence_A2;
+	qDebug() << "Enable Scatter: " << enableScatter;
+	qDebug() << "S1: " << S1;
+	qDebug() << "S3: " << S3;
+	qDebug() << "S5: " << S5;
+	qDebug() << "S8: " << S8;
+	qDebug() << "S10: " << S10;
+	qDebug() << "S12: " << S12;
+	qDebug() << "F1: " << F1;
+	qDebug() << "F2: " << F2;
+	qDebug() << "F3: " << F3;
+	qDebug() << "F4: " << F4;
+	qDebug() << "F5: " << F5;
+	qDebug() << "F6: " << F6;
+	qDebug() << "F7: " << F7;
+	qDebug() << "F8: " << F8;
+	qDebug() << "F9: " << F9;
+	qDebug() << "F10: " << F10;
+	qDebug() << "F11: " << F11;
+	qDebug() << "F12: " << F12;
+	qDebug()<<"============ scatter params xml read result  ===============";
 }
 
 void LAMP_ScatterSettingXmlClass::savexml(QString fileName)
diff --git a/src/PluginWBFZExchangePlugin/LAMP_ScatterSettingClass.h b/src/PluginWBFZExchangePlugin/LAMP_ScatterSettingClass.h
index 6659266..38a49aa 100644
--- a/src/PluginWBFZExchangePlugin/LAMP_ScatterSettingClass.h
+++ b/src/PluginWBFZExchangePlugin/LAMP_ScatterSettingClass.h
@@ -13,11 +13,6 @@ namespace Ui{
 }
 
 
-
-
-
-
-
 class LAMP_ScatterSettingXmlClass {
 public:
 	QString taskName;
@@ -60,10 +55,6 @@ public:
 
 
 
-
-
-
-
 class      LAMP_ScatterSettingClass : public QDialog
 {
 	Q_OBJECT
@@ -141,7 +132,4 @@ private:
 	Ui::LAMP_ScatterSettingClassClass* ui;
 };
 
-
-
-
 #endif
diff --git a/src/PluginWBFZExchangePlugin/TableProcess/TableViewModel.cpp b/src/PluginWBFZExchangePlugin/TableProcess/TableViewModel.cpp
index 8761e0f..8fe6bf4 100644
--- a/src/PluginWBFZExchangePlugin/TableProcess/TableViewModel.cpp
+++ b/src/PluginWBFZExchangePlugin/TableProcess/TableViewModel.cpp
@@ -78,6 +78,36 @@ void FEKOResultCsvTableModel::loadCSVFilePath(QString csvPath)
         inFile.close();
     }
     this->SetData(datamap, colnames, rowIDlist);
+	QStringList tempColNames;
+	for(int i=0;i<colnames.size();i++){
+		if(colnames[i].indexOf("Re")>=0){
+			QString colname=colnames[i];
+			colname.replace("Re","");
+			colname.replace("(","");
+			colname.replace(")","");
+			tempColNames.append(colname);
+		}
+	}
+
+
+//	for(int ii=0;ii<tempColNames.size();ii++) {
+//		colnames.append(tempColNames[ii]);
+//		for(size_t i = 0; i < datamap.size(); i++) {
+//			QVector<QVariant> mapline = datamap[i];
+//			double			  re	  = 0;
+//			double			  im	  = 0;
+//			for(int col = 1; col < mapline.size(); col++) {
+//				if(colnames[col].contains("Re") && colnames[col].contains(tempColNames[ii])){
+//					re=mapline[col].toDouble();
+//				}else{}
+//				if(colnames[col].contains("Im") && colnames[col].contains(tempColNames[ii])){
+//					im=mapline[col].toDouble();
+//				}else{}
+//			}
+//			double RCS=sqrt(re*re+im*im);
+//			mapline.append(QString::number(RCS));
+//		}
+//	}
 }
 
 void FEKOResultCsvTableModel::saveCSVFilePath(QString csvpath)
diff --git a/src/PluginWBFZExchangePlugin/TaskNodeList.cpp b/src/PluginWBFZExchangePlugin/TaskNodeList.cpp
index 4592317..6eaf863 100644
--- a/src/PluginWBFZExchangePlugin/TaskNodeList.cpp
+++ b/src/PluginWBFZExchangePlugin/TaskNodeList.cpp
@@ -393,14 +393,17 @@ void ComplexDataShowNode::OpenData(QString TaskXmlPath)
 int ComplexDataShowNode::ExcuteTask()
 {
 	this->status = TaskStatusEnum::excuting;
+	qDebug()<<"ComplexDataShowNode::ExcuteTask";
 	this->Load_amp_Image();
 	return 0;
 }
 
 void ComplexDataShowNode::Load_amp_Image()
 {
-	ImageShowDialogClass* DataShowDockWidget = new ImageShowDialogClass(this);
+	qDebug()<<"ComplexDataShowNode::Load_amp_Image";
+
 	gdalImageComplex img(this->TaskXmlPath);
+	qDebug()<<"gdalImageComplex img(this->TaskXmlPath);";
 	Eigen::MatrixXcd im_final = img.getDataComplex(0, 0, img.height, img.width, 1);
 	Eigen::MatrixXd gt = img.getGeoTranslation();
 
@@ -413,10 +416,11 @@ void ComplexDataShowNode::Load_amp_Image()
 	for (int i = 0; i < img.width; i++) {
 		X(i, 0) = gt(0, 0) + gt(0, 1) * i - gt(0, 2) * 0;
 	}
-
+	qDebug()<<"load_double_MatrixX_data";
 	Eigen::MatrixXd im_amp = Complex2Amplitude(im_final);
+	ImageShowDialogClass* DataShowDockWidget = new ImageShowDialogClass(nullptr);
 	DataShowDockWidget->load_double_MatrixX_data(X, Y, im_amp, this->getName());
-
+	qDebug()<<"DataShowDockWidget->show";
 	DataShowDockWidget->show();
 }