Changeset 1176

Timestamp:

08/02/18 16:56:42 (3 years ago)

Author:

mjuckes

Message:

updates to tikz

File:

• CMIP6dreqbuild/trunk/src/framework/tikz.py (modified) (5 diffs)

CMIP6dreqbuild/trunk/src/framework/tikz.py

@@ -35 +35 @@
     if mode == 'float':
       self.__dict__[k] = floatify(v)
+
+  def addChildren(self,nlist):
+    '''Add a list of child nodes and create a node list string for use in tikz'''
+    self.child = nlist
+    self.childList = ''.join( [ '(%s)' % x.label for x in nlist] )
+    self.isParent = True
 
   def dec(self):
@@ -100 +106 @@
 
 nodeTmpl = '''   \\node at (%(x)s,%(y)s) [%(nclass)s%(ncx)s] (%(label)s) {%(decTitle)s} ;\n'''
+parentNodeTmpl = '''   \\node [%(nclass)s%(ncx)s, parentLabel=%(decTitle)s fit={%(childList)s}] (%(label)s) {} ;\n'''
 flxTmpl = '''  (%(ffrom)s) edge %(pathDec)s %(flxLabel)s (%(tto)s) \n'''
 flxLabelTmpl = ''' node[below,align=center]{\\bf %s} '''
@@ -158 +165 @@
     for mip,p in parents:
       try:
-        self.reservoirsIx[ (mip,p) ].child = parents[(mip,p)]
+        self.reservoirsIx[ (mip,p) ].addChildren( parents[(mip,p)] )
+        ##self.reservoirsIx[ (mip,p) ].child = parents[(mip,p)]
         ##self.reservoirsIx[ (mip,p) ].child = thisnode
-        self.reservoirsIx[ (mip,p) ].isParent = True
+        ##self.reservoirsIx[ (mip,p) ].isParent = True
       except:
         print 'Failed to set parent: ', mip,p
@@ -247 +255 @@
  
     vars = set()
+    oo.write( '\\begin{pgfonlayer}{child}\n' )
     if mip in self.reservoirs:
       for this in self.reservoirs[mip] + self.reservoirs['all']:
@@ -261 +270 @@
           oo.write( nodeTmpl % this.__dict__ )
           vars.add( this.var )
+    oo.write( '\\end{pgfonlayer}{child}\n' )