Merge pull request #107 from openstudiocoalition/106_OpenStudioPolicy

Fix #106 - OpenStudioPolicy.xml couldn't be loaded correctly due to deprecated IDD object
openstudiocoalition · Jul 9, 2020 · 7f4e3d2 · 7f4e3d2
2 parents 3592ebd + ab54242
commit 7f4e3d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/model_editor/AccessPolicyStore.cpp b/src/model_editor/AccessPolicyStore.cpp
@@ -32,6 +32,9 @@
 
 #include <QXmlDefaultHandler>
 #include <QXmlReader>
+#include <QXmlSimpleReader>
+#include <QXmlInputSource>
+#include <QXmlAttributes>
 
 #include "AccessPolicyStore.hpp"
 

diff --git a/src/openstudio_lib/library/OpenStudioPolicy.xml b/src/openstudio_lib/library/OpenStudioPolicy.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!-- edited with XMLSpy v2008 (http://www.altova.com) by Daniel Macumber (NREL) -->
 <ROOT>
   <POLICY IddObjectType="OS_AirLoopHVAC_SupplyPlenum">
     <rule IddField="Thermal Zone" Access="LOCKED"/>
@@ -765,11 +764,6 @@
     <rule IddField="Air Inlet Node Name" Access="HIDDEN"/>
     <rule IddField="Air Outlet Node Name" Access="HIDDEN"/>
   </POLICY>
-  <POLICY IddObjectType="OS_AirTerminal_SingleDuct_Uncontrolled">
-    <rule IddField="Availability Schedule Name" Access="HIDDEN"/>
-    <rule IddField="Inlet Air Node Name" Access="HIDDEN"/>
-    <rule IddField="Zone Supply Air Node Name" Access="HIDDEN"/>
-  </POLICY>
   <POLICY IddObjectType="OS_AirTerminal_SingleDuct_ParallelPIU_Reheat">
     <rule IddField="Availability Schedule Name" Access="HIDDEN"/>
     <rule IddField="Supply Air Inlet Node Name" Access="HIDDEN"/>
@@ -1236,7 +1230,7 @@
     <rule IddField="Nominal Floor to Ceiling Height" Access="LOCKED"/>
   </POLICY>
   <POLICY IddObjectType="OS_DefaultConstructionSet">
-    <rule IddField="Name" Access="LOCKED"/>
+    <!--<rule IddField="Name" Access="LOCKED"/>-->
     <rule IddField="Default Exterior Surface Constructions Name" Access="LOCKED"/>
     <rule IddField="Default Interior Surface Constructions Name" Access="LOCKED"/>
     <rule IddField="Default Ground Contact Surface Constructions Name" Access="LOCKED"/>
@@ -1248,7 +1242,7 @@
     <rule IddField="Site Shading Construction Name" Access="LOCKED"/>
   </POLICY>
   <POLICY IddObjectType="OS_DefaultScheduleSet">
-    <rule IddField="Name" Access="LOCKED"/>
+    <!--<rule IddField="Name" Access="LOCKED"/>-->
     <rule IddField="Hours of Operation Schedule Name" Access="LOCKED"/>
     <rule IddField="Number of People Schedule Name" Access="LOCKED"/>
     <rule IddField="People Activity Level Schedule Name" Access="LOCKED"/>