comparison src/graphics.h.in @ 7056:2002804df782

[project @ 2007-10-24 00:32:44 by jwe]
author jwe
date Wed, 24 Oct 2007 00:32:44 +0000
parents e31f12bb9194
children 60a1165732f9
comparison
equal deleted inserted replaced
7055:3e4dab6a136c 7056:2002804df782
462 return *this; 462 return *this;
463 } 463 }
464 464
465 ~graphics_handle (void) { } 465 ~graphics_handle (void) { }
466 466
467 operator double (void) const { return val; }
468
469 double value (void) const { return val; } 467 double value (void) const { return val; }
470 468
471 octave_value as_octave_value (void) const 469 octave_value as_octave_value (void) const
472 { 470 {
473 return ok () ? octave_value (val) : octave_value (Matrix ()); 471 return ok () ? octave_value (val) : octave_value (Matrix ());
498 --val; 496 --val;
499 return h; 497 return h;
500 } 498 }
501 499
502 bool ok (void) const { return ! xisnan (val); } 500 bool ok (void) const { return ! xisnan (val); }
503
504 operator bool () const { return ok (); }
505 501
506 private: 502 private:
507 double val; 503 double val;
508 }; 504 };
509 505
577 573
578 void adopt (const graphics_handle& h) 574 void adopt (const graphics_handle& h)
579 { 575 {
580 octave_idx_type n = children.numel (); 576 octave_idx_type n = children.numel ();
581 children.resize (1, n+1); 577 children.resize (1, n+1);
582 children(n) = h; 578 children(n) = h.value ();
583 } 579 }
584 580
585 void set_parent (const octave_value& val); 581 void set_parent (const octave_value& val);
586 582
587 void reparent (const graphics_handle& new_parent) { parent = new_parent; } 583 void reparent (const graphics_handle& new_parent) { parent = new_parent; }
1911 Matrix do_handle_list (void) 1907 Matrix do_handle_list (void)
1912 { 1908 {
1913 Matrix retval (1, handle_map.size ()); 1909 Matrix retval (1, handle_map.size ());
1914 octave_idx_type i = 0; 1910 octave_idx_type i = 0;
1915 for (const_iterator p = handle_map.begin (); p != handle_map.end (); p++) 1911 for (const_iterator p = handle_map.begin (); p != handle_map.end (); p++)
1916 retval(i++) = p->first; 1912 {
1913 graphics_handle h = p->first;
1914 retval(i++) = h.value ();
1915 }
1917 return retval; 1916 return retval;
1918 } 1917 }
1919 1918
1920 Matrix do_figure_handle_list (void) 1919 Matrix do_figure_handle_list (void)
1921 { 1920 {
1922 Matrix retval (1, figure_list.size ()); 1921 Matrix retval (1, figure_list.size ());
1923 octave_idx_type i = 0; 1922 octave_idx_type i = 0;
1924 for (const_figure_list_iterator p = figure_list.begin (); 1923 for (const_figure_list_iterator p = figure_list.begin ();
1925 p != figure_list.end (); 1924 p != figure_list.end ();
1926 p++) 1925 p++)
1927 retval(i++) = *p; 1926 {
1927 graphics_handle h = *p;
1928 retval(i++) = h.value ();
1929 }
1928 return retval; 1930 return retval;
1929 } 1931 }
1930 1932
1931 void do_push_figure (const graphics_handle& h); 1933 void do_push_figure (const graphics_handle& h);
1932 1934