Changeset 1323 in lmdz_wrf for trunk/tools/generic_tools.py

Timestamp:

Nov 11, 2016, 8:46:15 PM (8 years ago)

Author:

lfita

Message:

Adding in 'latex_fig_array'

• `refsize': refernce images size (0.9, default)
• Flipping Ncol, Nrow distribution if Ncol < Ncol

File:

• trunk/tools/generic_tools.py (modified) (5 diffs)

trunk/tools/generic_tools.py

@@ -10297 +10297 @@
     return newmat, Lopn[opn]
 
-def latex_fig_array(figs, obf, figcaption, figlabel, dist='sqr', width='auto',       \
-  height='None', dorest='nothing'):
+def latex_fig_array(figs, obf, figcaption, figlabel, dist='sqr', refsize=0.9,        \
+  width='auto', height='None', dorest='nothing'):
     """ Function to add an array of figures to an existing tex file
       figs= list of figures names (with path)
@@ -10307 +10307 @@
         'sqr': squared, figures are equivenly distributed in rows and columns (sqrt(Nfigs), default)
         [Ncol]'x'Nrow: a given number of columns and rows
+      refsize= refernce images size (0.9, default)
       width= with of the figures
         'None': no value passed
-        'auto': getting according to fractions of 0.9\textwidth (default)
+        'auto': getting according to fractions of [refsize]\textwidth (default)
         [value]: exactly as it is desired (e.g.: '0.3\\textwidht', '5cm' ...)
       height= height of the figures
         'None': no value passed (default)
-        'auto': getting according to fractions of 0.9\textheight
+        'auto': getting according to fractions of [refsize]\textheight
         [value]: exactly as it is desired (e.g.: '0.3\\textheight', '5cm' ...)
       dorest= what to do with the last row if it does not fill the number of columns
@@ -10367 +10368 @@
         Nrest = np.mod(Nfig,Ncol)
 
+    # We prefer lines of figures rather than columns
+    if Ncol == 1 and Nrow > 1:
+        vc = Ncol
+        vr = Nrow
+        Ncol = vr
+        Nrow = vc
+
     print '  ' + fname + ': table of figures of: ', Ncol, 'columns', Nrow, 'rows'
+
+    # Checking for row/column size consistency definition
+    if width == 'auto' and height == 'None' and Nrow > Ncol:
+        print warnmsg
+        print '  ' + fname + ': changing autmoatic configuration !!'
+        print '   row-based definition of image sizes since number of rows:', Nrow,  \
+          'is larger than the number of columns:', Ncol
+        print "    from width='auto', height='None'"
+        print "    to width='None', height='auto'"
+        width = 'None'
+        height = 'auto'
 
     # Width and height section
@@ -10373 +10392 @@
     if width != 'None':
         if width == 'auto':
-            sec = 0.9/Ncol
+            sec = np.float(refsize)/Ncol
             widthheight = 'width=' + str(sec) + '\\textwidth'
         else:
@@ -10381 +10400 @@
         if len(widthheight) > 0: widthheight = widthheight + ', '
         if height == 'auto':
-            sec = 0.9/Nrow
+            sec = np.float(refsize)/Nrow
             widthheight = widthheight + 'height=' + str(sec) + '\\textheight'
         else: