Merge branch 'master'

xtt/lib/flow/qt/flow_draw_qt.cqt

@@ -1051,7 +1051,6 @@ void FlowDrawQt::cancel_event_timer(FlowCtx* ctx)
   FlowDrawQt* draw_ctx = (FlowDrawQt*)ctx->fdraw;
   if (draw_ctx->timer_id) {
     draw_ctx->timer_id->stop();
-    draw_ctx->timer_id = 0;
   }
 }
 

xtt/lib/flow/src/flow_con.h

@@ -97,6 +97,9 @@ public:
       double dest_x, double dest_y, flow_eDirection dest_dir);
   int con_route_grafcet(flow_eConType con_type, double src_x, double src_y,
       double dest_x, double dest_y);
+  void draw_routed_roundcorner(int points, double* x, double* y);
+  void draw_routed(int points, double* x, double* y);
+  void draw_routed_trans(int points, double* x, double* y);
   void set_highlight(int on);
   int get_highlight()
   {

xtt/lib/flow/src/flow_ctx.cpp

@@ -1529,6 +1529,8 @@ void FlowCtx::trace_scan()
 
   for (i = 0; i < a.a_size; i++)
     a.a[i]->trace_scan();
+
+  redraw_if_dirty();
 }
 
 void FlowCtx::get_selected_nodes(FlowArrayElem*** nodes, int* num)

xtt/lib/flow/src/flow_tiptext.cpp

@@ -47,6 +47,7 @@ static void tiptext_timer_cb(FlowCtx* ctx)
   ctx->tiptext->active = true;
 
   ctx->set_dirty();
+  ctx->redraw_if_dirty();
 }
 FlowTipText::~FlowTipText()
 {