Commit e62ded84 authored by Claes Sjofors's avatar Claes Sjofors

Ge pulldown menu dynamics, dyntype2 removed

parent ea0f66f1
...@@ -793,12 +793,16 @@ void GeDyn::get_attributes( grow_tObject object, attr_sItem *itemlist, int *item ...@@ -793,12 +793,16 @@ void GeDyn::get_attributes( grow_tObject object, attr_sItem *itemlist, int *item
total_dyn_type1 & ge_mDynType1_Trend || total_dyn_type1 & ge_mDynType1_Trend ||
total_dyn_type1 & ge_mDynType1_Table || total_dyn_type1 & ge_mDynType1_Table ||
total_dyn_type1 & ge_mDynType1_FastCurve || total_dyn_type1 & ge_mDynType1_FastCurve ||
total_dyn_type1 & ge_mDynType1_XY_Curve || total_dyn_type1 & ge_mDynType1_XY_Curve)
total_dyn_type2 & ge_mDynType2_Axis)
attrinfo[i].noedit = 1; attrinfo[i].noedit = 1;
attrinfo[i].mask = ~(ge_mDynType1_Bar | ge_mDynType1_Trend | ge_mDynType1_Table | attrinfo[i].mask = ~(ge_mDynType1_Bar | ge_mDynType1_Trend | ge_mDynType1_Table |
ge_mDynType1_FastCurve | ge_mDynType1_XY_Curve | ge_mDynType1_SliderBackground); ge_mDynType1_FastCurve | ge_mDynType1_XY_Curve | ge_mDynType1_SliderBackground);
attrinfo[i++].size = sizeof( dyn_type1); attrinfo[i++].size = sizeof( dyn_type1);
strcpy( attrinfo[i].name, "DynType2");
attrinfo[i].value = &dyn_type2;
attrinfo[i].type = ge_eAttrType_DynType2;
attrinfo[i++].size = sizeof( dyn_type2);
} }
else { else {
strcpy( attrinfo[i].name, "DynType1"); strcpy( attrinfo[i].name, "DynType1");
...@@ -808,11 +812,6 @@ void GeDyn::get_attributes( grow_tObject object, attr_sItem *itemlist, int *item ...@@ -808,11 +812,6 @@ void GeDyn::get_attributes( grow_tObject object, attr_sItem *itemlist, int *item
attrinfo[i++].size = sizeof( dyn_type1); attrinfo[i++].size = sizeof( dyn_type1);
} }
strcpy( attrinfo[i].name, "DynType2");
attrinfo[i].value = &dyn_type2;
attrinfo[i].type = ge_eAttrType_DynType2;
attrinfo[i++].size = sizeof( dyn_type2);
strcpy( attrinfo[i].name, "Action"); strcpy( attrinfo[i].name, "Action");
attrinfo[i].value = &action_type1; attrinfo[i].value = &action_type1;
attrinfo[i].type = ge_eAttrType_ActionType1; attrinfo[i].type = ge_eAttrType_ActionType1;
......
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