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.

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

Refactor plugins as of #112 and fix plugin diff with no fixtures #118

Merged
merged 6 commits into from
May 16, 2017

Conversation

fxedel
Copy link
Member

@fxedel fxedel commented May 16, 2017

No description provided.

@fxedel fxedel added component-plugin Affects one or more import or export plugins. component-test Affects the automated tests. labels May 16, 2017
@fxedel fxedel requested a review from FloEdelmann May 16, 2017 19:49
@FloEdelmann FloEdelmann temporarily deployed to open-fixture-library-pr-118 May 16, 2017 19:49 Inactive
@FloEdelmann
Copy link
Member

FloEdelmann commented May 16, 2017

Last updated: 5/16/2017, 9:05:42 PM

Diff plugin outputs test

Modified plugin ecue in this PR

Plugins are always tested with the following fixtures: fixtures/cameo/thunder-wash-600-w.json, fixtures/lightmaxx/vega-zoom-wash.json

Index: UserLibrary.xml
===================================================================
--- UserLibrary.xml
+++ UserLibrary.xml
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Document Owner="user" TypeVersion="2" SaveTimeStamp="2017-05-16#21:05:42">
     <Library>
         <Fixtures>
             <Manufacturer _CreationDate="2017-05-16#21:05:42" _ModifiedDate="2017-05-16#21:05:42" Name="cameo" Comment="" Web="http://www.cameolight.com/">
                 <Fixture _CreationDate="2017-02-24#00:00:00" _ModifiedDate="2017-03-09#00:00:00" Name="Thunder Wash 600 W (1ch mode)" NameShort="CLTW600W-1ch" Comment="" AllocateDmxChannels="1" Weight="3.25" Power="130" DimWidth="335" DimHeight="182" DimDepth="93">
                     <ChannelBeam Name="Strobe" DefaultValue="0" Highlight="220" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="1">
-                        <Range Name="Strobe closed" Start="0" End="10" AutoMenu="1" Centre="0" />
-                        <Range Name="Strobe 0Hz-30Hz" Start="11" End="255" AutoMenu="1" Centre="1" />
+                        <Range Name="Strobe closed" Start="0" End="10" AutoMenu="1" Centre="0"/>
+                        <Range Name="Strobe 0Hz-30Hz" Start="11" End="255" AutoMenu="1" Centre="1"/>
                     </ChannelBeam>
                 </Fixture>
                 <Fixture _CreationDate="2017-02-24#00:00:00" _ModifiedDate="2017-03-09#00:00:00" Name="Thunder Wash 600 W (2ch mode)" NameShort="CLTW600W-2ch" Comment="" AllocateDmxChannels="2" Weight="3.25" Power="130" DimWidth="335" DimHeight="182" DimDepth="93">
-                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1" />
+                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1"/>
                     <ChannelBeam Name="Strobe" DefaultValue="0" Highlight="220" Deflection="0" DmxByte0="2" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="2">
-                        <Range Name="Strobe open" Start="0" End="5" AutoMenu="1" Centre="0" />
-                        <Range Name="Strobe closed" Start="6" End="10" AutoMenu="1" Centre="0" />
-                        <Range Name="Strobe 0Hz-30Hz" Start="11" End="250" AutoMenu="1" Centre="1" />
-                        <Range Name="Strobe open" Start="251" End="255" AutoMenu="0" Centre="0" />
+                        <Range Name="Strobe open" Start="0" End="5" AutoMenu="1" Centre="0"/>
+                        <Range Name="Strobe closed" Start="6" End="10" AutoMenu="1" Centre="0"/>
+                        <Range Name="Strobe 0Hz-30Hz" Start="11" End="250" AutoMenu="1" Centre="1"/>
+                        <Range Name="Strobe open" Start="251" End="255" AutoMenu="0" Centre="0"/>
                     </ChannelBeam>
                 </Fixture>
                 <Fixture _CreationDate="2017-02-24#00:00:00" _ModifiedDate="2017-03-09#00:00:00" Name="Thunder Wash 600 W (3ch mode)" NameShort="CLTW600W-3ch" Comment="" AllocateDmxChannels="3" Weight="3.25" Power="130" DimWidth="335" DimHeight="182" DimDepth="93">
-                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1" />
+                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1"/>
                     <ChannelBeam Name="Strobe" DefaultValue="0" Highlight="220" Deflection="0" DmxByte0="2" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="2">
-                        <Range Name="Strobe open" Start="0" End="5" AutoMenu="1" Centre="0" />
-                        <Range Name="Strobe closed" Start="6" End="10" AutoMenu="1" Centre="0" />
-                        <Range Name="Strobe 0Hz-30Hz" Start="11" End="250" AutoMenu="1" Centre="1" />
-                        <Range Name="Strobe open" Start="251" End="255" AutoMenu="0" Centre="0" />
+                        <Range Name="Strobe open" Start="0" End="5" AutoMenu="1" Centre="0"/>
+                        <Range Name="Strobe closed" Start="6" End="10" AutoMenu="1" Centre="0"/>
+                        <Range Name="Strobe 0Hz-30Hz" Start="11" End="250" AutoMenu="1" Centre="1"/>
+                        <Range Name="Strobe open" Start="251" End="255" AutoMenu="0" Centre="0"/>
                     </ChannelBeam>
                     <ChannelBeam Name="Flash Duration" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="3" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="3">
-                        <Range Name="0-512ms" Start="0" End="255" AutoMenu="1" Centre="0" />
+                        <Range Name="0-512ms" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
                 </Fixture>
                 <Fixture _CreationDate="2017-02-24#00:00:00" _ModifiedDate="2017-03-09#00:00:00" Name="Thunder Wash 600 W (5ch mode)" NameShort="CLTW600W-5ch" Comment="" AllocateDmxChannels="5" Weight="3.25" Power="130" DimWidth="335" DimHeight="182" DimDepth="93">
-                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1" />
+                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1"/>
                     <ChannelBeam Name="Strobe" DefaultValue="0" Highlight="220" Deflection="0" DmxByte0="2" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="2">
-                        <Range Name="Strobe open" Start="0" End="5" AutoMenu="1" Centre="0" />
-                        <Range Name="Strobe closed" Start="6" End="10" AutoMenu="1" Centre="0" />
-                        <Range Name="Puls random slow-fast" Start="11" End="33" AutoMenu="1" Centre="1" />
-                        <Range Name="Ramp up random slow-fast" Start="34" End="56" AutoMenu="1" Centre="1" />
-                        <Range Name="Ramp down random slow-fast" Start="57" End="79" AutoMenu="1" Centre="1" />
-                        <Range Name="Random Strobe Effect slow-fast" Start="80" End="102" AutoMenu="1" Centre="1" />
-                        <Range Name="Strobe Break Effect 5s-1s" Start="103" End="127" AutoMenu="1" Centre="1" />
-                        <Range Name="Strobe 0Hz-30Hz" Start="128" End="250" AutoMenu="1" Centre="1" />
-                        <Range Name="Strobe open" Start="251" End="255" AutoMenu="0" Centre="0" />
+                        <Range Name="Strobe open" Start="0" End="5" AutoMenu="1" Centre="0"/>
+                        <Range Name="Strobe closed" Start="6" End="10" AutoMenu="1" Centre="0"/>
+                        <Range Name="Puls random slow-fast" Start="11" End="33" AutoMenu="1" Centre="1"/>
+                        <Range Name="Ramp up random slow-fast" Start="34" End="56" AutoMenu="1" Centre="1"/>
+                        <Range Name="Ramp down random slow-fast" Start="57" End="79" AutoMenu="1" Centre="1"/>
+                        <Range Name="Random Strobe Effect slow-fast" Start="80" End="102" AutoMenu="1" Centre="1"/>
+                        <Range Name="Strobe Break Effect 5s-1s" Start="103" End="127" AutoMenu="1" Centre="1"/>
+                        <Range Name="Strobe 0Hz-30Hz" Start="128" End="250" AutoMenu="1" Centre="1"/>
+                        <Range Name="Strobe open" Start="251" End="255" AutoMenu="0" Centre="0"/>
                     </ChannelBeam>
                     <ChannelBeam Name="Programs" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="3" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="3">
-                        <Range Name="No function" Start="0" End="10" AutoMenu="1" Centre="0" />
-                        <Range Name="Strobe Programs (alternating segments)" Start="11" End="255" AutoMenu="1" Centre="0" />
+                        <Range Name="No function" Start="0" End="10" AutoMenu="1" Centre="0"/>
+                        <Range Name="Strobe Programs (alternating segments)" Start="11" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
-                    <ChannelBeam Name="Program Speed" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="4" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="4" />
+                    <ChannelBeam Name="Program Speed" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="4" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="4"/>
                     <ChannelBeam Name="Sound Control" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="5" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="5">
-                        <Range Name="Sound Control Off" Start="0" End="5" AutoMenu="1" Centre="0" />
-                        <Range Name="Mic Sensitivity Low-High" Start="6" End="255" AutoMenu="1" Centre="1" />
+                        <Range Name="Sound Control Off" Start="0" End="5" AutoMenu="1" Centre="0"/>
+                        <Range Name="Mic Sensitivity Low-High" Start="6" End="255" AutoMenu="1" Centre="1"/>
                     </ChannelBeam>
                 </Fixture>
                 <Fixture _CreationDate="2017-02-24#00:00:00" _ModifiedDate="2017-03-09#00:00:00" Name="Thunder Wash 600 W (7ch mode)" NameShort="CLTW600W-7ch" Comment="" AllocateDmxChannels="7" Weight="3.25" Power="130" DimWidth="335" DimHeight="182" DimDepth="93">
-                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1" />
+                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="255" Deflection="0" DmxByte0="1" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="1"/>
                     <ChannelBeam Name="Strobe" DefaultValue="0" Highlight="220" Deflection="0" DmxByte0="2" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="2">
-                        <Range Name="Strobe open" Start="0" End="5" AutoMenu="1" Centre="0" />
-                        <Range Name="Strobe closed" Start="6" End="10" AutoMenu="1" Centre="0" />
-                        <Range Name="Strobe 0Hz-30Hz" Start="11" End="250" AutoMenu="1" Centre="1" />
-                        <Range Name="Strobe open" Start="251" End="255" AutoMenu="0" Centre="0" />
+                        <Range Name="Strobe open" Start="0" End="5" AutoMenu="1" Centre="0"/>
+                        <Range Name="Strobe closed" Start="6" End="10" AutoMenu="1" Centre="0"/>
+                        <Range Name="Strobe 0Hz-30Hz" Start="11" End="250" AutoMenu="1" Centre="1"/>
+                        <Range Name="Strobe open" Start="251" End="255" AutoMenu="0" Centre="0"/>
                     </ChannelBeam>
                     <ChannelBeam Name="Flash Duration" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="3" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="3">
-                        <Range Name="0-512ms" Start="0" End="255" AutoMenu="1" Centre="0" />
+                        <Range Name="0-512ms" Start="0" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
-                    <ChannelIntensity Name="LED1 Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="4" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="4" />
-                    <ChannelIntensity Name="LED2 Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="5" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="5" />
-                    <ChannelIntensity Name="LED3 Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="6" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="6" />
-                    <ChannelIntensity Name="LED4 Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="7" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="7" />
+                    <ChannelIntensity Name="LED1 Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="4" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="4"/>
+                    <ChannelIntensity Name="LED2 Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="5" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="5"/>
+                    <ChannelIntensity Name="LED3 Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="6" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="6"/>
+                    <ChannelIntensity Name="LED4 Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="7" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="7"/>
                 </Fixture>
             </Manufacturer>
             <Manufacturer _CreationDate="2017-05-16#21:05:42" _ModifiedDate="2017-05-16#21:05:42" Name="lightmaXX" Comment="" Web="https://www.musicstore.de/de_DE/EUR/Licht/Lightmaxx/cat-LICHT-LIGLIGHT">
                 <Fixture _CreationDate="2017-02-24#00:00:00" _ModifiedDate="2017-03-09#00:00:00" Name="Vega Zoom Wash" NameShort="VegaZoomWash" Comment="" AllocateDmxChannels="16" Weight="4.5" Power="95" DimWidth="260" DimHeight="280" DimDepth="340">
-                    <ChannelFocus Name="Pan" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="1" DmxByte1="2" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="1" />
-                    <ChannelFocus Name="Tilt" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="3" DmxByte1="4" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="2" />
-                    <ChannelBeam Name="Pan / Tilt Speed" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="5" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="3" />
-                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="6" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="4" />
+                    <ChannelFocus Name="Pan" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="1" DmxByte1="2" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="1"/>
+                    <ChannelFocus Name="Tilt" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="3" DmxByte1="4" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="2"/>
+                    <ChannelBeam Name="Pan / Tilt Speed" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="5" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="3"/>
+                    <ChannelIntensity Name="Dimmer" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="6" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="4"/>
                     <ChannelBeam Name="Shutter" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="7" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="5">
-                        <Range Name="closed" Start="0" End="9" AutoMenu="1" Centre="0" />
-                        <Range Name="strobe" Start="10" End="245" AutoMenu="1" Centre="0" />
-                        <Range Name="open" Start="246" End="255" AutoMenu="1" Centre="0" />
+                        <Range Name="closed" Start="0" End="9" AutoMenu="1" Centre="0"/>
+                        <Range Name="strobe" Start="10" End="245" AutoMenu="1" Centre="0"/>
+                        <Range Name="open" Start="246" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
-                    <ChannelColor Name="Red" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="8" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="6" />
-                    <ChannelColor Name="Green" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="9" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="7" />
-                    <ChannelColor Name="Blue" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="10" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="8" />
-                    <ChannelColor Name="White" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="11" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="9" />
-                    <ChannelBeam Name="Color Temperature" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="12" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="10" />
+                    <ChannelColor Name="Red" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="8" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="6"/>
+                    <ChannelColor Name="Green" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="9" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="7"/>
+                    <ChannelColor Name="Blue" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="10" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="8"/>
+                    <ChannelColor Name="White" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="11" DmxByte1="0" Constant="0" Crossfade="1" Invert="0" Precedence="LTP" ClassicPos="9"/>
+                    <ChannelBeam Name="Color Temperature" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="12" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="10"/>
                     <ChannelColor Name="Color Macro" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="13" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="11">
-                        <Range Name="open" Start="0" End="10" AutoMenu="1" Centre="0" />
-                        <Range Name="red" Start="11" End="20" AutoMenu="1" Centre="0" />
-                        <Range Name="green" Start="21" End="30" AutoMenu="1" Centre="0" />
-                        <Range Name="blue" Start="31" End="40" AutoMenu="1" Centre="0" />
-                        <Range Name="white" Start="41" End="50" AutoMenu="1" Centre="0" />
-                        <Range Name="yellow" Start="51" End="60" AutoMenu="1" Centre="0" />
-                        <Range Name="cyan" Start="61" End="70" AutoMenu="1" Centre="0" />
-                        <Range Name="lightblue" Start="71" End="80" AutoMenu="1" Centre="0" />
-                        <Range Name="pink" Start="81" End="90" AutoMenu="1" Centre="0" />
-                        <Range Name="lightgreen" Start="91" End="100" AutoMenu="1" Centre="0" />
-                        <Range Name="lightred" Start="101" End="110" AutoMenu="1" Centre="0" />
-                        <Range Name="RGB" Start="111" End="120" AutoMenu="1" Centre="0" />
-                        <Range Name="RGW" Start="121" End="130" AutoMenu="1" Centre="0" />
-                        <Range Name="GBW" Start="131" End="140" AutoMenu="1" Centre="0" />
-                        <Range Name="RGBW" Start="141" End="150" AutoMenu="1" Centre="0" />
-                        <Range Name="jump" Start="151" End="255" AutoMenu="1" Centre="0" />
+                        <Range Name="open" Start="0" End="10" AutoMenu="1" Centre="0"/>
+                        <Range Name="red" Start="11" End="20" AutoMenu="1" Centre="0"/>
+                        <Range Name="green" Start="21" End="30" AutoMenu="1" Centre="0"/>
+                        <Range Name="blue" Start="31" End="40" AutoMenu="1" Centre="0"/>
+                        <Range Name="white" Start="41" End="50" AutoMenu="1" Centre="0"/>
+                        <Range Name="yellow" Start="51" End="60" AutoMenu="1" Centre="0"/>
+                        <Range Name="cyan" Start="61" End="70" AutoMenu="1" Centre="0"/>
+                        <Range Name="lightblue" Start="71" End="80" AutoMenu="1" Centre="0"/>
+                        <Range Name="pink" Start="81" End="90" AutoMenu="1" Centre="0"/>
+                        <Range Name="lightgreen" Start="91" End="100" AutoMenu="1" Centre="0"/>
+                        <Range Name="lightred" Start="101" End="110" AutoMenu="1" Centre="0"/>
+                        <Range Name="RGB" Start="111" End="120" AutoMenu="1" Centre="0"/>
+                        <Range Name="RGW" Start="121" End="130" AutoMenu="1" Centre="0"/>
+                        <Range Name="GBW" Start="131" End="140" AutoMenu="1" Centre="0"/>
+                        <Range Name="RGBW" Start="141" End="150" AutoMenu="1" Centre="0"/>
+                        <Range Name="jump" Start="151" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelColor>
                     <ChannelBeam Name="Macro Speed" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="14" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="12">
-                        <Range Name="macro off" Start="0" End="10" AutoMenu="1" Centre="0" />
-                        <Range Name="speed" Start="11" End="255" AutoMenu="1" Centre="0" />
+                        <Range Name="macro off" Start="0" End="10" AutoMenu="1" Centre="0"/>
+                        <Range Name="speed" Start="11" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
                     <ChannelBeam Name="Program" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="15" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="13">
-                        <Range Name="no function" Start="0" End="20" AutoMenu="1" Centre="0" />
-                        <Range Name="program 1" Start="21" End="40" AutoMenu="1" Centre="0" />
-                        <Range Name="program 2" Start="41" End="60" AutoMenu="1" Centre="0" />
-                        <Range Name="program 3" Start="61" End="80" AutoMenu="1" Centre="0" />
-                        <Range Name="program 4" Start="81" End="100" AutoMenu="1" Centre="0" />
-                        <Range Name="program 5" Start="101" End="120" AutoMenu="1" Centre="0" />
-                        <Range Name="program 6" Start="121" End="140" AutoMenu="1" Centre="0" />
-                        <Range Name="program 7" Start="141" End="160" AutoMenu="1" Centre="0" />
-                        <Range Name="program 8" Start="161" End="180" AutoMenu="1" Centre="0" />
-                        <Range Name="no function" Start="181" End="200" AutoMenu="1" Centre="0" />
-                        <Range Name="motor reset" Start="201" End="225" AutoMenu="1" Centre="0" />
-                        <Range Name="no function" Start="226" End="255" AutoMenu="1" Centre="0" />
+                        <Range Name="no function" Start="0" End="20" AutoMenu="1" Centre="0"/>
+                        <Range Name="program 1" Start="21" End="40" AutoMenu="1" Centre="0"/>
+                        <Range Name="program 2" Start="41" End="60" AutoMenu="1" Centre="0"/>
+                        <Range Name="program 3" Start="61" End="80" AutoMenu="1" Centre="0"/>
+                        <Range Name="program 4" Start="81" End="100" AutoMenu="1" Centre="0"/>
+                        <Range Name="program 5" Start="101" End="120" AutoMenu="1" Centre="0"/>
+                        <Range Name="program 6" Start="121" End="140" AutoMenu="1" Centre="0"/>
+                        <Range Name="program 7" Start="141" End="160" AutoMenu="1" Centre="0"/>
+                        <Range Name="program 8" Start="161" End="180" AutoMenu="1" Centre="0"/>
+                        <Range Name="no function" Start="181" End="200" AutoMenu="1" Centre="0"/>
+                        <Range Name="motor reset" Start="201" End="225" AutoMenu="1" Centre="0"/>
+                        <Range Name="no function" Start="226" End="255" AutoMenu="1" Centre="0"/>
                     </ChannelBeam>
-                    <ChannelBeam Name="Focus" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="16" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="14" />
+                    <ChannelBeam Name="Focus" DefaultValue="0" Highlight="0" Deflection="0" DmxByte0="16" DmxByte1="0" Constant="0" Crossfade="0" Invert="0" Precedence="LTP" ClassicPos="14"/>
                 </Fixture>
             </Manufacturer>
         </Fixtures>
         <Tiles>
-            <Manufacturer _CreationDate="2017-05-16#21:05:42" _ModifiedDate="2017-05-16#21:05:42" Name="cameo" Comment="" Web="http://www.cameolight.com/" />
-            <Manufacturer _CreationDate="2017-05-16#21:05:42" _ModifiedDate="2017-05-16#21:05:42" Name="lightmaXX" Comment="" Web="https://www.musicstore.de/de_DE/EUR/Licht/Lightmaxx/cat-LICHT-LIGLIGHT" />
+            <Manufacturer _CreationDate="2017-05-16#21:05:42" _ModifiedDate="2017-05-16#21:05:42" Name="cameo" Comment="" Web="http://www.cameolight.com/"/>
+            <Manufacturer _CreationDate="2017-05-16#21:05:42" _ModifiedDate="2017-05-16#21:05:42" Name="lightmaXX" Comment="" Web="https://www.musicstore.de/de_DE/EUR/Licht/Lightmaxx/cat-LICHT-LIGLIGHT"/>
         </Tiles>
     </Library>
-</Document>
+</Document>
\ No newline at end of file

Modified plugin qlcplus in this PR

Plugins are always tested with the following fixtures: fixtures/cameo/thunder-wash-600-w.json, fixtures/lightmaxx/vega-zoom-wash.json

Index: cameo/thunder-wash-600-w.qxf
===================================================================
--- cameo/thunder-wash-600-w.qxf
+++ cameo/thunder-wash-600-w.qxf
@@ -2,9 +2,9 @@
 <!DOCTYPE FixtureDefinition>
 <FixtureDefinition xmlns="http://www.qlcplus.org/FixtureDefinition">
  <Creator>
   <Name>Open Fixture Library QLC+ plugin</Name>
-  <Version>0.1.1</Version>
+  <Version>0.2.0</Version>
   <Author>FloEdelmann</Author>
  </Creator>
  <Manufacturer>cameo</Manufacturer>
  <Model>Thunder Wash 600 W</Model>
@@ -77,46 +77,46 @@
   <Capability Min="0" Max="255">0-100%</Capability>
  </Channel>
  <Mode Name="1-channel">
   <Physical>
-   <Bulb ColourTemperature="0" Type="LED" Lumens="0" />
-   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25" />
-   <Lens Name="Other" DegreesMin="75" DegreesMax="75" />
-   <Focus Type="Fixed" TiltMax="0" PanMax="0" />
-   <Technical DmxConnector="3-pin" PowerConsumption="130" />
+   <Bulb ColourTemperature="0" Type="LED" Lumens="0"/>
+   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25"/>
+   <Lens Name="Other" DegreesMin="75" DegreesMax="75"/>
+   <Focus Type="Fixed" TiltMax="0" PanMax="0"/>
+   <Technical DmxConnector="3-pin" PowerConsumption="130"/>
   </Physical>
   <Channel Number="0">Strobe</Channel>
  </Mode>
  <Mode Name="2-channel">
   <Physical>
-   <Bulb ColourTemperature="0" Type="LED" Lumens="0" />
-   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25" />
-   <Lens Name="Other" DegreesMin="75" DegreesMax="75" />
-   <Focus Type="Fixed" TiltMax="0" PanMax="0" />
-   <Technical DmxConnector="3-pin" PowerConsumption="130" />
+   <Bulb ColourTemperature="0" Type="LED" Lumens="0"/>
+   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25"/>
+   <Lens Name="Other" DegreesMin="75" DegreesMax="75"/>
+   <Focus Type="Fixed" TiltMax="0" PanMax="0"/>
+   <Technical DmxConnector="3-pin" PowerConsumption="130"/>
   </Physical>
   <Channel Number="0">Dimmer</Channel>
   <Channel Number="1">Strobe 2</Channel>
  </Mode>
  <Mode Name="3-channel">
   <Physical>
-   <Bulb ColourTemperature="0" Type="LED" Lumens="0" />
-   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25" />
-   <Lens Name="Other" DegreesMin="75" DegreesMax="75" />
-   <Focus Type="Fixed" TiltMax="0" PanMax="0" />
-   <Technical DmxConnector="3-pin" PowerConsumption="130" />
+   <Bulb ColourTemperature="0" Type="LED" Lumens="0"/>
+   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25"/>
+   <Lens Name="Other" DegreesMin="75" DegreesMax="75"/>
+   <Focus Type="Fixed" TiltMax="0" PanMax="0"/>
+   <Technical DmxConnector="3-pin" PowerConsumption="130"/>
   </Physical>
   <Channel Number="0">Dimmer</Channel>
   <Channel Number="1">Strobe 2</Channel>
   <Channel Number="2">Flash Duration</Channel>
  </Mode>
  <Mode Name="5-channel">
   <Physical>
-   <Bulb ColourTemperature="0" Type="LED" Lumens="0" />
-   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25" />
-   <Lens Name="Other" DegreesMin="75" DegreesMax="75" />
-   <Focus Type="Fixed" TiltMax="0" PanMax="0" />
-   <Technical DmxConnector="3-pin" PowerConsumption="130" />
+   <Bulb ColourTemperature="0" Type="LED" Lumens="0"/>
+   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25"/>
+   <Lens Name="Other" DegreesMin="75" DegreesMax="75"/>
+   <Focus Type="Fixed" TiltMax="0" PanMax="0"/>
+   <Technical DmxConnector="3-pin" PowerConsumption="130"/>
   </Physical>
   <Channel Number="0">Dimmer</Channel>
   <Channel Number="1">Strobe 3</Channel>
   <Channel Number="2">Programs</Channel>
@@ -124,13 +124,13 @@
   <Channel Number="4">Sound Control</Channel>
  </Mode>
  <Mode Name="7-channel">
   <Physical>
-   <Bulb ColourTemperature="0" Type="LED" Lumens="0" />
-   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25" />
-   <Lens Name="Other" DegreesMin="75" DegreesMax="75" />
-   <Focus Type="Fixed" TiltMax="0" PanMax="0" />
-   <Technical DmxConnector="3-pin" PowerConsumption="130" />
+   <Bulb ColourTemperature="0" Type="LED" Lumens="0"/>
+   <Dimensions Width="335" Height="182" Depth="93" Weight="3.25"/>
+   <Lens Name="Other" DegreesMin="75" DegreesMax="75"/>
+   <Focus Type="Fixed" TiltMax="0" PanMax="0"/>
+   <Technical DmxConnector="3-pin" PowerConsumption="130"/>
   </Physical>
   <Channel Number="0">Dimmer</Channel>
   <Channel Number="1">Strobe 2</Channel>
   <Channel Number="2">Flash Duration</Channel>
Index: lightmaxx/vega-zoom-wash.qxf
===================================================================
--- lightmaxx/vega-zoom-wash.qxf
+++ lightmaxx/vega-zoom-wash.qxf
@@ -2,9 +2,9 @@
 <!DOCTYPE FixtureDefinition>
 <FixtureDefinition xmlns="http://www.qlcplus.org/FixtureDefinition">
  <Creator>
   <Name>Open Fixture Library QLC+ plugin</Name>
-  <Version>0.1.1</Version>
+  <Version>0.2.0</Version>
   <Author>FloEdelmann</Author>
  </Creator>
  <Manufacturer>lightmaXX</Manufacturer>
  <Model>Vega Zoom Wash</Model>
@@ -108,13 +108,13 @@
   <Capability Min="226" Max="255">no function</Capability>
  </Channel>
  <Mode Name="16-channel">
   <Physical>
-   <Bulb ColourTemperature="0" Type="LED" Lumens="0" />
-   <Dimensions Width="260" Height="280" Depth="340" Weight="4.5" />
-   <Lens Name="Other" DegreesMin="6" DegreesMax="45" />
-   <Focus Type="Head" TiltMax="190" PanMax="540" />
-   <Technical DmxConnector="3-pin" PowerConsumption="95" />
+   <Bulb ColourTemperature="0" Type="LED" Lumens="0"/>
+   <Dimensions Width="260" Height="280" Depth="340" Weight="4.5"/>
+   <Lens Name="Other" DegreesMin="6" DegreesMax="45"/>
+   <Focus Type="Head" TiltMax="190" PanMax="540"/>
+   <Technical DmxConnector="3-pin" PowerConsumption="95"/>
   </Physical>
   <Channel Number="0">Pan</Channel>
   <Channel Number="1">Pan fine</Channel>
   <Channel Number="2">Tilt</Channel>

@FloEdelmann FloEdelmann temporarily deployed to open-fixture-library-pr-118 May 16, 2017 19:57 Inactive
@FloEdelmann
Copy link
Member

Copy link
Member

@FloEdelmann FloEdelmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I definitely like the cleaner code. Can we somehow prevent the trailing space in self-closing tags from being deleted (<tag/> instead of <tag />)? Maybe patch the dependency?

plugins/ecue.js Outdated
@@ -3,30 +3,45 @@ const path = require('path');
const util = require('util');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this unused import

@@ -82,23 +97,29 @@ module.exports.export = function exportQLCplus(library, options) {

function exportHandleAvailableChannels(fixture, defaults) {
let str = '';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this unused variable

@FloEdelmann FloEdelmann temporarily deployed to open-fixture-library-pr-118 May 16, 2017 20:32 Inactive
@fxedel
Copy link
Member Author

fxedel commented May 16, 2017

https://github.com/oozcitak/xmlbuilder-js/blob/master/src/XMLStringWriter.coffee#L130

There currently is no way to add the additional space without making changes to the dependency. But we could create an issue and ask whether it's possible/wished to add an option to the dependency that adds this extra space and then make a pull request implementing that functionality.

However, it might be considerable whether this space is really that important.

@FloEdelmann FloEdelmann temporarily deployed to open-fixture-library-pr-118 May 16, 2017 21:04 Inactive
@FloEdelmann
Copy link
Member

@FloEdelmann
Copy link
Member

see oozcitak/xmlbuilder-js#157

Copy link
Member

@FloEdelmann FloEdelmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest we merge this now and add the space option later if possible.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component-plugin Affects one or more import or export plugins. component-test Affects the automated tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants