Skip to content

P
proview
Commit 1b2a9854 authored by Claes Sjofors's avatar Claes Sjofors
Browse files
Options

Bugfix in attribute name length

parent b51ca656
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 75 deletions
wb/lib/wb/src/wb_attribute.cpp
View file @ 1b2a9854
...@@ -234,7 +234,7 @@ wb_attribute::wb_attribute(const wb_attribute& pa, int idx, const char *aname) : ...@@ -234,7 +234,7 @@ wb_attribute::wb_attribute(const wb_attribute& pa, int idx, const char *aname) :
{ {
pwr_tCid cid; pwr_tCid cid;
wb_attrname n; wb_attrname n;
char attrname[120]; pwr_tAName attrname;
if ( !cdh_tidIsCid( pa.tid()) || pa.m_orep == 0) if ( !cdh_tidIsCid( pa.tid()) || pa.m_orep == 0)
return; return;
......
wb/lib/wb/src/wb_attrname.cpp
View file @ 1b2a9854
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
wb_attrname::wb_attrname( const char *name) wb_attrname::wb_attrname( const char *name)
{ {
try { try {
char str[80]; pwr_tOName str;
if ( *name != '.') { if ( *name != '.') {
strcpy( str, "."); strcpy( str, ".");
strcat( str, name); strncat( str, name, sizeof(str)-1);
} }
else else
strcpy( str, name); strncpy( str, name, sizeof(str));
m_nrep = new wb_nrep( str); m_nrep = new wb_nrep( str);
m_sts = LDH__SUCCESS; m_sts = LDH__SUCCESS;
m_nrep->ref(); m_nrep->ref();
......
wb/lib/wb/src/wb_nav.cpp
View file @ 1b2a9854
...@@ -1788,7 +1788,7 @@ int Nav::get_select( pwr_sAttrRef *attrref, int *is_attr) ...@@ -1788,7 +1788,7 @@ int Nav::get_select( pwr_sAttrRef *attrref, int *is_attr)
brow_tNode *node_list; brow_tNode *node_list;
int node_count; int node_count;
Item *item; Item *item;
pwr_tOName attr_str; pwr_tAName attr_str;
int sts, size; int sts, size;
brow_GetSelectedNodes( brow_ctx, &node_list, &node_count); brow_GetSelectedNodes( brow_ctx, &node_list, &node_count);
......
wb/lib/wb/src/wb_nrep.cpp
View file @ 1b2a9854
...@@ -687,7 +687,7 @@ char *wb_nrep::objectName(const char *n, char *res) ...@@ -687,7 +687,7 @@ char *wb_nrep::objectName(const char *n, char *res)
char *wb_nrep::pathName(const char *n, char *res) char *wb_nrep::pathName(const char *n, char *res)
{ {
static char result[80]; static pwr_tOName result;
if ( num_seg <= 1) { if ( num_seg <= 1) {
if ( res) { if ( res) {
...@@ -745,7 +745,7 @@ char *wb_nrep::segmentName(const char *n, int idx, char *res) ...@@ -745,7 +745,7 @@ char *wb_nrep::segmentName(const char *n, int idx, char *res)
char *wb_nrep::attributeName(const char *n, int idx, char *res) char *wb_nrep::attributeName(const char *n, int idx, char *res)
{ {
static char result[80]; static pwr_tOName result;
if ( idx >= num_attr || idx < 0) { if ( idx >= num_attr || idx < 0) {
if ( res) { if ( res) {
...@@ -883,7 +883,7 @@ char *wb_nrep::nameName(const char *n, int ntype, char *res) ...@@ -883,7 +883,7 @@ char *wb_nrep::nameName(const char *n, int ntype, char *res)
char *wb_nrep::unatName(const char *name) char *wb_nrep::unatName(const char *name)
{ {
static char result[80]; static char result[256];
const char *s; const char *s;
char *su; char *su;
......
xtt/lib/ge/src/ge_dyn.cpp
View file @ 1b2a9854
...@@ -1710,9 +1710,10 @@ void GeDigLowColor::set_attribute( grow_tObject object, const char *attr_name, i ...@@ -1710,9 +1710,10 @@ void GeDigLowColor::set_attribute( grow_tObject object, const char *attr_name, i
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( dyn->total_dyn_type & ge_mDynType_Tone) if ( dyn->total_dyn_type & ge_mDynType_Tone)
sprintf( msg, "DigLowTone.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigLowTone.Attribute = %s", attr_name);
else else
sprintf( msg, "DigLowColor.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigLowColor.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -1728,12 +1729,13 @@ int GeDigLowColor::set_color( grow_tObject object, glow_eDrawType color) ...@@ -1728,12 +1729,13 @@ int GeDigLowColor::set_color( grow_tObject object, glow_eDrawType color)
if ( dyn->total_dyn_type & ge_mDynType_Tone) { if ( dyn->total_dyn_type & ge_mDynType_Tone) {
this->color = glow_eDrawType( color / 30); this->color = glow_eDrawType( color / 30);
sprintf( msg, "DigLowTone.Tone = %s", grow_ColorToneToName( this->color)); snprintf( msg, sizeof(msg), "DigLowTone.Tone = %s", grow_ColorToneToName( this->color));
} }
else { else {
this->color = color; this->color = color;
sprintf( msg, "DigLowColor.Color = %s", grow_ColorToName(this->color)); snprintf( msg, sizeof(msg), "DigLowColor.Color = %s", grow_ColorToName(this->color));
} }
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
return 1; return 1;
} }
...@@ -2016,18 +2018,19 @@ void GeDigColor::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -2016,18 +2018,19 @@ void GeDigColor::set_attribute( grow_tObject object, const char *attr_name, int
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( instance == ge_mInstance_1) { if ( instance == ge_mInstance_1) {
if ( dyn->total_dyn_type & ge_mDynType_Tone) if ( dyn->total_dyn_type & ge_mDynType_Tone)
sprintf( msg, "DigTone.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigTone.Attribute = %s", attr_name);
else else
sprintf( msg, "DigColor.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigColor.Attribute = %s", attr_name);
} }
else { else {
if ( dyn->total_dyn_type & ge_mDynType_Tone) if ( dyn->total_dyn_type & ge_mDynType_Tone)
sprintf( msg, "DigTone%d.Attribute = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "DigTone%d.Attribute = %s", GeDyn::instance_to_number( instance),
attr_name); attr_name);
else else
sprintf( msg, "DigColor%d.Attribute = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "DigColor%d.Attribute = %s", GeDyn::instance_to_number( instance),
attr_name); attr_name);
} }
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -2044,19 +2047,20 @@ int GeDigColor::set_color( grow_tObject object, glow_eDrawType color) ...@@ -2044,19 +2047,20 @@ int GeDigColor::set_color( grow_tObject object, glow_eDrawType color)
if ( dyn->total_dyn_type & ge_mDynType_Tone) { if ( dyn->total_dyn_type & ge_mDynType_Tone) {
this->color = glow_eDrawType( color / 30); this->color = glow_eDrawType( color / 30);
if ( instance == ge_mInstance_1) if ( instance == ge_mInstance_1)
sprintf( msg, "DigTone.Tone = %s", grow_ColorToneToName( this->color)); snprintf( msg, sizeof(msg), "DigTone.Tone = %s", grow_ColorToneToName( this->color));
else else
sprintf( msg, "DigTone%d.Tone = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "DigTone%d.Tone = %s", GeDyn::instance_to_number( instance),
grow_ColorToneToName( this->color)); grow_ColorToneToName( this->color));
} }
else { else {
this->color = color; this->color = color;
if ( instance == ge_mInstance_1) if ( instance == ge_mInstance_1)
sprintf( msg, "DigColor.Color = %s", grow_ColorToName( this->color)); snprintf( msg, sizeof(msg), "DigColor.Color = %s", grow_ColorToName( this->color));
else else
sprintf( msg, "DigColor%d.Color = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "DigColor%d.Color = %s", GeDyn::instance_to_number( instance),
grow_ColorToName( this->color)); grow_ColorToName( this->color));
} }
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
return 1; return 1;
} }
...@@ -2290,7 +2294,8 @@ void GeDigWarning::set_attribute( grow_tObject object, const char *attr_name, in ...@@ -2290,7 +2294,8 @@ void GeDigWarning::set_attribute( grow_tObject object, const char *attr_name, in
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "DigWaring.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigWaring.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -2498,7 +2503,8 @@ void GeDigError::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -2498,7 +2503,8 @@ void GeDigError::set_attribute( grow_tObject object, const char *attr_name, int
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "DigError.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigError.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -2733,7 +2739,8 @@ void GeDigFlash::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -2733,7 +2739,8 @@ void GeDigFlash::set_attribute( grow_tObject object, const char *attr_name, int
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "DigFlash.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigFlash.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -2749,12 +2756,13 @@ int GeDigFlash::set_color( grow_tObject object, glow_eDrawType color) ...@@ -2749,12 +2756,13 @@ int GeDigFlash::set_color( grow_tObject object, glow_eDrawType color)
if ( dyn->total_dyn_type & ge_mDynType_Tone) { if ( dyn->total_dyn_type & ge_mDynType_Tone) {
this->color = glow_eDrawType( color / 30); this->color = glow_eDrawType( color / 30);
sprintf( msg, "DigFlash.Tone = %s", grow_ColorToneToName( this->color)); snprintf( msg, sizeof(msg), "DigFlash.Tone = %s", grow_ColorToneToName( this->color));
} }
else { else {
this->color = color; this->color = color;
sprintf( msg, "DigFlash.Color = %s", grow_ColorToName(this->color)); snprintf( msg, sizeof(msg), "DigFlash.Color = %s", grow_ColorToName(this->color));
} }
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
return 1; return 1;
} }
...@@ -2979,11 +2987,12 @@ void GeInvisible::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -2979,11 +2987,12 @@ void GeInvisible::set_attribute( grow_tObject object, const char *attr_name, int
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( instance == ge_mInstance_1) if ( instance == ge_mInstance_1)
sprintf( msg, "Invisible.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "Invisible.Attribute = %s", attr_name);
else else
sprintf( msg, "Invisible%d.Attribute = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "Invisible%d.Attribute = %s", GeDyn::instance_to_number( instance),
attr_name); attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -3301,7 +3310,8 @@ void GeDigBorder::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -3301,7 +3310,8 @@ void GeDigBorder::set_attribute( grow_tObject object, const char *attr_name, int
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "DigBorder.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigBorder.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -3488,12 +3498,13 @@ void GeDigText::set_attribute( grow_tObject object, const char *attr_name, int * ...@@ -3488,12 +3498,13 @@ void GeDigText::set_attribute( grow_tObject object, const char *attr_name, int *
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( instance == ge_mInstance_1) { if ( instance == ge_mInstance_1) {
sprintf( msg, "DigText.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigText.Attribute = %s", attr_name);
} }
else { else {
sprintf( msg, "DigText%d.Attribute = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "DigText%d.Attribute = %s", GeDyn::instance_to_number( instance),
attr_name); attr_name);
} }
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -3709,7 +3720,8 @@ void GeValue::set_attribute( grow_tObject object, const char *attr_name, int *cn ...@@ -3709,7 +3720,8 @@ void GeValue::set_attribute( grow_tObject object, const char *attr_name, int *cn
if ( instance == ge_mInstance_1) { if ( instance == ge_mInstance_1) {
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "Value.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "Value.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -4770,9 +4782,10 @@ void GeAnalogColor::set_attribute( grow_tObject object, const char *attr_name, i ...@@ -4770,9 +4782,10 @@ void GeAnalogColor::set_attribute( grow_tObject object, const char *attr_name, i
strncpy( e->attribute, attr_name, sizeof( attribute)); strncpy( e->attribute, attr_name, sizeof( attribute));
if ( dyn->total_dyn_type & ge_mDynType_Tone) if ( dyn->total_dyn_type & ge_mDynType_Tone)
sprintf( msg, "AnalogTone.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "AnalogTone.Attribute = %s", attr_name);
else else
sprintf( msg, "AnalogColor.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "AnalogColor.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -4789,19 +4802,20 @@ int GeAnalogColor::set_color( grow_tObject object, glow_eDrawType color) ...@@ -4789,19 +4802,20 @@ int GeAnalogColor::set_color( grow_tObject object, glow_eDrawType color)
if ( dyn->total_dyn_type & ge_mDynType_Tone) { if ( dyn->total_dyn_type & ge_mDynType_Tone) {
this->color = glow_eDrawType( color / 30); this->color = glow_eDrawType( color / 30);
if ( instance == ge_mInstance_1) if ( instance == ge_mInstance_1)
sprintf( msg, "AnalogTone.Tone = %s", grow_ColorToneToName( this->color)); snprintf( msg, sizeof(msg), "AnalogTone.Tone = %s", grow_ColorToneToName( this->color));
else else
sprintf( msg, "AnalogTone%d.Tone = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "AnalogTone%d.Tone = %s", GeDyn::instance_to_number( instance),
grow_ColorToneToName( this->color)); grow_ColorToneToName( this->color));
} }
else { else {
this->color = color; this->color = color;
if ( instance == ge_mInstance_1) if ( instance == ge_mInstance_1)
sprintf( msg, "AnalogColor.Color = %s", grow_ColorToName( this->color)); snprintf( msg, sizeof(msg), "AnalogColor.Color = %s", grow_ColorToName( this->color));
else else
sprintf( msg, "AnalogColor%d.Color = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "AnalogColor%d.Color = %s", GeDyn::instance_to_number( instance),
grow_ColorToName( this->color)); grow_ColorToName( this->color));
} }
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
return 1; return 1;
} }
...@@ -5099,7 +5113,8 @@ void GeRotate::set_attribute( grow_tObject object, const char *attr_name, int *c ...@@ -5099,7 +5113,8 @@ void GeRotate::set_attribute( grow_tObject object, const char *attr_name, int *c
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "Rotate.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "Rotate.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -5324,14 +5339,16 @@ void GeMove::set_attribute( grow_tObject object, const char *attr_name, int *cnt ...@@ -5324,14 +5339,16 @@ void GeMove::set_attribute( grow_tObject object, const char *attr_name, int *cnt
char msg[200]; char msg[200];
strncpy( move_x_attribute, attr_name, sizeof( move_x_attribute)); strncpy( move_x_attribute, attr_name, sizeof( move_x_attribute));
sprintf( msg, "Move.XAttribute = %s", attr_name); snprintf( msg, sizeof(msg), "Move.XAttribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
else if ( *cnt == 1) { else if ( *cnt == 1) {
char msg[200]; char msg[200];
strncpy( move_y_attribute, attr_name, sizeof( move_y_attribute)); strncpy( move_y_attribute, attr_name, sizeof( move_y_attribute));
sprintf( msg, "Move.YAttribute = %s", attr_name); snprintf( msg, sizeof(msg), "Move.YAttribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
(*cnt)--; (*cnt)--;
} }
...@@ -5684,7 +5701,8 @@ void GeAnalogShift::set_attribute( grow_tObject object, const char *attr_name, i ...@@ -5684,7 +5701,8 @@ void GeAnalogShift::set_attribute( grow_tObject object, const char *attr_name, i
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "AnalogShift.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "AnalogShift.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -5855,7 +5873,8 @@ void GeDigShift::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -5855,7 +5873,8 @@ void GeDigShift::set_attribute( grow_tObject object, const char *attr_name, int
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "DigShift.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigShift.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -6010,7 +6029,8 @@ void GeAnimation::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -6010,7 +6029,8 @@ void GeAnimation::set_attribute( grow_tObject object, const char *attr_name, int
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "Animation.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "Animation.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -6314,7 +6334,8 @@ void GeBar::set_attribute( grow_tObject object, const char *attr_name, int *cnt) ...@@ -6314,7 +6334,8 @@ void GeBar::set_attribute( grow_tObject object, const char *attr_name, int *cnt)
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "Bar.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "Bar.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -6540,14 +6561,16 @@ void GeTrend::set_attribute( grow_tObject object, const char *attr_name, int *cn ...@@ -6540,14 +6561,16 @@ void GeTrend::set_attribute( grow_tObject object, const char *attr_name, int *cn
char msg[200]; char msg[200];
strncpy( attribute1, attr_name, sizeof( attribute1)); strncpy( attribute1, attr_name, sizeof( attribute1));
sprintf( msg, "Trend.Attribute1 = %s", attr_name); snprintf( msg, sizeof(msg), "Trend.Attribute1 = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
else if ( *cnt == 1) { else if ( *cnt == 1) {
char msg[200]; char msg[200];
strncpy( attribute2, attr_name, sizeof( attribute2)); strncpy( attribute2, attr_name, sizeof( attribute2));
sprintf( msg, "Trend.YAttribute2 = %s", attr_name); snprintf( msg, sizeof(msg), "Trend.YAttribute2 = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
(*cnt)--; (*cnt)--;
} }
...@@ -7009,14 +7032,16 @@ void GeXY_Curve::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -7009,14 +7032,16 @@ void GeXY_Curve::set_attribute( grow_tObject object, const char *attr_name, int
char msg[200]; char msg[200];
strncpy( x_attr, attr_name, sizeof( x_attr)); strncpy( x_attr, attr_name, sizeof( x_attr));
sprintf( msg, "XY_Curve.XAttr = %s", attr_name); snprintf( msg, sizeof(msg), "XY_Curve.XAttr = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
else if ( *cnt == 1) { else if ( *cnt == 1) {
char msg[200]; char msg[200];
strncpy( y_attr, attr_name, sizeof( y_attr)); strncpy( y_attr, attr_name, sizeof( y_attr));
sprintf( msg, "XY_Curve.YAttr = %s", attr_name); snprintf( msg, sizeof(msg), "XY_Curve.YAttr = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
(*cnt)--; (*cnt)--;
} }
...@@ -7684,7 +7709,8 @@ void GeTable::set_attribute( grow_tObject object, const char *attr_name, int *cn ...@@ -7684,7 +7709,8 @@ void GeTable::set_attribute( grow_tObject object, const char *attr_name, int *cn
char msg[200]; char msg[200];
strncpy( attribute[0], attr_name, sizeof( attribute)); strncpy( attribute[0], attr_name, sizeof( attribute));
sprintf( msg, "Column1.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "Column1.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -8463,9 +8489,10 @@ void GeStatusColor::set_attribute( grow_tObject object, const char *attr_name, i ...@@ -8463,9 +8489,10 @@ void GeStatusColor::set_attribute( grow_tObject object, const char *attr_name, i
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( dyn->total_dyn_type & ge_mDynType_Tone) if ( dyn->total_dyn_type & ge_mDynType_Tone)
sprintf( msg, "StatusTone.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "StatusTone.Attribute = %s", attr_name);
else else
sprintf( msg, "StatusColor.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "StatusColor.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -8481,12 +8508,13 @@ int GeStatusColor::set_color( grow_tObject object, glow_eDrawType color) ...@@ -8481,12 +8508,13 @@ int GeStatusColor::set_color( grow_tObject object, glow_eDrawType color)
if ( dyn->total_dyn_type & ge_mDynType_Tone) { if ( dyn->total_dyn_type & ge_mDynType_Tone) {
this->nostatus_color = glow_eDrawType( color / 30); this->nostatus_color = glow_eDrawType( color / 30);
sprintf( msg, "StatusTone.NoStatusTone = %s", grow_ColorToneToName( this->nostatus_color)); snprintf( msg, sizeof(msg), "StatusTone.NoStatusTone = %s", grow_ColorToneToName( this->nostatus_color));
} }
else { else {
this->nostatus_color = color; this->nostatus_color = color;
sprintf( msg, "StatusColor.NoStatusColor = %s", grow_ColorToName(this->nostatus_color)); snprintf( msg, sizeof(msg), "StatusColor.NoStatusColor = %s", grow_ColorToName(this->nostatus_color));
} }
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
return 1; return 1;
} }
...@@ -8714,7 +8742,8 @@ void GeHostObject::set_attribute( grow_tObject object, const char *attr_name, in ...@@ -8714,7 +8742,8 @@ void GeHostObject::set_attribute( grow_tObject object, const char *attr_name, in
if ( (s = strrchr( hostobject, '.'))) if ( (s = strrchr( hostobject, '.')))
*s = 0; *s = 0;
sprintf( msg, "HostObject.Object = %s", hostobject); snprintf( msg, sizeof(msg), "HostObject.Object = %s", hostobject);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -8852,12 +8881,13 @@ void GeDigSound::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -8852,12 +8881,13 @@ void GeDigSound::set_attribute( grow_tObject object, const char *attr_name, int
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( instance == ge_mInstance_1) { if ( instance == ge_mInstance_1) {
sprintf( msg, "DigSound.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigSound.Attribute = %s", attr_name);
} }
else { else {
sprintf( msg, "DigSound%d.Attribute = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "DigSound%d.Attribute = %s", GeDyn::instance_to_number( instance),
attr_name); attr_name);
} }
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -9048,7 +9078,8 @@ void GeFillLevel::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -9048,7 +9078,8 @@ void GeFillLevel::set_attribute( grow_tObject object, const char *attr_name, int
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "FillLevel.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "FillLevel.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -9338,12 +9369,13 @@ void GeDigCommand::set_attribute( grow_tObject object, const char *attr_name, in ...@@ -9338,12 +9369,13 @@ void GeDigCommand::set_attribute( grow_tObject object, const char *attr_name, in
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( instance == ge_mInstance_1) { if ( instance == ge_mInstance_1) {
sprintf( msg, "DigCommand.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "DigCommand.Attribute = %s", attr_name);
} }
else { else {
sprintf( msg, "DigCommand%d.Attribute = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "DigCommand%d.Attribute = %s", GeDyn::instance_to_number( instance),
attr_name); attr_name);
} }
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -9504,7 +9536,8 @@ void GePopupMenu::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -9504,7 +9536,8 @@ void GePopupMenu::set_attribute( grow_tObject object, const char *attr_name, int
strncpy( ref_object, attr_name, sizeof( ref_object)); strncpy( ref_object, attr_name, sizeof( ref_object));
if ( (s = strchr( ref_object, '.'))) if ( (s = strchr( ref_object, '.')))
*s = 0; *s = 0;
sprintf( msg, "PopupMenu.ReferenceObject = %s", ref_object); snprintf( msg, sizeof(msg), "PopupMenu.ReferenceObject = %s", ref_object);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -9754,10 +9787,11 @@ void GeSetDig::set_attribute( grow_tObject object, const char *attr_name, int *c ...@@ -9754,10 +9787,11 @@ void GeSetDig::set_attribute( grow_tObject object, const char *attr_name, int *c
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( instance == ge_mInstance_1) if ( instance == ge_mInstance_1)
sprintf( msg, "SetDig.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "SetDig.Attribute = %s", attr_name);
else else
sprintf( msg, "SetDig%d.Attribute = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "SetDig%d.Attribute = %s", GeDyn::instance_to_number( instance),
attr_name); attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -9962,10 +9996,11 @@ void GeResetDig::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -9962,10 +9996,11 @@ void GeResetDig::set_attribute( grow_tObject object, const char *attr_name, int
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( instance == ge_mInstance_1) if ( instance == ge_mInstance_1)
sprintf( msg, "ResetDig.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "ResetDig.Attribute = %s", attr_name);
else else
sprintf( msg, "ResetDig%d.Attribute = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "ResetDig%d.Attribute = %s", GeDyn::instance_to_number( instance),
attr_name); attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -10128,7 +10163,8 @@ void GeToggleDig::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -10128,7 +10163,8 @@ void GeToggleDig::set_attribute( grow_tObject object, const char *attr_name, int
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "ToggleDig.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "ToggleDig.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -10322,7 +10358,8 @@ void GeStoDig::set_attribute( grow_tObject object, const char *attr_name, int *c ...@@ -10322,7 +10358,8 @@ void GeStoDig::set_attribute( grow_tObject object, const char *attr_name, int *c
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "StoDig.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "StoDig.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -10742,7 +10779,8 @@ void GeIncrAnalog::set_attribute( grow_tObject object, const char *attr_name, in ...@@ -10742,7 +10779,8 @@ void GeIncrAnalog::set_attribute( grow_tObject object, const char *attr_name, in
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "IncrAnalog.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "IncrAnalog.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -10892,7 +10930,8 @@ void GeRadioButton::set_attribute( grow_tObject object, const char *attr_name, i ...@@ -10892,7 +10930,8 @@ void GeRadioButton::set_attribute( grow_tObject object, const char *attr_name, i
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "RadioButton.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "RadioButton.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -11349,7 +11388,8 @@ void GeOpenGraph::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -11349,7 +11388,8 @@ void GeOpenGraph::set_attribute( grow_tObject object, const char *attr_name, int
strncpy( graph_object, attr_name, sizeof( graph_object)); strncpy( graph_object, attr_name, sizeof( graph_object));
if ( (s = strrchr( graph_object, '.'))) if ( (s = strrchr( graph_object, '.')))
*s = 0; *s = 0;
sprintf( msg, "OpenGraph.GraphObject = %s", graph_object); snprintf( msg, sizeof(msg), "OpenGraph.GraphObject = %s", graph_object);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -12026,7 +12066,8 @@ void GeSlider::set_attribute( grow_tObject object, const char *attr_name, int *c ...@@ -12026,7 +12066,8 @@ void GeSlider::set_attribute( grow_tObject object, const char *attr_name, int *c
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "Slider.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "Slider.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -12525,7 +12566,8 @@ void GeFastCurve::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -12525,7 +12566,8 @@ void GeFastCurve::set_attribute( grow_tObject object, const char *attr_name, int
strncpy( fast_object, attr_name, sizeof( fast_object)); strncpy( fast_object, attr_name, sizeof( fast_object));
if ( (s = strchr( fast_object, '.'))) if ( (s = strchr( fast_object, '.')))
*s = 0; *s = 0;
sprintf( msg, "FastCurve.FastObject = %s", fast_object); snprintf( msg, sizeof(msg), "FastCurve.FastObject = %s", fast_object);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -13861,7 +13903,8 @@ void GeOptionMenu::set_attribute( grow_tObject object, const char *attr_name, in ...@@ -13861,7 +13903,8 @@ void GeOptionMenu::set_attribute( grow_tObject object, const char *attr_name, in
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "OptionMenu.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "OptionMenu.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -14480,7 +14523,8 @@ void GeAnalogText::set_attribute( grow_tObject object, const char *attr_name, in ...@@ -14480,7 +14523,8 @@ void GeAnalogText::set_attribute( grow_tObject object, const char *attr_name, in
char msg[200]; char msg[200];
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
sprintf( msg, "AnalogText.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "AnalogText.Attribute = %s", attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
...@@ -14614,10 +14658,11 @@ void GeSetValue::set_attribute( grow_tObject object, const char *attr_name, int ...@@ -14614,10 +14658,11 @@ void GeSetValue::set_attribute( grow_tObject object, const char *attr_name, int
strncpy( attribute, attr_name, sizeof( attribute)); strncpy( attribute, attr_name, sizeof( attribute));
if ( instance == ge_mInstance_1) if ( instance == ge_mInstance_1)
sprintf( msg, "SetValue.Attribute = %s", attr_name); snprintf( msg, sizeof(msg), "SetValue.Attribute = %s", attr_name);
else else
sprintf( msg, "SetValue%d.Attribute = %s", GeDyn::instance_to_number( instance), snprintf( msg, sizeof(msg), "SetValue%d.Attribute = %s", GeDyn::instance_to_number( instance),
attr_name); attr_name);
msg[sizeof(msg)-1] = 0;
dyn->graph->message( 'I', msg); dyn->graph->message( 'I', msg);
} }
} }
......
xtt/lib/ge/src/ge_graph.cpp
View file @ 1b2a9854
...@@ -2669,6 +2669,10 @@ static int graph_grow_cb( GlowCtx *ctx, glow_tEvent event) ...@@ -2669,6 +2669,10 @@ static int graph_grow_cb( GlowCtx *ctx, glow_tEvent event)
sprintf( name, "C%d", grow_IncrNextObjectNameNumber( graph->grow->ctx)); sprintf( name, "C%d", grow_IncrNextObjectNameNumber( graph->grow->ctx));
grow_SetObjectName( move_list[i], name); grow_SetObjectName( move_list[i], name);
break; break;
case glow_eObjectType_GrowGroup:
sprintf( name, "Grp%d_", grow_IncrNextObjectNameNumber( graph->grow->ctx));
grow_SetObjectName( move_list[i], name);
break;
default: default:
sprintf( name, "O%d", grow_IncrNextObjectNameNumber( graph->grow->ctx)); sprintf( name, "O%d", grow_IncrNextObjectNameNumber( graph->grow->ctx));
grow_SetObjectName( move_list[i], name); grow_SetObjectName( move_list[i], name);
......
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