Changeset 2493

Timestamp:

2006-09-17 13:52:53 (2 years ago)

Author:

scott

Message:

Information storage technique changed. Created better forward/back plus smooth transition between transcribing and reviewing transcriptions.

Files:

• scripts/trunk/annotool.py (modified) (20 diffs)

scripts/trunk/annotool.py

@@ -89 +89 @@
-     
-  def open_file(self, accel_group, window, keyval, modifier):
-
+if self.show_keystrokes: 
-    dialog = gtk.FileChooserDialog("Open",self.window,gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
-    dialog.set_default_response(gtk.RESPONSE_OK)
@@ -114 +114 @@
-    
-  def import_file(self, accel_group, window, keyval, modifier):
-
+if self.show_keystrokes: 
-    dialog = gtk.FileChooserDialog("Import",self.window,gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
-    dialog.set_default_response(gtk.RESPONSE_OK)
@@ -147 +147 @@
-    
-  def save_file(self, accel_group, window, keyval, modifier):
-
+if self.show_keystrokes: 
-    dialog = gtk.FileChooserDialog("Save",self.window,gtk.FILE_CHOOSER_ACTION_SAVE, (gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_SAVE,gtk.RESPONSE_OK))
-    dialog.set_default_response(gtk.RESPONSE_OK)
@@ -184 +184 @@
-  # Text overlay functions.
-  def toggle_track(self, accel_group, window, keyval, modifier):
-
+if self.show_keystrokes: 
-    keys = self.times.keys()
-    new_track = keys.index(self.current_track)+1
@@ -192 +192 @@
-  # Navigation functions.
-  def restart_clip(self, accel_group, window, keyval, modifier):
-
+if self.show_keystrokes: 
-    self.seek(self.start_time.get_text())
-    
-  def current_clip(self,current_time):
-  
-  while (x)
-  
-  
+
+while x
+
+
-     
-  def previous_clip(self, accel_group, window, keyval, modifier):
-
+if self.show_keystrokes: 
-    clip_now = self.current_clip(self.pipeline.query_position(gst.FORMAT_TIME)[0]/gst.MSECOND)
-    if clip_now > 0:
@@ -209 +209 @@
-      #Highlight chapter entry.
-      self.text.remove_tag(self.tag_current, self.text.get_start_iter(),self.text.get_end_iter())
-
+current_track + "-" + self.
-      start_iter = self.text.get_iter_at_mark(mark)
-      if not start_iter.begins_tag(self.tag_clip):
@@ -231 +231 @@
-    
-  def next_clip(self, accel_group, window, keyval, modifier):
-
+if self.show_keystrokes: 
-    #Only seek forward clips if more clips exist.
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-      #Highlight chapter entry.
-      self.text.remove_tag(self.tag_current, self.text.get_start_iter(),self.text.get_end_iter())
-times[self.current_track]['start'][-(x-1)
+current_track + "-" + self.times[self.current_track]['start'][clip_now+1
-      start_iter = self.text.get_iter_at_mark(mark)
-      if not start_iter.begins_tag(self.tag_clip):
@@ -256 +257 @@
-      self.textView.scroll_to_mark(mark,0.1)
-      
-      self.mode = 'review'
-      
-      self.start_time.set_text(self.times[self.current_track]['start'][-(x-1)])
-      self.end_time.set_text(self.times[self.current_track]['start'][-(x-2)])
-      if self.pipeline_duration==10:
-        self.pipeline_duration = self.pipeline.query_duration(gst.FORMAT_TIME)[0]/gst.MSECOND
-
-
-
+
+
+
+
+
-  
-  def just_play(self, accel_group, window, keyval, modifier):
-
+if self.show_keystrokes: 
-    if (self.pipeline.get_state()[1] != gst.STATE_PLAYING):
-      self.pipeline.set_state(gst.STATE_PLAYING);
+      self.progress.props.text = self.current_file + ": Playing."
-      
-  def seek(self,start,end=None):
-
-
+
+
+
+
+
-    else:
-      return self.pipeline.seek(1.0, gst.FORMAT_TIME, gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE, gst.SEEK_TYPE_SET, gst.MSECOND*to_ms(start), gst.SEEK_TYPE_SET, gst.MSECOND*to_ms(end))
-      
-widget, data=None
+accel_group, window, keyval, modifier
-    #Handles clip to text buffer, formatting and pipeline control.
-
+if self.show_keystrokes: 
-    if (self.pipeline.get_state()[1] == gst.STATE_PLAYING):
-      self.pipeline.set_state(gst.STATE_PAUSED);
-      self.textView.props.can_focus = True
-      current_time = self.pipeline.query_position(gst.FORMAT_TIME)[0]/gst.MSECOND
-      self.end_time.set_text(format_time(current_time))
@@ -289 +291 @@
-        self.pipeline_duration = self.pipeline.query_duration(gst.FORMAT_TIME)[0]/gst.MSECOND
-      self.progress.props.fraction = float(current_time)/self.pipeline_duration
-not self.mode=='review
+self.mode=='transcribe
-      text = self.clip_text.get_text()
-
+text != "" and 
-        #Chapter deocration.
-        self.text.insert(self.text.get_end_iter(),"\n\nChapter " + str(len(self.times["chapter"])+1) + ": ")
-        #Mark handling.
-        self.times["chapter"]['start'].append(self.start_time.get_text())
-
+
+
+
+
+
+
+
+
+
+
-        mark.set_visible(self.visible_marks)
-
-
-
-
+
-        # If using the last type def make sure doesn't have ';' instead of intended ':'
-        if text.find(":")==-1 and text.find(";")!=-1:
@@ -321 +329 @@
-        #Mark handling.
-        self.times["subtitle"]['start'].append(self.start_time.get_text())
-
-
+
+
+
-        #Insert and tag speaker string.  (will be invisible)
-        self.text.insert_with_tags(self.text.get_end_iter(),self.last_type_def.strip(":"),self.tag_speaker)
-        #Insert text.
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-      self.clip_text.set_text("")
-      self.start_time.set_text(format_time(self.pipeline.query_position(gst.FORMAT_TIME)[0]/gst.MSECOND))
-      self.end_time.set_text("xx:xx:xx.xxx")
-      self.textView.props.can_focus = False
-      self.scroll_to_bottom()
-      self.pipeline.set_state(gst.STATE_PLAYING);
@@ -347 +349 @@
-      self.start_time.set_text(format_time(self.pipeline.query_position(gst.FORMAT_TIME)[0]/gst.MSECOND))
-      self.end_time.set_text("xx:xx:xx.xxx")
-      self.textView.props.can_focus = False
-      self.pipeline.set_state(gst.STATE_PLAYING);
-      self.progress.props.text = self.current_file + ": Playing."
@@ -365 +366 @@
-      times.sort(lambda x,y: cmp(to_ms(x), to_ms(y)))
-      for time in times:
-
+key + "-" + 
-        
-        #Checks that the next mark is not at the same location.
-        try:
-
+key + "-" + 
-        except:
-          count = 0
@@ -377 +378 @@
-          tmp_iter = iter.copy()
-          tmp_iter.forward_to_tag_toggle(self.tag_clip)
-
+key + "-" + 
-          con = self.text.get_iter_at_mark(tmp_mark).compare(tmp_iter)
-          if con>0 or (con==0 and tmp_iter.ends_tag(self.tag_clip)):
@@ -406 +407 @@
-          last_iter.forward_to_tag_toggle(None)
-          desc = self.text.get_text(iter,last_iter)
+          if desc != "/placeholder/":
+            desc = desc.strip("/")
-          if len(times)>x:
-            clip = [time,times[x],desc]
@@ -519 +522 @@
-      #Make sure last_time has a record for the track.
-      if not last_time.has_key(track):
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        
-      # Add current entry.
@@ -551 +542 @@
-          self.times["chapter"]['start'].append(start_time)
-          self.last_type_def = ')'
-
-
+
+
+
+
+
+
+
-        
-        #Insert and tag speaker string.  (will be invisible)
-
-
+
-        #Insert text.
-        self.text.insert_with_tags(self.text.get_end_iter(),desc.strip(),self.tag_clip)
+        if end_time != None:
+          if track.startswith('subtitle'): 
+            self.times["subtitle"]['end'].append(end_time)
+            mark = self.text.create_mark("subtitle-" + end_time,self.text.get_end_iter(),True)
+          else:
+            self.times["chapter"]['end'].append(end_time)
+            mark = self.text.create_mark("chapter-" + end_time,self.text.get_end_iter(),True)
+          mark.set_visible(self.visible_marks)
+          ended_previous = True
+        else:
+          ended_previous = False
-        last_time[track] = end_time
-      elif not ended_previous:
-        if track.startswith('subtitle'): 
-          self.times["subtitle"]['end'].append(start_time)
+          mark = self.text.create_mark("subtitle-" + start_time,self.text.get_end_iter(),True)
-        else:
-          self.times["chapter"]['end'].append(start_time)
-mark = self.text.create_mark(
+  mark = self.text.create_mark("chapter-" + 
-        mark.set_visible(self.visible_marks)
-      x += 1
-      self.progress.props.fraction = x/total_clips
-    self.pipeline.get_state() # Let pipeline catch up to script.
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    f.close()
-    return 
@@ -592 +601 @@
-      start_time = format_time(int(node.getAttribute('clipBegin'))/29.97*1000)
-      end_time = format_time(int(node.getAttribute('clipEnd'))/29.97*1000)
-  
+
-      # If a gap exists between previous end and current start add a mark to end previous clip.
-if last_time != start_time and last_time!=None:
-  self.times["chapter"]["end"].append(last_time)
-las
+self.times["chapter"]["start"].append(start_time)
+if last_time!=start_time:
+"chapter-" + star
-        mark.set_visible(self.visible_marks)
-        ended_previous = True
-      else:
-        ended_previous = False
-        
-      # Add current entry.
-      self.text.insert(self.text.get_end_iter(),"\n\nChapter " + str(x+1) + ": ")
-      self.times["chapter"]["start"].append(start_time)
-      self.last_type_def = ')'
-
+
+
+
+
+
-      mark.set_visible(self.visible_marks)
-      
-      #Insert text.
-      self.text.insert_with_tags(self.text.get_end_iter(),'/placeholder/',self.tag_clip)
-      last_time = end_time
-      x += 1
@@ -643 +649 @@
-    self.accels.connect_group(gtk.gdk.keyval_from_name("p"),gtk.gdk.CONTROL_MASK,gtk.ACCEL_VISIBLE,self.just_play) # ctrl - p
-    self.accels.connect_group(gtk.gdk.keyval_from_name("i"),gtk.gdk.CONTROL_MASK,gtk.ACCEL_VISIBLE,self.import_file) # ctrl - i
+    self.accels.connect_group(gtk.gdk.keyval_from_name("Return"),0,gtk.ACCEL_VISIBLE,self.enter_activated) # enter
-    self.window.add_accel_group(self.accels)
-    
@@ -680 +687 @@
-    
-    self.clip_text = gtk.Entry()
-    self.clip_text.connect("activate",self.enter_activated)
-    self.hbox.pack_start(self.start_time, False, False)
-    self.hbox.pack_start(self.end_time, False, False)
@@ -726 +732 @@
-    self.pipeline_duration = 1000 #Something non-zero to avoid non-zero errors.
-    self.mode = 'transcribe'
+    self.show_keystrokes = False
+    self.debug = False
-    
-    self.window.show_all()