Mercurial > octave-nkf
comparison src/graphics.cc @ 13130:d7f74a8bdc46
maint: Periodic merge of stable to default
author | Jordi Gutiérrez Hermoso <jordigh@octave.org> |
---|---|
date | Sun, 11 Sep 2011 14:04:43 -0500 |
parents | d44d7f3c7998 8e61aa0fac77 |
children | e3e8ca96f923 |
comparison
equal
deleted
inserted
replaced
13129:155d7a5e70f5 | 13130:d7f74a8bdc46 |
---|---|
5261 lo = std::log10 (lo); | 5261 lo = std::log10 (lo); |
5262 } | 5262 } |
5263 | 5263 |
5264 double tick_sep = calc_tick_sep (lo , hi); | 5264 double tick_sep = calc_tick_sep (lo , hi); |
5265 | 5265 |
5266 if (is_logscale && ! (xisinf (hi) || xisinf (lo))) | |
5267 { | |
5268 // FIXME - what if (hi-lo) < tick_sep? | |
5269 // ex: loglog ([1 1.1]) | |
5270 tick_sep = std::max (tick_sep, 1.); | |
5271 tick_sep = std::ceil (tick_sep); | |
5272 } | |
5273 | |
5266 int i1 = static_cast<int> (gnulib::floor (lo / tick_sep)); | 5274 int i1 = static_cast<int> (gnulib::floor (lo / tick_sep)); |
5267 int i2 = static_cast<int> (std::ceil (hi / tick_sep)); | 5275 int i2 = static_cast<int> (std::ceil (hi / tick_sep)); |
5268 | 5276 |
5269 if (limmode_is_auto) | 5277 if (limmode_is_auto) |
5270 { | 5278 { |