Skip to content

P
proview
Commit 24680d18 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Plc editor execute order display fix

parent edf2c28f
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 18 deletions
wb/lib/wb/src/wb_goen.h
View file @ 24680d18
......@@ -130,7 +130,7 @@ class WGre;
#define GOEN_REFNODEWIDTH 0.08 /* Reference rect width */
#define GOEN_REFNODEHEIGHT 0.035 /* Reference rect height */
#define GOEN_DISPLAYNODEWIDTH 0.09 /* Display node rect width */
#define GOEN_DISPLAYNODEHEIGHT 0.030 /* Display node rect height */
#define GOEN_DISPLAYNODEHEIGHT 0.040 /* Display node rect height */
/* Connection attributes */
#define GOEN_CON_OBJTOOBJ 1
......
wb/lib/wb/src/wb_goenm0.cpp
View file @ 24680d18
......@@ -330,7 +330,10 @@ int goen_create_nodetype_m0(
/* Add execute order display */
flow_AddFilledRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc_pid,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_yoffs,
......
wb/lib/wb/src/wb_goenm1.cpp
View file @ 24680d18
......@@ -325,7 +325,10 @@ int goen_create_nodetype_m1(
/* Add execute order display */
flow_AddFilledRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc_pid,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_yoffs,
......
wb/lib/wb/src/wb_goenm10.cpp
View file @ 24680d18
......@@ -325,7 +325,10 @@ int goen_create_nodetype_m10(
/* Add execute order display */
flow_AddFilledRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc_pid,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_yoffs,
......
wb/lib/wb/src/wb_goenm12.cpp
View file @ 24680d18
......@@ -147,7 +147,10 @@ int goen_create_nodetype_m12( pwr_sGraphPlcNode *graphbody,
double y = 0;
flow_AddFilledRect( nc, x, y,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc, x, y,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc,
x + f_strlength,
y + (GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0,
......
wb/lib/wb/src/wb_goenm14.cpp
View file @ 24680d18
......@@ -336,7 +336,10 @@ int goen_create_nodetype_m14(
/* Add execute order display */
flow_AddFilledRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc_pid,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_yoffs,
......
wb/lib/wb/src/wb_goenm15.cpp
View file @ 24680d18
......@@ -365,7 +365,10 @@ int goen_create_nodetype_m15(
/* Add execute order display */
flow_AddFilledRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc_pid,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_yoffs,
......
wb/lib/wb/src/wb_goenm16.cpp
View file @ 24680d18
......@@ -469,7 +469,10 @@ int goen_create_nodetype_m16(
/* Add execute order display */
flow_AddFilledRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc_pid,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_yoffs,
......
wb/lib/wb/src/wb_goenm2.cpp
View file @ 24680d18
......@@ -384,8 +384,11 @@ int goen_create_nodetype_m2(
/* Add execute order display */
flow_AddFilledRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc_pid,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_yoffs,
......
wb/lib/wb/src/wb_goenm4.cpp
View file @ 24680d18
......@@ -173,7 +173,10 @@ int goen_create_nodetype_m4(
/* Add execute order display */
flow_AddFilledRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc,
f_width/2 - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_height/2,
......@@ -210,7 +213,10 @@ int goen_create_nodetype_m4(
/* Add execute order display */
flow_AddFilledRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc,
f_width/2 - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_height/2,
......@@ -251,7 +257,10 @@ int goen_create_nodetype_m4(
/* Add execute order display */
flow_AddFilledRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc,
f_width/2 - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_height/2,
......@@ -279,7 +288,10 @@ int goen_create_nodetype_m4(
/* Add execute order display */
flow_AddFilledRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc,
f_width/2 - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_height/2,
......@@ -307,7 +319,10 @@ int goen_create_nodetype_m4(
/* Add execute order display */
flow_AddFilledRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc,
f_width/2 - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_height/2,
......@@ -339,7 +354,10 @@ int goen_create_nodetype_m4(
/* Add execute order display */
flow_AddFilledRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, 0,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc, f_width/2 - GOEN_DISPLAYNODEWIDTH, 0,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc,
f_width/2 - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0,
......@@ -387,7 +405,10 @@ int goen_create_nodetype_m4(
/* Add execute order display */
flow_AddFilledRect( nc, f_width - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc, f_width - GOEN_DISPLAYNODEWIDTH, -f_height/2,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_height/2,
......
wb/lib/wb/src/wb_goenm5.cpp
View file @ 24680d18
......@@ -270,7 +270,10 @@ int goen_create_nodetype_m5(
/* Add execute order display */
flow_AddFilledRect( nc, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_yoffs,
......
wb/lib/wb/src/wb_goenm7.cpp
View file @ 24680d18
......@@ -327,7 +327,10 @@ int goen_create_nodetype_m7(
/* Add execute order display */
flow_AddFilledRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineGray, flow_mDisplayLevel_2);
flow_eDrawType_LineErase, flow_mDisplayLevel_2);
flow_AddRect( nc_pid, f_width - GOEN_DISPLAYNODEWIDTH, -f_yoffs,
GOEN_DISPLAYNODEWIDTH, GOEN_DISPLAYNODEHEIGHT,
flow_eDrawType_LineRed, 1, flow_mDisplayLevel_2);
flow_AddAnnot( nc_pid,
f_width - GOEN_DISPLAYNODEWIDTH + f_strlength,
(GOEN_DISPLAYNODEHEIGHT + f_strheight)/2.0 - f_yoffs,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7