Merging master into develop

Author: macumber

CMakeLists.txt

@@ -16,7 +16,7 @@ if(CCACHE_PROGRAM)
   set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "C compiler cache used")
 endif()
 
-project(OpenStudioApplication VERSION 1.7.1)
+project(OpenStudioApplication VERSION 1.7.2)
 
 # Check system info globally so we can use it everywhere after: Has to be done before FindOpenStudioSDK.cmake
 if(APPLE)

src/openstudio_lib/OSDocument.cpp

@@ -1493,23 +1493,9 @@ std::vector<BCLComponent> OSDocument::componentAttributeSearch(const std::vector
 }
 
 boost::optional<BCLMeasure> OSDocument::standardReportMeasure() {
-  const std::string uid("a25386cd-60e4-46bc-8b11-c755f379d916");
-  boost::optional<BCLMeasure> result = getLocalMeasure(uid);
-
-  if (!result) {
-    // if we don't have a result measure in local bcl, use the one in the installer
-    result = BCLMeasure::load(m_resourcesPath / toPath("openstudio_results"));
-  }
-
-  if (m_haveLocalBCL && RemoteBCL::isOnline()) {
-    RemoteBCL remoteBCL;
-    boost::optional<BCLMeasure> onlineResult = remoteBCL.getMeasure(uid);
-    if (onlineResult) {
-      result = onlineResult;
-    }
-  }
-
-  return result;
+  // DLM: Breaking changes in openstudio_results measures prevent us from being able to ensure
+  // that measure in users local BCL or remote BCL will work, just use measure in installer
+  return BCLMeasure::load(m_resourcesPath / toPath("openstudio_results"));
 }
 
 bool OSDocument::save() {