[Orca-checkins] r344 - trunk/orca/lib/Orca

[Blair Zajac]

Author: blair
Date: Sat Jun 12 14:07:53 2004
New Revision: 344

Modified:
   trunk/orca/lib/Orca/Config.pm
   trunk/orca/lib/Orca/SourceFile.pm
Log:
* lib/Orca/Config.pm,
* lib/Orca/SourceFile.pm:
  Rename Orca::Config::get_color to Orca::Config::data_index_to_color.


Modified: trunk/orca/lib/Orca/Config.pm
==============================================================================
--- trunk/orca/lib/Orca/Config.pm	(original)
+++ trunk/orca/lib/Orca/Config.pm	Sat Jun 12 14:07:53 2004
@@ -34,7 +34,7 @@
 
 # Export the main subroutine to load configuration data and a subroutine
 # to get a color indexed by an integer.
-push(@EXPORT_OK, qw(load_config get_color));
+push(@EXPORT_OK, qw(data_index_to_color load_config));
 
 # The following array and hashes hold the contents of the
 # configuration file.
@@ -228,7 +228,7 @@
                                     'c7eaff',   # Ice blue
                                     'd3ff52');  # Gatorade green
 
-sub get_color {
+sub data_index_to_color {
   $cc_default_colors[$_[0] % @cc_default_colors];
 }
 
@@ -825,7 +825,7 @@
     # Set the colors of any data not defined.
     $plot->{color} = [] unless defined $plot->{color};
     for (my $k=@{$plot->{color}}; $k<$number_datas; ++$k) {
-      $plot->{color}[$k] = get_color($k);
+      $plot->{color}[$k] = data_index_to_color($k);
     }
 
     # Check each line type setting.  Use the last line_type to set any

Modified: trunk/orca/lib/Orca/SourceFile.pm
==============================================================================
--- trunk/orca/lib/Orca/SourceFile.pm	(original)
+++ trunk/orca/lib/Orca/SourceFile.pm	Sat Jun 12 14:07:53 2004
@@ -21,7 +21,7 @@
                            @config_groups
                            @config_groups_names
                            @config_plots
-                           get_color);
+                           data_index_to_color);
 use Orca::OldState      qw($orca_old_state);
 use Orca::DataFile      qw(ORCA_DATAFILE_LAST_INDEX);
 use Orca::OpenFileHash  qw($open_file_cache);
@@ -436,7 +436,8 @@
             $plot->{data_type}[$new_data_index-1];
         }
         unless (defined $plot->{color}[$new_data_index]) {
-          $plot->{color}[$new_data_index] = get_color($new_data_index);
+          $plot->{color}[$new_data_index] =
+            data_index_to_color($new_data_index);
         }
         unless (defined $plot->{legend}[$new_data_index]) {
           $plot->{legend}[$new_data_index] = $original_legend;