diff --git a/BaseCommonLibrary/BaseTool/ImageOperatorBase.h b/BaseCommonLibrary/BaseTool/ImageOperatorBase.h index 2f52328..633dd9e 100644 --- a/BaseCommonLibrary/BaseTool/ImageOperatorBase.h +++ b/BaseCommonLibrary/BaseTool/ImageOperatorBase.h @@ -328,7 +328,7 @@ ErrorCode BASECONSTVARIABLEAPI Complex2AmpRaster(QString inComplexPath, QString ErrorCode BASECONSTVARIABLEAPI ResampleDEM(QString indemPath, QString outdemPath, double gridx, double gridy); - +void BASECONSTVARIABLEAPI CloseAllGDALRaster(); diff --git a/BaseCommonLibrary/ImageOperatorFuntion.cpp b/BaseCommonLibrary/ImageOperatorFuntion.cpp index 6313329..2397a00 100644 --- a/BaseCommonLibrary/ImageOperatorFuntion.cpp +++ b/BaseCommonLibrary/ImageOperatorFuntion.cpp @@ -1665,6 +1665,12 @@ ErrorCode ResampleDEM(QString indemPath, QString outdemPath, double gridx, doubl } } +void BASECONSTVARIABLEAPI CloseAllGDALRaster() +{ + GDALDestroyDriverManager(); + return ; +} + ErrorCode Complex2AmpRaster(QString inComplexPath, QString outRasterPath) diff --git a/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.cpp b/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.cpp index eb4f02a..d985f06 100644 --- a/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.cpp +++ b/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.cpp @@ -14,7 +14,7 @@ #include "FileOperator.h" #include "RasterWidgetMessageShow.h" - +#include "ImageOperatorBase.h" #pragma execution_character_set("utf-8") @@ -59,7 +59,7 @@ RasterMainWidget::RasterMainWidget(QWidget *parent) //mUi->layerList->setCurrentItem(mLayerList.first()); - + connect(mUi->actioncloseAllRasterFile, SIGNAL(triggered()), this, SLOT(onactioncloseAllRasterFile_triggered())); } @@ -341,6 +341,11 @@ void RasterMainWidget::on_addPlaneaction_triggered() mMapConvas->selectTool("addplane_tool"); } +void RasterMainWidget::onactioncloseAllRasterFile_triggered() +{ + CloseAllGDALRaster(); +} + QTableWidget* RasterMainWidget::getTaskTable() { return this->mUi->taskTable; diff --git a/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.h b/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.h index a64eb49..f4f3316 100644 --- a/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.h +++ b/RasterMainWidgetGUI/RasterMainWidget/RasterMainWidget.h @@ -77,7 +77,7 @@ namespace LAMPMainWidget { private slots: void on_drawArea_triggered(); void on_addPlaneaction_triggered(); - + void onactioncloseAllRasterFile_triggered(); private: Ui::RasterMainWidget* mUi; MapCanvas* mMapConvas;