Changeset 1320 in lmdz_wrf for trunk

Timestamp:

Nov 11, 2016, 6:33:54 PM (8 years ago)

Author:

lfita

Message:

Adding special case on Nfigs=1 in 'latex_fig_array'

File:

• trunk/tools/generic_tools.py (modified) (1 diff)

trunk/tools/generic_tools.py

@@ -10383 +10383 @@
     obf.write('\\begin{table}\n')
     obf.write('\\begin{center}\n')
-    obf.write('\\begin{tabular}{' + cS + '}\n')
 
     # loop of figures distributed by Ncol, Nrow
-    iifig = 0
-    for irow in range(Nrow):
-        if irow < Nrow -1 or (irow == Nrow - 1 and dorest == 'nothing'):
-            for icol in range(Ncol):
-                # Getting figure name if it does exist
-                if iifig <= Nfig - 1:
+    if Nfig > 1:
+        obf.write('\\begin{tabular}{' + cS + '}\n')
+        iifig = 0
+        for irow in range(Nrow):
+            if irow < Nrow -1 or (irow == Nrow - 1 and dorest == 'nothing'):
+                for icol in range(Ncol):
+                    # Getting figure name if it does exist
+                    if iifig <= Nfig - 1:
+                        fign = figs[iifig]
+                        obf.write('\\includegraphics[' + widthheight + ']{' +fign+ '}\n')
+                        if icol < Ncol - 1:
+                            obf.write('&\n')
+                        elif irow != Nrow - 1:
+                            obf.write('\\\\\n')
+                    else:
+                        if icol < Ncol -2: obf.write('&\n')
+                    iifig = iifig + 1
+            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]
-                    obf.write('\\includegraphics[' + widthheight + ']{' +fign+ '}\n')
-                    if icol < Ncol - 1:
+                    print icol, fign, iifig
+                    obf.write('\\includegraphics[' + widthheight + ']{' + fign + '}\n')
+                    if icol < Nrest - 1:
                         obf.write('&\n')
-                    elif irow != Nrow - 1:
-                        obf.write('\\\\\n')
-                else:
-                    if icol < Ncol -2: obf.write('&\n')
-                iifig = iifig + 1
-        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
-
-    obf.write('\\end{tabular}\n')
+                    else:
+                        obf.write('\\end{tabular}}\n')
+                    iifig = iifig + 1
+    
+        obf.write('\\end{tabular}\n')
+    else:
+        fign = figs[0]
+        obf.write('\\includegraphics[' + widthheight + ']{' +fign+ '}\n')
+
     obf.write('\\end{center}\n')
     obf.write('\\caption{' + figcaption + '}\n')