Skip to content

Commit 3e269fe

Browse files
committed
clang format + cppcheck
1 parent 1b7fd18 commit 3e269fe

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

src/openstudio_lib/LocationTabView.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,8 @@ std::string toLowerCase(const std::string& str) {
638638
return lowerStr;
639639
}
640640

641-
std::vector<model::DesignDay> filterDesignDays(const std::vector<model::DesignDay>& designDays, const std::string& dayType, const std::string& percentage, const std::string& humidityConditionType = "") {
641+
std::vector<model::DesignDay> filterDesignDays(const std::vector<model::DesignDay>& designDays, const std::string& dayType,
642+
const std::string& percentage, const std::string& humidityConditionType = "") {
642643
std::vector<model::DesignDay> filteredDesignDays;
643644

644645
std::copy_if(designDays.begin(), designDays.end(), std::back_inserter(filteredDesignDays), [&](const model::DesignDay& designDay) {
@@ -648,9 +649,10 @@ std::vector<model::DesignDay> filterDesignDays(const std::vector<model::DesignDa
648649
return false;
649650
}
650651

651-
bool matchesHumidityConditionType = humidityConditionType.empty() || toLowerCase(designDay.humidityConditionType()) == toLowerCase(humidityConditionType);
652-
bool matchesPercentage = QString::fromStdString(name.get()).contains(QString::fromStdString(percentage)) ||
653-
(percentage == "0.4%" && QString::fromStdString(name.get()).contains(".4%"));
652+
bool matchesHumidityConditionType =
653+
humidityConditionType.empty() || toLowerCase(designDay.humidityConditionType()) == toLowerCase(humidityConditionType);
654+
bool matchesPercentage = QString::fromStdString(name.get()).contains(QString::fromStdString(percentage))
655+
|| (percentage == "0.4%" && QString::fromStdString(name.get()).contains(".4%"));
654656
return name && matchesPercentage && toLowerCase(designDay.dayType()) == toLowerCase(dayType) && matchesHumidityConditionType;
655657
});
656658

@@ -663,17 +665,17 @@ std::vector<model::DesignDay> LocationView::showDesignDaySelectionDialog(const s
663665
QDialog dialog(this);
664666
dialog.setWindowTitle(QCoreApplication::translate("LocationView", "Import Design Days"));
665667

666-
QGridLayout *layout = new QGridLayout(&dialog);
668+
QGridLayout* layout = new QGridLayout(&dialog);
667669

668670
// Define row labels and percentages
669671
QStringList rowLabels = {"Heating", "Cooling"};
670672
std::vector<std::string> heatingPercentages = {"99.6%", "99%"};
671673
std::vector<std::string> coolingPercentages = {"2%", "1%", "0.4%"};
672674

673675
// Ok and Cancel buttons
674-
QPushButton *okButton = new QPushButton(tr("Ok"), &dialog);
675-
QPushButton *cancelButton = new QPushButton(tr("Cancel"), &dialog);
676-
QPushButton *importAllButton = new QPushButton(tr("Skip\nselection\nimport\nall DDYs"), &dialog);
676+
QPushButton* okButton = new QPushButton(tr("Ok"), &dialog);
677+
QPushButton* cancelButton = new QPushButton(tr("Cancel"), &dialog);
678+
QPushButton* importAllButton = new QPushButton(tr("Skip\nselection\nimport\nall DDYs"), &dialog);
677679

678680
// Set the same size for all buttons
679681
okButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
@@ -688,7 +690,7 @@ std::vector<model::DesignDay> LocationView::showDesignDaySelectionDialog(const s
688690
okButton->setMinimumSize(cancelButton->sizeHint());
689691
importAllButton->setMinimumSize(cancelButton->sizeHint());
690692

691-
okButton->setEnabled(false); // Initially disable the Ok button
693+
okButton->setEnabled(false); // Initially disable the Ok button
692694

693695
connect(okButton, &QPushButton::clicked, &dialog, &QDialog::accept);
694696
connect(cancelButton, &QPushButton::clicked, &dialog, &QDialog::reject);
@@ -699,16 +701,16 @@ std::vector<model::DesignDay> LocationView::showDesignDaySelectionDialog(const s
699701

700702
// Populate table for Heating and Cooling
701703
for (int row = 0; row < rowLabels.size(); ++row) {
702-
QLabel *rowLabel = new QLabel(rowLabels[row]);
704+
QLabel* rowLabel = new QLabel(rowLabels[row]);
703705
layout->addWidget(rowLabel, row * 2 + 1, 0, Qt::AlignCenter);
704706

705707
const auto& percentages = (row == 0) ? heatingPercentages : coolingPercentages;
706708

707709
for (int col = 0; col < percentages.size(); ++col) {
708-
QLabel *percentageLabel = new QLabel(QString::fromStdString(percentages[col]));
710+
QLabel* percentageLabel = new QLabel(QString::fromStdString(percentages[col]));
709711
layout->addWidget(percentageLabel, row * 2, col + 1, Qt::AlignCenter);
710712

711-
QCheckBox *checkBox = new QCheckBox();
713+
QCheckBox* checkBox = new QCheckBox();
712714
layout->addWidget(checkBox, row * 2 + 1, col + 1, Qt::AlignCenter);
713715

714716
connect(checkBox, &QCheckBox::toggled, [=, &designDaysToInsert](bool checked) {
@@ -733,7 +735,7 @@ std::vector<model::DesignDay> LocationView::showDesignDaySelectionDialog(const s
733735
}
734736

735737
// Add a spacer item to add more space between the checkboxes and the buttons
736-
QSpacerItem *spacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
738+
QSpacerItem* spacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
737739
layout->addItem(spacer, rowLabels.size() * 2 + 2, 0, 1, 5);
738740

739741
dialog.setLayout(layout);
@@ -749,7 +751,6 @@ std::vector<model::DesignDay> LocationView::showDesignDaySelectionDialog(const s
749751

750752
void LocationView::onDesignDayBtnClicked() {
751753
QString fileTypes("Files (*.ddy)");
752-
std::vector<openstudio::model::DesignDay> designDaysToInsert;
753754

754755
QString lastPath = m_lastDdyPathOpened;
755756
if (lastPath.isEmpty() && m_lastEpwPathOpened.isEmpty()) {
@@ -767,12 +768,12 @@ void LocationView::onDesignDayBtnClicked() {
767768
if (ddyIdfFile) {
768769

769770
openstudio::Workspace ddyWorkspace(StrictnessLevel::None, IddFileType::EnergyPlus);
770-
771+
771772
for (const IdfObject& idfObject : ddyIdfFile->objects()) {
772773
IddObjectType iddObjectType = idfObject.iddObject().type();
773-
if ((iddObjectType == IddObjectType::SizingPeriod_DesignDay) || (iddObjectType == IddObjectType::SizingPeriod_WeatherFileDays)
774+
if ((iddObjectType == IddObjectType::SizingPeriod_DesignDay) || (iddObjectType == IddObjectType::SizingPeriod_WeatherFileDays)
774775
|| (iddObjectType == IddObjectType::SizingPeriod_WeatherFileConditionType)) {
775-
ddyWorkspace.addObject(idfObject);
776+
ddyWorkspace.addObject(idfObject);
776777
}
777778
}
778779

@@ -782,7 +783,6 @@ void LocationView::onDesignDayBtnClicked() {
782783
// Use a heuristic based on the ddy files provided by EnergyPlus
783784
// Filter out the days that are not helpful.
784785
if (!ddyModel.objects().empty()) {
785-
786786

787787
// Evan note: do not remove existing design days
788788
//for (model::SizingPeriod sizingPeriod : m_model.getModelObjects<model::SizingPeriod>()){

src/openstudio_lib/LocationTabView.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ class LocationView : public QWidget
124124

125125
void onWeatherFileBtnClicked();
126126

127-
std::vector<openstudio::model::DesignDay> showDesignDaySelectionDialog(const std::vector<openstudio::model::DesignDay, std::allocator<openstudio::model::DesignDay>>& allNonAnnual);
127+
std::vector<openstudio::model::DesignDay>
128+
showDesignDaySelectionDialog(const std::vector<openstudio::model::DesignDay, std::allocator<openstudio::model::DesignDay>>& allNonAnnual);
128129

129130
void onDesignDayBtnClicked();
130131

0 commit comments

Comments
 (0)