Commit 90bde1fd authored by Claes Sjofors's avatar Claes Sjofors

Merge branch 'master'

parents 8b74cc11 b086ae5a
...@@ -1051,7 +1051,6 @@ void FlowDrawQt::cancel_event_timer(FlowCtx* ctx) ...@@ -1051,7 +1051,6 @@ void FlowDrawQt::cancel_event_timer(FlowCtx* ctx)
FlowDrawQt* draw_ctx = (FlowDrawQt*)ctx->fdraw; FlowDrawQt* draw_ctx = (FlowDrawQt*)ctx->fdraw;
if (draw_ctx->timer_id) { if (draw_ctx->timer_id) {
draw_ctx->timer_id->stop(); draw_ctx->timer_id->stop();
draw_ctx->timer_id = 0;
} }
} }
......
This diff is collapsed.
...@@ -97,6 +97,9 @@ public: ...@@ -97,6 +97,9 @@ public:
double dest_x, double dest_y, flow_eDirection dest_dir); double dest_x, double dest_y, flow_eDirection dest_dir);
int con_route_grafcet(flow_eConType con_type, double src_x, double src_y, int con_route_grafcet(flow_eConType con_type, double src_x, double src_y,
double dest_x, double dest_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); void set_highlight(int on);
int get_highlight() int get_highlight()
{ {
......
...@@ -1529,6 +1529,8 @@ void FlowCtx::trace_scan() ...@@ -1529,6 +1529,8 @@ void FlowCtx::trace_scan()
for (i = 0; i < a.a_size; i++) for (i = 0; i < a.a_size; i++)
a.a[i]->trace_scan(); a.a[i]->trace_scan();
redraw_if_dirty();
} }
void FlowCtx::get_selected_nodes(FlowArrayElem*** nodes, int* num) void FlowCtx::get_selected_nodes(FlowArrayElem*** nodes, int* num)
......
...@@ -47,6 +47,7 @@ static void tiptext_timer_cb(FlowCtx* ctx) ...@@ -47,6 +47,7 @@ static void tiptext_timer_cb(FlowCtx* ctx)
ctx->tiptext->active = true; ctx->tiptext->active = true;
ctx->set_dirty(); ctx->set_dirty();
ctx->redraw_if_dirty();
} }
FlowTipText::~FlowTipText() FlowTipText::~FlowTipText()
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment