guqing 1 день назад
Родитель
Сommit
4ca1ae640d
40 измененных файлов с 5 добавлено и 2 удалено
  1. 4 1
      GFS-Client/save_result.py
  2. 0 0
      depoly_cultural_relics_furniture/.idea/.gitignore
  3. 0 0
      depoly_cultural_relics_furniture/.idea/depoly.iml
  4. 0 0
      depoly_cultural_relics_furniture/.idea/inspectionProfiles/Project_Default.xml
  5. 0 0
      depoly_cultural_relics_furniture/.idea/inspectionProfiles/profiles_settings.xml
  6. 0 0
      depoly_cultural_relics_furniture/.idea/misc.xml
  7. 0 0
      depoly_cultural_relics_furniture/.idea/modules.xml
  8. 0 0
      depoly_cultural_relics_furniture/depoly.txt
  9. 1 1
      depoly_cultural relics and furniture/inf_run.txt
  10. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/SG-0uQb047fxOJ_0.jpg
  11. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/__pycache__/obb_client.cpython-38-pytest-8.3.5.pyc
  12. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/__pycache__/obb_server.cpython-312.pyc
  13. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/__pycache__/obb_server.cpython-38.pyc
  14. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/load_result_json.py
  15. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/nohup.out
  16. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/nolabel.jpg
  17. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_client.py
  18. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_client_cpu.py
  19. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_detect_Cultural relics disease detection-2560.pt
  20. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_results.json
  21. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_server.py
  22. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/res_SG-0uQb047fxOJ_0.jpg
  23. 0 0
      depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/res_SG-0uQb047fxOJ_0.json
  24. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/KJ-vYL6GFH2fYw_30.jpg
  25. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/__pycache__/obb_client.cpython-38-pytest-8.3.5.pyc
  26. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/__pycache__/seg_client.cpython-38-pytest-8.3.5.pyc
  27. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/__pycache__/seg_server.cpython-312.pyc
  28. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/__pycache__/seg_server.cpython-38.pyc
  29. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/load_result_json.py
  30. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/nohup.out
  31. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/nolabel.jpg
  32. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/res_KJ-vYL6GFH2fYw_30.jpg
  33. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/res_KJ-vYL6GFH2fYw_30.json
  34. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_client.py
  35. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_client_cpu.py
  36. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_detect_Panoramic_Home.pt
  37. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_results.json
  38. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_server.py
  39. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/server_copy.py
  40. 0 0
      depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/yolov_seg_test.py

+ 4 - 1
GFS-Client/save_result.py

@@ -351,7 +351,10 @@ def process_and_draw_bboxes(picture_name, floor_path, raw_bbox_data, floor_id, o
         
         
         output_3d_json_data = {
         output_3d_json_data = {
             "shapes": shapes_3d,
             "shapes": shapes_3d,
-            "version": "4Dage_Furniture_Detection_0.0.1_3D_final"
+            "imageHeight": img_height,
+            "imagePath": os.path.basename(picture_name),
+            "imageWidth": img_width,
+            "version": "4Dage_Furniture_Detection_0.0.1"
         }
         }
         os.makedirs(os.path.dirname(output_3d_json_path), exist_ok=True)
         os.makedirs(os.path.dirname(output_3d_json_path), exist_ok=True)
         with open(output_3d_json_path, 'w', encoding='utf-8') as f:
         with open(output_3d_json_path, 'w', encoding='utf-8') as f:

depoly_cultural relics and furniture/.idea/.gitignore → depoly_cultural_relics_furniture/.idea/.gitignore


depoly_cultural relics and furniture/.idea/depoly.iml → depoly_cultural_relics_furniture/.idea/depoly.iml


depoly_cultural relics and furniture/.idea/inspectionProfiles/Project_Default.xml → depoly_cultural_relics_furniture/.idea/inspectionProfiles/Project_Default.xml


depoly_cultural relics and furniture/.idea/inspectionProfiles/profiles_settings.xml → depoly_cultural_relics_furniture/.idea/inspectionProfiles/profiles_settings.xml


depoly_cultural relics and furniture/.idea/misc.xml → depoly_cultural_relics_furniture/.idea/misc.xml


depoly_cultural relics and furniture/.idea/modules.xml → depoly_cultural_relics_furniture/.idea/modules.xml


depoly_cultural relics and furniture/depoly.txt → depoly_cultural_relics_furniture/depoly.txt


+ 1 - 1
depoly_cultural relics and furniture/inf_run.txt

@@ -1,7 +1,7 @@
 ###################################################
 ###################################################
 文物病害检测
 文物病害检测
 
 
-cd obb_detect_Cultural relics disease detection
+cd obb_detect_Cultural_relics_disease_detection
 
 
 #run the server
 #run the server
 python obb_server.py
 python obb_server.py

depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/SG-0uQb047fxOJ_0.jpg → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/SG-0uQb047fxOJ_0.jpg


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/__pycache__/obb_client.cpython-38-pytest-8.3.5.pyc → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/__pycache__/obb_client.cpython-38-pytest-8.3.5.pyc


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/__pycache__/obb_server.cpython-312.pyc → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/__pycache__/obb_server.cpython-312.pyc


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/__pycache__/obb_server.cpython-38.pyc → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/__pycache__/obb_server.cpython-38.pyc


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/load_result_json.py → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/load_result_json.py


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/nohup.out → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/nohup.out


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/nolabel.jpg → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/nolabel.jpg


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/obb_client.py → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_client.py


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/obb_client_cpu.py → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_client_cpu.py


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/obb_detect_Cultural relics disease detection-2560.pt → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_detect_Cultural relics disease detection-2560.pt


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/obb_results.json → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_results.json


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/obb_server.py → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/obb_server.py


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/res_SG-0uQb047fxOJ_0.jpg → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/res_SG-0uQb047fxOJ_0.jpg


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/res_SG-0uQb047fxOJ_0.json → depoly_cultural_relics_furniture/obb_detect_Cultural_relics_disease_detection/res_SG-0uQb047fxOJ_0.json


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/KJ-vYL6GFH2fYw_30.jpg → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/KJ-vYL6GFH2fYw_30.jpg


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/__pycache__/obb_client.cpython-38-pytest-8.3.5.pyc → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/__pycache__/obb_client.cpython-38-pytest-8.3.5.pyc


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/__pycache__/seg_client.cpython-38-pytest-8.3.5.pyc → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/__pycache__/seg_client.cpython-38-pytest-8.3.5.pyc


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/__pycache__/seg_server.cpython-312.pyc → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/__pycache__/seg_server.cpython-312.pyc


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/__pycache__/seg_server.cpython-38.pyc → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/__pycache__/seg_server.cpython-38.pyc


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/load_result_json.py → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/load_result_json.py


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/nohup.out → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/nohup.out


depoly_cultural relics and furniture/obb_detect_Cultural relics disease detection/nolabel.jpg → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/nolabel.jpg


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/res_KJ-vYL6GFH2fYw_30.jpg → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/res_KJ-vYL6GFH2fYw_30.jpg


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/res_KJ-vYL6GFH2fYw_30.json → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/res_KJ-vYL6GFH2fYw_30.json


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/seg_client.py → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_client.py


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/seg_client_cpu.py → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_client_cpu.py


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/seg_detect_Panoramic_Home.pt → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_detect_Panoramic_Home.pt


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/seg_results.json → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_results.json


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/seg_server.py → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/seg_server.py


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/server_copy.py → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/server_copy.py


depoly_cultural relics and furniture/seg_detect_Panoramic_Home/yolov_seg_test.py → depoly_cultural_relics_furniture/seg_detect_Panoramic_Home/yolov_seg_test.py