Merge pull request #1371 from NREL/86121908_copy_schedule

86121908 copy schedule
NREL · Feb 7, 2015 · cbf8a40 · cbf8a40 · nrel-bot · Feb 7, 2015
2 parents 5e5d50e + baf33bb
commit cbf8a40
Show file tree

Hide file tree

Showing 14 changed files with 4,759 additions and 3,821 deletions.
diff --git a/openstudiocore/src/model/ScheduleTypeLimits.cpp b/openstudiocore/src/model/ScheduleTypeLimits.cpp
@@ -20,9 +20,9 @@
 #include "ScheduleTypeLimits.hpp"
 #include "ScheduleTypeLimits_Impl.hpp"
 
-#include <utilities/idd/IddFactory.hxx>
+#include <utilities/idd/IddFactory.hxx>
 
-#include <utilities/idd/OS_ScheduleTypeLimits_FieldEnums.hxx>
+#include <utilities/idd/OS_ScheduleTypeLimits_FieldEnums.hxx>
 #include <utilities/idd/IddEnums.hxx>
 
 #include "../utilities/units/QuantityConverter.hpp"
@@ -110,6 +110,11 @@ namespace detail {
     return isEmpty(OS_ScheduleTypeLimitsFields::UnitType);
   }
 
+  boost::optional<Unit> ScheduleTypeLimits_Impl::units(bool returnIP) const
+  {
+    return ScheduleTypeLimits::units(unitType(), returnIP);
+  }
+
   void ScheduleTypeLimits_Impl::setLowerLimitValue(boost::optional<double> lowerLimitValue) {
     bool result = false;
     if (lowerLimitValue) {
@@ -487,6 +492,10 @@ bool ScheduleTypeLimits::isUnitTypeDefaulted() const {
   return getImpl<detail::ScheduleTypeLimits_Impl>()->isUnitTypeDefaulted();
 }
 
+boost::optional<Unit> ScheduleTypeLimits::units(bool returnIP) const {
+  return getImpl<detail::ScheduleTypeLimits_Impl>()->units(returnIP);
+}
+
 void ScheduleTypeLimits::setLowerLimitValue(double lowerLimitValue) {
   getImpl<detail::ScheduleTypeLimits_Impl>()->setLowerLimitValue(lowerLimitValue);
 }

diff --git a/openstudiocore/src/model/ScheduleTypeLimits.hpp b/openstudiocore/src/model/ScheduleTypeLimits.hpp
@@ -73,6 +73,8 @@ class MODEL_API ScheduleTypeLimits : public ResourceObject {
 
   bool isUnitTypeDefaulted() const;
 
+  boost::optional<Unit> units(bool returnIP = false) const;
+
   //@}
   /** @name Setters */
   //@{

diff --git a/openstudiocore/src/model/ScheduleTypeLimits_Impl.hpp b/openstudiocore/src/model/ScheduleTypeLimits_Impl.hpp
@@ -97,6 +97,8 @@ namespace detail {
 
     bool isUnitTypeDefaulted() const;
 
+    boost::optional<Unit> units(bool returnIP=false) const;
+
     //@}
     /** @name Setters */
     //@{

diff --git a/openstudiocore/src/model/ScheduleTypeRegistry.cpp b/openstudiocore/src/model/ScheduleTypeRegistry.cpp
@@ -128,6 +128,8 @@ ScheduleTypeLimits ScheduleTypeRegistrySingleton::getOrCreateScheduleTypeLimits(
 
 ScheduleTypeRegistrySingleton::ScheduleTypeRegistrySingleton()
 {
+  // className, scheduleDisplayName, scheduleRelationshipName, isContinuous, unitType, lowerLimitValue, upperLimitValue;
+
   const ScheduleType scheduleTypes[] =
   {
     {"AirConditionerVariableRefrigerantFlow","Availability Schedule","availabilitySchedule",false,"Availability",0.0,1.0},
@@ -168,7 +170,7 @@ ScheduleTypeRegistrySingleton::ScheduleTypeRegistrySingleton()
     {"CoilCoolingLowTempRadiantConstFlow","Cooling Low Water Temperature","coolingLowWaterTemperatureSchedule",true,"Temperature",OptionalDouble(),OptionalDouble()},
     {"CoilCoolingLowTempRadiantConstFlow","Cooling High Control Temperature","coolingHighControlTemperatureSchedule",true,"Temperature",OptionalDouble(),OptionalDouble()},
     {"CoilCoolingLowTempRadiantConstFlow","Cooling Low Control Temperature","coolingLowControlTemperatureSchedule",true,"Temperature",OptionalDouble(),OptionalDouble()},
-    {"CoilCoolingLowTempRadiantVarFlow","Cooling Control Temperature Schedule","coolingControlTemperatureSchedule",false,"Temperature",OptionalDouble(),OptionalDouble()},
+    {"CoilCoolingLowTempRadiantVarFlow","Cooling Control Temperature Schedule","coolingControlTemperatureSchedule",true,"Temperature",OptionalDouble(),OptionalDouble()},
     {"CoilCoolingWater","Availability","availabilitySchedule",false,"Availability",0.0,1.0},
     {"CoilHeatingDesuperheater","Availability","availabilitySchedule",false,"Availability",0.0,1.0},
     {"CoilHeatingDXSingleSpeed","Availability","availabilitySchedule",false,"Availability",0.0,1.0},
@@ -293,7 +295,7 @@ ScheduleTypeRegistrySingleton::ScheduleTypeRegistrySingleton()
     {"ZoneHVACFourPipeFanCoil","Availability","availabilitySchedule",false,"Availability",0.0,1.0},
     {"ZoneHVACFourPipeFanCoil","Outdoor Air","outdoorAirSchedule",true,"",0.0,1.0},
     {"ZoneHVACLowTemperatureRadiantElectric","Availability","availabilitySchedule",false,"Availability",0.0,1.0},
-    {"ZoneHVACLowTemperatureRadiantElectric","Heating Setpoint Temperature","heatingSetpointTemperature",false,"Temperature",OptionalDouble(),OptionalDouble()},
+    {"ZoneHVACLowTemperatureRadiantElectric","Heating Setpoint Temperature","heatingSetpointTemperature",true,"Temperature",OptionalDouble(),OptionalDouble()},
     {"ZoneHVACLowTempRadiantConstFlow","Availability","availabilitySchedule",false,"Availability",0.0,1.0},
     {"ZoneHVACLowTempRadiantConstFlow","Pump Flow Rate","pumpFlowRateSchedule",false,"Availability",0.0,1.0},
     {"ZoneHVACLowTempRadiantVarFlow","Availability","availabilitySchedule",false,"Availability",0.0,1.0},
@@ -308,7 +310,7 @@ ScheduleTypeRegistrySingleton::ScheduleTypeRegistrySingleton()
     {"ZoneHVACTerminalUnitVariableRefrigerantFlow","Terminal Unit Availability schedule","terminalUnitAvailabilityschedule",false,"Availability",0.0,1.0},
     {"ZoneHVACTerminalUnitVariableRefrigerantFlow","Supply Air Fan Operating Mode Schedule","supplyAirFanOperatingModeSchedule",false,"ControlMode",0.0,1.0},
     {"ZoneHVACHighTemperatureRadiant","Availability","availabilitySchedule",false,"Availability",0.0,1.0},
-    {"ZoneHVACHighTemperatureRadiant","Heating Setpoint Temperature","heatingSetpointTemperatureSchedule",false,"Temperature",OptionalDouble(),OptionalDouble()},
+    {"ZoneHVACHighTemperatureRadiant","Heating Setpoint Temperature","heatingSetpointTemperatureSchedule",true,"Temperature",OptionalDouble(),OptionalDouble()},
     {"ZoneHVACWaterToAirHeatPump","Availability","availabilitySchedule",false,"Availability",0.0,1.0},
     {"ZoneHVACWaterToAirHeatPump","Supply Air Fan Operating Mode","supplyAirFanOperatingModeSchedule",false,"ControlMode",0.0,1.0},
     {"ZoneHVACUnitHeater","Availability","availabilitySchedule",false,"Availability",0.0,1.0},

diff --git a/openstudiocore/src/openstudio_lib/CMakeLists.txt b/openstudiocore/src/openstudio_lib/CMakeLists.txt
@@ -232,6 +232,8 @@ set(${target_name}_SRC
   RunTabController.hpp
   RunTabView.cpp
   RunTabView.hpp
+  ScheduleDayView.cpp
+  ScheduleDayView.hpp  
   ScheduleDialog.cpp
   ScheduleDialog.hpp
   ScheduleSetInspectorView.cpp
@@ -575,6 +577,7 @@ set(${target_name}_moc
   ResultsTabView.hpp
   RunTabController.hpp
   RunTabView.hpp
+  ScheduleDayView.hpp
   ScheduleDialog.hpp
   ScheduleSetInspectorView.hpp
   ScheduleSetsController.hpp