|
From: Aman (n. A. <nes...@gm...> - 2012-04-22 20:32:02
|
? share/Gnuplot
? src/beos/Makefile
? src/qtterminal/Makefile
? src/qtterminal/Makefile.in
? src/wxterminal/Makefile
Index: src/axis.c
===================================================================
RCS file: /cvsroot/gnuplot/gnuplot/src/axis.c,v
retrieving revision 1.102
diff -u -a -r1.102 axis.c
--- src/axis.c 3 Apr 2012 16:57:47 -0000 1.102
+++ src/axis.c 22 Apr 2012 19:34:42 -0000
@@ -143,6 +143,9 @@
struct lp_style_type mgrid_lp = DEFAULT_GRID_LP;
int grid_layer = -1;
double polar_grid_angle = 0; /* nonzero means a polar grid */
+double tic_quant[] = {5.0, 2.0, 1.0};
+int tic_min = 5;
+int tic_max = 10;
TBOOLEAN raxis = TRUE;
/* Length of the longest tics label, set by widest_tic_callback(): */
@@ -582,6 +585,27 @@
return (tics * power);
}
+
+double
+quantize_tics(double val_axis_min, double val_axis_max)
+{
+
+ double log_normal, tic_val;
+ int i, tics, diff_tic_val;
+
+ log_normal = log10((val_axis_max - val_axis_min)/tic_max);
+ for (i = 0; i < sizeof(tic_quant)/sizeof(tic_quant[0]); i++) {
+ tics = ceil(log_normal - log10(tic_quant[i]) - FLT_EPSILON);
+ tic_val = tic_quant[i]*pow(10, tics);
+ diff_tic_val = ceil(val_axis_max/tic_val) - floor(val_axis_min/tic_val);
+ if (diff_tic_val >= tic_min)
+ break;
+ }
+ return tic_val;
+}
+
+
+
/* }}} */
/* {{{ make_tics() */
@@ -599,7 +623,9 @@
if (xr >= VERYLARGE)
int_error(NO_CARET,"%s axis range undefined or overflow",
axis_defaults[axis].name);
- tic = quantize_normal_tics(xr, guide);
+
+ //tic = quantize_normal_tics(xr, guide);
+ tic = quantize_tics(axis_array[axis].min, axis_array[axis].max);
/* FIXME HBB 20010831: disabling this might allow short log axis
* to receive better ticking... */
if (axis_array[axis].log && tic < 1.0)
Index: src/version.c
===================================================================
RCS file: /cvsroot/gnuplot/gnuplot/src/version.c,v
retrieving revision 1.104
diff -u -a -r1.104 version.c
--- src/version.c 9 Mar 2012 18:26:39 -0000 1.104
+++ src/version.c 22 Apr 2012 19:34:42 -0000
@@ -41,7 +41,7 @@
const char gnuplot_version[] = "4.7";
const char gnuplot_patchlevel[] = "0";
-const char gnuplot_date[] = "2012-03-02 ";
+const char gnuplot_date[] = "2012-04-20 ";
const char gnuplot_copyright[] = "Copyright (C) 1986-1993, 1998, 2004, 2007-2012";
const char faq_location[] = FAQ_LOCATION; |