Merge pull request #1565 from NREL/BIMDataHub

Merging pull request from @zhouchong90 and adding IFC import, nice job!
NREL · Mar 31, 2015 · b567fe4 · b567fe4 · nrel-bot · Mar 31, 2015
2 parents fa54c93 + a39ce2a
commit b567fe4
Show file tree

Hide file tree

Showing 23 changed files with 1,651 additions and 56 deletions.
diff --git a/openstudiocore/CMakeLists.txt b/openstudiocore/CMakeLists.txt
@@ -195,6 +195,7 @@ set(project_directories
   energyplus
   radiance
   gbxml
+  bimserver
   airflow
   isomodel
   osversion
@@ -935,6 +936,7 @@ set(all_lib_targets
   openstudio_analysis
   openstudio_radiance
   openstudio_gbxml
+  openstudio_bimserver
   openstudio_isomodel
   openstudio_lib
   openstudio_sdd

diff --git a/openstudiocore/resources/CMakeLists.txt b/openstudiocore/resources/CMakeLists.txt
@@ -740,6 +740,26 @@ add_custom_target(openstudio_isomodel_resources
 )
 
 CREATE_SRC_GROUPS("${isomodel_resources_src}")
+
+########################################################
+# bimserver resources
+# clear runs, calls to RUN_ENERGYPLUS will populate this
+set(ENERGYPLUS_OUTPUTS "")
+
+set(bimserver_resources_src
+)
+
+# update the resources
+UPDATE_RESOURCES("${bimserver_resources_src}")
+
+# add target
+add_custom_target(openstudio_bimserver_resources
+  DEPENDS ${bimserver_resources_src} ${ENERGYPLUS_OUTPUTS}
+  SOURCES ${bimserver_resources_src}
+)
+
+CREATE_SRC_GROUPS("${bimserver_resources_src}")
+
 ########################################################
 # CONTAM resources
 # clear runs, calls to RUN_ENERGYPLUS will populate this

diff --git a/openstudiocore/src/bimserver/BIMServer.i b/openstudiocore/src/bimserver/BIMServer.i
@@ -0,0 +1,33 @@
+#ifndef BIMSERVER_I
+#define BIMSERVER_I
+
+#ifdef SWIGPYTHON
+%module openstudiobimserver
+#endif
+
+
+#define UTILITIES_API
+#define BIMSERVER_API
+
+%include <utilities/core/CommonInclude.i>
+%import <utilities/core/CommonImport.i>
+%import <utilities/Utilities.i>
+%import <model/Model.i>
+
+%{
+  #include <bimserver/ProjectImportation.hpp>
+  using namespace openstudio::bimserver;
+  using namespace openstudio;
+
+  #include <model/Model.hpp>
+  #include <model/ModelObject.hpp>
+
+%}
+
+// #ifdef SWIGCSHARP
+%rename(BIMserverProjectImportation) openstudio::bimserver::ProjectImportation;
+// #endif
+
+%include bimserver/ProjectImportation.hpp>
+
+#endif //BIMSERVER_I 
diff --git a/openstudiocore/src/bimserver/BIMserverAPI.hpp b/openstudiocore/src/bimserver/BIMserverAPI.hpp
@@ -0,0 +1,15 @@
+#ifndef BIMSERVER_BIMSERVERAPI_HPP
+#define BIMSERVER_BIMSERVERAPI_HPP
+
+#if _WIN32 || _MSC_VER
+
+#ifdef openstudio_bimserver_EXPORTS
+#define BIMSERVER_API __declspec(dllexport)
+#else
+#define BIMSERVER_API __declspec(dllimport)
+#endif
+#else
+#define BIMSERVER_API
+#endif
+
+#endif