Mercurial > octave

comparison libinterp/corefcn/gl-render.cc @ 31105:670a0d878af1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate WHO arguments from interpreter-private functions * interpreter-private.h, inpterpreter-private.cc (__get_interpreter__, __get_dynamic_loader__, __get_error_system__, __get_gh_manager__, __get_help_system__, __get_input_system__, __get_load_path__, __get_load_save_system__, __get_event_manager__, __get_output_system__, __get_type_info__, __get_symbol_table__, __get_current_scope__, __require_current_scope__, __get_evaluator__, __get_bp_table__, __get_child_list__, __get_cdef_manager__, __get_display_info__, __get_gtk_manager__): Eliminate WHO argument. Previously, it was never displayed by __get_interpreter__. And, as pointed out by Petter Tomner in patch #10216, passing a std::string object could have performance issues. (__get_interpreter__): Eliminate useless call to error. Display message to std::cerr then abort.
author John W. Eaton <jwe@octave.org>
date Wed, 22 Jun 2022 12:48:59 -0400
parents 796f54d4ddbf
children e88a07dec498
comparison
equal deleted inserted replaced
31104:90549b20fb28 31105:670a0d878af1
1549 void 1549 void
1550 opengl_renderer::draw_axes_x_grid (const axes::properties& props) 1550 opengl_renderer::draw_axes_x_grid (const axes::properties& props)
1551 { 1551 {
1552 #if defined (HAVE_OPENGL) 1552 #if defined (HAVE_OPENGL)
1553 1553
1554 gh_manager& gh_mgr 1554 gh_manager& gh_mgr = __get_gh_manager__ ();
1555 = __get_gh_manager__ ("opengl_renderer::draw_axes_x_grid");
1556 1555
1557 int xstate = props.get_xstate (); 1556 int xstate = props.get_xstate ();
1558 1557
1559 if (xstate != AXE_DEPTH_DIR 1558 if (xstate != AXE_DEPTH_DIR
1560 && (props.is_visible () 1559 && (props.is_visible ()
1746 void 1745 void
1747 opengl_renderer::draw_axes_y_grid (const axes::properties& props) 1746 opengl_renderer::draw_axes_y_grid (const axes::properties& props)
1748 { 1747 {
1749 #if defined (HAVE_OPENGL) 1748 #if defined (HAVE_OPENGL)
1750 1749
1751 gh_manager& gh_mgr 1750 gh_manager& gh_mgr = __get_gh_manager__ ();
1752 = __get_gh_manager__ ("opengl_renderer::draw_axes_y_grid");
1753 1751
1754 int ystate = props.get_ystate (); 1752 int ystate = props.get_ystate ();
1755 1753
1756 if (ystate != AXE_DEPTH_DIR && props.is_visible () 1754 if (ystate != AXE_DEPTH_DIR && props.is_visible ()
1757 && (props.is_visible () 1755 && (props.is_visible ()
1942 } 1940 }
1943 1941
1944 void 1942 void
1945 opengl_renderer::draw_axes_z_grid (const axes::properties& props) 1943 opengl_renderer::draw_axes_z_grid (const axes::properties& props)
1946 { 1944 {
1947 gh_manager& gh_mgr 1945 gh_manager& gh_mgr = __get_gh_manager__ ();
1948 = __get_gh_manager__ ("opengl_renderer::draw_axes_z_grid");
1949 1946
1950 int zstate = props.get_zstate (); 1947 int zstate = props.get_zstate ();
1951 1948
1952 if (zstate != AXE_DEPTH_DIR && props.is_visible () 1949 if (zstate != AXE_DEPTH_DIR && props.is_visible ()
1953 && (props.is_visible () 1950 && (props.is_visible ()
2165 void 2162 void
2166 opengl_renderer::draw_all_lights (const base_properties& props, 2163 opengl_renderer::draw_all_lights (const base_properties& props,
2167 std::list<graphics_object>& obj_list) 2164 std::list<graphics_object>& obj_list)
2168 { 2165 {
2169 #if defined (HAVE_OPENGL) 2166 #if defined (HAVE_OPENGL)
2170 gh_manager& gh_mgr 2167 gh_manager& gh_mgr = __get_gh_manager__ ();
2171 = __get_gh_manager__ ("opengl_renderer::draw_axes_all_lights");
2172 2168
2173 Matrix children = props.get_all_children (); 2169 Matrix children = props.get_all_children ();
2174 2170
2175 for (octave_idx_type i = children.numel () - 1; i >= 0; i--) 2171 for (octave_idx_type i = children.numel () - 1; i >= 0; i--)
2176 { 2172 {
3769 const double mea = props.get_markeredgealpha (); 3765 const double mea = props.get_markeredgealpha ();
3770 const double mfa = props.get_markerfacealpha (); 3766 const double mfa = props.get_markerfacealpha ();
3771 3767
3772 if (props.markerfacecolor_is ("auto")) 3768 if (props.markerfacecolor_is ("auto"))
3773 { 3769 {
3774 gh_manager& gh_mgr 3770 gh_manager& gh_mgr = __get_gh_manager__ ();
3775 = __get_gh_manager__ ("opengl_renderer::draw_scatter");
3776 graphics_object go = gh_mgr.get_object (props.get___myhandle__ ()); 3771 graphics_object go = gh_mgr.get_object (props.get___myhandle__ ());
3777 graphics_object ax = go.get_ancestor ("axes"); 3772 graphics_object ax = go.get_ancestor ("axes");
3778 const axes::properties& ax_props 3773 const axes::properties& ax_props
3779 = dynamic_cast<const axes::properties&> (ax.get_properties ()); 3774 = dynamic_cast<const axes::properties&> (ax.get_properties ());
3780 3775
4161 4156
4162 void opengl_renderer::draw (const Matrix& hlist, bool toplevel) 4157 void opengl_renderer::draw (const Matrix& hlist, bool toplevel)
4163 { 4158 {
4164 int len = hlist.numel (); 4159 int len = hlist.numel ();
4165 4160
4166 gh_manager& gh_mgr = __get_gh_manager__ ("opengl_renderer::draw"); 4161 gh_manager& gh_mgr = __get_gh_manager__ ();
4167 4162
4168 for (int i = len-1; i >= 0; i--) 4163 for (int i = len-1; i >= 0; i--)
4169 { 4164 {
4170 graphics_object obj = gh_mgr.get_object (hlist(i)); 4165 graphics_object obj = gh_mgr.get_object (hlist(i));
4171 4166
4662 } 4657 }
4663 4658
4664 double 4659 double
4665 opengl_renderer::points_to_pixels (const double val) const 4660 opengl_renderer::points_to_pixels (const double val) const
4666 { 4661 {
4667 gh_manager& gh_mgr = __get_gh_manager__ ("opengl_renderer::points_to_pixels"); 4662 gh_manager& gh_mgr = __get_gh_manager__ ();
4668 4663
4669 // FIXME: Does making this static cause problems if figure is moved to a 4664 // FIXME: Does making this static cause problems if figure is moved to a
4670 // 2nd monitor with a different value for "screenpixelsperinch"? 4665 // 2nd monitor with a different value for "screenpixelsperinch"?
4671 static const double pix_per_pts = 4666 static const double pix_per_pts =
4672 gh_mgr.get_object (0).get ("screenpixelsperinch").double_value () / 72.0; 4667 gh_mgr.get_object (0).get ("screenpixelsperinch").double_value () / 72.0;