From 3d1f8751de637a7b4bf113696564802d61ba084d Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Mon, 15 Oct 2018 10:41:22 -0400 Subject: [PATCH] Respect plotbarrier style setting for latex circuit drawers This commit adds support to the latex circuit drawers (output 'latex' and 'latex_source') for respecting the plotbarrier style config setting. However, to maintain backwards compatibility for the latex drawer the default style has to change from false to true. Partially addresses #1099 --- .../visualization/_circuit_visualization.py | 19 ++++++++++--------- qiskit/tools/visualization/_qcstyle.py | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/qiskit/tools/visualization/_circuit_visualization.py b/qiskit/tools/visualization/_circuit_visualization.py index 0d9432548e50..9b5b70e486bb 100644 --- a/qiskit/tools/visualization/_circuit_visualization.py +++ b/qiskit/tools/visualization/_circuit_visualization.py @@ -1325,15 +1325,16 @@ def _build_latex_array(self, aliases=None): raise QISKitError('Error during Latex building: %s' % str(e)) elif op['name'] == "barrier": - qarglist = [self.qubit_list[i] for i in op['qubits']] - if self._style.reverse: - qarglist = list(reversed(qarglist)) - if aliases is not None: - qarglist = map(lambda x: aliases[x], qarglist) - start = self.img_regs[(qarglist[0][0], - qarglist[0][1])] - span = len(op['qubits']) - 1 - self._latex[start][columns] += " \\barrier{" + str(span) + "}" + if self._style.barrier: + qarglist = [self.qubit_list[i] for i in op['qubits']] + if self._style.reverse: + qarglist = list(reversed(qarglist)) + if aliases is not None: + qarglist = map(lambda x: aliases[x], qarglist) + start = self.img_regs[(qarglist[0][0], + qarglist[0][1])] + span = len(op['qubits']) - 1 + self._latex[start][columns] += " \\barrier{" + str(span) + "}" else: assert False, "bad node data" diff --git a/qiskit/tools/visualization/_qcstyle.py b/qiskit/tools/visualization/_qcstyle.py index 0de1cf2ffa22..7f3da4fd4239 100644 --- a/qiskit/tools/visualization/_qcstyle.py +++ b/qiskit/tools/visualization/_qcstyle.py @@ -64,7 +64,7 @@ def __init__(self): self.pimode = False self.fold = 20 self.bundle = False - self.barrier = False + self.barrier = True self.index = False self.compress = True self.figwidth = -1