Changeset 895

Timestamp:

08/15/07 06:42:30 (1 year ago)

Author:

nikhilsharma

Message:

- included support for thumb-nailing (thumbnail selection)
- debugged the in/out point selection and playback

Files:

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

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

@@ -126 +126 @@
 struct TimelineSlider::PrivateTimeline
 {
-        enum Tracking { NONE, VALUE, IN, OUT };
+        enum Tracking { NONE, VALUE, IN, OUT, THUMB };
 
         PrivateTimeline( TimelineSlider* p )
@@ -152 +152 @@
         }
 
+        int markerClamp( int i ) const
+        {
+                return std::max( std::min( i, activeRange->out ), activeRange->in );
+        }
+
         int inClamp( int i ) const
         {
@@ -277 +282 @@
         bool hitInRect( QPoint pos ) const
         {
-                // We've got to be in the thumb rect and outside the currentMarkerRect region
+                // We've got to be in the thumb rect and outside the currentMarkerRect/thumbnailMarkerRect region
                 if ( inRect().contains( pos ) == false ) return false;
-                return true;
+
+                // else check the marker/thumbnail rect
+                QRect markerRect = currentMarkerRect();
+                QRect thumbnailRect = thumbnailMarkerRect();
+                return !( markerRect.contains( pos ) && thumbnailRect.contains( pos ) );
         }
 
         bool hitOutRect( QPoint pos ) const
         {
-                // We've got to be in the thumb rect and outside the currentMarkerRect region
+                // We've got to be in the thumb rect and outside the currentMarkerRect/thumbnailMarkerRect region
                 if ( outRect().contains( pos ) == false ) return false;
-                return true;
+
+                // else check the marker/thumbnail rect
+                QRect markerRect = currentMarkerRect();
+                QRect thumbnailRect = thumbnailMarkerRect();
+                return !( markerRect.contains( pos ) && thumbnailRect.contains( pos ) );
         }
 
@@ -569 +582 @@
 }
 
+// Insert an in/out range and return range id
 int TimelineSlider::insertRange( int in, int out )
 {
@@ -582 +596 @@
 }
 
+// Remove an in/out range
 void TimelineSlider::removeRangeWithId( int id ) 
 {
@@ -608 +623 @@
 }
 
+// Return an array containing all in/out ranges
 TimelineSlider::RangeArray TimelineSlider::allRanges() const
 {
@@ -622 +638 @@
 }
 
+// Returns a range specified by a range id
 boost::optional<TimelineSlider::Range> TimelineSlider::rangeWithId( int id ) const
 {
@@ -679 +696 @@
 }
 
+// Returns currently active in/out range id
 int TimelineSlider::activeRangeId() const
 {
@@ -684 +702 @@
 }
 
+// Sets a range id to active
 void TimelineSlider::setActiveRangeId( int id )
 {
@@ -836 +855 @@
         setMouseTracking( !m_impl->thumb.active.isNull() 
                                           || !m_impl->inThumb.active.isNull() 
-                                          || !m_impl->outThumb.active.isNull() );
+                                          || !m_impl->outThumb.active.isNull()
+                                          || !m_impl->thumbnailMarker.active.isNull() );
         update();
 }
@@ -894 +914 @@
         setMouseTracking( !m_impl->thumb.active.isNull() 
                                           || !m_impl->inThumb.active.isNull() 
-                                          || !m_impl->outThumb.active.isNull() );
+                                          || !m_impl->outThumb.active.isNull()
+                                          || !m_impl->thumbnailMarker.active.isNull() );
         update();
 }
@@ -930 +951 @@
         setMouseTracking( !m_impl->thumb.active.isNull() 
                                           || !m_impl->inThumb.active.isNull() 
-                                          || !m_impl->outThumb.active.isNull() );
+                                          || !m_impl->outThumb.active.isNull()
+                                          || !m_impl->thumbnailMarker.active.isNull() );
         update();
 }
@@ -953 +975 @@
 {
         m_impl->thumbnailMarker.normal = p;
-        setMouseTracking( !m_impl->thumbnailMarker.normal.isNull() 
-                                          || !m_impl->thumbnailMarker.normal.isNull() 
-                                          || !m_impl->thumbnailMarker.normal.isNull() );
+        setMouseTracking( !m_impl->thumb.active.isNull() 
+                                          || !m_impl->inThumb.active.isNull() 
+                                          || !m_impl->outThumb.active.isNull()
+                                          || !m_impl->thumbnailMarker.active.isNull() );
         update();
 }
@@ -967 +990 @@
 {
         m_impl->thumbnailMarker.active = p;
-        setMouseTracking( !m_impl->thumbnailMarker.active.isNull() 
-                                          || !m_impl->thumbnailMarker.active.isNull() 
+        setMouseTracking( !m_impl->thumb.active.isNull() 
+                                          || !m_impl->inThumb.active.isNull() 
+                                          || !m_impl->outThumb.active.isNull()
                                           || !m_impl->thumbnailMarker.active.isNull() );
         update();
@@ -989 +1013 @@
         emit thumbnailFrameChanged( m_impl->thumbnailFrame );
         emit thumbnailFrame_changed();
+
+        update();
 }
 
@@ -1067 +1093 @@
 
         // Prioritise the marker
+        // Marker rect is selected
         if ( m_impl->currentMarkerRect().contains( e->pos() ) )
         {
@@ -1072 +1099 @@
                 m_impl->tracking = PrivateTimeline::VALUE;
         }
-        else if ( m_impl->inRect().contains( e->pos() ) )       // hitInRect -> InRect
+        // An in point is selected
+        else if ( m_impl->hitInRect( e->pos() ) )
         {
                 m_impl->mouseDownValue = activeInValue();
                 m_impl->tracking = PrivateTimeline::IN;
-                setSelectedPoint( m_impl->activeRange->in );
-        }
-        else if ( m_impl->outRect().contains( e->pos() ) )      // hitOutRect -> OutRect
+                setSelectedPoint( m_impl->activeRange->in );    // Change the active In point range
+        }
+        // An out point is selected
+        else if ( m_impl->hitOutRect( e->pos() ) )
         {
                 m_impl->mouseDownValue = activeOutValue();
                 m_impl->tracking = PrivateTimeline::OUT;
-                setSelectedPoint( m_impl->activeRange->out );
-        }
+                setSelectedPoint( m_impl->activeRange->out );   // Change the active Out point range
+        }
+        // Thumbnail marker rect is selected
+        else if ( m_impl->thumbnailMarkerRect().contains( e->pos() ) )
+        {
+                m_impl->mouseDownValue = thumbnailFrame();
+                m_impl->tracking = PrivateTimeline::THUMB;
+        }
+        // Move marker rect to the the spot hit on the private timeline
         else
         {
@@ -1135 +1171 @@
                 e->accept();
         }               
-        // else hit test the in/out points (and marker) and re-paint if necessary
-        else 
-        {
+        else if ( m_impl->tracking == PrivateTimeline::THUMB )
+        {
+                setThumbnailFrame( m_impl->convertToValue( m_impl->convertToPixel( m_impl->mouseDownValue ) + delta ) );
+                e->accept();
+        }
+        // else hit test the in/out points (and marker/thumbnail) and re-paint if necessary
+        else {
                 // Avoid an update unless we need one
                 bool needsUpdate = false;
@@ -1146 +1186 @@
                 needsUpdate |= m_impl->inThumb.setActive( m_impl->hitInRect( e->pos() ) && !markerActive );
                 needsUpdate |= m_impl->outThumb.setActive( m_impl->hitOutRect( e->pos() ) && !markerActive );
+                needsUpdate |= m_impl->thumbnailMarker.setActive( m_impl->thumbnailMarkerRect().contains( e->pos() ) && !markerActive );
                 if ( needsUpdate ) 
                         update();
@@ -1157 +1198 @@
         m_impl->inThumb.setActive( false );
         m_impl->outThumb.setActive( false );
+        m_impl->thumbnailMarker.setActive( false );
         update();
 }