Skip to content

Fix #671 - Mark Python Measures as in Error if use classic CLI to run the simulation #733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmarrec merged 1 commit into from
Sep 3, 2024
Merged

Fix #671 - Mark Python Measures as in Error if use classic CLI to run the simulation #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/shared_gui_components/LocalLibraryController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,11 @@ QWidget* LibraryItemDelegate::view(QSharedPointer<OSListItem> dataSource) {
// Name

widget->label->setText(libraryItem->displayName());
if (libraryItem->hasError()) {
const bool useClassicCLI = OSAppBase::instance()->currentDocument()->mainWindow()->useClassicCLI();
if (useClassicCLI && (measureLanguage == MeasureLanguage::Python)) {
widget->setToolTip("Python Measures are not supported in the Classic CLI.\nYou can change CLI version using 'Preferences->Use Classic CLI'.");
widget->errorLabel->setVisible(true);
} else if (libraryItem->hasError()) {
widget->setToolTip(libraryItem->error());
widget->errorLabel->setVisible(true);
} else {
Expand Down
24 changes: 17 additions & 7 deletions src/shared_gui_components/WorkflowController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "BaseApp.hpp"
#include "../openstudio_lib/OSAppBase.hpp"
#include "../openstudio_lib/OSDocument.hpp"
#include "../openstudio_lib/MainWindow.hpp"
#include "LocalLibraryController.hpp"
#include "WorkflowTools.hpp"
#include "../model_editor/Utilities.hpp"
Expand Down Expand Up @@ -556,7 +557,9 @@ QWidget* MeasureStepItemDelegate::view(QSharedPointer<OSListItem> dataSource) {
if (QSharedPointer<MeasureStepItem> measureStepItem = dataSource.objectCast<MeasureStepItem>()) {
auto* workflowStepView = new WorkflowStepView();

const QString measureLangStr = toQString(measureStepItem->measureLanguage().valueName());
const MeasureLanguage measureLanguage = measureStepItem->measureLanguage();

const QString measureLangStr = toQString(measureLanguage.valueName());
if (measureStepItem->measureType() == MeasureType::ModelMeasure) {
workflowStepView->workflowStepButton->measureTypeBadge->setPixmap(
QPixmap(QString(":/images/openstudio_measure_icon_%1.png").arg(measureLangStr))
Expand Down Expand Up @@ -591,13 +594,20 @@ QWidget* MeasureStepItemDelegate::view(QSharedPointer<OSListItem> dataSource) {

connect(measureStepItem.data(), &MeasureStepItem::selectedChanged, workflowStepView->workflowStepButton, &WorkflowStepButton::setHasEmphasis);

try {
// Warning Icon
workflowStepView->workflowStepButton->cautionLabel->setVisible(measureStepItem->hasIncompleteArguments());
connect(measureStepItem.data(), &MeasureStepItem::argumentsChanged, workflowStepView->workflowStepButton->cautionLabel, &QLabel::setVisible);
} catch (const std::exception& e) {
workflowStepView->workflowStepButton->errorLabel->setToolTip(e.what());
const bool useClassicCLI = OSAppBase::instance()->currentDocument()->mainWindow()->useClassicCLI();
if (useClassicCLI && (measureLanguage == MeasureLanguage::Python)) {
workflowStepView->workflowStepButton->errorLabel->setToolTip(
"Python Measures are not supported in the Classic CLI.\nYou can change CLI version using 'Preferences->Use Classic CLI'.");
workflowStepView->workflowStepButton->errorLabel->setVisible(true);
} else {
try {
// Warning Icon
workflowStepView->workflowStepButton->cautionLabel->setVisible(measureStepItem->hasIncompleteArguments());
connect(measureStepItem.data(), &MeasureStepItem::argumentsChanged, workflowStepView->workflowStepButton->cautionLabel, &QLabel::setVisible);
} catch (const std::exception& e) {
workflowStepView->workflowStepButton->errorLabel->setToolTip(e.what());
workflowStepView->workflowStepButton->errorLabel->setVisible(true);
}
}

// Up and down buttons
Expand Down