Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More window shading options #418

Merged
merged 14 commits into from
Aug 30, 2024
Merged

More window shading options #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4aa04e6
Allow medium interior shading enumerations.
shorowit Jun 25, 2024
b1d7e5c
Latest HPXMLMerged.xsd
Jun 25, 2024
0655ef3
Add InsectScreen element.
shorowit Jul 5, 2024
e63f47f
Adds BlindsClosedOrOpen and FractionCovered elements for InteriorShad…
shorowit Jul 5, 2024
0ed7788
Latest HPXMLMerged.xsd
Jul 5, 2024
2529ece
Split new elements into summer vs winter.
shorowit Jul 5, 2024
12df2df
Latest HPXMLMerged.xsd
Jul 5, 2024
eae38e1
Add "half open" option for blinds.
shorowit Jul 26, 2024
977b354
Latest HPXMLMerged.xsd
Jul 26, 2024
781958b
Split InsectScreen/FractionCovered into summer vs window.
shorowit Aug 8, 2024
a818046
Merge branch 'medium_shading' of https://github.com/hpxmlwg/hpxml int…
shorowit Aug 8, 2024
f3caa40
Latest HPXMLMerged.xsd
Aug 8, 2024
c57b6f1
Merge branch 'master' of https://github.com/hpxmlwg/hpxml into medium…
shorowit Aug 21, 2024
8747fe2
Merge remote-tracking branch 'origin/master' into medium_shading
nmerket Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 58 additions & 0 deletions merged_schema/HPXMLMerged.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5194,6 +5194,26 @@
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" name="Type" type="InteriorShading"/>
<xs:element minOccurs="0" name="BlindsSummerClosedOrOpen" type="BlindsClosedOrOpen">
<xs:annotation>
<xs:documentation>Specifies if the blinds are open or closed during the summer.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="BlindsWinterClosedOrOpen" type="BlindsClosedOrOpen">
<xs:annotation>
<xs:documentation>Specifies if the blinds are open or closed during the winter.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="SummerFractionCovered" type="Fraction">
<xs:annotation>
<xs:documentation>Use, e.g., 0.5 for a shade that is drawn halfway and 1.0 for a fully drawn shade during the summer.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="WinterFractionCovered" type="Fraction">
<xs:annotation>
<xs:documentation>Use, e.g., 0.5 for a shade that is drawn halfway and 1.0 for a fully drawn shade during the winter.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="SummerShadingCoefficient" type="Fraction">
<xs:annotation>
<xs:documentation>The shading coefficient to apply during the summer months. Shading coefficients are defined as a multiplier on transmittance: 1 is transparent, 0 is
Expand All @@ -5211,6 +5231,27 @@
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="InsectScreen">
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" name="Location" type="StormLocation"/>
<xs:element minOccurs="0" name="SummerFractionCovered" type="Fraction">
<xs:annotation>
<xs:documentation>The fraction of the window area covered by the insect screen during the summer.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="WinterFractionCovered" type="Fraction">
<xs:annotation>
<xs:documentation>The fraction of the window area covered by the insect screen during the winter.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="Condition" type="WindowCondition"/>
<xs:element minOccurs="0" ref="extension"/>
</xs:sequence>
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="StormWindow">
<xs:complexType>
<xs:sequence>
Expand Down Expand Up @@ -8035,10 +8076,13 @@
<xs:simpleType name="InteriorShading_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="light blinds"/>
<xs:enumeration value="medium blinds"/>
<xs:enumeration value="dark blinds"/>
<xs:enumeration value="light shades"/>
<xs:enumeration value="medium shades"/>
<xs:enumeration value="dark shades"/>
<xs:enumeration value="light curtains"/>
<xs:enumeration value="medium curtains"/>
<xs:enumeration value="dark curtains"/>
<xs:enumeration value="none"/>
</xs:restriction>
Expand Down Expand Up @@ -11162,6 +11206,20 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="BlindsClosedOrOpen_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="closed"/>
<xs:enumeration value="open"/>
<xs:enumeration value="half open"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="BlindsClosedOrOpen">
<xs:simpleContent>
<xs:extension base="BlindsClosedOrOpen_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="PerformanceClass_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="residential"/>
Expand Down
41 changes: 41 additions & 0 deletions schemas/HPXMLBaseElements.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5180,6 +5180,26 @@
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" name="Type" type="InteriorShading"/>
<xs:element minOccurs="0" name="BlindsSummerClosedOrOpen" type="BlindsClosedOrOpen">
<xs:annotation>
<xs:documentation>Specifies if the blinds are open or closed during the summer.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="BlindsWinterClosedOrOpen" type="BlindsClosedOrOpen">
<xs:annotation>
<xs:documentation>Specifies if the blinds are open or closed during the winter.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="SummerFractionCovered" type="Fraction">
<xs:annotation>
<xs:documentation>Use, e.g., 0.5 for a shade that is drawn halfway and 1.0 for a fully drawn shade during the summer.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="WinterFractionCovered" type="Fraction">
<xs:annotation>
<xs:documentation>Use, e.g., 0.5 for a shade that is drawn halfway and 1.0 for a fully drawn shade during the winter.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="SummerShadingCoefficient" type="Fraction">
<xs:annotation>
<xs:documentation>The shading coefficient to apply during the summer months. Shading coefficients are defined as a multiplier on transmittance: 1 is transparent, 0 is
Expand All @@ -5197,6 +5217,27 @@
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="InsectScreen">
<xs:complexType>
<xs:sequence>
<xs:group ref="SystemInfo"/>
<xs:element minOccurs="0" name="Location" type="StormLocation"/>
<xs:element minOccurs="0" name="SummerFractionCovered" type="Fraction">
<xs:annotation>
<xs:documentation>The fraction of the window area covered by the insect screen during the summer.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="WinterFractionCovered" type="Fraction">
<xs:annotation>
<xs:documentation>The fraction of the window area covered by the insect screen during the winter.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element minOccurs="0" name="Condition" type="WindowCondition"/>
<xs:element minOccurs="0" ref="extension"/>
</xs:sequence>
<xs:attribute name="dataSource" type="DataSource"/>
</xs:complexType>
</xs:element>
<xs:element minOccurs="0" name="StormWindow">
<xs:complexType>
<xs:sequence>
Expand Down
17 changes: 17 additions & 0 deletions schemas/HPXMLDataTypes.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1692,10 +1692,13 @@
<xs:simpleType name="InteriorShading_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="light blinds"/>
<xs:enumeration value="medium blinds"/>
<xs:enumeration value="dark blinds"/>
<xs:enumeration value="light shades"/>
<xs:enumeration value="medium shades"/>
<xs:enumeration value="dark shades"/>
<xs:enumeration value="light curtains"/>
<xs:enumeration value="medium curtains"/>
<xs:enumeration value="dark curtains"/>
<xs:enumeration value="none"/>
</xs:restriction>
Expand Down Expand Up @@ -4819,6 +4822,20 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="BlindsClosedOrOpen_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="closed"/>
<xs:enumeration value="open"/>
<xs:enumeration value="half open"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="BlindsClosedOrOpen">
<xs:simpleContent>
<xs:extension base="BlindsClosedOrOpen_simple">
<xs:attribute name="dataSource" type="DataSource"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
<xs:simpleType name="PerformanceClass_simple">
<xs:restriction base="xs:string">
<xs:enumeration value="residential"/>
Expand Down