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

Timestamp:

Nov 11, 2016, 7:11:26 PM (8 years ago)

Author:

lfita

Message:

Fixing `latex_fig_array'

File:

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

trunk/tools/generic_tools.py

@@ -10342 +10342 @@
     fname = 'latex_fig_array'
 
+    if type(figs) == type('s'):
+        figs = list(figs)
+
     Nfig = len(figs)
 
@@ -10358 +10361 @@
             print "  passed value of '" + dist + "' does not fit", Nfig, 'figures'
             quit(-1)
+    # Special case on Nfigs == 2
+    if Nfig == 2:
+        Ncol = 2
+        Nrow = 1
+        Nrest = np.mod(Nfig,Ncol)
+
     print '  ' + fname + ': table of figures of: ', Ncol, 'columns', Nrow, 'rows'
 
@@ -10404 +10413 @@
             elif irow == Nrow -1 and dorest == 'center':
                 crestS = ''
-                for irc in range(Nrest): crestS = crestS + 'c'
-                obf.write('\\multicolumn{'+str(Ncol)+'}{c}{\\begin{tabular}{'+crestS +   \
-                  '}\n')
-                for icol in range(Nrest):
-                    fign = figs[iifig]
-                    print icol, fign, iifig
-                    obf.write('\\includegraphics[' + widthheight + ']{' + fign + '}\n')
-                    if icol < Nrest - 1:
-                        obf.write('&\n')
-                    else:
-                        obf.write('\\end{tabular}}\n')
-                    iifig = iifig + 1
+                if Nrest != 0: 
+                    for irc in range(Nrest): crestS = crestS + 'c'
+                    obf.write('\\multicolumn{'+str(Ncol)+'}{c}{\\begin{tabular}{' +  \
+                      crestS + '}\n')
+                    for icol in range(Nrest):
+                        fign = figs[iifig]
+                        obf.write('\\includegraphics[' + widthheight + ']{' + fign + \
+                          '}\n')
+                        if icol < Nrest - 1:
+                            obf.write('&\n')
+                        else:
+                            obf.write('\\end{tabular}}\n')
+                        iifig = iifig + 1
+                else:
+                    # Case with images which fulfill the last row
+                    for icol in range(Ncol):
+                        fign = figs[iifig]
+                        obf.write('\\includegraphics[' + widthheight + ']{' + fign + \
+                          '}\n')
+                        if icol < Ncol - 1:
+                            obf.write('&\n')
+                        iifig = iifig + 1
+
     
         obf.write('\\end{tabular}\n')
     else:
+        print warnmsg
+        print '  ' + fname + ': passed a single figure!!'
         fign = figs[0]
         obf.write('\\includegraphics[' + widthheight + ']{' +fign+ '}\n')