Changeset 40943

Timestamp:

Oct 13, 2019, 1:17:00 PM (7 years ago)

Author:

eugene

Message:

let plus and minus adjust tv scale in non-cursor mode; fix overlay in buffered mode; restore buttons in buffered mode

Location:

branches/eam_branches/ohana.20190329/src/kapa2/src

Files:

• InterpretKeys.c (modified) (2 diffs)
• Refresh.c (modified) (3 diffs)
• bDrawOverlay.c (modified) (2 diffs)

branches/eam_branches/ohana.20190329/src/kapa2/src/InterpretKeys.c

@@ -160 +160 @@
       break;
 
+    case XK_plus:
+    case XK_equal:
     case XK_KP_Add:
       if (modstate & ControlMask) {
@@ -171 +173 @@
       Reorient (graphic, image, image[0].picture.Xc, image[0].picture.Yc, 0);
       break;
+
+    case XK_minus:
+    case XK_underscore:
     case XK_KP_Subtract:
       if (modstate & ControlMask) {

branches/eam_branches/ohana.20190329/src/kapa2/src/Refresh.c

@@ -1 +1 @@
 # include "Ximage.h"
 
-# define USE_BUFFERED_DRAW 0
+# define USE_BUFFERED_DRAW 1
 
 void bDrawXimage (bDrawBuffer *buffer);
@@ -47 +47 @@
   for (int i = 0; i < Nsection; i++) {
     Section *section = GetSectionByNumber (i);
-    DrawImageTool (section->image);
+
+    KapaImageWidget *image = section->image;
+    DrawImageTool (image);
+
+    /*** PaintOverlay is called in DrawImage ***
+    if (!image) continue;
+    for (int j = 0; j < NOVERLAYS; j++) {
+      if (image[0].overlay[j].active) {
+        PaintOverlay (graphic, image, j);
+      }
+    }
+    */
   }
+
   FlushDisplay ();
 }
@@ -71 +83 @@
   Nsection = GetNumberOfSections ();
   for (i = 0; i < Nsection; i++) {
-      section = GetSectionByNumber (i);
-      DrawSectionBG (graphic, section);
-      DrawImage (section->image);
-      DrawGraph (section->graph);
+    section = GetSectionByNumber (i);
+    DrawSectionBG (graphic, section);
+
+    KapaImageWidget *image = section->image;
+    DrawImage (image);
+    DrawImageTool (image);
+
+    /*** the overlay is added in DrawImage  ***/
+    if (image) {
+      for (int j = 0; j < NOVERLAYS; j++) {
+        if (image[0].overlay[j].active) {
+          PaintOverlay (graphic, image, j);
+        }
+      }
+    }
+
+    DrawGraph (section->graph);
   }
 

branches/eam_branches/ohana.20190329/src/kapa2/src/bDrawOverlay.c

@@ -24 +24 @@
   }
 
-  Xmin = 0;
-  Ymin = 0;
-  Xmax = image[0].picture.dx;
-  Ymax = image[0].picture.dy;
+  // Xmin = 0;
+  // Ymin = 0;
+  // Xmax = image[0].picture.dx;
+  // Ymax = image[0].picture.dy;
+
+  Xmin = image[0].picture.x;
+  Ymin = image[0].picture.y;
+  Xmax = image[0].picture.x + image[0].picture.dx; // maybe this should be just dx?
+  Ymax = image[0].picture.y + image[0].picture.dy;
 
   if (N == INFRONT) {
@@ -35 +40 @@
 
   for (i = 0; i < image[0].overlay[N].Nobjects; i++) {
-    Image_to_Picture (&X, &Y, image[0].overlay[N].objects[i].x, image[0].overlay[N].objects[i].y, &image[0].picture);
+    // XXX the 0.5,0.5 offset is apparently needed here.
+    // work on rationalizing these functions in the context of their different plotting types
+    Image_to_Screen (&X, &Y, image[0].overlay[N].objects[i].x - 0.5, image[0].overlay[N].objects[i].y - 0.5, &image[0].picture);
     dX = image[0].overlay[N].objects[i].dx * expand;
     dY = image[0].overlay[N].objects[i].dy * expand;