Merge lp:~spud/spud/make-diamond-pick-up-attributes-of-real-vectors-and-tensors into lp:spud

[Patrick Farrell]

Found a major bug in Diamond's interface, pointed out by Dan Barker.

In the MixedTree class (used to hide real_value and stuff like that from the user), the attributes came solely from the parent. But the child (real_value) element also could have attributes the user must set -- but these were never displayed, and could never be set.

To test this, take a look at the first.rng included with this commit, with Diamond before and after this change. In particular, real_vector and real_tensor have /never/ worked, despite being in the spud_base schema.

[David Ham (david-ham)]

review: Approve

=== modified file 'diamond/diamond/attributewidget.py'
--- diamond/diamond/attributewidget.py	2011-07-28 12:30:12 +0000
+++ diamond/diamond/attributewidget.py	2011-11-30 15:31:25 +0000
@@ -86,7 +86,7 @@
 
     self.node = node
 
-    if node is None or not node.attrs.keys():
+    if node is None or node.all_attrs_fixed():
       self.set_property("visible", False)
     else:
       self.set_property("visible", True)

=== modified file 'diamond/diamond/mixedtree.py'
--- diamond/diamond/mixedtree.py	2011-07-30 04:36:33 +0000
+++ diamond/diamond/mixedtree.py	2011-11-30 15:31:25 +0000
@@ -30,7 +30,7 @@
 
     self.name = parent.name
     self.schemaname = parent.schemaname
-    self.attrs = self.parent.attrs
+    self.attrs = dict(self.parent.attrs.items() + self.child.attrs.items())
     self.children = parent.children
     self.datatype = child.datatype
     self.data = child.data
@@ -40,12 +40,22 @@
     return
 
   def set_attr(self, attr, val):
-    self.parent.set_attr(attr, val)
+    if attr in self.parent.attrs:
+      self.parent.set_attr(attr, val)
+    elif attr in self.child.attrs:
+      self.child.set_attr(attr, val)
+    else:
+      raise Exception, "Attribute not present in either parent or child!"
 
     return
 
   def get_attr(self, attr):
-    return self.parent.get_attr(attr)
+    if attr in self.parent.attrs:
+      self.parent.get_attr(attr)
+    elif attr in self.child.attrs:
+      self.child.get_attr(attr)
+    else:
+      raise Exception, "Attribute not present in either parent or child!"
 
   def set_data(self, data):
     self.child.set_data(data)
@@ -197,3 +207,10 @@
 
   def is_sliceable(self):
     return True
+
+  def all_attrs_fixed(self):
+    for attr in self.attrs:
+      if self.attrs[attr][0] != "fixed":
+        return False
+
+    return True

=== modified file 'diamond/diamond/tree.py'
--- diamond/diamond/tree.py	2011-09-01 14:59:55 +0000
+++ diamond/diamond/tree.py	2011-11-30 15:31:25 +0000
@@ -540,6 +540,13 @@
   
   def __repr__(self):
     return self.get_name_path()
+
+  def all_attrs_fixed(self):
+    for attr in self.attrs:
+      if self.attrs[attr][0] != "fixed":
+        return False
+
+    return True
  
 gobject.type_register(Tree)
 

=== modified file 'diamond/tests/schema/first.rnc'
--- diamond/tests/schema/first.rnc	2008-06-23 14:35:46 +0000
+++ diamond/tests/schema/first.rnc	2011-11-30 15:31:25 +0000
@@ -1,3 +1,6 @@
+include "spud_base.rnc"
+
 start = element test {
-	empty
+	element example_real_tensor { real_tensor },
+  element example_real_vector { real_vector }
 }

=== modified file 'diamond/tests/schema/first.rng'
--- diamond/tests/schema/first.rng	2008-06-23 14:35:46 +0000
+++ diamond/tests/schema/first.rng	2011-11-30 15:31:25 +0000
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <include href="spud_base.rng"/>
   <start>
     <element name="test">
-      <empty/>
+      <element name="example_real_tensor">
+        <ref name="real_tensor"/>
+      </element>
+      <element name="example_real_vector">
+        <ref name="real_vector"/>
+      </element>
     </element>
   </start>
 </grammar>