@@ -34,28 +34,40 @@ public class Animator : Object {
3434 private double ? _eox = null ; // Ending x -origin
3535 private double ? _eoy = null ; // Ending y -origin
3636 private int _index = 1 ; // Animation index
37- private const int _timeout = 20 ; // Number of milliseconds between frames
37+ private string _name = "";
38+ private int _id ;
39+ // private const int _timeout = 20 ; // Number of milliseconds between frames (30 fps )
40+ private const int _timeout = 1000; // Number of milliseconds between frames (30 fps )
3841 private const double _frames = 10; // Number of frames to animate (note : set to 1 to disable animation )
42+ private static int _next_id = 0;
43+
44+ public static bool _in_progress = false ;
3945
4046 /* Default constructor */
41- public Animator ( DrawArea da ) {
47+ public Animator ( DrawArea da , string name = " unnamed " ) {
4248 _da = da;
49+ _name = name;
50+ _id = _next_id++ ;
4351 _da. stop_animation();
4452 _spos = new AnimationPositions ( _da );
4553 }
4654
4755 /* Constructor for a specified node tree */
48- public Animator.node ( DrawArea da , Node n ) {
56+ public Animator.node ( DrawArea da , Node n , string name = " unnamed " ) {
4957 _da = da;
58+ _name = name;
59+ _id = _next_id++ ;
5060 _da. stop_animation();
5161 _node = n;
5262 _spos = new AnimationPositions .for_node( _node );
5363 _index = 0 ;
5464 }
5565
5666 /* Constructor for a scale change */
57- public Animator.scale ( DrawArea da ) {
67+ public Animator.scale ( DrawArea da , string name = " unnamed " ) {
5868 _da = da;
69+ _name = name;
70+ _id = _next_id++ ;
5971 _da. stop_animation();
6072 _sscale = da. get_scale_factor();
6173 _da. get_origin( out _sox, out _soy );
@@ -66,32 +78,33 @@ public class Animator : Object {
6678 _da. stop_animation. connect( stop_animating );
6779 if ( _node != null ) {
6880 _epos = new AnimationPositions .for_node( _node );
69- animate_positions( );
81+ Timeout . add( _timeout, animate_positions );
7082 } else if ( _sscale != null ) {
7183 _escale = _da. get_scale_factor();
7284 _da. get_origin( out _eox, out _eoy );
73- animate_scaling( );
85+ Timeout . add( _timeout, animate_scaling );
7486 } else {
7587 _epos = new AnimationPositions ( _da );
76- animate_positions( );
88+ Timeout . add( _timeout, animate_positions );
7789 }
7890 }
7991
8092 /* Perform the animation */
8193 private bool animate_positions () {
8294 double divisor = _index / _frames;
8395 _index++ ;
84- for ( int i= 0 ; i< _spos. length; i++ ) {
96+ for ( int i= 0 ; i< _spos. length() ; i++ ) {
8597 double x = _spos. x( i ) + ((_epos. x( i ) - _spos. x( i )) * divisor);
8698 double y = _spos. y( i ) + ((_epos. y( i ) - _spos. y( i )) * divisor);
8799 _spos. node( i ). set_posx_only( x );
88100 _spos. node( i ). set_posy_only( y );
89101 }
90102 _da. queue_draw();
91- if ( _index <= _frames ) {
92- Timeout . add( _timeout, this . animate_positions );
103+ if ( _index > _frames ) {
104+ _da. stop_animation. disconnect( stop_animating );
105+ return ( false );
93106 }
94- return ( false );
107+ return ( true );
95108 }
96109
97110 /* Animates the given scaling and origin changes */
@@ -101,19 +114,25 @@ public class Animator : Object {
101114 double scale_factor = _sscale + ((_escale - _sscale) * divisor);
102115 double origin_x = _sox + ((_eox - _sox) * divisor);
103116 double origin_y = _soy + ((_eoy - _soy) * divisor);
117+ stdout. printf( " index: %d , divisor: %g , scale: %g , ox: %g , oy: %g\n "
104118 _da. set_scale_factor( scale_factor );
105119 _da. set_origin( origin_x, origin_y );
106120 _da. queue_draw();
107- if ( _index <= _frames ) {
108- Timeout . add( _timeout, this . animate_scaling );
121+ if ( _index > _frames ) {
122+ _da. stop_animation. disconnect( stop_animating );
123+ return ( false );
109124 }
110- return ( false );
125+ return ( true );
111126 }
112127
113128 /* Stops any active animations */
114129 private void stop_animating () {
115- stdout. printf( " Stopping animation, index: %d\n "
116130 _index = (int )_frames;
131+ if ( _sscale != null ) {
132+ animate_scaling();
133+ } else {
134+ animate_positions();
135+ }
117136 }
118137
119138}
@@ -128,13 +147,6 @@ public class AnimationPositions : Object {
128147 private Array<double?> _y;
129148 private Array<Node ?> _node;
130149
131- public uint length {
132- private set {}
133- get {
134- return ( _node. length );
135- }
136- }
137-
138150 /* Default constructor */
139151 public AnimationPositions ( DrawArea da ) {
140152 _x = new Array<double?> ();
@@ -166,6 +178,11 @@ public class AnimationPositions : Object {
166178 }
167179 }
168180
181+ /* Returns the number of nodes in this structure */
182+ public uint length () {
183+ return ( _node. length );
184+ }
185+
169186 /* Returns the X position at the given index */
170187 public double x ( int index ) {
171188 return ( _x. index( index ) );
0 commit comments