Skip to content

Commit 8c42e0f

Browse files
author
kflemin
committed
fix nested lamp components
1 parent de286e0 commit 8c42e0f

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

  • lib/components/Electric Lighting/Lamps/Non-SSL Lamps

lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 26W Compact Fluorescent/Generic 26W Compact Fluorescent/component.xml renamed to lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 26W Compact Fluorescent Integral Ballast/component.xml

File renamed without changes.

lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 42W Compact Fluorescent/Generic 42W Compact Fluorescent/component.xml renamed to lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 42W Compact Fluorescent Integral Ballast/component.xml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="component.xsd">
22
<schema_version/>
33
<name>Generic 42W Compact Fluorescent</name>
4-
<uid>b1190ac0-7709-0131-79d1-00ff50f47a08</uid>
5-
<version_id>6ed24d2c-862e-4c59-802e-b322a877df9b</version_id>
4+
<uid>1c4f9e30-1749-0131-bd0c-00ffb04b4107</uid>
5+
<version_id>fbb45497-a4ac-4db5-a560-96eef2b5f5b4</version_id>
66
<xml_checksum/>
77
<display_name/>
88
<description/>
99
<modeler_description/>
1010
<source>
1111
<manufacturer/>
1212
<model/>
13-
<serial_no>2014.0</serial_no>
13+
<serial_no>2013.0</serial_no>
1414
<year/>
1515
<url/>
1616
</source>
@@ -25,13 +25,28 @@
2525
</attribute>
2626
<attribute>
2727
<name>Integral Ballast</name>
28-
<value>false</value>
28+
<value>true</value>
2929
<datatype>string</datatype>
3030
</attribute>
3131
<attribute>
3232
<name>Input Power</name>
3333
<value>42.0</value>
3434
<datatype>float</datatype>
3535
</attribute>
36+
<attribute>
37+
<name>Mean Luminous Flux</name>
38+
<value>2850.0</value>
39+
<datatype>float</datatype>
40+
</attribute>
41+
<attribute>
42+
<name>Correlated Color Temperature</name>
43+
<value>6500.0</value>
44+
<datatype>float</datatype>
45+
</attribute>
46+
<attribute>
47+
<name>Color Rendering Index</name>
48+
<value>81.0</value>
49+
<datatype>float</datatype>
50+
</attribute>
3651
</attributes>
3752
</component>

‎lib/components/Electric Lighting/Lamps/Non-SSL Lamps/Generic 42W Compact Fluorescent/component.xml‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="component.xsd">
22
<schema_version/>
33
<name>Generic 42W Compact Fluorescent</name>
4-
<uid>1c4f9e30-1749-0131-bd0c-00ffb04b4107</uid>
5-
<version_id>fbb45497-a4ac-4db5-a560-96eef2b5f5b4</version_id>
4+
<uid>b1190ac0-7709-0131-79d1-00ff50f47a08</uid>
5+
<version_id>6ed24d2c-862e-4c59-802e-b322a877df9b</version_id>
66
<xml_checksum/>
77
<display_name/>
88
<description/>
99
<modeler_description/>
1010
<source>
1111
<manufacturer/>
1212
<model/>
13-
<serial_no>2013.0</serial_no>
13+
<serial_no>2014.0</serial_no>
1414
<year/>
1515
<url/>
1616
</source>
@@ -25,28 +25,13 @@
2525
</attribute>
2626
<attribute>
2727
<name>Integral Ballast</name>
28-
<value>true</value>
28+
<value>false</value>
2929
<datatype>string</datatype>
3030
</attribute>
3131
<attribute>
3232
<name>Input Power</name>
3333
<value>42.0</value>
3434
<datatype>float</datatype>
3535
</attribute>
36-
<attribute>
37-
<name>Mean Luminous Flux</name>
38-
<value>2850.0</value>
39-
<datatype>float</datatype>
40-
</attribute>
41-
<attribute>
42-
<name>Correlated Color Temperature</name>
43-
<value>6500.0</value>
44-
<datatype>float</datatype>
45-
</attribute>
46-
<attribute>
47-
<name>Color Rendering Index</name>
48-
<value>81.0</value>
49-
<datatype>float</datatype>
50-
</attribute>
5136
</attributes>
5237
</component>

0 commit comments

Comments
 (0)