Changeset 28347

Timestamp:

Jun 15, 2010, 4:37:26 PM (16 years ago)

Author:

eugene

Message:

fix tick positions and stupid loop error

Location:

trunk/Ohana/src/kapa2/src

Files:

• PSFrame.c (modified) (4 diffs)
• bDrawFrame.c (modified) (2 diffs)

trunk/Ohana/src/kapa2/src/PSFrame.c

@@ -4 +4 @@
 int PSFrame (KapaGraphWidget *graph, FILE *f) {
   
-  int i, Nticks, P;
+  int i, j, Nticks, P;
   double fx, fy, dfx, dfy, lweight;
   Graphic *graphic;
@@ -34 +34 @@
     if (graph[0].axis[i].areticks) {
       ticks = CreateAxisTicks (&graph[0].axis[i], &Nticks);
-      for (i = 0; i < Nticks; i++) {
-        PSTick (graphic, &graph[0].axis[i], P, &ticks[i], i, f);
+      for (j = 0; j < Nticks; j++) {
+        PSTick (graphic, &graph[0].axis[i], P, &ticks[j], i, f);
       }
       FREE (ticks);
@@ -72 +72 @@
   y = fy + (value-min)*dfy/(max - min);
 
-  dir = ((naxis == 0) || (naxis == 1)) ? -1 : +1;
+  dir = ((naxis == 0) || (naxis == 1)) ? +1 : -1;
   dx = dir*size*dfy*n;  
   dy = dir*size*dfx*n;
@@ -86 +86 @@
     
     /* temporarily assume rectilinear axes */
-    if (naxis == 0) { dx = 0; dy = +pad; pos = 1; }
-    if (naxis == 2) { dx = 0; dy = -pad; pos = 7; }
+    if (naxis == 0) { dx = 0; dy = -pad; pos = 1; }
+    if (naxis == 2) { dx = 0; dy = +pad; pos = 7; }
 
     if (naxis == 1) { dy = 0; dx = -pad; pos = 3; }

trunk/Ohana/src/kapa2/src/bDrawFrame.c

@@ -4 +4 @@
 int bDrawFrame (KapaGraphWidget *graph) {
   
-  int i, Nticks, P;
+  int i, j, Nticks, P;
   double fx, fy, dfx, dfy, lweight;
   // Graphic graphic; is not needed
@@ -33 +33 @@
     if (graph[0].axis[i].areticks) {
       ticks = CreateAxisTicks (&graph[0].axis[i], &Nticks);
-      for (i = 0; i < Nticks; i++) {
-        bDrawTick (&graph[0].axis[i], P, &ticks[i], i);
+      for (j = 0; j < Nticks; j++) {
+        bDrawTick (&graph[0].axis[i], P, &ticks[j], i);
       }
       FREE (ticks);