Skip to content

Commit

Permalink
Deal with 3.7.0 having C++ CLI as default
Browse files Browse the repository at this point in the history
  • Loading branch information
jmarrec authored Dec 23, 2023
1 parent d8ff326 commit 3460396
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/openstudio_app/OpenStudioApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1290,7 +1290,7 @@ void OpenStudioApp::startMeasureManagerProcess() {
if (ok) {
LOG(Debug, "OPENSTUDIO_APPLICATION_USE_LOCAL_MEASURE_MANAGER_PORT is " << port);
QString portString = QString::number(port);
QString urlString = "http://127.0.0.1:" + portString;
QString urlString = "http://localhost:" + portString;
QUrl url(urlString);
LOG(Debug, "Connection to existing Local Measure Manager: " << toString(urlString));
measureManager().setUrl(url);
Expand Down Expand Up @@ -1324,8 +1324,8 @@ void OpenStudioApp::startMeasureManagerProcess() {
const QString program = toQString(openstudioCLIPath());
QStringList arguments;

if (m_useLabsCLI) {
arguments << "labs";
if (!m_useLabsCLI) {
arguments << "classic";
}
arguments << "measure";
arguments << "-s";
Expand Down
4 changes: 2 additions & 2 deletions src/openstudio_lib/ApplyMeasureNowDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@ void ApplyMeasureNowDialog::runMeasure() {
OS_ASSERT(tempWorkflowJSONPath);

QStringList arguments;
if (OSAppBase::instance()->currentDocument()->mainWindow()->useLabsCLI()) {
arguments << "labs";
if (!OSAppBase::instance()->currentDocument()->mainWindow()->useLabsCLI()) {
arguments << "classic";
}
arguments << "run"
<< "-m"
Expand Down

0 comments on commit 3460396

Please sign in to comment.