Skip to content

P
proview
Commit 428c1cf5 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Merge branch 'master' of pwrcvs:/data1/git/pwr

parents 7962453d 069611a5
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
src/lib/rt/src/rt_ndc.c
View file @ 428c1cf5
......@@ -1479,7 +1479,9 @@ ndc_ConvertRemoteToNativeTable (
relem = cap->elem;
}
/* Adjust size to be multiple of element size */
if (*size < ap->size)
*size -= *size % (ap->size / ap->elem) ;
if(!conv_Fctn[cidx](ap->elem, ap->size/ap->elem, (char *)tp + (ap->offs - base) + toffs, (int *) size,
relem, cap->size/cap->elem, (const char *)sp + roffs + soffs, adef))
......
src/tools/pkg/deb/pwr/postinst
View file @ 428c1cf5
......@@ -28,7 +28,7 @@ if getent passwd pwrp > /dev/null; then
else
new_user=1
if useradd -s /bin/bash -p aaupl/kQs1p3U -g pwrp -G b55,b66,skiftel -d /home/pwrp pwrp; then
if useradd -s /bin/bash -p aaupl/kQs1p3U -g pwrp -d /home/pwrp pwrp; then
echo "-- user pwrp added"
fi
if [ ! -e /home/pwrp ]; then
......
wb/lib/wb/src/wb_wnav_brow.cpp
View file @ 428c1cf5
......@@ -1058,6 +1058,8 @@ void WNavBrow::create_nodeclasses()
// Input with Used and Inverted radiobutton
brow_CreateNodeClass( ctx, "NavigatorAttrInput",
flow_eNodeGroup_Common, &nc_attr_input);
brow_AddRadiobutton( nc_attr_input, 14, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
brow_AddRadiobutton( nc_attr_input, 18, 0.03, 0.7, 0.7, 1, flow_eDrawType_Line, 1);
brow_AddAnnotPixmap( nc_attr_input, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_attr_input, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_attr_input, 2, 0.6, 0,
......@@ -1071,12 +1073,11 @@ void WNavBrow::create_nodeclasses()
brow_AddText( nc_attr_input, "Inverted", 15, 0.6,
flow_eDrawType_TextHelvetica, 2);
brow_AddFrame( nc_attr_input, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
brow_AddRadiobutton( nc_attr_input, 14, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
brow_AddRadiobutton( nc_attr_input, 18, 0.03, 0.7, 0.7, 1, flow_eDrawType_Line, 1);
// Input with Inverted radiobutton
brow_CreateNodeClass( ctx, "NavigatorAttrInputNoinv",
flow_eNodeGroup_Common, &nc_attr_inputinv);
brow_AddRadiobutton( nc_attr_inputinv, 15, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
brow_AddAnnotPixmap( nc_attr_inputinv, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_attr_inputinv, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_attr_inputinv, 2, 0.6, 0,
......@@ -1088,11 +1089,11 @@ void WNavBrow::create_nodeclasses()
brow_AddText( nc_attr_inputinv, "Inverted", 12, 0.6,
flow_eDrawType_TextHelvetica, 2);
brow_AddFrame( nc_attr_inputinv, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
brow_AddRadiobutton( nc_attr_inputinv, 15, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
// Input and output with Used radiobutton
brow_CreateNodeClass( ctx, "NavigatorAttrOutput",
flow_eNodeGroup_Common, &nc_attr_output);
brow_AddRadiobutton( nc_attr_output, 14, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
brow_AddAnnotPixmap( nc_attr_output, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_attr_output, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_attr_output, 2, 0.6, 0,
......@@ -1104,7 +1105,6 @@ void WNavBrow::create_nodeclasses()
brow_AddText( nc_attr_output, "Used", 12, 0.6,
flow_eDrawType_TextHelvetica, 2);
brow_AddFrame( nc_attr_output, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
brow_AddRadiobutton( nc_attr_output, 14, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
// Create multiline attribute nodeclass
......@@ -1141,13 +1141,13 @@ void WNavBrow::create_nodeclasses()
brow_CreateNodeClass( ctx, "NavigatorEnum",
flow_eNodeGroup_Common, &nc_enum);
brow_AddRadiobutton( nc_enum, 12, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
brow_AddAnnotPixmap( nc_enum, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_enum, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_enum, 2, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
0);
brow_AddFrame( nc_enum, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
brow_AddRadiobutton( nc_enum, 12, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
// Create table nodeclass
......
xtt/lib/ge/src/ge_attrnav.cpp
View file @ 428c1cf5
......@@ -1666,7 +1666,6 @@ static int attrnav_brow_cb( FlowCtx *ctx, flow_tEvent event)
break;
case flow_eEvent_Radiobutton:
{
printf( "Radiobutton\n");
switch ( event->object.object_type)
{
case flow_eObjectType_Node:
......@@ -1882,7 +1881,6 @@ void AttrNavBrow::create_nodeclasses()
brow_CreateNodeClass( ctx, "NavigatorDefault",
flow_eNodeGroup_Common, &nc_object);
brow_AddFrame( nc_object, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_object, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_object, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_object, 2, 0.6, 0,
......@@ -1894,12 +1892,12 @@ void AttrNavBrow::create_nodeclasses()
brow_AddAnnot( nc_object, 11, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
1);
brow_AddFrame( nc_object, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
// Create attribute nodeclass
brow_CreateNodeClass( ctx, "NavigatorAttr",
flow_eNodeGroup_Common, &nc_attr);
brow_AddFrame( nc_attr, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_attr, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_attr, 2, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
......@@ -1907,12 +1905,12 @@ void AttrNavBrow::create_nodeclasses()
brow_AddAnnot( nc_attr, 8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
1);
brow_AddFrame( nc_attr, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
// Create multiline attribute nodeclass
brow_CreateNodeClass( ctx, "NavigatorAttrMultiLine",
flow_eNodeGroup_Common, &nc_attr_multiline);
brow_AddFrame( nc_attr_multiline, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_attr_multiline, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_attr_multiline, 2, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
......@@ -1920,23 +1918,23 @@ void AttrNavBrow::create_nodeclasses()
brow_AddAnnot( nc_attr_multiline, 8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_MultiLine,
1);
brow_AddFrame( nc_attr_multiline, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
// Create attribute nodeclass
brow_CreateNodeClass( ctx, "NavigatorEnum",
flow_eNodeGroup_Common, &nc_enum);
brow_AddRadiobutton( nc_enum, 12, 0.1, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
brow_AddFrame( nc_enum, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_enum, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_enum, 2, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
0);
brow_AddFrame( nc_enum, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
// Create table nodeclass
brow_CreateNodeClass( ctx, "NavigatorTable",
flow_eNodeGroup_Common, &nc_table);
brow_AddFrame( nc_table, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_table, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_table, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_table, 2, 0.6, 0,
......@@ -1969,12 +1967,12 @@ void AttrNavBrow::create_nodeclasses()
brow_AddAnnot( nc_table, 38, 0.6, 9,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
1);
brow_AddFrame( nc_table, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
// Create Header
brow_CreateNodeClass( ctx, "NavigatorHead",
flow_eNodeGroup_Common, &nc_header);
brow_AddFrame( nc_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
brow_AddAnnotPixmap( nc_header, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_header, 2, 0.6, 0,
flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine,
......@@ -1982,12 +1980,12 @@ void AttrNavBrow::create_nodeclasses()
brow_AddAnnot( nc_header, 8, 0.6, 1,
flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine,
1);
brow_AddFrame( nc_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
// Create TableHeader
brow_CreateNodeClass( ctx, "NavigatorTableHead",
flow_eNodeGroup_Common, &nc_table_header);
brow_AddFrame( nc_table_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
brow_AddAnnotPixmap( nc_table_header, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_table_header, 2, 0.6, 0,
flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine,
......@@ -2019,6 +2017,7 @@ void AttrNavBrow::create_nodeclasses()
brow_AddAnnot( nc_table_header, 38, 0.6, 9,
flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine,
0);
brow_AddFrame( nc_table_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
}
......
xtt/lib/ge/src/ge_subgraphs.cpp
View file @ 428c1cf5
......@@ -395,7 +395,6 @@ void SubGraphsBrow::create_nodeclasses()
brow_CreateNodeClass( ctx, "NavigatorDefault",
flow_eNodeGroup_Common, &nc_object);
brow_AddFrame( nc_object, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_object, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_object, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_object, 2, 0.6, 0,
......@@ -407,12 +406,12 @@ void SubGraphsBrow::create_nodeclasses()
brow_AddAnnot( nc_object, 11, 0.6, 2,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
1);
brow_AddFrame( nc_object, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
// Create attribute nodeclass
brow_CreateNodeClass( ctx, "NavigatorAttr",
flow_eNodeGroup_Common, &nc_attr);
brow_AddFrame( nc_attr, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_attr, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_attr, 2, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
......@@ -420,12 +419,12 @@ void SubGraphsBrow::create_nodeclasses()
brow_AddAnnot( nc_attr, 8, 0.6, 1,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
1);
brow_AddFrame( nc_attr, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
// Create table nodeclass
brow_CreateNodeClass( ctx, "NavigatorTable",
flow_eNodeGroup_Common, &nc_table);
brow_AddFrame( nc_table, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_table, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_table, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_table, 2, 0.6, 0,
......@@ -458,12 +457,12 @@ void SubGraphsBrow::create_nodeclasses()
brow_AddAnnot( nc_table, 38, 0.6, 9,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
1);
brow_AddFrame( nc_table, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
// Create Header
brow_CreateNodeClass( ctx, "NavigatorHead",
flow_eNodeGroup_Common, &nc_header);
brow_AddFrame( nc_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
brow_AddAnnotPixmap( nc_header, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_header, 2, 0.6, 0,
flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine,
......@@ -471,12 +470,12 @@ void SubGraphsBrow::create_nodeclasses()
brow_AddAnnot( nc_header, 8, 0.6, 1,
flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine,
1);
brow_AddFrame( nc_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
// Create TableHeader
brow_CreateNodeClass( ctx, "NavigatorTableHead",
flow_eNodeGroup_Common, &nc_table_header);
brow_AddFrame( nc_table_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
brow_AddAnnotPixmap( nc_table_header, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_table_header, 2, 0.6, 0,
flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine,
......@@ -508,6 +507,7 @@ void SubGraphsBrow::create_nodeclasses()
brow_AddAnnot( nc_table_header, 38, 0.6, 9,
flow_eDrawType_TextHelveticaBold, 2, flow_eAnnotType_OneLine,
0);
brow_AddFrame( nc_table_header, 0, 0, 20, 0.8, flow_eDrawType_LineGray, 2, 1);
}
int SubGraphs::object_attr()
......
xtt/lib/ge/src/ge_subpalette.cpp
View file @ 428c1cf5
......@@ -931,23 +931,23 @@ void SubPaletteBrow::create_nodeclasses()
brow_CreateNodeClass( ctx, "NavigatorDefault",
flow_eNodeGroup_Common, &nc_object);
brow_AddFrame( nc_object, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_object, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_object, 1.5, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
0);
brow_AddAnnotPixmap( nc_object, 1, 7.8, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddFrame( nc_object, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
// Create subgraph-class
brow_CreateNodeClass( ctx, "NavigatorSubgraph",
flow_eNodeGroup_Common, &nc_sub);
brow_AddFrame( nc_sub, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_sub, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_sub, 1, 1.4, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_sub, 2.7, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
0);
brow_AddFrame( nc_sub, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
}
......
xtt/lib/xtt/src/xtt_xnav_brow.cpp
View file @ 428c1cf5
......@@ -1000,7 +1000,6 @@ void XNavBrow::create_nodeclasses()
brow_CreateNodeClass( ctx, "NavigatorDefault",
flow_eNodeGroup_Common, &nc_object);
brow_AddFrame( nc_object, 0, 0, 20, 0.8, flow_eDrawType_Line, -1, 1);
brow_AddAnnotPixmap( nc_object, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_object, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_object, 2, 1.1, 0.1, flow_eDrawType_LineRed, 2, 0);
......@@ -1149,13 +1148,13 @@ void XNavBrow::create_nodeclasses()
brow_CreateNodeClass( ctx, "NavigatorEnum",
flow_eNodeGroup_Common, &nc_enum);
brow_AddRadiobutton( nc_enum, 12, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
brow_AddAnnotPixmap( nc_enum, 0, 0.2, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnotPixmap( nc_enum, 1, 1.1, 0.1, flow_eDrawType_Line, 2, 0);
brow_AddAnnot( nc_enum, 2.9, 0.6, 0,
flow_eDrawType_TextHelvetica, 2, flow_eAnnotType_OneLine,
0);
brow_AddFrame( nc_enum, 0, 0, 20, 0.8, flow_eDrawType_LineGray, -1, 1);
brow_AddRadiobutton( nc_enum, 12, 0.03, 0.7, 0.7, 0, flow_eDrawType_Line, 1);
}
......
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