diff --git a/Ortho-NoS1GBM/OrthoMain.py b/Ortho-NoS1GBM/OrthoMain.py index cbeacbe..76c2a01 100644 --- a/Ortho-NoS1GBM/OrthoMain.py +++ b/Ortho-NoS1GBM/OrthoMain.py @@ -636,6 +636,11 @@ class OrthoMain: Orthorectification.preCaldem_sar_rc(dem_path,in_slc_path,self.__workspace_Temporary_path,self.__workspace_package_path.replace("\\","\\\\")) # 初步筛选坐标范围 out_dir_path = self.__workspace_package_path.replace("\\", "\\\\") # sim_ori_rpc = self.correct_sim_ori(Orthorectification, slc_paths, bsMap_merged_path, out_dir_path) + + if os.path.exists(os.path.join(out_dir_path,"RD_sim_ori.tif")): + out_sim_ori_temp=os.path.join(out_dir_path,"sim_ori-ortho.tif") + shutil.move(os.path.join(out_dir_path,"RD_sim_ori.tif"), out_sim_ori_temp) + logger.info('progress bar: 40%') # clip_dem_reample_path=os.path.join(self.__workspace_Temporary_path, "SAR_dem.tiff") # infooption=gdal.InfoOptions("-json") @@ -815,6 +820,11 @@ class OrthoMain: if __name__ == '__main__': DEBUG = config['config']['debug']# True + DEBUG = DEBUG.lower() if isinstance(DEBUG, str) else str(DEBUG) + + if DEBUG == 'true': + DEBUG=True + if '-DEBUG' in sys.argv: DEBUG=True start = datetime.datetime.now() diff --git a/Ortho-NoS1GBM/OrthoMain.spec b/Ortho-NoS1GBM/OrthoMain.spec index b9503b2..636f47e 100644 --- a/Ortho-NoS1GBM/OrthoMain.spec +++ b/Ortho-NoS1GBM/OrthoMain.spec @@ -29,7 +29,7 @@ block_cipher = None a = Analysis(['OrthoMain.py'], pathex=[], binaries=[], - datas=[('D:/Anaconda/envs/micro/Lib/site-packages/dask/dask.yaml', './dask'), ('D:/Anaconda/envs/micro/Lib/site-packages/distributed/distributed.yaml', './distributed')], + datas=[('C:/Users/30453/.conda/envs/micro/Lib/site-packages/dask/dask.yaml', './dask'), ('C:/Users/30453/.conda/envs/micro/Lib/site-packages/distributed/distributed.yaml', './distributed')], hiddenimports=['pyproj._compat'], hookspath=[], hooksconfig={}, diff --git a/Ortho-NoS1GBM/config.ini b/Ortho-NoS1GBM/config.ini index b5c0e47..b68d3c5 100644 --- a/Ortho-NoS1GBM/config.ini +++ b/Ortho-NoS1GBM/config.ini @@ -7,5 +7,5 @@ target = Ortho # 算法名称。修改临时工作区生成临时文件的名称,日志名称; exe_name = Ortho # 开启调试模式则不删除临时工作区,True:开启调试,False:不开启调试 -debug = True +debug = False diff --git a/Ortho-NoS1GBM/打包命令.txt b/Ortho-NoS1GBM/打包命令.txt index c7110f1..ed0ba30 100644 --- a/Ortho-NoS1GBM/打包命令.txt +++ b/Ortho-NoS1GBM/打包命令.txt @@ -1,4 +1,8 @@ cd E:\0test\oneOrtho һļ pyinstaller -D packing.spec -pyinstaller -F --add-data "D:/Anaconda/envs/micro/Lib/site-packages/dask/dask.yaml;./dask" --add-data "D:/Anaconda/envs/micro/Lib/site-packages/distributed/distributed.yaml;./distributed" --hidden-import pyproj._compat \ No newline at end of file +pyinstaller -F --add-data "D:/Anaconda/envs/micro/Lib/site-packages/dask/dask.yaml;./dask" --add-data "D:/Anaconda/envs/micro/Lib/site-packages/distributed/distributed.yaml;./distributed" --hidden-import pyproj._compat + + +pyinstaller -F --add-data "C:/Users/30453/.conda/envs/micro/Lib/site-packages/dask/dask.yaml;./dask" --add-data "C:/Users/30453/.conda/envs/micro/Lib/site-packages/distributed/distributed.yaml;./distributed" --hidden-import pyproj._compat +