Changeset 26258 for trunk/Ohana/src/opihi/cmd.data

Timestamp:

Nov 22, 2009, 2:54:39 PM (17 years ago)

Author:

eugene

Message:

other minor cleanups from eam_branches/20091113

File:

• trunk/Ohana/src/opihi/cmd.data/grid.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/grid.c

@@ -1 +1 @@
 # include "data.h"
+
+int SetGridScales (double *major, double *minor, double range) {
+
+  double lrange, factor, mantis, fmantis, power;
+
+  lrange = log10(MAX(fabs(range), 1e-30));
+  factor = (int) (lrange);
+  if (lrange < 0) { factor -= 1; }
+  mantis = lrange - factor;
+  power = pow(10.0, factor);
+  fmantis = pow(10.0, mantis);
+  if ((fmantis >= 1.0) && (fmantis <=  2.0)) {
+    *major = 0.5 * power;
+    *minor = 0.1 * power;
+  }
+  if ((fmantis > 2.0) && (fmantis <=  4.0)) {
+    *major = 1.0 * power;
+    *minor = 0.2 * power;
+  }
+  if ((fmantis > 4.0) && (fmantis <=  6.0)) {
+    *major = 1.0 * power;
+    *minor = 0.5 * power;
+  }
+  if ((fmantis > 6.0) && (fmantis <=  10.0)) {
+    *major = 2.0 * power;
+    *minor = 0.5 * power;
+  }
+  return TRUE;
+}
 
 int grid (int argc, char **argv) {
   
+  double range, major, minor, first, next;
   int j, kapa, N, MinorTick, MajorTick;
   Vector Xvec, Yvec;
-  double range, lrange, factor, mantis, fmantis, power, major, minor, first, next;
   Graphdata graphmode;
 
@@ -28 +57 @@
   major = minor = 1;
   range = graphmode.xmax - graphmode.xmin;
-  lrange = log10(MAX(fabs(range), 1e-30));
-  factor = (int) (lrange);
-  if (lrange < 0) { factor -= 1; }
-  mantis = lrange - factor;
-  power = pow(10.0, factor);
-  fmantis = pow(10.0, mantis);
-  if ((fmantis >= 1.0) && (fmantis <=  2.0)) {
-    major = 0.5 * power;
-    minor = 0.1 * power;
-  }
-  if ((fmantis > 2.0) && (fmantis <=  4.0)) {
-    major = 1.0 * power;
-    minor = 0.2 * power;
-  }
-  if ((fmantis > 4.0) && (fmantis <=  6.0)) {
-    major = 1.0 * power;
-    minor = 0.5 * power;
-  }
-  if ((fmantis > 6.0) && (fmantis <=  10.0)) {
-    major = 2.0 * power;
-    minor = 0.5 * power;
-  }
+  SetGridScales (&major, &minor, range);
   if (graphmode.xmin > 0)
     first = minor + minor*((int)(graphmode.xmin/minor));
@@ -108 +116 @@
 
   range = graphmode.ymax - graphmode.ymin;
-  lrange = log10(MAX(fabs(range), 1e-30));
-  factor = (int) (lrange);
-  if (lrange < 0) { factor -= 1; }
-  mantis = lrange - factor;
-  power = pow(10.0, factor);
-  fmantis = pow(10.0, mantis);
-  if ((fmantis >= 1.0) && (fmantis <=  2.0)) {
-    major = 0.5 * power;
-    minor = 0.1 * power;
-  }
-  if ((fmantis > 2.0) && (fmantis <=  4.0)) {
-    major = 1.0 * power;
-    minor = 0.2 * power;
-  }
-  if ((fmantis > 4.0) && (fmantis <=  6.0)) {
-    major = 1.0 * power;
-    minor = 0.5 * power;
-  }
-  if ((fmantis > 6.0) && (fmantis <=  10.0)) {
-    major = 2.0 * power;
-    minor = 0.5 * power;
-  }
+  SetGridScales (&major, &minor, range);
   if (graphmode.ymin > 0)
     first = minor + minor*((int)(graphmode.ymin/minor));