Merge remote-tracking branch 'origin/master' into develop

Author: macumber

src/openstudio_lib/GeometryEditorView.cpp

@@ -48,7 +48,7 @@
 
 #include <openstudio/utilities/core/Assert.hpp>
 #include <openstudio/utilities/core/Checksum.hpp>
-#include <openstudio/utilities/bcl/RemoteBCL.hpp>
+#include "../utilities/RemoteBCLNLR.hpp"
 #include <openstudio/utilities/geometry/FloorplanJS.hpp>
 #include <openstudio/utilities/geometry/ThreeJS.hpp>
 
@@ -256,7 +256,7 @@ void FloorspaceEditor::loadEditor() {
     }
 
     // DLM: need a better check here
-    if (openstudio::RemoteBCL::isOnline()) {
+    if (openstudio::RemoteBCLNLR::isOnline()) {
       config["online"] = true;
     } else {
       config["online"] = false;

src/openstudio_lib/OSDocument.cpp

@@ -58,7 +58,7 @@
 
 #include <openstudio/utilities/bcl/BCLComponent.hpp>
 #include <openstudio/utilities/bcl/LocalBCL.hpp>
-#include <openstudio/utilities/bcl/RemoteBCL.hpp>
+#include "../utilities/RemoteBCLNLR.hpp"
 #include <openstudio/utilities/core/Assert.hpp>
 #include <openstudio/utilities/core/Checksum.hpp>
 #include <openstudio/utilities/core/PathHelpers.hpp>
@@ -1757,7 +1757,7 @@ void OSDocument::openBclDlg() {
     return;
   }
 
-  if (!RemoteBCL::isOnline()) {
+  if (!RemoteBCLNLR::isOnline()) {
     QMessageBox::information(this->mainWindow(), "Offline", "You appear to be offline, please connect to the internet to access the BCL.",
                              QMessageBox::Ok);
     return;
@@ -1807,7 +1807,7 @@ void OSDocument::openMeasuresBclDlg() {
     return;
   }
 
-  if (!RemoteBCL::isOnline()) {
+  if (!RemoteBCLNLR::isOnline()) {
     QMessageBox::information(this->mainWindow(), "Offline", "You appear to be offline, please connect to the internet to access the BCL.",
                              QMessageBox::Ok);
     return;

src/shared_gui_components/BuildingComponentDialogCentralWidget.cpp

@@ -18,7 +18,7 @@
 
 #include <openstudio/utilities/bcl/BCL.hpp>
 #include <openstudio/utilities/bcl/LocalBCL.hpp>
-#include <openstudio/utilities/bcl/RemoteBCL.hpp>
+#include "../utilities/RemoteBCLNLR.hpp"
 #include <openstudio/utilities/core/Assert.hpp>
 
 #include "../model_editor/Application.hpp"
@@ -190,7 +190,7 @@ void BuildingComponentDialogCentralWidget::setTid(const std::string& filterType,
     delete comp;
   }
 
-  RemoteBCL remoteBCL;
+  RemoteBCLNLR remoteBCL;
   remoteBCL.setTimeOutSeconds(m_timeoutSeconds);
   std::vector<BCLSearchResult> responses;
   if (filterType == "components") {
@@ -330,7 +330,7 @@ void BuildingComponentDialogCentralWidget::downloadNextComponent() {
   if (m_remoteBCL) {
     // currently doing a download
     if (m_downloadTimer.isValid()) {
-      // RemoteBCL does not always call the call back for us if we timeout
+      // RemoteBCLNLR does not always call the call back for us if we timeout
       if (m_downloadTimer.elapsed() > static_cast<qint64>(1000) * m_timeoutSeconds) {
         m_timer->stop();
 
@@ -344,7 +344,7 @@ void BuildingComponentDialogCentralWidget::downloadNextComponent() {
         m_downloadTimer.invalidate();
         m_currentDownload.reset();
 
-        if (!RemoteBCL::isOnline()) {
+        if (!RemoteBCLNLR::isOnline()) {
           // if we have gone offline cancel the remaining pending downloads
           clearPendingDownloads(true);
         }
@@ -372,7 +372,7 @@ void BuildingComponentDialogCentralWidget::downloadNextComponent() {
     m_progressBar->setVisible(true);
 
     if (m_currentDownload->second == "components") {
-      m_remoteBCL = std::make_shared<RemoteBCL>();
+      m_remoteBCL = std::make_shared<RemoteBCLNLR>();
       m_remoteBCL->setTimeOutSeconds(m_timeoutSeconds);
 
       // Connect to Nano Signal
@@ -388,7 +388,7 @@ void BuildingComponentDialogCentralWidget::downloadNextComponent() {
       }
 
     } else if (m_currentDownload->second == "measures") {
-      m_remoteBCL = std::make_shared<RemoteBCL>();
+      m_remoteBCL = std::make_shared<RemoteBCLNLR>();
       m_remoteBCL->setTimeOutSeconds(m_timeoutSeconds);
 
       // Connect to Nano Signal

src/shared_gui_components/BuildingComponentDialogCentralWidget.hpp

@@ -28,7 +28,7 @@ namespace openstudio {
 class Component;
 class ComponentList;
 class CollapsibleComponentList;
-class RemoteBCL;
+class RemoteBCLNLR;
 
 class BuildingComponentDialogCentralWidget
   : public QWidget
@@ -64,7 +64,7 @@ class BuildingComponentDialogCentralWidget
   int m_pageIdx;
   QString m_searchString;
   bool m_showNewComponents;
-  std::shared_ptr<RemoteBCL> m_remoteBCL;
+  std::shared_ptr<RemoteBCLNLR> m_remoteBCL;
   QTimer* m_timer;
   QElapsedTimer m_downloadTimer;
   std::optional<std::pair<std::string, std::string>> m_currentDownload;

src/shared_gui_components/MeasureManager.cpp

@@ -25,7 +25,7 @@
 #include <openstudio/utilities/core/PathHelpers.hpp>
 #include <openstudio/utilities/core/System.hpp>
 #include <openstudio/utilities/bcl/BCLMeasure.hpp>
-#include <openstudio/utilities/bcl/RemoteBCL.hpp>
+#include "../utilities/RemoteBCLNLR.hpp"
 #include <openstudio/utilities/bcl/LocalBCL.hpp>
 #include <openstudio/utilities/filetypes/WorkflowJSON.hpp>
 #include <openstudio/utilities/filetypes/WorkflowStep.hpp>
@@ -953,7 +953,7 @@ bool MeasureManager::checkForUpdates(const openstudio::path& measureDir, bool fo
 }
 
 void MeasureManager::checkForRemoteBCLUpdates() {
-  RemoteBCL remoteBCL;
+  RemoteBCLNLR remoteBCL;
   remoteBCL.checkForMeasureUpdates();
   std::vector<BCLSearchResult> updates = remoteBCL.measuresWithUpdates();
 

src/utilities/CMakeLists.txt

@@ -8,6 +8,8 @@ CONFIGURE_FILE_WITH_CHECKSUM("OpenStudioApplicationPathHelpers.cxx.in" "${CMAKE_
 set(${target_name}_src
   OpenStudioApplicationPathHelpers.hpp
   ${CMAKE_CURRENT_BINARY_DIR}/OpenStudioApplicationPathHelpers.cxx
+  RemoteBCLNLR.hpp
+  RemoteBCLNLR.cpp
 )
 
 # set up groups of source files for Visual Studio