[script][common_options,figure,test_script] Change legends options to

titles for histograms.

bob/measure/script/common_options.py

@@ -491,7 +491,7 @@ def legends_option(**kwargs):
             return value
         return click.option(
             '-lg', '--legends', type=click.STRING, default=None,
-            help='The title for each system comma separated. '
+            help='The legend for each system comma separated. '
             'Example: --legends ISV,CNN',
             callback=callback, **kwargs)(func)
     return custom_legends_option
@@ -779,7 +779,7 @@ def hist_command(docstring):
         @eval_option()
         @hide_dev_option()
         @n_bins_option()
-        @legends_option()
+        @titles_option()
         @no_legend_option()
         @legend_ncols_option()
         @criterion_option()

bob/measure/script/figure.py

@@ -680,11 +680,13 @@ class Hist(PlotBase):
         self._y_label = 'Probability density'
         self._x_label = 'Score values'
         self._end_setup_plot = False
-        if self._legends is not None and len(self._legends) == self.n_systems \
+        # overide _titles of PlotBase
+        self._titles = ctx.meta.get('titles')
+        if self._titles is not None and len(self._titles) == self.n_systems \
            and not self._hide_dev:
             # use same legend for dev and eval if needed
-            self._legends = [x for pair in zip(self._legends, self._legends)
-                             for x in pair]
+            self._titles = [x for pair in zip(self._titles, self._titles)
+                            for x in pair]
 
     def compute(self, idx, input_scores, input_names):
         ''' Draw histograms of negative and positive scores.'''
@@ -740,8 +742,8 @@ class Hist(PlotBase):
 
     def _get_title(self, idx, dflt=None):
         ''' Get the histo title for the given idx'''
-        title = self._legends[idx] if self._legends is not None \
-            and idx < len(self._legends) else dflt
+        title = self._titles[idx] if self._titles is not None \
+            and idx < len(self._titles) else dflt
         title = title or self._title_base
         title = '' if title is not None and not title.replace(
             ' ', '') else title

bob/measure/test_script.py

@@ -144,7 +144,7 @@ def test_hist():
     with runner.isolated_filesystem():
         result = runner.invoke(commands.hist, ['-e', '--criterion', 'eer','--output',
                                                'HISTO.pdf',  '-b',  '30,20',
-                                               '-sp', 221, '-lg', 'A,B',
+                                               '-sp', 221, '-ts', 'A,B',
                                                dev1, test1, dev2, test2])
         if result.output:
             click.echo(result.output)
@@ -159,7 +159,7 @@ def test_hist_legends():
 
     # share same legend for dev/eval of each system
     with runner.isolated_filesystem():
-        result = runner.invoke(commands.hist, ['-e', '-sp', 221, '-lg', 'A,B',
+        result = runner.invoke(commands.hist, ['-e', '-sp', 221, '-ts', 'A,B',
                                                dev1, test1, dev2, test2])
         if result.output:
             click.echo(result.output)
@@ -167,7 +167,7 @@ def test_hist_legends():
 
     # individual legends for dev and eval
     with runner.isolated_filesystem():
-        result = runner.invoke(commands.hist, ['-e', '-sp', 221, '-lg',
+        result = runner.invoke(commands.hist, ['-e', '-sp', 221, '-ts',
                                                'A,B,C,D',
                                                dev1, test1, dev2, test2])
         if result.output: