Changeset 37412 for trunk/Ohana/src/kapa2

Timestamp:

Sep 19, 2014, 4:41:20 PM (12 years ago)

Author:

eugene

Message:

handle equinox and epoch with string values; use image for cursor coords if image is inactive

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/kapa2/src/InterpretKeys.c (modified) (1 diff)

trunk/Ohana/src/kapa2/src/InterpretKeys.c

@@ -50 +50 @@
     Z = -1;
 
-    if (graph) {
+    int haveGraph = graph && graph->haveGraph;
+    if (haveGraph) {
       X = (event[0].x - graph[0].axis[0].fx)*(graph[0].axis[0].max - graph[0].axis[0].min)/graph[0].axis[0].dfx + graph[0].axis[0].min;
       Y = (event[0].y - graph[0].axis[1].fy)*(graph[0].axis[1].max - graph[0].axis[1].min)/graph[0].axis[1].dfy + graph[0].axis[1].min;
       XY_to_RD (&R, &D, X, Y, &graph[0].data.coords);
     } 
-    if (image && !graph) {
+    if (image && !haveGraph) {
       if (event[0].x < image[0].picture.x) goto skip_cursor;
       if (event[0].y < image[0].picture.y) goto skip_cursor;