cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGrPlot.h : Make callbacks for deselected objects when a new object is selected.

Browse Source 
Added cmPlotObjCb() function.
This commit is contained in:
Kevin Larke 2015-03-31 11:17:58 -07:00
parent e9ad88ae0f
commit 4cd55db162
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cmGrPlot.c
View File

@ -180,7 +180,7 @@ bool _cmGrPlotObjIsFocused(cmGrPlotObj_t* op)
{ return _cmGrPlotObjIsEnabled(op) && op->p->fop==op; } { return _cmGrPlotObjIsEnabled(op) && op->p->fop==op; }
bool _cmGrPlotObjIsSelected(cmGrPlotObj_t* op) bool _cmGrPlotObjIsSelected(cmGrPlotObj_t* op)
{ return _cmGrPlotObjIsFocused(op) || cmIsFlag(op->stateFlags,kSelectGrPlFl); } { return /*_cmGrPlotObjIsFocused(op) ||*/ cmIsFlag(op->stateFlags,kSelectGrPlFl); }
void _cmGrPlotObjSetupCbArg( cmGrPlotCbArg_t* a, cmGrPlotObj_t* op, cmGrPlCbSelId_t selId ) void _cmGrPlotObjSetupCbArg( cmGrPlotCbArg_t* a, cmGrPlotObj_t* op, cmGrPlCbSelId_t selId )
{ {
@ -249,6 +249,8 @@ void _cmGrPlotObjSetFocus( cmGrPlotObj_t* op )
} }
// Set the clear flag to clear all other selected objects if this object is
// selected.
void _cmGrPlotObjSetSelect( cmGrPlotObj_t* op, bool clearFl ) void _cmGrPlotObjSetSelect( cmGrPlotObj_t* op, bool clearFl )
{ {
// if the object is disabled or not selectable // if the object is disabled or not selectable
@ -257,7 +259,7 @@ void _cmGrPlotObjSetSelect( cmGrPlotObj_t* op, bool clearFl )
unsigned stateFlags = op->stateFlags; unsigned stateFlags = op->stateFlags;
// if the application callback returns false then do change the select state of the object // if the application callback returns false then do not change the select state of the object
if(_cmGrPlotObjCb(op, kPreEventCbSelGrPlId, kSelectGrPlFl ) == false ) if(_cmGrPlotObjCb(op, kPreEventCbSelGrPlId, kSelectGrPlFl ) == false )
return; return;
@ -268,8 +270,15 @@ void _cmGrPlotObjSetSelect( cmGrPlotObj_t* op, bool clearFl )
// clear the select flag on all objects that share op->parent // clear the select flag on all objects that share op->parent
for(; cop!=NULL; cop=cop->next) for(; cop!=NULL; cop=cop->next)
if( cmHandlesAreEqual(cmGrObjParent(cop->grObjH),parentObjH) ) if( cop!=op && cmHandlesAreEqual(cmGrObjParent(cop->grObjH),parentObjH) )
cop->stateFlags = cmClrFlag(cop->stateFlags,kSelectGrPlFl); {
if( cmIsFlag(cop->stateFlags,kSelectGrPlFl) )
{
cop->stateFlags = cmClrFlag(cop->stateFlags,kSelectGrPlFl);
_cmGrPlotObjCb(cop, kStateChangeGrPlId, kSelectGrPlFl );
}
}
} }
op->stateFlags = cmTogFlag(stateFlags,kSelectGrPlFl); op->stateFlags = cmTogFlag(stateFlags,kSelectGrPlFl);
@ -603,7 +612,7 @@ bool _cmGrPlotObjEvent( cmGrObjFuncArgs_t* args, unsigned flags, unsigned key, i
{ {
cmGrPlotObj_t* cb_op = op; cmGrPlotObj_t* cb_op = op;
// if this is a key up/dn event and 'op' is not the 'focused op' then callback // if this is a key up/dn event and 'op' is not the 'focused op' then
// callback on the 'focused op' instead of this 'op'. // callback on the 'focused op' instead of this 'op'.
if( (cmIsFlag(flags,kKeyDnGrFl) || cmIsFlag(flags,kKeyUpGrFl)) && op->p->fop != op ) if( (cmIsFlag(flags,kKeyDnGrFl) || cmIsFlag(flags,kKeyUpGrFl)) && op->p->fop != op )
cb_op = op->p->fop; cb_op = op->p->fop;
@ -834,17 +843,17 @@ cmGrPlRC_t cmGrPlotObjCreate(
// set the default colors // set the default colors
op->drawColors[kSelectPlGrId] = 0xcd853f; op->drawColors[kSelectPlGrId] = kPeruGrId;
op->fillColors[kSelectPlGrId] = 0xdeb887; op->fillColors[kSelectPlGrId] = kBurlyWoodGrId;
op->drawColors[kFocusPlGrId] = 0x483d8b; op->drawColors[kFocusPlGrId] = kDarkSlateBlueGrId;
op->fillColors[kFocusPlGrId] = 0x8470ff; op->fillColors[kFocusPlGrId] = 0x8470ff;
op->drawColors[kEnablePlGrId] = 0x000000; op->drawColors[kEnablePlGrId] = kBlackGrId;
op->fillColors[kEnablePlGrId] = 0x009ff7; op->fillColors[kEnablePlGrId] = 0x009ff7;
op->drawColors[kDisablePlGrId] = 0xbebebe; op->drawColors[kDisablePlGrId] = 0xbebebe;
op->fillColors[kDisablePlGrId] = 0xd3d3de; op->fillColors[kDisablePlGrId] = kLightGrayGrId;
unsigned grObjCfgFlags = 0; unsigned grObjCfgFlags = 0;
cmGrObjH_t parentGrH = op->parent == NULL ? cmGrObjNullHandle : op->parent->grObjH; cmGrObjH_t parentGrH = op->parent == NULL ? cmGrObjNullHandle : op->parent->grObjH;
@ -1345,6 +1354,18 @@ cmGrPlObjH_t cmGrPlotObjectIndexToHandle( cmGrPlH_t h, unsigned index )
return oh; return oh;
} }
void cmGrPlotObjCb( cmGrPlH_t h, cmGrPlotObjCbFunc_t func, void* arg )
{
cmGrPl_t* p = _cmGrPlHandleToPtr(h);
cmGrPlotObj_t* op = p->list;
cmGrPlObjH_t oh = cmGrPlObjNullHandle;
for(; op!=NULL; op=op->next)
{
oh.h = op;
func(arg,oh);
}
}
void cmGrPlotKeyEvent( cmGrPlH_t h, cmGrH_t grH, unsigned eventFlags, cmGrKeyCodeId_t keycode ) void cmGrPlotKeyEvent( cmGrPlH_t h, cmGrH_t grH, unsigned eventFlags, cmGrKeyCodeId_t keycode )
{ {

4
cmGrPlot.h
View File

@ -219,6 +219,10 @@ extern "C" {
// Given a plot object id return the associated object handle. // Given a plot object id return the associated object handle.
cmGrPlObjH_t cmGrPlotObjectIdToHandle( cmGrPlH_t h, unsigned id ); cmGrPlObjH_t cmGrPlotObjectIdToHandle( cmGrPlH_t h, unsigned id );
// Callback func(arg,objH) for every object.
typedef void (*cmGrPlotObjCbFunc_t)( void* arg, cmGrPlObjH_t oh );
void cmGrPlotObjCb( cmGrPlH_t h, cmGrPlotObjCbFunc_t func, void* arg );
// Pass a keyboard event to the plot system. // Pass a keyboard event to the plot system.
void cmGrPlotKeyEvent( cmGrPlH_t h, cmGrH_t grH, unsigned eventFlags, cmGrKeyCodeId_t keycode ); void cmGrPlotKeyEvent( cmGrPlH_t h, cmGrH_t grH, unsigned eventFlags, cmGrKeyCodeId_t keycode );