Changeset 41157 for trunk/Ohana/src/kapa2/src/Refresh.c

Timestamp:

Nov 27, 2019, 11:00:17 AM (7 years ago)

Author:

eugene

Message:

add memory cleanup functions; add buffered drawing to allow opacity in X; add reversed colormaps; add multi-point polygon plots (and filled versions); add memory checks; add buffer smoothing for anti-aliasing

File:

• trunk/Ohana/src/kapa2/src/Refresh.c (modified) (2 diffs)

trunk/Ohana/src/kapa2/src/Refresh.c

@@ -1 +1 @@
 # include "Ximage.h"
 
+# define USE_BUFFERED_DRAW 1
+
+void bDrawXimage (bDrawBuffer *buffer);
+void Refresh_Buffered (void);
+void Refresh_Unbuffered (void);
+
 void Refresh (void) {
+  if (USE_BUFFERED_DRAW) {
+    Refresh_Buffered();
+  } else {
+    Refresh_Unbuffered();
+  }
+}
+
+void Refresh_Buffered (void) {
+
+  int Npalette;
+  Graphic *graphic;
+
+  if (!USE_XWINDOW) return;
+  // if (HAVE_BACKING) return;
+
+  graphic = GetGraphic();
+  
+  // limit the png window to the min needed to contain the active graphic regions
+  SectionMinBoundary (graphic);
+
+  // is the palette reasonable in modern context?
+  png_color *palette = KapaPNGPalette (&Npalette);
+
+  bDrawBuffer *buffer = bDrawIt (palette, Npalette, 3);
+  
+  /* XClearWindow   (graphic.display, graphic.window); */
+  XSetForeground (graphic->display, graphic->gc, graphic->back);
+  XFillRectangle (graphic->display, graphic->window, graphic->gc, 0, 0, graphic->dx, graphic->dy);
+  XSetForeground (graphic->display, graphic->gc, graphic->fore);
+  
+  // copy buffer to Xwindow as image?
+  bDrawXimage (buffer);
+  bDrawBufferFree (buffer);
+  free (palette);
+
+  // draw image tool for all sections
+  int Nsection = GetNumberOfSections ();
+  for (int i = 0; i < Nsection; i++) {
+    Section *section = GetSectionByNumber (i);
+
+    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 ();
+}
+
+void Refresh_Unbuffered (void) {
 
   int i, Nsection;
@@ -20 +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);
   }