Changeset 897

Timestamp:

08/16/07 12:13:05 (1 year ago)

Author:

nikhilsharma

Message:

Updated to fix in/out points, marker selection, and other tracking bugs on the timeline, though one bug remains - marker thumb plays through the last active in/out point region in play mode.

Files:

• trunk/jahwidgets/src/qt3/widgets/timelineSlider.cpp (modified) (5 diffs)

trunk/jahwidgets/src/qt3/widgets/timelineSlider.cpp

@@ -152 +152 @@
         }
 
-        int markerClamp( int i ) const
-        {
-                return std::max( std::min( i, activeRange->out ), activeRange->in );
-        }
-
         int inClamp( int i ) const
         {
+                // Change input point to a valid point below the current out point
                 i = std::max( std::min( i, activeRange->out-1 ), min );
 
                 // And clamp above neighbouring out point
+                for ( RangeSet::const_reverse_iterator I = rangeContainer.rbegin();
+                          I != rangeContainer.rend();
+                          ++I ) 
+                {
+                        if ( *I == activeRange ) continue;
+
+                        if ( (*I)->out < activeRange->out )     {
+                                if ( i <= (*I)->out ) {
+                                        i = (*I)->out - 1;
+                                        break;
+                                }
+                        }
+                }
+
+                return i;
+        }
+
+        int outClamp( int i ) const
+        {
+                // Change input point to a valid point above the current in point
+                i = std::min( std::max( i, activeRange->in+1 ), max );
+
+                // And clamp below neighbouring in point
                 for ( RangeSet::const_iterator I = rangeContainer.begin();
                           I != rangeContainer.end();
@@ -168 +187 @@
                         if ( *I == activeRange ) continue;
 
-                        if ( (*I)->out > activeRange->out ) break;
-
-                        if ( i <= (*I)->out ) {
-                                i = (*I)->out + 1;
-                                break;
-                        }
-                }
-
-                return i;
-        }
-
-        int outClamp( int i ) const
-        {
-                i = std::max( std::min( i, max ), activeRange->in );
-
-                // And clamp below neighbouring in point
-                for ( RangeSet::const_reverse_iterator I = rangeContainer.rbegin();
-                          I != rangeContainer.rend();
-                          ++I ) 
-                {
-                        if ( *I == activeRange ) continue;
-
-                        if ( (*I)->out < activeRange->in ) break;
-
-                        if ( i >= (*I)->in ) {
-                                i = (*I)->in - 1;
-                                break;
+                        if ( (*I)->in > activeRange->in ) {
+                                if ( i >= (*I)->in ) {
+                                        i = (*I)->in + 1;
+                                        break;
+                                }
                         }
                 }
@@ -585 +582 @@
 int TimelineSlider::insertRange( int in, int out )
 {
-        qDebug( "insertRange: %d %d", in, out );
+        //qDebug( "insertRange: %d %d", in, out );
 
         // Clamp to min/max, but otherwise leave as-is
@@ -599 +596 @@
 void TimelineSlider::removeRangeWithId( int id ) 
 {
-        qDebug( "removeRangeWithId: %d", id );
+        //qDebug( "removeRangeWithId: %d", id );
 
         RangeSet::iterator I = std::find_if( m_impl->rangeContainer.begin(),
@@ -1043 +1040 @@
 {
         // tracking check avoids anyone messing with the value during mouse tracking
-        if ( val != m_impl->v && m_impl->tracking != PrivateTimeline::VALUE )
+        if ( val != m_impl->v && ( (m_impl->tracking != PrivateTimeline::VALUE) &&
+                                                        (m_impl->tracking != PrivateTimeline::THUMB) ) )
         {
                 _setValue( val );