Bugfixes in exportQuirk

Author: perak

lib/quantum-circuit.js

@@ -5994,18 +5994,18 @@ QuantumCircuit.prototype.exportQuirk = function(decompose) {
 									isDecomposeCustomCircuit = true;
 								}
 							}
-			
-							if(isDecomposeCustomCircuit){
-								circuit.gates.map(function(circuitGate, index){
-									circuitGate.map(function(gateToRemove){
-										if(gateToRemove && gateToRemove.name == gate.name){
-											circuit.removeGate(gateToRemove.id);
-										}
-									});														
-								});
-							}else {
-								gatesToBeAdded = [];
-							}
+						}
+
+						if(isDecomposeCustomCircuit){
+							circuit.gates.map(function(circuitGate, index){
+								circuitGate.map(function(gateToRemove){
+									if(gateToRemove && gateToRemove.name == gate.name){
+										circuit.removeGate(gateToRemove.id);
+									}
+								});														
+							});
+						}else {
+							gatesToBeAdded = [];
 						}
 					}
 				}
@@ -6019,6 +6019,26 @@ QuantumCircuit.prototype.exportQuirk = function(decompose) {
 		}
 	});
 
+	var previousColumn = null;
+	var previousGate = null;
+	for(var column = 0; column < numCols; column++) {
+		for(var wire = 0; wire < circuit.numQubits; wire++) {
+			var gate = circuit.getGateAt(column, wire);
+			if(gate){
+				// if(previousGate){
+				// 	console.log(previousGate.name, gate.name, previousGate.connector, previousColumn, column)
+				// }
+				if(previousGate && previousGate.name != gate.name && previousGate.connector != 0 && previousColumn == column){
+					circuit.removeGate(gate.id);
+					circuit.insertGate(gate.name, gate.column + 1, gate.wires, gate.options);
+					// console.log(gate.name, previousColumn, column)
+				}
+				previousGate = gate;
+				previousColumn = column;
+			}
+		}
+	}
+
 	var numCols = circuit.numCols();
 	for(var column = 0; column < numCols; column++) {
 		var quirkColumn = [];