Changeset 2069 for trunk/gui

Timestamp:

Jan 27, 2011, 12:48:57 AM (14 years ago)

Author:

dkearney

Message:

adding ability to pass a directory holding thumbnail images to the videochooer. if it can find a premade thumbnail image, it doesn't have to open each video and dynamically create the images

Location:

trunk/gui/scripts

Files:

• videochooser.tcl (modified) (2 diffs)
• videochooserinfo.tcl (modified) (3 diffs)

trunk/gui/scripts/videochooser.tcl

@@ -22 +22 @@
     itk_option define -height height Height 300
     itk_option define -variable variable Variable ""
+    itk_option define -thumbsdir thumbsdir Thumbsdir ""
 
     constructor { args } {
@@ -82 +83 @@
 
         set ci [Rappture::VideoChooserInfo $f.vi${_vcnt} \
-                    -variable ${_variable}]
+                    -variable ${_variable} \
+                    -thumbsdir $itk_option(-thumbsdir)]
         $ci load $path ""
         pack $ci -expand yes -fill both -side left

trunk/gui/scripts/videochooserinfo.tcl

@@ -23 +23 @@
     itk_option define -selectedheight selectedheight Selectedheight 63
     itk_option define -variable variable Variable ""
+    itk_option define -thumbsdir thumbsdir Thumbsdir ""
 
     constructor { args } {
@@ -94 +95 @@
 
     set _path $path
-
-    set movie [Rappture::Video file ${_path}]
-    $movie seek 60
+    set preview_fname ""
+    set selected_fname ""
 
     set _preview [image create photo]
     set _selected [image create photo]
+
+    if {[string compare "" $itk_option(-thumbsdir)] != 0} {
+        set root [file tail [file rootname ${_path}]]
+        set preview_fname [file join $itk_option(-thumbsdir) ${root}_${_width}x${_height}.png]
+        set selected_fname [file join $itk_option(-thumbsdir) ${root}_${_selectedwidth}x${_selectedheight}.png]
+
+        if {[file readable $preview_fname] && [file readable $selected_fname]} {
+            set fid [open $preview_fname r]
+            fconfigure $fid -translation binary
+            ${_preview} put [read $fid]
+            close $fid
+
+            set fid [open $selected_fname r]
+            fconfigure $fid -translation binary
+            ${_selected} put [read $fid]
+            close $fid
+        }
+    } else {
+        # there are some incomplete movies that don't open up
+        set err [catch {
+            set movie [Rappture::Video file ${_path}]
+            $movie seek 60
+
+            ${_preview} put [$movie get image ${_width} ${_height}]
+            ${_selected} put [$movie get image ${_selectedwidth} ${_selectedheight}]
+
+            $movie release
+        }]
+        if {$err} {
+            puts stderr "Error while opening movie: $movie"
+            return
+        }
+    }
 
     set cw [expr round(${_selectedwidth}/2.0)]
@@ -109 +142 @@
         -tags preview
 
-    ${_preview} put [$movie get image ${_width} ${_height}]
-    ${_selected} put [$movie get image ${_selectedwidth} ${_selectedheight}]
-
-    $movie release
-
     $itk_component(main) bind preview <ButtonPress-1> [itcl::code $this _bindings b1press]
     $itk_component(main) bind preview <Enter> [itcl::code $this _bindings enter]