Attempting to address 153, by allowing user to specifically import 99%,99.6%, 0.4%,1% and 2% annual design days

src/model_editor/InspectorGadget.cpp

@@ -794,7 +794,7 @@ void InspectorGadget::layoutComboBox(QVBoxLayout* layout, QWidget* parent, opens
     idx = 0;
     combo->insertItem(idx, QPixmap(":/images/alert_image.png"), curVal.c_str(), "Invalid");
 
-   //QString errormsg("We have a value:");
+    //QString errormsg("We have a value:");
     //errormsg += curVal.c_str();
     //errormsg += " that does not match the allowable values in the idd.Name:";
     //errormsg += name.c_str();

src/openstudio_lib/LocationTabView.cpp

@@ -52,6 +52,8 @@
 #include <QBoxLayout>
 #include <QComboBox>
 #include <QDateTime>
+#include <QCheckBox>
+#include <QDialogButtonBox>
 #include <QDir>
 #include <QFile>
 #include <QFileDialog>
@@ -62,6 +64,11 @@
 #include <QScrollArea>
 #include <QSettings>
 #include <QSizePolicy>
+#include <vector>
+#include <tuple>
+#include <QCoreApplication>
+#include <QObject>
+#include <QPushButton>
 
 static constexpr auto NAME("Name: ");
 static constexpr auto LATITUDE("Latitude: ");
@@ -625,6 +632,127 @@ void LocationView::onWeatherFileBtnClicked() {
   }
 }
 
+std::vector<model::DesignDay> filterDesignDays(const std::vector<model::DesignDay>& designDays, const std::string& dayType,
+                                               const std::string& percentage, const std::string& humidityConditionType = "") {
+  std::vector<model::DesignDay> filteredDesignDays;
+
+  std::copy_if(designDays.begin(), designDays.end(), std::back_inserter(filteredDesignDays), [&](const model::DesignDay& designDay) {
+    QString nameString = QString::fromStdString(designDay.name().get());
+
+    if (!nameString.contains("ann", Qt::CaseInsensitive)) {
+      return false;
+    }
+
+    bool matchesHumidityConditionType =
+      humidityConditionType.empty() || openstudio::istringEqual(designDay.humidityConditionType(), humidityConditionType);
+    bool matchesPercentage = nameString.contains(QString::fromStdString(percentage)) || (percentage == "0.4%" && nameString.contains(".4%"));
+
+    bool matchesDesignDay = openstudio::istringEqual(designDay.dayType(), dayType);
+
+    return matchesPercentage && matchesDesignDay && matchesHumidityConditionType;
+  });
+
+  return filteredDesignDays;
+}
+
+std::vector<model::DesignDay> LocationView::showDesignDaySelectionDialog(const std::vector<openstudio::model::DesignDay>& allDesignDays) {
+  std::vector<openstudio::model::DesignDay> designDaysToInsert;
+  designDaysToInsert.reserve(allDesignDays.size());  // Reserve space for designDaysToInsert
+
+  QDialog dialog(this);
+  dialog.setWindowTitle(QCoreApplication::translate("LocationView", "Import Design Days"));
+
+  QGridLayout* layout = new QGridLayout(&dialog);
+
+  // Define row labels and percentages
+  QStringList rowLabels = {"Heating", "Cooling"};
+  std::vector<std::string> heatingPercentages = {"99.6%", "99%"};
+  std::vector<std::string> coolingPercentages = {"2%", "1%", "0.4%"};
+
+  // Ok and Cancel buttons
+  QPushButton* okButton = new QPushButton(tr("Ok"), &dialog);
+  QPushButton* cancelButton = new QPushButton(tr("Cancel"), &dialog);
+  QPushButton* importAllButton = new QPushButton(tr("Skip\nselection\nimport\nall DDYs"), &dialog);
+
+  // Set the same size for all buttons
+  okButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+  cancelButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+  importAllButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
+
+  // Adjust the order of the buttons
+  layout->addWidget(importAllButton, rowLabels.size() * 2 + 3, 1);
+  layout->addWidget(okButton, rowLabels.size() * 2 + 3, 2);
+  layout->addWidget(cancelButton, rowLabels.size() * 2 + 3, 3);
+
+  okButton->setMinimumSize(cancelButton->sizeHint());
+  importAllButton->setMinimumSize(cancelButton->sizeHint());
+
+  okButton->setEnabled(false);  // Initially disable the Ok button
+
+  connect(okButton, &QPushButton::clicked, [&dialog, &designDaysToInsert, &allDesignDays, rowLabels, heatingPercentages, coolingPercentages]() {
+    for (int row = 0; row < rowLabels.size(); ++row) {
+      const auto& percentages = (row == 0) ? heatingPercentages : coolingPercentages;
+      for (int col = 0; col < percentages.size(); ++col) {
+        QCheckBox* checkBox = dialog.findChild<QCheckBox*>(QString("checkBox_%1_%2").arg(row).arg(col));
+        if (checkBox && checkBox->isChecked()) {
+          std::string dayType = (row == 0) ? "WinterDesignDay" : "SummerDesignDay";
+          std::vector<model::DesignDay> filteredDays = filterDesignDays(allDesignDays, dayType, percentages[col]);
+          designDaysToInsert.insert(designDaysToInsert.end(), filteredDays.begin(), filteredDays.end());
+        }
+      }
+    }
+    dialog.accept();
+  });
+
+  connect(cancelButton, &QPushButton::clicked, &dialog, &QDialog::reject);
+  connect(importAllButton, &QPushButton::clicked, [&dialog, &designDaysToInsert, &allDesignDays]() {
+    designDaysToInsert = allDesignDays;
+    dialog.accept();
+  });
+
+  // Populate table for Heating and Cooling
+  for (int row = 0; row < rowLabels.size(); ++row) {
+    QLabel* rowLabel = new QLabel(rowLabels[row]);
+    layout->addWidget(rowLabel, row * 2 + 1, 0, Qt::AlignCenter);
+
+    const auto& percentages = (row == 0) ? heatingPercentages : coolingPercentages;
+
+    for (int col = 0; col < percentages.size(); ++col) {
+      QLabel* percentageLabel = new QLabel(QString::fromStdString(percentages[col]));
+      layout->addWidget(percentageLabel, row * 2, col + 1, Qt::AlignCenter);
+
+      std::string dayType = (row == 0) ? "WinterDesignDay" : "SummerDesignDay";
+
+      if (filterDesignDays(allDesignDays, dayType, percentages[col]).empty()) {
+        continue;
+      }
+
+      QCheckBox* checkBox = new QCheckBox();
+      checkBox->setObjectName(QString("checkBox_%1_%2").arg(row).arg(col));
+      layout->addWidget(checkBox, row * 2 + 1, col + 1, Qt::AlignCenter);
+
+      connect(checkBox, &QCheckBox::toggled, [=, &dialog](bool checked) {
+        auto checkBoxes = dialog.findChildren<QCheckBox*>();
+        okButton->setEnabled(std::any_of(checkBoxes.begin(), checkBoxes.end(), [](QCheckBox* cb) { return cb->isChecked(); }));
+      });
+    }
+  }
+
+  // Add a spacer item to add more space between the checkboxes and the buttons
+  QSpacerItem* spacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+  layout->addItem(spacer, rowLabels.size() * 2 + 2, 0, 1, 5);
+
+  dialog.setLayout(layout);
+  dialog.setMinimumSize(dialog.sizeHint());
+
+  // Execute the dialog and wait for user interaction
+  if (dialog.exec() == QDialog::Accepted) {
+    return designDaysToInsert;
+  } else {
+    return {};
+  }
+}
+
 void LocationView::onDesignDayBtnClicked() {
   QString fileTypes("Files (*.ddy)");
 
@@ -644,87 +772,43 @@ void LocationView::onDesignDayBtnClicked() {
     if (ddyIdfFile) {
 
       openstudio::Workspace ddyWorkspace(StrictnessLevel::None, IddFileType::EnergyPlus);
+
       for (const IdfObject& idfObject : ddyIdfFile->objects()) {
         IddObjectType iddObjectType = idfObject.iddObject().type();
         if ((iddObjectType == IddObjectType::SizingPeriod_DesignDay) || (iddObjectType == IddObjectType::SizingPeriod_WeatherFileDays)
             || (iddObjectType == IddObjectType::SizingPeriod_WeatherFileConditionType)) {
-
           ddyWorkspace.addObject(idfObject);
         }
       }
 
-      energyplus::ReverseTranslator reverseTranslator;
+      openstudio::energyplus::ReverseTranslator reverseTranslator;
       model::Model ddyModel = reverseTranslator.translateWorkspace(ddyWorkspace);
 
       // Use a heuristic based on the ddy files provided by EnergyPlus
       // Filter out the days that are not helpful.
       if (!ddyModel.objects().empty()) {
-        // Containers to hold 99%, 99.6%, 2%, 1%, and 0.4% design points
-        std::vector<model::DesignDay> days99;
-        std::vector<model::DesignDay> days99_6;
-        std::vector<model::DesignDay> days2;
-        std::vector<model::DesignDay> days1;
-        std::vector<model::DesignDay> days0_4;
-
-        bool unknownDay = false;
-
-        for (const model::DesignDay& designDay : ddyModel.getConcreteModelObjects<model::DesignDay>()) {
-          boost::optional<std::string> name;
-          name = designDay.name();
-
-          if (name) {
-            QString qname = QString::fromStdString(name.get());
-
-            if (qname.contains("99%")) {
-              days99.push_back(designDay);
-            } else if (qname.contains("99.6%")) {
-              days99_6.push_back(designDay);
-            } else if (qname.contains("2%")) {
-              days2.push_back(designDay);
-            } else if (qname.contains("1%")) {
-              days1.push_back(designDay);
-            } else if (qname.contains(".4%")) {
-              days0_4.push_back(designDay);
-            } else {
-              unknownDay = true;
-            }
-          }
-        }
-
-        // Pick only the most stringent design points
-        if (!unknownDay) {
-          if (!days99_6.empty()) {
-            for (model::DesignDay designDay : days99) {
-              designDay.remove();
-            }
-          }
-
-          if (!days0_4.empty()) {
-            for (model::DesignDay designDay : days1) {
-              designDay.remove();
-            }
-            for (model::DesignDay designDay : days2) {
-              designDay.remove();
-            }
-          } else if (!days1.empty()) {
-            for (model::DesignDay designDay : days2) {
-              designDay.remove();
-            }
-          }
-        }
 
         // Evan note: do not remove existing design days
         //for (model::SizingPeriod sizingPeriod : m_model.getModelObjects<model::SizingPeriod>()){
         //  sizingPeriod.remove();
         //}
 
+        //m_model.insertObjects(ddyModel.objects());
+
+        std::vector<openstudio::model::DesignDay> designDaysToInsert = showDesignDaySelectionDialog(ddyModel.getModelObjects<model::DesignDay>());
+
+        // Remove design days from ddyModel that are not in designDaysToInsert
+        for (auto& designDay : ddyModel.getConcreteModelObjects<model::DesignDay>()) {
+          if (std::find(designDaysToInsert.begin(), designDaysToInsert.end(), designDay) == designDaysToInsert.end()) {
+            designDay.remove();
+          }
+        }
+
         m_model.insertObjects(ddyModel.objects());
 
         m_lastDdyPathOpened = QFileInfo(fileName).absoluteFilePath();
       }
     }
-
-    QTimer::singleShot(0, this, &LocationView::checkNumDesignDays);
   }
 }
 
@@ -785,7 +869,7 @@ void LocationView::setDstStartDayOfWeekAndMonth(int newWeek, int newDay, int new
 void LocationView::setDstStartDate(const QDate& newdate) {
   auto dst = m_model.getUniqueModelObject<model::RunPeriodControlDaylightSavingTime>();
 
-  dst.setStartDate(monthOfYear(newdate.month()), newdate.day());
+  dst.setStartDate(MonthOfYear(newdate.month()), newdate.day());
 }
 
 void LocationView::setDstEndDayOfWeekAndMonth(int newWeek, int newDay, int newMonth) {
@@ -797,7 +881,7 @@ void LocationView::setDstEndDayOfWeekAndMonth(int newWeek, int newDay, int newMo
 void LocationView::setDstEndDate(const QDate& newdate) {
   auto dst = m_model.getUniqueModelObject<model::RunPeriodControlDaylightSavingTime>();
 
-  dst.setEndDate(monthOfYear(newdate.month()), newdate.day());
+  dst.setEndDate(MonthOfYear(newdate.month()), newdate.day());
 }
 
 void LocationView::onSelectItem() {

src/openstudio_lib/LocationTabView.hpp

@@ -9,7 +9,7 @@
 #include <openstudio/model/Model.hpp>
 #include <openstudio/model/Site.hpp>
 #include <openstudio/model/YearDescription.hpp>
-
+#include <openstudio/model/DesignDay.hpp>
 #include "MainTabView.hpp"
 #include "YearSettingsWidget.hpp"
 
@@ -124,6 +124,9 @@ class LocationView : public QWidget
 
   void onWeatherFileBtnClicked();
 
+  std::vector<openstudio::model::DesignDay>
+    showDesignDaySelectionDialog(const std::vector<openstudio::model::DesignDay, std::allocator<openstudio::model::DesignDay>>& allNonAnnual);
+
   void onDesignDayBtnClicked();
 
   void onASHRAEClimateZoneChanged(const QString& climateZone);