Mercurial > octave-nkf
comparison libinterp/corefcn/gl-render.cc @ 20320: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 |
comparison
equal
deleted
inserted
replaced
| 20319:085c99b96aed | 20320:6db2ea5556a4 |
|---|---|
| 1473 | 1473 |
| 1474 draw_axes_planes (props); | 1474 draw_axes_planes (props); |
| 1475 draw_axes_boxes (props); | 1475 draw_axes_boxes (props); |
| 1476 | 1476 |
| 1477 set_font (props); | 1477 set_font (props); |
| 1478 set_interpreter (props.get_ticklabelinterpreter ()); | |
| 1478 | 1479 |
| 1479 draw_axes_x_grid (props); | 1480 draw_axes_x_grid (props); |
| 1480 draw_axes_y_grid (props); | 1481 draw_axes_y_grid (props); |
| 1481 draw_axes_z_grid (props); | 1482 draw_axes_z_grid (props); |
| 1482 | 1483 |
| 3227 Matrix& bbox, | 3228 Matrix& bbox, |
| 3228 int halign, int valign, double rotation) | 3229 int halign, int valign, double rotation) |
| 3229 { | 3230 { |
| 3230 #if HAVE_FREETYPE | 3231 #if HAVE_FREETYPE |
| 3231 text_renderer.text_to_pixels (txt, pixels, bbox, | 3232 text_renderer.text_to_pixels (txt, pixels, bbox, |
| 3232 halign, valign, rotation, "none"); | 3233 halign, valign, rotation, interpreter); |
| 3233 #endif | 3234 #endif |
| 3234 } | 3235 } |
| 3235 | 3236 |
| 3236 Matrix | 3237 Matrix |
| 3237 opengl_renderer::render_text (const std::string& txt, | 3238 opengl_renderer::render_text (const std::string& txt, |