Timer API sync

SVN revision: 57538
This commit is contained in:
Andreas Volz 2011-03-06 08:33:13 +00:00
parent 7779b257d1
commit a077647bd1
5 changed files with 21 additions and 13 deletions

View File

@ -78,7 +78,7 @@ typedef list<Star*> Starfield;
typedef list<Star*>::iterator StarfieldIterator;
Starfield starfield;
void advance( Ecorexx::Timer* e )
void advance()
{
for (StarfieldIterator it = starfield.begin(); it != starfield.end(); ++it )
{

View File

@ -25,7 +25,8 @@ public:
xstep( 2*PI/360 ), ystep( 2*PI/360 ),
size( BALLSIZE ), direction( -1 ),
alpha( 0 ), alphadirection( 1 ),
xaddfactor( 1 ), yaddfactor( 1 )
xaddfactor( 1 ), yaddfactor( 1 ),
ecoreTimer (NULL)
{
Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( size );
Evasxx::Canvas &evas = mw->getCanvas();
@ -55,7 +56,8 @@ public:
balls[i]->show();
}
startTimer( 1.0 / 25 );
ecoreTimer = new Ecorexx::Timer( 1.0 / 25 );
ecoreTimer->timeout.connect( sigc::mem_fun( this, &TimerApp::timerEvent ) );
mw->show();
}
@ -72,8 +74,9 @@ public:
int alphadirection;
double xaddfactor;
double yaddfactor;
Ecorexx::Timer* ecoreTimer;
virtual bool timerEvent()
void timerEvent()
{
logo->setColor( Color (255, 255, 255, alpha) );
@ -97,8 +100,6 @@ public:
xaddfactor = -2 + (4.0*rand()/(RAND_MAX));
yaddfactor = -2 + (4.0*rand()/(RAND_MAX));
}
return true; // call me again, please
}
};

View File

@ -19,7 +19,7 @@ Starfield starfield;
int width = 0;
void advance( Ecorexx::Timer* e )
void advance( )
{
for (StarfieldIterator it = starfield.begin(); it != starfield.end(); ++it )
{

View File

@ -26,7 +26,8 @@ public:
xstep( 2*PI/360 ), ystep( 2*PI/360 ),
size( BALLSIZE ), direction( -1 ),
alpha( 0 ), alphadirection( 1 ),
xaddfactor( 1 ), yaddfactor( 1 )
xaddfactor( 1 ), yaddfactor( 1 ),
ecoreTimer (NULL)
{
Ecorexx::EvasWindowSoftwareX11* mw = new Ecorexx::EvasWindowSoftwareX11( Size (WIDTH, HEIGHT) );
Evasxx::Canvas &evas = mw->getCanvas();
@ -54,7 +55,8 @@ public:
balls[i]->show();
}
startTimer( 1.0 / 25 );
ecoreTimer = new Ecorexx::Timer( 1.0 / 25 );
ecoreTimer->timeout.connect( sigc::mem_fun( this, &TimerApp::timerEvent ) );
mw->show();
}
@ -72,8 +74,9 @@ public:
int alphadirection;
double xaddfactor;
double yaddfactor;
Ecorexx::Timer* ecoreTimer;
virtual bool timerEvent()
void timerEvent()
{
logo->setColor( Color (255, 255, 255, alpha) );
@ -97,8 +100,11 @@ public:
xaddfactor = -2 + (4.0*rand()/(RAND_MAX));
yaddfactor = -2 + (4.0*rand()/(RAND_MAX));
}
}
return true; // call me again, please
~TimerApp ()
{
delete ecoreTimer;
}
};

View File

@ -17,7 +17,7 @@ typedef struct _MyProgressbar
static MyProgressbar _test_progressbar;
static void _my_progressbar_value_set (Ecorexx::Timer *timer)
static void _my_progressbar_value_set ()
{
double progress;
@ -40,7 +40,8 @@ static void _my_progressbar_value_set (Ecorexx::Timer *timer)
if (progress > 1.0)
{
_test_progressbar.run = false;
timer->del ();
//timer->del ();
// FIXME: new design offern no timers pointer!
}
}