Документ взят из кэша поисковой машины. Адрес оригинального документа : http://xray.sai.msu.ru/~ivan/gmt/patch/patch.wao Дата изменения: Fri Jun 4 20:38:26 1999 Дата индексирования: Tue Oct 2 06:57:51 2012 Кодировка: Поисковые слова: с р р с с п п р п п с с с р р р р р п п р р р п п р

*** src/gmt_plot.c Thu Mar 25 11:59:02 1999
--- src/gmt_plot.c.new Fri Jun 4 20:36:03 1999
***************
*** 167,173 ****
ps_plot (0.0, 0.0, 3);
ps_plot (length, 0.0, -2);
GMT_setpen (&gmtdefs.tick_pen);
!
i_a = i_f = 0;
switch (axistype) {
case POW: /* Anotate in pow(x) */
--- 167,173 ----
ps_plot (0.0, 0.0, 3);
ps_plot (length, 0.0, -2);
GMT_setpen (&gmtdefs.tick_pen);
!
i_a = i_f = 0;
switch (axistype) {
case POW: /* Anotate in pow(x) */
***************
*** 196,202 ****
v1 = d_log10 (val1);
val = pow (10.0, floor (v0));
test = irint (anotation_int) - 1;
! if (test < 0 || test > 2) test = 0;
if (test == 0) {
n_anotations = 1;
tvals_a[0] = 10.0;
--- 196,202 ----
v1 = d_log10 (val1);
val = pow (10.0, floor (v0));
test = irint (anotation_int) - 1;
! if (test < 0 || (test > 2 && test <= 9)) test = 0;
if (test == 0) {
n_anotations = 1;
tvals_a[0] = 10.0;
***************
*** 211,218 ****
n_anotations = 9;
for (i = 0; i < n_anotations; i++) tvals_a[i] = i + 1;
}
test = irint (tickmark_int) - 1;
! if (test < 0 || test > 2) test = 0;
if (test == 0) {
n_tickmarks = 1;
tvals_f[0] = 10.0;
--- 211,223 ----
n_anotations = 9;
for (i = 0; i < n_anotations; i++) tvals_a[i] = i + 1;
}
+ else if (test >=10) {
+ test++;
+ n_anotations = 1;
+ tvals_a[0] = pow(10,floor(d_log10(test)));
+ }
test = irint (tickmark_int) - 1;
! if (test < 0 || ( test > 2 && test < 9)) test = 0;
if (test == 0) {
n_tickmarks = 1;
tvals_f[0] = 10.0;
***************
*** 227,232 ****
--- 232,242 ----
n_tickmarks = 9;
for (i = 0; i < n_tickmarks; i++) tvals_f[i] = i + 1;
}
+ else if (test >=9) {
+ test++;
+ n_tickmarks = 1;
+ tvals_f[0] = pow(10,floor(d_log10(test)));
+ }
i_a = 0;
start_log_a = val = pow (10.0, floor (v0));
while ((val0 - val) > SMALL) {
***************
*** 295,301 ****
}
else {
xx = (d_log10 (val) - v0) * axis_scale;
! sprintf (annotation, "10@+%d@+\0", irint (d_log10 (val)));
}
break;
}
--- 305,312 ----
}
else {
xx = (d_log10 (val) - v0) * axis_scale;
! if (val > 10 || val < 1) sprintf (annotation, "10@+%d@+\0", irint (d_log10 (val)));
! else sprintf (annotation, "%.0lf",val);
}
break;
}
***************
*** 310,316 ****
if (i_a < n_anotations)
val = start_log_a * tvals_a[i_a];
else {
! val = (start_log_a *= 10.0);
i_a = 0;
}
}
--- 321,327 ----
if (i_a < n_anotations)
val = start_log_a * tvals_a[i_a];
else {
! val = (start_log_a *= (tvals_a[0]==1)?10:tvals_a[0]);
i_a = 0;
}
}
***************
*** 351,357 ****
if (i_f < n_tickmarks)
val = start_log_f * tvals_f[i_f];
else {
! val = start_log_f *= 10.0;
i_f = 0;
}
}
--- 362,368 ----
if (i_f < n_tickmarks)
val = start_log_f * tvals_f[i_f];
else {
! val = start_log_f *= (tvals_f[0]==1)?10:tvals_f[0];
i_f = 0;
}
}
***************
*** 432,438 ****
v1 = d_log10 (val1);
val = pow (10.0, floor (v0));
test = irint (anotation_int) - 1;
! if (test < 0 || test > 2) test = 0;
if (test == 0) {
n_anotations = 1;
tvals_a[0] = 10.0;
--- 443,449 ----
v1 = d_log10 (val1);
val = pow (10.0, floor (v0));
test = irint (anotation_int) - 1;
! if (test < 0 || (test > 2 && test <=9)) test = 0;
if (test == 0) {
n_anotations = 1;
tvals_a[0] = 10.0;
***************
*** 448,455 ****
n_anotations = 9;
for (i = 0; i < n_anotations; i++) tvals_a[i] = i + 1;
}
test = irint (tickmark_int) - 1;
! if (test < 0 || test > 2) test = 0;
if (test == 0) {
n_tickmarks = 1;
tvals_f[0] = 10.0;
--- 459,471 ----
n_anotations = 9;
for (i = 0; i < n_anotations; i++) tvals_a[i] = i + 1;
}
+ else if (test >=9) {
+ test++;
+ n_tickmarks = 1;
+ tvals_a[0] = pow(10,floor(d_log10(test)));
+ }
test = irint (tickmark_int) - 1;
! if (test < 0 || (test > 2 && test <=9)) test = 0;
if (test == 0) {
n_tickmarks = 1;
tvals_f[0] = 10.0;
***************
*** 464,469 ****
--- 480,491 ----
n_tickmarks = 9;
for (i = 0; i < n_tickmarks; i++) tvals_f[i] = i + 1;
}
+ else if (test >=9) {
+ test++;
+ n_tickmarks = 1;
+ tvals_f[0] = pow(10,floor(d_log10(test)));
+ }
+
i_a = 0;
start_log_a = val = pow (10.0, floor (v0));
while ((val0 - val) > SMALL) {
***************
*** 569,575 ****
}
else {
xx = (d_log10 (val) - v0) * axis_scale;
! sprintf (annotation, "10@+%d@+\0", irint (d_log10 (val)));
}
break;
}
--- 591,598 ----
}
else {
xx = (d_log10 (val) - v0) * axis_scale;
! if (val > 10 || val < 1) sprintf (annotation, "10@+%d@+\0", irint (d_log10 (val)));
! else sprintf (annotation, "%.0lf",val);
}
break;
}
***************
*** 584,590 ****
if (i_a < n_anotations)
val = start_log_a * tvals_a[i_a];
else {
! val = (start_log_a *= 10.0);
i_a = 0;
}
}
--- 607,613 ----
if (i_a < n_anotations)
val = start_log_a * tvals_a[i_a];
else {
! val = (start_log_a *= (tvals_a[0]==1)?10:tvals_a[0]);
i_a = 0;
}
}
***************
*** 626,632 ****
if (i_f < n_tickmarks)
val = start_log_f * tvals_f[i_f];
else {
! val = start_log_f *= 10.0;
i_f = 0;
}
}
--- 649,655 ----
if (i_f < n_tickmarks)
val = start_log_f * tvals_f[i_f];
else {
! val = start_log_f *= (tvals_f[0]==1)?10:tvals_f[0];
i_f = 0;
}
}