[Cvs-annodex] commit (annodex): keystroke/trunk/clip.py keystroke/trunk/keystroke.py keystroke/trunk/scriptview.py

[scott]

Update of /var/local/lib/svn/annodex (new revision 2548)

Modified files:
   keystroke/trunk/clip.py
   keystroke/trunk/keystroke.py
   keystroke/trunk/scriptview.py

Log Message:
Fixed assumption that the default track always exists.  Fixed clip storage of track upon initialization.

Modified: keystroke/trunk/clip.py
===================================================================
--- keystroke/trunk/clip.py	2006-11-15 08:42:58 UTC (rev 2547)
+++ keystroke/trunk/clip.py	2006-11-17 08:20:50 UTC (rev 2548)
@@ -42,6 +42,7 @@
     self.__end = end
     self.__text = text
     self.__speaker = speaker
+    self.__track = track
     
   def set_start(self,time):
     """Sets the start time.

Modified: keystroke/trunk/keystroke.py
===================================================================
--- keystroke/trunk/keystroke.py	2006-11-15 08:42:58 UTC (rev 2547)
+++ keystroke/trunk/keystroke.py	2006-11-17 08:20:50 UTC (rev 2548)
@@ -303,7 +303,7 @@
     
   def push_text(self):
     data = self.scriptview.export_buffer()
-    self.textsource.set_cliplist(data["default"])
+    self.textsource.set_cliplist(data[data.keys()[0]])
       
   def enter_activated(self, accel_group, window, keyval, modifier):
     '''Callback which handles actions upon enter activation.'''

Modified: keystroke/trunk/scriptview.py
===================================================================
--- keystroke/trunk/scriptview.py	2006-11-15 08:42:58 UTC (rev 2547)
+++ keystroke/trunk/scriptview.py	2006-11-17 08:20:50 UTC (rev 2548)
@@ -44,22 +44,26 @@
     self.props.can_focus = True
     self.set_buffer(self.__text)
 
-    self.__tracks = {"default" : cliplist.cliplist()}
-    self.__last_track = "subtitle-en"
+    self.__tracks = {}
+    self.__last_track = "subtitle-en_US"
     self.__last_speaker = None
-    self.__current_track = "default"
+    self.__current_track = None
     self.__visible_marks = False
     self.__ended_previous = True
 
   def append(self, clip):
     """This adds text at the end of the buffer."""
-    if not clip.get_track():
+    if clip.get_track() == None:
       clip.set_track(self.__last_track)
     if not clip.get_speaker():
       clip.set_speaker(self.__last_speaker)
     if not self.__tracks.has_key(clip.get_track()):
       self.__tracks[clip.get_track()] = cliplist.cliplist()
     
+    # Make sure current track is valid.
+    if not self.__tracks.has_key(self.__current_track):
+      self.__current_track = clip.get_track()
+    
     # Add track type specific decorations.
     if clip.get_track().startswith('subtitle') and not clip.get_speaker()==self.__last_speaker:
       if self.__tracks[clip.get_track()].length()!=0:
@@ -102,11 +106,13 @@
        Parameters:
          time: The time in a clip."""
     last_clip = None
+
     for current_clip in self.__tracks[self.__current_track]:
       if time>=current_clip.get_start():
         last_clip = current_clip
       else:
         break
+
     if last_clip != None and time>last_clip.get_end():
       return None
 
@@ -205,7 +211,7 @@
   def clear(self):
     """Clears the data from the scriptview."""
     self.__text.delete(self.__text.get_start_iter(),self.__text.get_end_iter())
-    self.__tracks = {"default" : cliplist.cliplist()}
+    self.__tracks = {}
   
   def scroll_to_bottom(self):
     self.scroll_to_iter(self.__text.get_end_iter(),0.1)


-- 
scott