Skip to content

P
proview
Commit ee13bad8 authored by claes's avatar claes
Browse files
Options

Bit attrtype i DigColor

parent 304eba0f
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 32 deletions
xtt/lib/ge/src/ge_dyn.cpp
View file @ ee13bad8
/* /*
* Proview $Id: ge_dyn.cpp,v 1.50 2007-04-25 07:31:47 claes Exp $ * Proview $Id: ge_dyn.cpp,v 1.51 2007-04-25 13:36:13 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -1799,7 +1799,22 @@ int GeDigColor::connect( grow_tObject object, glow_sTraceData *trace_data) ...@@ -1799,7 +1799,22 @@ int GeDigColor::connect( grow_tObject object, glow_sTraceData *trace_data)
if ( strcmp( parsed_name,"") == 0) if ( strcmp( parsed_name,"") == 0)
return 1; return 1;
if ( attr_type == graph_eType_Bit) {
// Get bit number from parsed name
char *s;
int bitnum;
if ( (s = strchr( parsed_name, '['))) {
sscanf( s+1, "%d", &bitnum);
*s = 0;
if ( bitnum >= 0 && bitnum < 32)
bitmask = 1 << bitnum;
}
}
sts = dyn->graph->ref_object_info( dyn->cycle, parsed_name, (void **)&p, &subid, size); sts = dyn->graph->ref_object_info( dyn->cycle, parsed_name, (void **)&p, &subid, size);
a_typeid = attr_type;
if ( EVEN(sts)) return sts; if ( EVEN(sts)) return sts;
if ( p) if ( p)
...@@ -1821,46 +1836,100 @@ int GeDigColor::scan( grow_tObject object) ...@@ -1821,46 +1836,100 @@ int GeDigColor::scan( grow_tObject object)
if ( !p || dyn->ignore_color) if ( !p || dyn->ignore_color)
return 1; return 1;
if ( !first_scan) { switch ( a_typeid) {
if ( old_value == *p && !dyn->reset_color) { case pwr_eType_Boolean:
// No change since last time case pwr_eType_Int32:
if ( (!inverted && *p) || (inverted && !*p)) case pwr_eType_UInt32: {
dyn->ignore_color = true;
return 1; if ( !first_scan) {
if ( old_value == *p && !dyn->reset_color) {
// No change since last time
if ( (!inverted && *p) || (inverted && !*p))
dyn->ignore_color = true;
return 1;
}
} }
} else
else first_scan = false;
first_scan = false;
if ( dyn->total_dyn_type & ge_mDynType_Tone) { if ( dyn->total_dyn_type & ge_mDynType_Tone) {
if ( (!inverted && *p) || (inverted && !*p)) { if ( (!inverted && *p) || (inverted && !*p)) {
if ( color >= (glow_eDrawType) glow_eDrawTone__) { if ( color >= (glow_eDrawType) glow_eDrawTone__) {
if ( dyn->reset_color) if ( dyn->reset_color)
grow_ResetObjectFillColor( object); // Previous color might be a tone grow_ResetObjectFillColor( object); // Previous color might be a tone
grow_SetObjectFillColor( object, color); grow_SetObjectFillColor( object, color);
}
else
grow_SetObjectColorTone( object, (glow_eDrawTone) color);
dyn->ignore_color = true;
}
else {
if ( color >= (glow_eDrawType) glow_eDrawTone__)
grow_ResetObjectFillColor( object);
grow_ResetObjectColorTone( object);
dyn->reset_color = true;
} }
else
grow_SetObjectColorTone( object, (glow_eDrawTone) color);
dyn->ignore_color = true;
} }
else { else {
if ( color >= (glow_eDrawType) glow_eDrawTone__) if ( (!inverted && *p) || (inverted && !*p)) {
grow_SetObjectFillColor( object, color);
dyn->ignore_color = true;
}
else {
grow_ResetObjectFillColor( object); grow_ResetObjectFillColor( object);
grow_ResetObjectColorTone( object); dyn->reset_color = true;
dyn->reset_color = true; }
} }
old_value = *p;
break;
} }
else { case graph_eType_Bit: {
if ( (!inverted && *p) || (inverted && !*p)) { pwr_tBoolean val = ((*p & bitmask) != 0);
grow_SetObjectFillColor( object, color);
dyn->ignore_color = true; if ( !first_scan) {
if ( old_value == val && !dyn->reset_color) {
// No change since last time
if ( (!inverted && val) || (inverted && !val))
dyn->ignore_color = true;
return 1;
}
}
else
first_scan = false;
if ( dyn->total_dyn_type & ge_mDynType_Tone) {
if ( (!inverted && val) || (inverted && !val)) {
if ( color >= (glow_eDrawType) glow_eDrawTone__) {
if ( dyn->reset_color)
grow_ResetObjectFillColor( object); // Previous color might be a tone
grow_SetObjectFillColor( object, color);
}
else
grow_SetObjectColorTone( object, (glow_eDrawTone) color);
dyn->ignore_color = true;
}
else {
if ( color >= (glow_eDrawType) glow_eDrawTone__)
grow_ResetObjectFillColor( object);
grow_ResetObjectColorTone( object);
dyn->reset_color = true;
}
} }
else { else {
grow_ResetObjectFillColor( object); if ( (!inverted && val) || (inverted && !val)) {
dyn->reset_color = true; grow_SetObjectFillColor( object, color);
dyn->ignore_color = true;
}
else {
grow_ResetObjectFillColor( object);
dyn->reset_color = true;
}
} }
old_value = val;
break;
} }
old_value = *p; }
return 1; return 1;
} }
...@@ -3800,6 +3869,12 @@ int GeValueInput::change_value( grow_tObject object, char *text) ...@@ -3800,6 +3869,12 @@ int GeValueInput::change_value( grow_tObject object, char *text)
case pwr_eType_Float64: case pwr_eType_Float64:
if ( double( *(pwr_tFloat64 *) buf) > max_value) max_exceeded = 1; if ( double( *(pwr_tFloat64 *) buf) > max_value) max_exceeded = 1;
break; break;
case pwr_eType_Int64:
if ( double( *(pwr_tInt64 *) buf) > max_value) max_exceeded = 1;
break;
case pwr_eType_UInt64:
if ( double( *(pwr_tUInt64 *) buf) > max_value) max_exceeded = 1;
break;
case pwr_eType_Int32: case pwr_eType_Int32:
if ( double( *(pwr_tInt32 *) buf) > max_value) max_exceeded = 1; if ( double( *(pwr_tInt32 *) buf) > max_value) max_exceeded = 1;
break; break;
...@@ -3833,6 +3908,12 @@ int GeValueInput::change_value( grow_tObject object, char *text) ...@@ -3833,6 +3908,12 @@ int GeValueInput::change_value( grow_tObject object, char *text)
case pwr_eType_Float64: case pwr_eType_Float64:
if ( double( *(pwr_tFloat64 *) buf) < min_value) min_exceeded = 1; if ( double( *(pwr_tFloat64 *) buf) < min_value) min_exceeded = 1;
break; break;
case pwr_eType_Int64:
if ( double( *(pwr_tInt64 *) buf) < min_value) min_exceeded = 1;
break;
case pwr_eType_UInt64:
if ( double( *(pwr_tUInt64 *) buf) < min_value) min_exceeded = 1;
break;
case pwr_eType_Int32: case pwr_eType_Int32:
if ( double( *(pwr_tInt32 *) buf) < min_value) min_exceeded = 1; if ( double( *(pwr_tInt32 *) buf) < min_value) min_exceeded = 1;
break; break;
...@@ -10663,6 +10744,12 @@ int GeFastCurve::scan( grow_tObject object) ...@@ -10663,6 +10744,12 @@ int GeFastCurve::scan( grow_tObject object)
case pwr_eType_Float64: case pwr_eType_Float64:
data[i + 1][j] = ((pwr_tFloat64 *)tmp)[k]; data[i + 1][j] = ((pwr_tFloat64 *)tmp)[k];
break; break;
case pwr_eType_Int64:
data[i + 1][j] = ((pwr_tInt64 *)tmp)[k];
break;
case pwr_eType_UInt64:
data[i + 1][j] = ((pwr_tUInt64 *)tmp)[k];
break;
case pwr_eType_Int32: case pwr_eType_Int32:
data[i + 1][j] = ((pwr_tInt32 *)tmp)[k]; data[i + 1][j] = ((pwr_tInt32 *)tmp)[k];
break; break;
...@@ -10697,6 +10784,12 @@ int GeFastCurve::scan( grow_tObject object) ...@@ -10697,6 +10784,12 @@ int GeFastCurve::scan( grow_tObject object)
case pwr_eType_Float64: case pwr_eType_Float64:
data[i + 1][j] = ((pwr_tFloat64 *)tmp)[k]; data[i + 1][j] = ((pwr_tFloat64 *)tmp)[k];
break; break;
case pwr_eType_Int64:
data[i + 1][j] = ((pwr_tInt32 *)tmp)[k];
break;
case pwr_eType_UInt64:
data[i + 1][j] = ((pwr_tUInt32 *)tmp)[k];
break;
case pwr_eType_Int32: case pwr_eType_Int32:
data[i + 1][j] = ((pwr_tInt32 *)tmp)[k]; data[i + 1][j] = ((pwr_tInt32 *)tmp)[k];
break; break;
...@@ -10735,6 +10828,12 @@ int GeFastCurve::scan( grow_tObject object) ...@@ -10735,6 +10828,12 @@ int GeFastCurve::scan( grow_tObject object)
case pwr_eType_Float64: case pwr_eType_Float64:
data[i + 1][j] = ((pwr_tFloat64 *)tmp)[j]; data[i + 1][j] = ((pwr_tFloat64 *)tmp)[j];
break; break;
case pwr_eType_Int64:
data[i + 1][j] = ((pwr_tInt32 *)tmp)[j];
break;
case pwr_eType_UInt64:
data[i + 1][j] = ((pwr_tUInt32 *)tmp)[j];
break;
case pwr_eType_Int32: case pwr_eType_Int32:
data[i + 1][j] = ((pwr_tInt32 *)tmp)[j]; data[i + 1][j] = ((pwr_tInt32 *)tmp)[j];
break; break;
...@@ -11977,6 +12076,8 @@ int GeOptionMenu::connect( grow_tObject object, glow_sTraceData *trace_data) ...@@ -11977,6 +12076,8 @@ int GeOptionMenu::connect( grow_tObject object, glow_sTraceData *trace_data)
switch ( type_id) { switch ( type_id) {
case pwr_eType_Float32: size = sizeof( pwr_tFloat32); break; case pwr_eType_Float32: size = sizeof( pwr_tFloat32); break;
case pwr_eType_Int64: size = sizeof( pwr_tInt64); break;
case pwr_eType_UInt64: size = sizeof( pwr_tUInt64); break;
case pwr_eType_Int32: size = sizeof( pwr_tInt32); break; case pwr_eType_Int32: size = sizeof( pwr_tInt32); break;
case pwr_eType_UInt32: size = sizeof( pwr_tUInt32); break; case pwr_eType_UInt32: size = sizeof( pwr_tUInt32); break;
case pwr_eType_Int16: size = sizeof( pwr_tInt16); break; case pwr_eType_Int16: size = sizeof( pwr_tInt16); break;
...@@ -12022,6 +12123,8 @@ int GeOptionMenu::scan( grow_tObject object) ...@@ -12022,6 +12123,8 @@ int GeOptionMenu::scan( grow_tObject object)
enum_value = (unsigned int) (*(pwr_tFloat32 *) p > 0 ? enum_value = (unsigned int) (*(pwr_tFloat32 *) p > 0 ?
*(pwr_tFloat32 *)p+0.5 : *(pwr_tFloat32 *)p-0.5); *(pwr_tFloat32 *)p+0.5 : *(pwr_tFloat32 *)p-0.5);
break; break;
case pwr_eType_Int64: enum_value = (unsigned int) *(pwr_tInt64 *) p; break;
case pwr_eType_UInt64: enum_value = (unsigned int) *(pwr_tUInt64 *) p; break;
case pwr_eType_Int32: enum_value = (unsigned int) *(pwr_tInt32 *) p; break; case pwr_eType_Int32: enum_value = (unsigned int) *(pwr_tInt32 *) p; break;
case pwr_eType_UInt32: enum_value = (unsigned int) *(pwr_tUInt32 *) p; break; case pwr_eType_UInt32: enum_value = (unsigned int) *(pwr_tUInt32 *) p; break;
case pwr_eType_Int16: enum_value = (unsigned int) *(pwr_tInt16 *) p; break; case pwr_eType_Int16: enum_value = (unsigned int) *(pwr_tInt16 *) p; break;
......
xtt/lib/ge/src/ge_dyn.h
View file @ ee13bad8
/* /*
* Proview $Id: ge_dyn.h,v 1.31 2007-01-17 06:20:38 claes Exp $ * Proview $Id: ge_dyn.h,v 1.32 2007-04-25 13:36:13 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -869,10 +869,12 @@ class GeDigColor : public GeDynElem { ...@@ -869,10 +869,12 @@ class GeDigColor : public GeDynElem {
int inverted; int inverted;
bool first_scan; bool first_scan;
pwr_tBoolean old_value; pwr_tBoolean old_value;
int a_typeid;
unsigned int bitmask;
GeDigColor( GeDyn *e_dyn, ge_mInstance e_instance = ge_mInstance_1) : GeDigColor( GeDyn *e_dyn, ge_mInstance e_instance = ge_mInstance_1) :
GeDynElem(e_dyn, ge_mDynType_DigColor, (ge_mActionType) 0, ge_eDynPrio_DigColor), GeDynElem(e_dyn, ge_mDynType_DigColor, (ge_mActionType) 0, ge_eDynPrio_DigColor),
color(glow_eDrawType_Inherit) color(glow_eDrawType_Inherit), bitmask(0)
{ strcpy( attribute, ""); instance = e_instance;} { strcpy( attribute, ""); instance = e_instance;}
GeDigColor( const GeDigColor& x) : GeDigColor( const GeDigColor& x) :
GeDynElem(x.dyn,x.dyn_type,x.action_type,x.prio), color(x.color) GeDynElem(x.dyn,x.dyn_type,x.action_type,x.prio), color(x.color)
......
xtt/lib/ge/src/ge_graph.cpp
View file @ ee13bad8
/* /*
* Proview $Id: ge_graph.cpp,v 1.37 2007-03-15 15:42:03 claes Exp $ * Proview $Id: ge_graph.cpp,v 1.38 2007-04-25 13:36:13 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB. * Copyright (C) 2005 SSAB Oxelsund AB.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -63,9 +63,11 @@ static const graph_sTypeStr graph_type_table[] = { ...@@ -63,9 +63,11 @@ static const graph_sTypeStr graph_type_table[] = {
{"Int8", pwr_eType_Int8, sizeof(pwr_tInt8)}, {"Int8", pwr_eType_Int8, sizeof(pwr_tInt8)},
{"Int16", pwr_eType_Int16, sizeof(pwr_tInt16)}, {"Int16", pwr_eType_Int16, sizeof(pwr_tInt16)},
{"Int32", pwr_eType_Int32, sizeof(pwr_tInt32)}, {"Int32", pwr_eType_Int32, sizeof(pwr_tInt32)},
{"Int64", pwr_eType_Int64, sizeof(pwr_tInt64)},
{"UInt8", pwr_eType_UInt8, sizeof(pwr_tUInt8)}, {"UInt8", pwr_eType_UInt8, sizeof(pwr_tUInt8)},
{"UInt16", pwr_eType_UInt16, sizeof(pwr_tUInt16)}, {"UInt16", pwr_eType_UInt16, sizeof(pwr_tUInt16)},
{"UInt32", pwr_eType_UInt32, sizeof(pwr_tUInt32)}, {"UInt32", pwr_eType_UInt32, sizeof(pwr_tUInt32)},
{"UInt64", pwr_eType_UInt64, sizeof(pwr_tUInt64)},
{"Objid", pwr_eType_Objid, sizeof(pwr_tObjid)}, {"Objid", pwr_eType_Objid, sizeof(pwr_tObjid)},
{"Time", pwr_eType_Time, sizeof(pwr_tTime)}, {"Time", pwr_eType_Time, sizeof(pwr_tTime)},
{"DeltaTime", pwr_eType_DeltaTime, sizeof(pwr_tDeltaTime)}, {"DeltaTime", pwr_eType_DeltaTime, sizeof(pwr_tDeltaTime)},
...@@ -3904,6 +3906,11 @@ void Graph::string_to_type( char *type_str, pwr_eType *type, ...@@ -3904,6 +3906,11 @@ void Graph::string_to_type( char *type_str, pwr_eType *type,
else else
*size = atoi( str + 6); *size = atoi( str + 6);
} }
if ( !found && strncmp("BIT", str, 3) == 0)
{
*type = (pwr_eType) graph_eType_Bit;
*size = 4;
}
if ( *elements > 1) if ( *elements > 1)
*size *= *elements; *size *= *elements;
...@@ -4333,6 +4340,12 @@ int graph_attr_string_to_value( int type_id, char *value_str, ...@@ -4333,6 +4340,12 @@ int graph_attr_string_to_value( int type_id, char *value_str,
return GE__INPUT_SYNTAX; return GE__INPUT_SYNTAX;
break; break;
} }
case pwr_eType_Int64:
{
if ( sscanf( value_str, "%lld", (pwr_tInt64 *)buffer_ptr) != 1)
return GE__INPUT_SYNTAX;
break;
}
case pwr_eType_UInt8: case pwr_eType_UInt8:
{ {
pwr_tUInt8 i8; pwr_tUInt8 i8;
...@@ -4357,6 +4370,12 @@ int graph_attr_string_to_value( int type_id, char *value_str, ...@@ -4357,6 +4370,12 @@ int graph_attr_string_to_value( int type_id, char *value_str,
return GE__INPUT_SYNTAX; return GE__INPUT_SYNTAX;
break; break;
} }
case pwr_eType_UInt64:
{
if ( sscanf( value_str, "%llu", (pwr_tUInt64 *)buffer_ptr) != 1)
return GE__INPUT_SYNTAX;
break;
}
case pwr_eType_String: case pwr_eType_String:
{ {
if ( (int) strlen( value_str) >= attr_size) if ( (int) strlen( value_str) >= attr_size)
......
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