Merge lp:~nico-inattendu/luciole/bug_521371 into lp:luciole/0.8

[NicoInattendu]

Fix for bug #521371

[NicoInattendu (nico-inattendu)]

Corrections after merge rejection

[NicoInattendu (nico-inattendu)]

A test ( unit test ?) for change to several / single framerate in projetc properties could be fine ? Find a way to do it.

[NicoInattendu (nico-inattendu)]

review: Approve

=== modified file 'lucioLib/gui/dialog_project_properties.py'
--- lucioLib/gui/dialog_project_properties.py	2010-02-07 17:46:34 +0000
+++ lucioLib/gui/dialog_project_properties.py	2010-02-14 06:30:30 +0000
@@ -31,8 +31,12 @@
 import pango
 
 from .. import luciole_constants as LCONST
+from .. import luciole_exceptions as LEXCEP
 import webcam_detection_widget as LWDW
 
+import logging 
+module_logger = logging.getLogger('luciole')
+
 
 #type of widgets for displaying webcam data
 (LABEL,ENTRY,SCALE)=range(3)
@@ -102,6 +106,8 @@
     
     def __init__(self,main_window,  project, cb_project_change) :
         """ create a Dialog with project properties and display it"""
+        # init logger
+        self.logger = logging.getLogger('luciole')
         self._dialog = gtk.Dialog   (   _(self._title),
                                         main_window,
                                         gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
@@ -111,10 +117,11 @@
                                     )
         self._project = project
         self._cb_project_change = cb_project_change
-        
         # keep framerate list and framerate selected those value can change
         self._framerate_selected = None
         self._framerate_list = None
+        self.webcam_widget_table_position = 0
+
         if self._project['hardtype'] == LCONST.WEBCAM and  self._project['webcam_data'] != {} :
             self._framerate_selected = self._project['webcam_data']['framerate_selected']
             self._framerate_list = self._project['webcam_data']['framerate_list']
@@ -232,9 +239,20 @@
             widget.set_alignment(xalign = 0.0, yalign = 0.5)     # left justification 
             widget.set_text("%s"%self._project['webcam_data'][key])
         elif self._WEBCAM_PREFS[key]['type'] == SCALE :
-            widget = Framerate_scale(self._project['webcam_data'][key],
-                                    self._project['webcam_data']['framerate_selected'],
-                                    self._cb_framerate_selected)
+            # display scale bar if several framerates are available 
+            if len( self._project['webcam_data'][key]) > 1 :
+                widget = Framerate_scale(self._project['webcam_data'][key],
+                                        self._project['webcam_data']['framerate_selected'],
+                                        self._cb_framerate_selected)
+            elif len( self._project['webcam_data'][key]) == 1 :
+                widget = gtk.Label()
+                widget.set_alignment(xalign = 0.0, yalign = 0.5)     # left justification
+                # in that case framerate_selected = framerate_list[0]
+                framerate = int(self._project['webcam_data']['framerate_selected'][0]/self._project['webcam_data']['framerate_selected'][1])
+                widget.set_text("%s"%framerate)
+            else :
+                self.logging.debug('Something goes wrong')
+            self.webcam_widget_table_position = row
 
         self.webcam_widgets[key] = widget     # save the widget
         
@@ -334,9 +352,77 @@
             for (w_key, w_widget) in self.webcam_widgets.iteritems() :
                 # Sepcific operation for framerate_list widget
                 if w_key == 'framerate_list' :
-                    w_widget.refresh(project_data['webcam_data']['framerate_list'],
-                                    project_data['webcam_data']['framerate_selected'] )
                     self._framerate_list = project_data['webcam_data']['framerate_list']
+                    self._framerate_selected = project_data['webcam_data']['framerate_selected']
+                    # 2 cases only one framerate or several framerates : 
+                    # display a Label or a Scale 
+                    
+                    # current widget is a label
+                    if type(w_widget) == gtk.Label :
+                        # how many framerates in framerate list 
+                        if len( self._framerate_list) > 1 :
+                            # Sevaral framerates
+                            # Hide current widget
+                            w_widget.hide()
+                            # create a Framerate_scale widget
+                            widget = Framerate_scale(self._framerate_list,
+                                        self._framerate_selected,
+                                        self._cb_framerate_selected)
+                            
+                            
+                            # Parent is a table attach new widget
+                            w_widget.parent.attach( widget, 1, 2, 
+                                                    self.webcam_widget_table_position, 
+                                                    self.webcam_widget_table_position+1,
+                                                    xpadding = 10 )
+                            
+                            self.webcam_widgets[w_key] = widget     # replace the widget
+                        
+                        elif len( self._framerate_list ) == 1 :
+                            # only one framerate update label 
+                            w_text = int(   self._framerate_selected[0] / 
+                                            self._framerate_selected[1])
+                            w_text ="%s"%w_text
+                            w_widget.set_text(w_text)
+                        else :
+                            # Not normal
+                            lerr =  " 0 is an invalid number of framerates."
+                            raise LEXCEP.LucioException, lerr
+ 
+                    # current widegt is a framerate scale     
+                    else :
+                        # how many framerates in framerate list 
+                        if len(self._framerate_list) > 1 :
+                            # Several framerates
+                            # refresh Framerate_scale widget 
+                            w_widget.refresh(self._framerate_list,self._framerate_selected )
+
+                        elif len( self._framerate_list ) == 1 :
+                            # only one framerate is available
+                            # Hide current widget
+                            w_widget.hide()
+                            
+                            # create a Label widget
+                            widget = gtk.Label()
+                            widget.set_alignment(xalign = 0.0, yalign = 0.5)     # left justification
+                            w_text = int(   self._framerate_selected[0]/
+                                            self._framerate_selected[1])
+                            w_text ="%s"%w_text
+                            widget.set_text("%s"%framerate)
+
+                            # Parent is a table attach new widget
+                            w_widget.parent.attach( widget, 1, 2, 
+                                                    self.webcam_widget_table_position, 
+                                                    self.webcam_widget_table_position+1,
+                                                    xpadding = 10 )
+                            
+                            self.webcam_widgets[w_key] = widget     # replace the widget
+                        else :
+                            # Not normal
+                            lerr =  " 0 is an invalid number of framerates."
+                            raise LEXCEP.LucioException, lerr
+
+
                 # for other webcam widgets : only text to update
                 else :
                     if  project_data['webcam_data'].has_key(w_key) :