Skip to content

Commit a5263ba

Browse files
committed
use QString contains and use openstudio::isEqual
1 parent 78291c1 commit a5263ba

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/openstudio_lib/LocationTabView.cpp

+10-6
Original file line numberDiff line numberDiff line change
@@ -636,16 +636,20 @@ std::vector<model::DesignDay> filterDesignDays(const std::vector<model::DesignDa
636636
std::vector<model::DesignDay> filteredDesignDays;
637637

638638
std::copy_if(designDays.begin(), designDays.end(), std::back_inserter(filteredDesignDays), [&](const model::DesignDay& designDay) {
639-
boost::optional<std::string> name = designDay.name();
639+
QString nameString = QString::fromStdString(designDay.name().get());
640640

641-
if (!QString::fromStdString(boost::to_lower_copy(name.get())).contains("ann")) {
641+
if (!nameString.contains("ann",Qt::CaseInsensitive))
642+
{
642643
return false;
643644
}
644645

645-
bool matchesHumidityConditionType = humidityConditionType.empty() || boost::to_lower_copy(designDay.humidityConditionType()) == boost::to_lower_copy(humidityConditionType);
646-
bool matchesPercentage = QString::fromStdString(name.get()).contains(QString::fromStdString(percentage)) ||
647-
(percentage == "0.4%" && QString::fromStdString(name.get()).contains(".4%"));
648-
return name && matchesPercentage && boost::to_lower_copy(designDay.dayType()) == boost::to_lower_copy(dayType) && matchesHumidityConditionType;
646+
bool matchesHumidityConditionType = humidityConditionType.empty() || openstudio::istringEqual(designDay.humidityConditionType(),humidityConditionType);
647+
bool matchesPercentage = nameString.contains(QString::fromStdString(percentage)) ||
648+
(percentage == "0.4%" && nameString.contains(".4%"));
649+
650+
bool matchesDesignDay = openstudio::istringEqual(designDay.dayType(), dayType);
651+
652+
return matchesPercentage && matchesDesignDay && matchesHumidityConditionType;
649653
});
650654

651655
return filteredDesignDays;

0 commit comments

Comments
 (0)