Merge remote-tracking branch 'origin/stable/0.3' into stable/0.3

src/quafu/circuits/quantum_circuit.py

@@ -68,9 +68,10 @@ def measures(self, measures):
 
     @property
     def gates(self):
-        warnings.warn('Deprecated warning: due to historical reason, ``gates`` contains not only instances of '
+        warnings.warn('Due to historical reason, ``gates`` contains not only instances of '
                       'QuantumGate, meanwhile not contains measurements. This attributes might be deprecated in'
-                      ' the future. Better to use ``instructions`` which contains all the instructions.')
+                      ' the future. Better to use ``instructions`` which contains all the instructions.',
+                      category=DeprecationWarning)
         return self._gates
 
     @gates.setter

src/quafu/tasks/tasks.py

@@ -248,7 +248,12 @@ def send(self,
                 else:
                     self.submit_history[group].append(task_id)
 
-                return ExecResult(res_dict)
+                result = ExecResult(res_dict)
+                while wait and (self.shots > 0) and (not result.counts):
+                    if verbose:
+                        logging.warning('warning for quafu status: empty result.counts, retrieving task...')
+                    result = self.retrieve(result.taskid)
+                return result
 
     def retrieve(self, taskid: str) -> ExecResult:
         """

src/quafu/visualisation/circuitPlot.py

@@ -206,8 +206,9 @@ def _process_ins(self, ins: Instruction, append: bool = True):
         elif name in r2_gate_names:
             # TODO: combine into one box
             self._ctrl_wire_points.append([[depth, ins.pos[0]], [depth, ins.pos[1]]])
-            self._proc_su2(name[:-1], depth, ins.pos[0], paras)
-            self._proc_su2(name[:-1], depth, ins.pos[1], paras)
+
+            self._proc_su2(name[:-1], depth, min(ins.pos), None)
+            self._proc_su2(name[:-1], depth, max(ins.pos), paras)
         elif isinstance(ins, ControlledGate):
             self._proc_ctrl(depth, ins)
         elif name == 'delay':
@@ -363,7 +364,7 @@ def _proc_su2(self, id_name, depth, pos, paras):
 
         if id_name in ['rx', 'ry', 'rz', 'p']:
             # too long to display: r'$\theta=$' + f'{paras:.3f}' (TODO)
-            para_txt = f'({paras:.3f})'
+            para_txt = f'({paras:.3f})' if paras else None
         else:
             para_txt = None