Changeset 38916

Timestamp:

Oct 20, 2015, 8:25:48 PM (11 years ago)

Author:

eugene

Message:

adding ticks = 3 option

Location:

branches/eam_branches/ipp-20150625/Ohana/src/kapa2/src

Files:

• DrawFrame.c (modified) (5 diffs)
• LoadFrame.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/kapa2/src/DrawFrame.c

@@ -138 +138 @@
     
     /* temporarily assume rectilinear axes */
-    if (naxis == 0) { dx = 0; dy = +1.0*pad; pos = 7; }
-    if (naxis == 2) { dx = 0; dy = -1.0*pad; pos = 1; }
-
-    if (naxis == 1) { dy = 0; dx = -0.5*pad; pos = 3; }
-    if (naxis == 3) { dy = 0; dx = +0.5*pad; pos = 5; }
+    if (naxis == 0) { dx = 0; dy = +1.0*pad; pos = 7; } // center, down justified
+    if (naxis == 2) { dx = 0; dy = -1.0*pad; pos = 1; } // center, up justified
+
+    if (naxis == 1) { dy = 0; dx = -0.5*pad; pos = 3; } // left, center justified
+    if (naxis == 3) { dy = 0; dx = +0.5*pad; pos = 5; } // right, center justified
 
     xt = fx + (value-min)*dfx/(max - min) + dx;
@@ -188 +188 @@
       *nsignif = factor - 2;
     }     
+    if (axis[0].areticks == 3) {
+      *major = 1.0 * power;
+      *nsignif = factor - 1;
+    }     
   }
   if ((fmantis >= 1.999) && (fmantis <  3.999)) {
@@ -196 +200 @@
       *nsignif = factor - 1;
     }     
+    if (axis[0].areticks == 3) {
+      *major = 2.0 * power;
+      *nsignif = factor;
+    }     
   }
   if ((fmantis >= 3.999) && (fmantis <  5.999)) {
@@ -204 +212 @@
       *nsignif = factor;
     }     
+    if (axis[0].areticks == 3) {
+      *major = 2.0 * power;
+      *nsignif = factor;
+    }     
   }
   if ((fmantis >= 5.999) && (fmantis <   7.999)) {
@@ -212 +224 @@
       *nsignif = factor;
     }     
+    if (axis[0].areticks == 3) {
+      *major = 4.0 * power;
+      *nsignif = factor;
+    }     
   }
   if ((fmantis >= 7.999) && (fmantis <  10.000)) {
     *major = 2.5 * power;
-      *nsignif = factor - 1;
+    *nsignif = factor - 1;
     if (axis[0].areticks == 1) {
       *major = 2.0 * power;
+      *nsignif = factor;
+    }     
+    if (axis[0].areticks == 3) {
+      *major = 4.0 * power;
       *nsignif = factor;
     }     

branches/eam_branches/ipp-20150625/Ohana/src/kapa2/src/LoadFrame.c

@@ -74 +74 @@
       graph[0].axis[i].areticks = 2;
       break;
+    case '3':
+      graph[0].axis[i].areticks = 3;
+      break;
     }
     switch (graph[0].data.labels[i]) {