octave-nkf: libinterp/corefcn/graphics.in.h comparison

comparison libinterp/corefcn/graphics.in.h @ 20577:c547458dc10e

eliminate error_state from most header files * defun-int.h, event-queue.h, graphics.in.h, oct-handle.h, ov-classdef.h, misc/f77-fcn.h, unwind-prot.h: Eliminate use of global error_state variable.

author	John W. Eaton <jwe@octave.org>
date	Sat, 03 Oct 2015 13:20:28 -0400
parents	564e59f75ef8
children	3af34e1ef330

comparison

equal deleted inserted replaced

-:0fc9b572e566
+:c547458dc10e
 value[i] = c(i).string_value ();
 else
 {
 double d = c(i).double_value ();
-if (! error_state)
+std::ostringstream buf;
-{
+buf << d;
-std::ostringstream buf;
+value[i] = buf.str ();
-buf << d;
-value[i] = buf.str ();
-}
-else
-break;
 }
 }
 }
 text_label_property (const text_label_property& p)
 value[i] = c(i).string_value ();
 else
 {
 double d = c(i).double_value ();
-if (! error_state)
+std::ostringstream buf;
-{
+buf << d;
-std::ostringstream buf;
+value[i] = buf.str ();
-buf << d;
-value[i] = buf.str ();
-}
-else
-return false;
 }
 }
 stored_type = cellstr_t;
 }
 else
 {
-NDArray nda = val.array_value ();
+NDArray nda;
-if (! error_state)
+try
 {
-octave_idx_type nel = nda.numel ();
+nda = val.array_value ();
-value.resize (nel);
-for (octave_idx_type i = 0; i < nel; i++)
-{
-std::ostringstream buf;
-buf << nda(i);
-value[i] = buf.str ();
-}
-stored_type = char_t;
 }
-else
+catch (const octave_execution_exception&)
 {
 error ("set: invalid string property value for \"%s\"",
 get_name ().c_str ());
-return false;
 }
+octave_idx_type nel = nda.numel ();
+value.resize (nel);
+for (octave_idx_type i = 0; i < nel; i++)
+{
+std::ostringstream buf;
+buf << nda(i);
+value[i] = buf.str ();
+}
+stored_type = char_t;
 }
 return true;
 }
 protected:
 bool do_set (const octave_value& v)
 {
 bool retval = array_property::do_set (v);
-if (! error_state)
+dim_vector dv = data.dims ();
+if (dv(0) > 1 && dv(1) == 1)
 {
-dim_vector dv = data.dims ();
+int tmp = dv(0);
+dv(0) = dv(1);
-if (dv(0) > 1 && dv(1) == 1)
+dv(1) = tmp;
-{
-int tmp = dv(0);
+data = data.reshape (dv);
-dv(0) = dv(1);
-dv(1) = tmp;
-data = data.reshape (dv);
-}
-return retval;
 }
-return false;
+return retval;
 }
 private:
 OCTINTERP_API bool validate (const octave_value& v);
 };
 std::list<double> children_list;
 protected:
 bool do_set (const octave_value& val)
 {
-const Matrix new_kids = val.matrix_value ();
+Matrix new_kids;
+try
+{
+new_kids = val.matrix_value ();
+}
+catch (const octave_execution_exception&)
+{
+error ("set: expecting children to be array of graphics handles");
+}
 octave_idx_type nel = new_kids.numel ();
 const Matrix new_kids_column = new_kids.reshape (dim_vector (nel, 1));
 bool is_ok = true;
 bool add_hidden = true;
-if (! error_state)
+const Matrix visible_kids = do_get_children (false);
+if (visible_kids.numel () == new_kids.numel ())
 {
-const Matrix visible_kids = do_get_children (false);
+Matrix t1 = visible_kids.sort ();
+Matrix t2 = new_kids_column.sort ();
-if (visible_kids.numel () == new_kids.numel ())
+Matrix t3 = get_hidden ().sort ();
-{
-Matrix t1 = visible_kids.sort ();
+if (t1 != t2)
-Matrix t2 = new_kids_column.sort ();
-Matrix t3 = get_hidden ().sort ();
-if (t1 != t2)
-is_ok = false;
-if (t1 == t3)
-add_hidden = false;
-}
-else
 is_ok = false;
-if (! is_ok)
+if (t1 == t3)
-error ("set: new children must be a permutation of existing children");
+add_hidden = false;
 }
 else
-{
+is_ok = false;
-is_ok = false;
-error ("set: expecting children to be array of graphics handles");
+if (! is_ok)
-}
+error ("set: new children must be a permutation of existing children");
 if (is_ok)
 {
 Matrix tmp = new_kids_column;
 void set_toolkit (const graphics_toolkit& b);
 void set___graphics_toolkit__ (const octave_value& val)
 {
-if (! error_state)
+if (val.is_string ())
 {
-if (val.is_string ())
+std::string nm = val.string_value ();
+graphics_toolkit b = gtk_manager::find_toolkit (nm);
+if (b.get_name () != nm)
+error ("set___graphics_toolkit__: invalid graphics toolkit");
+else if (nm != get___graphics_toolkit__ ())
 {
-std::string nm = val.string_value ();
+set_toolkit (b);
-graphics_toolkit b = gtk_manager::find_toolkit (nm);
+mark_modified ();
-if (b.get_name () != nm)
-{
-error ("set___graphics_toolkit__: invalid graphics toolkit");
-}
-else
-{
-if (nm != get___graphics_toolkit__ ())
-{
-set_toolkit (b);
-mark_modified ();
-}
-}
 }
-else
-error ("set___graphics_toolkit__ must be a string");
 }
+else
+error ("set___graphics_toolkit__ must be a string");
 }
 void adopt (const graphics_handle& h);
 void set_position (const octave_value& val,
 public:
 double get_fontsize_points (double box_pix_height = 0) const;
 void set_position (const octave_value& val)
 {
-if (! error_state)
+octave_value new_val (val);
+if (new_val.numel () == 2)
 {
-octave_value new_val (val);
+dim_vector dv (1, 3);
-if (new_val.numel () == 2)
+new_val = new_val.resize (dv, true);
-{
-dim_vector dv (1, 3);
-new_val = new_val.resize (dv, true);
-}
-if (position.set (new_val, false))
-{
-set_positionmode ("manual");
-update_position ();
-position.run_listeners (POSTSET);
-mark_modified ();
-}
-else
-set_positionmode ("manual");
 }
+if (position.set (new_val, false))
+{
+set_positionmode ("manual");
+update_position ();
+position.run_listeners (POSTSET);
+mark_modified ();
+}
+else
+set_positionmode ("manual");
 }
 // See the genprops.awk script for an explanation of the
 // properties declarations.
 if (go.valid_object ())
 cb = go.get (name);
 }
-if (! error_state)
+execute_callback (h, cb, data);
-execute_callback (h, cb, data);
 }
 static void execute_callback (const graphics_handle& h,
 const octave_value& cb,
 const octave_value& data = Matrix ())

Mercurial > octave-nkf

comparison libinterp/corefcn/graphics.in.h @ 20577:c547458dc10e