From afd292142e816e02912408cd4bcb6cc238440bbc Mon Sep 17 00:00:00 2001
From: elvez <elvez@3ecf2c5c-341e-0410-92b4-d18e462d057c>
Date: Mon, 11 Sep 2006 00:40:34 +0000
Subject: [PATCH] - (Hopefully) improved readability of colored entities inside
 the schedulables tree and resource list

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1091 3ecf2c5c-341e-0410-92b4-d18e462d057c
---
 doc/sgpem2uman.texi               |  6 +++---
 src/backend/global_preferences.cc | 16 ++++++++--------
 src/resources_widget.cc           |  4 ++--
 src/schedulables_tree_widget.cc   |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/sgpem2uman.texi b/doc/sgpem2uman.texi
index 135c86a..cf2c85d 100644
--- a/doc/sgpem2uman.texi
+++ b/doc/sgpem2uman.texi
@@ -774,9 +774,9 @@ a request has no additional information other than its state, it makes sense to
 its associated subrequests on a single line. @*
 So the color of the @strong{at <n>:} represents the state of the
 request, the <n> being the instant at which the request is raised.@*
-Then there are a series of subrequests, which are displayed as colored @strong{->} (arrows), followed by a 
-resource name and two numbers separated by a slash. The color of the arrow represents the state of the subrequest,
-and the numbers between parenthesis are its "elapsed time"/"required time".
+Then there are a series of subrequests, which are displayed as @strong{->} (arrows), followed by a 
+colored resource name and two numbers separated by a slash. The color of the resource represents 
+the state of the subrequest, and the numbers between parenthesis are its "elapsed time"/"required time".
 
 @c % -------------------------------------------------
 @node The Resources list, The Simulation widget, The Schedulables/Requests tree, From the GUI
diff --git a/src/backend/global_preferences.cc b/src/backend/global_preferences.cc
index 0295ecd..80dd3f0 100644
--- a/src/backend/global_preferences.cc
+++ b/src/backend/global_preferences.cc
@@ -119,15 +119,15 @@ GlobalPreferences::get_schedulable_color(Schedulable::state st) const
   switch(st)
   {
   case Schedulable::state_running:
-    return "green";
+    return "ForestGreen";
   case Schedulable::state_ready:
-    return "yellow";
+    return "GoldenRod";
   case Schedulable::state_blocked:
     return "red";
   case Schedulable::state_terminated:
-    return "DimGray";
+    return "DarkSlateGray";
   case Schedulable::state_future:
-    return "LightGrey";
+    return "Gray";
   default:
     return "black";
   }
@@ -139,15 +139,15 @@ GlobalPreferences::get_request_color(Request::state st) const
   switch(st)
   {
   case Request::state_allocated:
-    return "green";
+    return "ForestGreen";
   case Request::state_allocable:
-    return "yellow";
+    return "GoldenRod";
   case Request::state_unallocable:
     return "red";
   case Request::state_exhausted:
-    return "DimGray";
+    return "DarkSlateGray";
   case Request::state_future:
-    return "LightGrey";
+    return "Gray";
   default:
     return "black";
   }
diff --git a/src/resources_widget.cc b/src/resources_widget.cc
index fd95196..5f46759 100644
--- a/src/resources_widget.cc
+++ b/src/resources_widget.cc
@@ -295,10 +295,10 @@ ResourcesWidget::_on_cell_name_data(Gtk::CellRenderer* cr,
   {
     SubRequest& sr = *(*it);
  
-    oss << "<span foreground=\"" 
+    oss << "<b><span foreground=\"" 
         << GlobalPreferences::get_instance().get_request_color(sr.get_state()) 
 	<< "\">  " << sr.get_request().get_thread().get_name() 
-	<< "</span>" << " (" 
+	<< "</span></b>" << " (" 
 	<< (sr.get_length() - sr.get_remaining_time())
 	<< "/" << sr.get_length() << ")";
   }
diff --git a/src/schedulables_tree_widget.cc b/src/schedulables_tree_widget.cc
index 04cf974..7685e91 100644
--- a/src/schedulables_tree_widget.cc
+++ b/src/schedulables_tree_widget.cc
@@ -667,9 +667,9 @@ SchedulablesTreeWidget::markup_request(Request& r)
     SubRequest& sr = *(*it);
     Resource& res = *(resources.find(sr.get_resource_key())->second);
  
-    oss << "<span foreground=\"" 
+    oss << " -&gt; <span foreground=\"" 
         << GlobalPreferences::get_instance().get_request_color(sr.get_state()) 
-	<< "\"> -&gt; </span>" << res.get_name() << " (" 
+	<< "\"><b>" << res.get_name() << "</b></span> (" 
 	<< (sr.get_length() - sr.get_remaining_time())
 	<< "/" << sr.get_length() << ")";
   }