From 93dfb8e3003b483c1041c6f7b4ff293935aeb7c0 Mon Sep 17 00:00:00 2001
From: rcoh <rcoh@mit.edu>
Date: Wed, 29 Dec 2010 17:27:33 -0500
Subject: Inheritence now happens at all levels on reading of config files.  No
 additional resolution of inheritances should be necessary.  RCOH

---
 layouts/50PixelStrip.xml  |  8 ++++++++
 layouts/BasicSixStrip.xml | 42 ++++++++++++------------------------------
 2 files changed, 20 insertions(+), 30 deletions(-)
 create mode 100644 layouts/50PixelStrip.xml

(limited to 'layouts')

diff --git a/layouts/50PixelStrip.xml b/layouts/50PixelStrip.xml
new file mode 100644
index 0000000..beabb97
--- /dev/null
+++ b/layouts/50PixelStrip.xml
@@ -0,0 +1,8 @@
+<PixelStrip>
+    <Class>layouts.LineLayout</Class>
+    <Args>
+        <pixelToPixelSpacing>4</pixelToPixelSpacing>
+        <spacing>4</spacing> 
+        <numPixels>50</numPixels>
+    </Args>
+</PixelStrip>
diff --git a/layouts/BasicSixStrip.xml b/layouts/BasicSixStrip.xml
index 38c50d4..0d2d277 100644
--- a/layouts/BasicSixStrip.xml
+++ b/layouts/BasicSixStrip.xml
@@ -1,61 +1,43 @@
 <PixelConfiguration>
         <PixelStrip>
-            <Class>layouts.LineLayout</Class>
-            <Args>
+            <InheritsFrom>layouts/50PixelStrip.xml</InheritsFrom>
+            <Args OverrideBehavior="Merge">
                 <Id>strip1</Id>
-                <pixelToPixelSpacing>4</pixelToPixelSpacing>
-                <spacing>4</spacing> 
-                <numPixels>50</numPixels>
                 <originLocation>(10,20)</originLocation>
             </Args>
         </PixelStrip>
         <PixelStrip>
-            <Class>layouts.LineLayout</Class>
-            <Args>
+            <InheritsFrom>layouts/50PixelStrip.xml</InheritsFrom>
+            <Args OverrideBehavior="Merge">
                 <Id>strip2</Id>
-                <pixelToPixelSpacing>4</pixelToPixelSpacing>
-                <spacing>4</spacing> 
-                <numPixels>50</numPixels>
                 <originLocation>(10,24)</originLocation>
             </Args>
         </PixelStrip>
         <PixelStrip>
-            <Class>layouts.LineLayout</Class>
-            <Args>
+            <InheritsFrom>layouts/50PixelStrip.xml</InheritsFrom>
+            <Args OverrideBehavior="Merge">
                 <Id>strip3</Id>
-                <pixelToPixelSpacing>4</pixelToPixelSpacing>
-                <spacing>4</spacing> 
-                <numPixels>50</numPixels>
                 <originLocation>(10,28)</originLocation>
             </Args>
         </PixelStrip>
         <PixelStrip>
-            <Class>layouts.LineLayout</Class>
-            <Args>
+            <InheritsFrom>layouts/50PixelStrip.xml</InheritsFrom>
+            <Args OverrideBehavior="Merge">
                 <Id>strip4</Id>
-                <pixelToPixelSpacing>4</pixelToPixelSpacing>
-                <spacing>4</spacing> 
-                <numPixels>50</numPixels>
                 <originLocation>(10,32)</originLocation>
             </Args>
         </PixelStrip>
         <PixelStrip>
-            <Class>layouts.LineLayout</Class>
-            <Args>
+            <InheritsFrom>layouts/50PixelStrip.xml</InheritsFrom>
+            <Args OverrideBehavior="Merge">
                 <Id>strip5</Id>
-                <pixelToPixelSpacing>4</pixelToPixelSpacing>
-                <spacing>4</spacing> 
-                <numPixels>50</numPixels>
                 <originLocation>(10,36)</originLocation>
             </Args>
         </PixelStrip>
         <PixelStrip>
-            <Class>layouts.LineLayout</Class>
-            <Args>
+            <InheritsFrom>layouts/50PixelStrip.xml</InheritsFrom>
+            <Args OverrideBehavior="Merge">
                 <Id>strip6</Id>
-                <pixelToPixelSpacing>4</pixelToPixelSpacing>
-                <spacing>4</spacing> 
-                <numPixels>50</numPixels>
                 <originLocation>(10,40)</originLocation>
             </Args>
         </PixelStrip>
-- 
cgit v1.2.3