BIM: Renamed Arch to BIM

cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake

@@ -17,7 +17,7 @@ macro(CheckInterModuleDependencies)
         endif(${dependent})
     endfunction(REQUIRES_MODS)
 
-    REQUIRES_MODS(BUILD_ARCH               BUILD_PART BUILD_MESH BUILD_DRAFT)
+    REQUIRES_MODS(BUILD_BIM                BUILD_PART BUILD_MESH BUILD_DRAFT)
     REQUIRES_MODS(BUILD_DRAFT              BUILD_SKETCHER)
     REQUIRES_MODS(BUILD_DRAWING            BUILD_PART BUILD_SPREADSHEET)
     REQUIRES_MODS(BUILD_FEM                BUILD_PART)

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -104,7 +104,7 @@ macro(InitializeFreeCADBuildOptions)
     option(BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
     option(BUILD_TEMPLATE "Build the FreeCAD template module which is only for testing purposes" OFF)
     option(BUILD_ADDONMGR "Build the FreeCAD addon manager module" ON)
-    option(BUILD_ARCH "Build the FreeCAD Architecture module" ON)
+    option(BUILD_BIM "Build the FreeCAD BIM module" ON)
     option(BUILD_DRAFT "Build the FreeCAD draft module" ON)
     option(BUILD_DRAWING "Build the FreeCAD drawing module" OFF)
     option(BUILD_HELP "Build the FreeCAD help module" ON)

cMake/FreeCAD_Helpers/PrintFinalReport.cmake

@@ -89,7 +89,7 @@ macro(PrintFinalReport)
     value(FREECAD_USE_PYBIND11)
     value(FREECAD_USE_EXTERNAL_KDL)
     value(BUILD_ADDONMGR)
-    value(BUILD_ARCH)
+    value(BUILD_BIM)
     value(BUILD_ASSEMBLY)
     value(BUILD_CLOUD)
     value(BUILD_DRAFT)

src/Mod/BIM/ArchIFCSchema.py

@@ -35,14 +35,14 @@ from draftutils import params
 ifcVersions = ["IFC4", "IFC2X3"]
 IfcVersion = ifcVersions[params.get_param_arch("IfcVersion")]
 
-with open(os.path.join(FreeCAD.getResourceDir(), "Mod", "Arch", "Presets",
+with open(os.path.join(FreeCAD.getResourceDir(), "Mod", "BIM", "Presets",
 "ifc_contexts_" + IfcVersion + ".json")) as f:
     IfcContexts = json.load(f)
 
-with open(os.path.join(FreeCAD.getResourceDir(), "Mod", "Arch", "Presets",
+with open(os.path.join(FreeCAD.getResourceDir(), "Mod", "BIM", "Presets",
 "ifc_products_" + IfcVersion + ".json")) as f:
     IfcProducts = json.load(f)
 
-with open(os.path.join(FreeCAD.getResourceDir(), "Mod", "Arch", "Presets",
+with open(os.path.join(FreeCAD.getResourceDir(), "Mod", "BIM", "Presets",
 "ifc_types_" + IfcVersion + ".json")) as f:
     IfcTypes = json.load(f)

src/Mod/BIM/ArchProfile.py

@@ -55,9 +55,9 @@ else:
 # Presets in the form: Class, Name, Profile type, [profile data]
 # Search for profiles.csv in data/Mod/Arch/Presets and in the same folder as this file
 # and in the user path
-profilefiles = [os.path.join(FreeCAD.getResourceDir(),"Mod","Arch","Presets","profiles.csv"),
+profilefiles = [os.path.join(FreeCAD.getResourceDir(),"Mod","BIM","Presets","profiles.csv"),
                 os.path.join(os.path.dirname(__file__),"Presets","profiles.csv"),
-                os.path.join(FreeCAD.getUserAppDataDir(),"Arch","profiles.csv")]
+                os.path.join(FreeCAD.getUserAppDataDir(),"BIM","profiles.csv")]
 
 
 def readPresets():

src/Mod/BIM/CMakeLists.txt

@@ -43,8 +43,6 @@ SET(Arch_SRCS
     OfflineRenderingUtils.py
     ArchTruss.py
     ArchCurtainWall.py
-    ifc_objects.py
-    ifc_viewproviders.py
     ArchSketchObject.py
     BimSelect.py
     BimStatusBar.py
@@ -192,11 +190,11 @@ SET(nativeifc_SRCS
 
 SOURCE_GROUP("" FILES ${Arch_SRCS})
 
-SET(ArchGuiIcon_SVG
+SET(BIMGuiIcon_SVG
     Resources/icons/BIMWorkbench.svg
 )
 
-ADD_CUSTOM_TARGET(Arch ALL
+ADD_CUSTOM_TARGET(BIM ALL
     SOURCES ${Arch_SRCS}
             ${Arch_QRC_SRCS}
             ${Dice3DS_SRCS}
@@ -207,23 +205,23 @@ ADD_CUSTOM_TARGET(Arch ALL
             ${nativeifc_SRCS}
 )
 
-fc_copy_sources(Arch "${CMAKE_BINARY_DIR}/Mod/Arch" ${Arch_SRCS})
-fc_copy_sources(Arch "${CMAKE_BINARY_DIR}/Mod/Arch" ${Dice3DS_SRCS})
-fc_copy_sources(Arch "${CMAKE_BINARY_DIR}/Mod/Arch" ${importers_SRCS})
-fc_copy_sources(Arch "${CMAKE_BINARY_DIR}/Mod/Arch" ${bimcommands_SRCS})
-fc_copy_sources(Arch "${CMAKE_BINARY_DIR}/Mod/Arch" ${nativeifc_SRCS})
-fc_copy_sources(Arch "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Arch" ${ArchGuiIcon_SVG})
+fc_copy_sources(BIM "${CMAKE_BINARY_DIR}/Mod/Arch" ${Arch_SRCS})
+fc_copy_sources(BIM "${CMAKE_BINARY_DIR}/Mod/Arch" ${Dice3DS_SRCS})
+fc_copy_sources(BIM "${CMAKE_BINARY_DIR}/Mod/Arch" ${importers_SRCS})
+fc_copy_sources(BIM "${CMAKE_BINARY_DIR}/Mod/Arch" ${bimcommands_SRCS})
+fc_copy_sources(BIM "${CMAKE_BINARY_DIR}/Mod/Arch" ${nativeifc_SRCS})
+fc_copy_sources(BIM "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Arch" ${BIMGuiIcon_SVG})
 
-fc_target_copy_resource(Arch
-    ${CMAKE_SOURCE_DIR}/src/Mod/Arch
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Arch
+fc_target_copy_resource(BIM
+    ${CMAKE_SOURCE_DIR}/src/Mod/BIM
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/BIM
     ${Arch_presets}
 )
 
 IF (BUILD_GUI)
-    fc_target_copy_resource(Arch
+    fc_target_copy_resource(BIM
         ${CMAKE_CURRENT_BINARY_DIR}
-        ${CMAKE_BINARY_DIR}/Mod/Arch
+        ${CMAKE_BINARY_DIR}/Mod/BIM
         Arch_rc.py)
 ENDIF (BUILD_GUI)
 
@@ -231,44 +229,44 @@ INSTALL(
     FILES
         ${Arch_SRCS}
         ${Arch_QRC_SRCS}
-    DESTINATION Mod/Arch
+    DESTINATION Mod/BIM
 )
 
 INSTALL(
     FILES
         ${Dice3DS_SRCS}
-    DESTINATION Mod/Arch/Dice3DS
+    DESTINATION Mod/BIM/Dice3DS
 )
 
 INSTALL(
     FILES
         ${importers_SRCS}
-    DESTINATION Mod/Arch/importers
+    DESTINATION Mod/BIM/importers
 )
 
 INSTALL(
     FILES
         ${bimcommands_SRCS}
-    DESTINATION Mod/Arch/bimcommands
+    DESTINATION Mod/BIM/bimcommands
 )
 
 INSTALL(
     FILES
         ${nativeifc_SRCS}
-    DESTINATION Mod/Arch/nativeifc
+    DESTINATION Mod/BIM/nativeifc
 )
 
 INSTALL(
     DIRECTORY
         Presets
     DESTINATION
-        ${CMAKE_INSTALL_DATADIR}/Mod/Arch
+        ${CMAKE_INSTALL_DATADIR}/Mod/BIM
 )
 
 INSTALL(
     FILES
-        ${ArchGuiIcon_SVG}
+        ${BIMGuiIcon_SVG}
     DESTINATION
-       "${CMAKE_INSTALL_DATADIR}/Mod/Arch/Resources/icons"
+       "${CMAKE_INSTALL_DATADIR}/Mod/BIM/Resources/icons"
 )