Mercurial > octave
diff libinterp/corefcn/gl-render.h @ 20285:6db2ea5556a4
Make use of the axes "ticklabelinterpreter" property (bug #45438)
* plot.txi: add an anchor pointing to usage of interpreter property
* genpropdoc.m: document axes "ticklabelinterpreter" property and text "interpreter" property
* gl-render.h: new private attribute "interpreter" that stores the interperter to be used in text_to_pixels
* gl-render.h (set_interpreter): new protected virtual method to set "interpreter"
* gl-render.cc (opengl_renderer::draw_axes): set interpreter before rendering tick labels
* gl-render.cc (opengl_renderer::text_to_pixels): make use of interpreter attribute
* graphics.cc (axes::properties::set_defaults): initialize "ticklabelinterpreter" instead of unused "interpreter"
* graphics.in.h (axes::properties): fix doubly defined defaults for "ticklabelinterpreter" and "interpreter" properties
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Tue, 23 Jun 2015 22:21:50 +0200 |
| parents | a9574e3c6e9e |
| children | dcfbf4c1c3c8 |
line wrap: on
line diff
--- a/libinterp/corefcn/gl-render.h Thu Jun 25 08:32:21 2015 -0400 +++ b/libinterp/corefcn/gl-render.h Tue Jun 23 22:21:50 2015 +0200 @@ -59,7 +59,7 @@ opengl_renderer (void) : toolkit (), xform (), xmin (), xmax (), ymin (), ymax (), zmin (), zmax (), xZ1 (), xZ2 (), marker_id (), filled_marker_id (), - camera_pos (), camera_dir () + camera_pos (), camera_dir (), interpreter ("none") #if HAVE_FREETYPE , text_renderer () #endif @@ -108,6 +108,10 @@ double z1, double z2); virtual void set_clipping (bool on); virtual void set_font (const base_properties& props); + virtual void set_interpreter (const caseless_str interp) + { + interpreter = interp; + } virtual void init_marker (const std::string& m, double size, float width); virtual void end_marker (void); @@ -207,6 +211,9 @@ // camera information for primitive sorting ColumnVector camera_pos, camera_dir; + // interpreter to be used by text_to_pixels + caseless_str interpreter; + #if HAVE_FREETYPE // FreeType render, used for text rendering ft_render text_renderer;