Commit 9aa6d66a authored by Claes Sjofors's avatar Claes Sjofors

Fixcolor added to arc properties

parent 768808bd
......@@ -152,3 +152,4 @@
091102 cs ge Menu entry to create subgraphs added.
091102 cs ge Menu items for connections changed to radio items.
091103 cs xtt Translation and utf8 conversion of search condition in EventLog window fixed.
091104 cs glow Fixcolor added to arc properties.
\ No newline at end of file
......@@ -1345,6 +1345,7 @@ typedef enum {
glow_eSave_GrowArc_gradient = 2418,
glow_eSave_GrowArc_gradient_contrast = 2419,
glow_eSave_GrowArc_disable_gradient = 2420,
glow_eSave_GrowArc_fixcolor = 2421,
glow_eSave_PolyLine_draw_type = 2500,
glow_eSave_PolyLine_line_width = 2501,
glow_eSave_PolyLine_a_points = 2502,
......
......@@ -1482,6 +1482,11 @@ int grow_GetObjectAttrInfo( grow_tObject object, char *transtab,
attrinfo[i].type = glow_eType_Relief;
attrinfo[i++].size = sizeof( op->relief);
strcpy( attrinfo[i].name, "fixcolor");
attrinfo[i].value_p = &op->fixcolor;
attrinfo[i].type = glow_eType_Boolean;
attrinfo[i++].size = sizeof( op->fixcolor);
strcpy( attrinfo[i].name, "disable_shadow");
attrinfo[i].value_p = &op->disable_shadow;
attrinfo[i].type = glow_eType_Boolean;
......
......@@ -41,7 +41,7 @@ GrowArc::GrowArc( GrowCtx *glow_ctx, const char *name, double x1, double y1,
original_fill_drawtype(fill_d_type), fill_drawtype(fill_d_type),
border(display_border),
dynamic(0), dynamicsize(0), shadow(display_shadow), shadow_width(5),
relief(glow_eRelief_Up), shadow_contrast(2), disable_shadow(0),
relief(glow_eRelief_Up), shadow_contrast(2), disable_shadow(0), fixcolor(0),
gradient(glow_eGradient_No), gradient_contrast(4), disable_gradient(0)
{
strcpy( n_name, name);
......@@ -271,6 +271,7 @@ void GrowArc::save( ofstream& fp, glow_eSaveMode mode)
fp << int(glow_eSave_GrowArc_shadow_contrast) << FSPACE << shadow_contrast << endl;
fp << int(glow_eSave_GrowArc_relief) << FSPACE << int(relief) << endl;
fp << int(glow_eSave_GrowArc_disable_shadow) << FSPACE << disable_shadow << endl;
fp << int(glow_eSave_GrowArc_fixcolor) << FSPACE << fixcolor << endl;
fp << int(glow_eSave_GrowArc_gradient) << FSPACE << int(gradient) << endl;
fp << int(glow_eSave_GrowArc_gradient_contrast) << FSPACE << gradient_contrast << endl;
fp << int(glow_eSave_GrowArc_disable_gradient) << FSPACE << disable_gradient << endl;
......@@ -328,6 +329,7 @@ void GrowArc::open( ifstream& fp)
case glow_eSave_GrowArc_shadow_contrast: fp >> shadow_contrast; break;
case glow_eSave_GrowArc_relief: fp >> tmp; relief = (glow_eRelief)tmp; break;
case glow_eSave_GrowArc_disable_shadow: fp >> disable_shadow; break;
case glow_eSave_GrowArc_fixcolor: fp >> fixcolor; break;
case glow_eSave_GrowArc_gradient: fp >> tmp; gradient = (glow_eGradient)tmp; break;
case glow_eSave_GrowArc_gradient_contrast: fp >> gradient_contrast; break;
case glow_eSave_GrowArc_disable_gradient: fp >> disable_gradient; break;
......@@ -659,6 +661,8 @@ void GrowArc::draw( GlowWind *w, GlowTransform *t, int highlight, int hot, void
return;
hot = 0;
}
if ( fixcolor)
colornode = 0;
if ( node && ((GrowNode *)node)->line_width)
idx = int( w->zoom_factor_y / w->base_zoom_factor *
......
......@@ -273,6 +273,7 @@ class GrowArc : public GlowArc {
glow_eRelief relief; //!< Type of relief.
int shadow_contrast; //!< Shadow contrast.
int disable_shadow; //!< Disable shadow, even if parent node has shadow.
int fixcolor; //!< Color independent of node color.
glow_eGradient gradient; //!< Type of gradient.
int gradient_contrast; //!< Gradient contrast.
int disable_gradient; //!< Disable gradient, even if parent node has gradient.
......
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