Changeset 39916

Timestamp:

Jan 6, 2017, 10:49:17 AM (10 years ago)

Author:

eugene

Message:

do not let axes have very different tick sizes

Location:

branches/czw_branch/20160809/Ohana/src/kapa2/src

Files:

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

branches/czw_branch/20160809/Ohana/src/kapa2/src/DrawFrame.c

@@ -12 +12 @@
 
   graphic = GetGraphic();
+
+  P = 0.5 * (1 + 0.25*graph[0].axis[0].lweight) * (hypot (graph[0].axis[0].dfx, graph[0].axis[0].dfy) + hypot (graph[0].axis[0].dfx, graph[0].axis[0].dfy));
 
   /* each axis is drawn independently, but ticks and labels are placed according to perpendicular distance. */
@@ -30 +32 @@
     dfy = graph[0].axis[i].dfy + 2*dy;
 
-    P = hypot (graph[0].axis[(i+1)%2].dfx, graph[0].axis[(i+1)%2].dfy);
-    P *= (1 + 0.25*lweight);
+    // P = hypot (graph[0].axis[(i+1)%2].dfx, graph[0].axis[(i+1)%2].dfy);
+    // P *= (1 + 0.25*lweight);
 
     XSetLineAttributes (graphic->display, graphic->gc, lweight, LineSolid, CapNotLast, JoinMiter);

branches/czw_branch/20160809/Ohana/src/kapa2/src/PSFrame.c

@@ -11 +11 @@
 
   graphic = GetGraphic();
+
+  P = 0.5 * (1 + 0.25*graph[0].axis[0].lweight) * (hypot (graph[0].axis[0].dfx, graph[0].axis[0].dfy) + hypot (graph[0].axis[0].dfx, graph[0].axis[0].dfy));
 
   /* each axis is drawn independently */
@@ -30 +32 @@
     dfy = -graph[0].axis[i].dfy + 2*dy;
 
-    P = hypot (graph[0].axis[(i+1)%2].dfx, graph[0].axis[(i+1)%2].dfy);
-    P *= (1 + 0.25*lweight);
+    // P = hypot (graph[0].axis[(i+1)%2].dfx, graph[0].axis[(i+1)%2].dfy);
+    // P *= (1 + 0.25*lweight);
 
     fprintf (f, "%.1f setlinewidth\n", lweight);

branches/czw_branch/20160809/Ohana/src/kapa2/src/bDrawFrame.c

@@ -11 +11 @@
 
   // don't need graphic, unlink DrawFrame
+
+  P = 0.5 * (1 + 0.25*graph[0].axis[0].lweight) * (hypot (graph[0].axis[0].dfx, graph[0].axis[0].dfy) + hypot (graph[0].axis[0].dfx, graph[0].axis[0].dfy));
 
   /* each axis is drawn independently */
@@ -28 +30 @@
     dfx = graph[0].axis[i].dfx + 2*dx;
     dfy = graph[0].axis[i].dfy + 2*dy;
-    P = hypot (graph[0].axis[(i+1)%2].dfx, graph[0].axis[(i+1)%2].dfy);
-    P *= (1 + 0.25*lweight);
+
+    // P = hypot (graph[0].axis[(i+1)%2].dfx, graph[0].axis[(i+1)%2].dfy);
+    // P *= (1 + 0.25*lweight);
 
     bDrawSetStyle (buffer, color, lweight, 0);