更新代码

file_util.py

@@ -13,12 +13,10 @@ def getAllFiles(filePath):
     for root, dirs, files in os.walk(folder_path):
         for file in files:
             file_path = os.path.join(root, file)
-            if file_path.endswith('.tif'):
+            if file_path.endswith('.tif') or file_path.endswith('.TIF'):
                 fileList.append(file_path)
     return fileList
 
-# allPath = getAllFiles('img/DDOM')
-
 
 # 获取当前目录下的文件夹
 def getDirList(filePath,startName):

img_util.py

@@ -10,11 +10,11 @@ import matplotlib.pyplot as plt
 # 调整尺寸
 
 
-def resizeImage(dir, fileName):
+def resizeImage(dir, fileName,size0,size1):
     # 打开原始图片
     original_image = Image.open(dir+"/"+fileName)
     # 调整图片尺寸到 256x256
-    resized_image = original_image.resize((256, 256))
+    resized_image = original_image.resize((size0, size1))
     # dir = dir.replace('tb', 'tb_256')
     if not os.path.exists(dir):
         os.makedirs(dir)
@@ -25,7 +25,7 @@ def resizeImage(dir, fileName):
 # resizeImage('img/tb/6401812024070108270001change.png')
 
 # 保存为 PNG 图片
-def savePng(fileName, ewkt, dir):
+def savePng(fileName, ewkt, dir,size0,size1):
     # 解析 WKT 数据字符串
     geometry = loads(ewkt.split(';')[1])  # 解析 WKT
     gdf = gpd.GeoDataFrame(geometry=[geometry])
@@ -70,7 +70,7 @@ def savePng(fileName, ewkt, dir):
     os.remove(temp_file_path)
 
     # 调用 resizeImage 函数来调整图片大小
-    resizeImage(dir, fileName + '.png')
+    resizeImage(dir, fileName + '.png',size0,size1)
 
 
 # ewkt = "SRID=3857;POLYGON((13522050.0 3666550.0, 13522050.0 3657500.0, 13512100.0 3657500.0, 13512100.0 3666550.0, 13522050.0 3666550.0), (13516300.0 3662300.0, 13517350.0 3662300.0, 13517350.0 3663150.0, 13516300.0 3663150.0, 13516300.0 3662300.0))"

main.py

@@ -7,29 +7,36 @@ from img_util import getImageSize
 import re
 
 # 1.获取图斑的根目录
-dirs = getDirList('img', '2024')
+dirs = getDirList('img', '2023_1023')
 for dir in dirs:
+    print('图斑根目录：'+dir)
+
     # 2.获取tif路径
-    allPathList = getAllFiles(dir+'/DDOM')
+    allPathList = getAllFiles(dir+'/QDOM')
+    print('tif路径长度：'+allPathList.__len__().__str__())
 
     for filePath in allPathList:
-
         print('tif路径：'+filePath)
         imageSize=getImageSize(filePath)
-        if not(imageSize[0] ==256 and imageSize[1] == 256):
-            print('图片尺寸不是256：',imageSize)
-            continue
+        size0=imageSize[0]
+        size1=imageSize[1]
+        # if not(imageSize[0] ==256 and imageSize[1] == 256):
+        #     print('图片尺寸不是256：',imageSize)
+        #     continue
 
         # 3.获取tif的边界矢量范围
         ewkt = getTifEwkt(filePath)
         # 4.tif边界-变化矢量（生成图片的黑色部分）
-        match = re.search(r'/DDOM/(.*)DDOM\.tif', filePath)
+        fileType=filePath.split('.')[-1]
+        match = re.search(r'/QDOM/(.*)\.'+fileType, filePath)
         code = match.group(1) if match else ''
         tbName=dir.replace('img/','')
         ewkt = getDiffEwkt(ewkt, tbName)
         # 5.生成变化的图片
-        savePng(code, ewkt, 'img/lable')
+        savePng(code, ewkt, 'img/lable',size0,size1)
         # 6.tif转png
-        saveImage(filePath,'img/A/'+code+'.tif')
-        filePath=filePath.replace('DDOM','QDOM')
-        saveImage(filePath,'img/B/'+code+'.tif')
+        saveImage(filePath,'img/A/'+code+'.'+fileType)
+        filePath=filePath.replace('/QDOM/','/DDOM_QDOM_crop1/')
+        filePath=filePath.replace('QDOM.','DDOM.')
+        saveImage(filePath,'img/B/'+code+'.'+fileType)
+print('end')

test.py

@@ -0,0 +1,16 @@
+import json
+
+arg="{\n  \"img1\": \"predict/upload/8afb5a7b-82a7-4654-96e7-c32b7fab857clogo-site.png\",\n  \"img2\": \"predict/upload/b27f1346-097d-47c1-9d26-877c66aca42dlogo-site-dark.png\"\n}\n"
+
+
+def main(arg1):
+   # 解析 JSON 字符串
+    data_dict = json.loads(arg1)
+
+    # 获取并输出 data 字段内容
+    img1 = data_dict.get("img1", "")
+    img2 = data_dict.get("img2", "")
+    print({"img1":img1,"img2":img2})
+    return {"img1":img1,"img2":img2}
+
+main(arg)