Mercurial > octave-nkf

diff src/graphics.cc @ 6938:688ef9440022

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-10-01 15:59:33 by dbateman]
author dbateman
date Mon, 01 Oct 2007 16:01:53 +0000
parents 1401a79af68c
children 6bbf56a9718a
line wrap: on
line diff
--- a/src/graphics.cc	Mon Oct 01 10:08:31 2007 +0000
+++ b/src/graphics.cc	Mon Oct 01 16:01:53 2007 +0000
@@ -122,8 +122,8 @@
   return retval;
 }
 
-color_property::color_property (const octave_value& val, const radio_values &v)
-  : radio_val (v), current_val ()
+color_property::color_property (const octave_value& val)
+  : radio_val (), current_val ()
 {
   // FIXME -- need some error checking here.
 
@@ -133,19 +133,11 @@
 
       if (! s.empty ())
 	{
-	  if (radio_val.contains (s))
-	    {
-	      current_val = s;
-	      current_type = radio_t;
-	    }
-          else
+	  color_values col (s);
+	  if (! error_state)
 	    {
-	      color_values col (s);
-	      if (! error_state)
-		{
-		  color_val = col;
-		  current_type = color_t;
-		}
+	      color_val = col;
+	      current_type = color_t;
 	    }
 	}
       else
@@ -2131,7 +2123,7 @@
   else if (name.compare ("zdata"))
     set_zdata (val);
   else if (name.compare ("facecolor"))
-    set_facecolor (color_property (val, radio_values ("flat|none|interp")));
+    set_facecolor (val);
   else if (name.compare ("facealpha"))
     set_facealpha (val);
   else if (name.compare ("edgecolor"))