removed Gradient usage in this example
SVN revision: 54657
This commit is contained in:
parent
01e49e85dd
commit
5783211bf6
|
@ -115,12 +115,8 @@ CalibrationRectangle::CalibrationRectangle( Evasxx::Canvas &evas, const Rect &re
|
||||||
floor->show();
|
floor->show();
|
||||||
|
|
||||||
// setup background
|
// setup background
|
||||||
background = new Evasxx::Gradient( evas, Rect (0, 0, s.width(), s.height()) );
|
background = new Evasxx::Rectangle( evas, Rect (0, 0, s.width(), s.height()) );
|
||||||
background->setLayer( 5 );
|
background->setLayer( 5 );
|
||||||
background->setAngle( angle = 13 );
|
|
||||||
background->addColorStop( Color (255, 255, 255, 255), 10 );
|
|
||||||
background->addColorStop( Color (170, 160, 190, 255), 5 );
|
|
||||||
background->addColorStop( Color (255, 255, 240, 255), 10 );
|
|
||||||
background->setColor( Color (255, 255, 255, 255) );
|
background->setColor( Color (255, 255, 255, 255) );
|
||||||
//background->show();
|
//background->show();
|
||||||
//new CalibrationAnimator( CalibrationAnimator::alpha, background, 255, 0 );
|
//new CalibrationAnimator( CalibrationAnimator::alpha, background, 255, 0 );
|
||||||
|
@ -395,13 +391,6 @@ bool CalibrationAnimator::tick()
|
||||||
if ( newy < _y ) newy++;
|
if ( newy < _y ) newy++;
|
||||||
_o->move( Point (newx, newy) );
|
_o->move( Point (newx, newy) );
|
||||||
return true;
|
return true;
|
||||||
case angle:
|
|
||||||
newx = static_cast<Evasxx::Gradient*>( _o )->getAngle();
|
|
||||||
if ( newx == _x ) return false;
|
|
||||||
if ( newx > _x ) newx--;
|
|
||||||
if ( newx < _x ) newx++;
|
|
||||||
static_cast<Evasxx::Gradient*>( _o )->setAngle( newx );
|
|
||||||
return true;
|
|
||||||
case alpha:
|
case alpha:
|
||||||
c = _o->getColor();
|
c = _o->getColor();
|
||||||
newx = c.alpha();
|
newx = c.alpha();
|
||||||
|
@ -418,5 +407,4 @@ bool CalibrationAnimator::tick()
|
||||||
void CalibrationRectangle::timerEvent()
|
void CalibrationRectangle::timerEvent()
|
||||||
{
|
{
|
||||||
cout << "CalibrationAnimator::timerEvent()" << endl;
|
cout << "CalibrationAnimator::timerEvent()" << endl;
|
||||||
background->setAngle( ++angle );
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ protected:
|
||||||
private:
|
private:
|
||||||
CalibrationData cd;
|
CalibrationData cd;
|
||||||
unsigned int position;
|
unsigned int position;
|
||||||
Evasxx::Gradient* background;
|
Evasxx::Rectangle* background;
|
||||||
Evasxx::Image* crosshair;
|
Evasxx::Image* crosshair;
|
||||||
Evasxx::Image* crosshairShadow;
|
Evasxx::Image* crosshairShadow;
|
||||||
Evasxx::Line* crosshairhorz;
|
Evasxx::Line* crosshairhorz;
|
||||||
|
|
Loading…
Reference in New Issue