Separate visual exe

3 files changed, 311 insertions, 101 deletions

diff --git a/include/snippets/raylib_block.c b/include/snippets/raylib_block.c
deleted file mode 100644
index ef81fd2..0000000
--- a/include/snippets/raylib_block.c
+++ /dev/null
@@ -1,93 +0,0 @@
-  //-----------------------------------------------
-  //-RAYLIB-INIT-----------------------------------
-  //-----------------------------------------------
-  SetTraceLogLevel(LOG_ERROR);
-  SetConfigFlags(FLAG_WINDOW_RESIZABLE);
-  const char* gui_title = "Image Manip - Useful for segmentations!";
-  InitWindow(SCREEN_WIDTH, SCREEN_HEIGHT, gui_title);
-
-  //-----------------------------------------------
-  // (When treating this as RGBA, last bits should ensure opaque)
-  //  This assumes 4096 (2^12) > labels
-  for (size_t y = 0; y < height; y++) {
-    for (size_t x = 0; x < width; x++) {
-      /// RGBA channels: Move labels to RGB
-      masks[x + y*width] <<= 4;
-      masks[x + y*width] |= 0x000F;
-    }
-  }
-  //-----------------------------------------------
-
-  //-----------------------------------------------
-  //-RAYLIB-IMAGE-STRUCTURING----------------------
-  //-----------------------------------------------
-  Image RaylibImage;
-  RaylibImage.width  = width;
-  RaylibImage.height = height;
-  RaylibImage.mipmaps = 1;
-  // Use Contiguous Labels
-  RaylibImage.data = masks;
-  RaylibImage.format = PIXELFORMAT_UNCOMPRESSED_R4G4B4A4;
-  //-----------------------------------------------
-
-  // Image to a Texture
-  Texture2D RaylibTexture = LoadTextureFromImage(RaylibImage);
-
-  // Scale the image to the viewport
-  /// Source Rectangle: Original Size
-  Rectangle sourceRec = { 0.0f, 0.0f, (float)width, (float)height };
-  /// Destination Rectangle: Transformed Size
-  Rectangle destRec = { 0.0f, 0.0f, (float)SCREEN_WIDTH, (float)(SCREEN_HEIGHT-OFFSET) };
-  /// Location to begin drawing
-  Vector2 origin = { (float)0, (float)-OFFSET };
-
-  // Raylib boilerplate
-  SetTargetFPS(60);
-  Camera2D camera = { 0 };
-  camera.zoom = 1.0f;
-
-  // GUI Loop
-  while (!WindowShouldClose()) {
-    //-----------------------------------------------
-    //-DRAWING---------------------------------------
-    //-----------------------------------------------
-    BeginDrawing();
-    ClearBackground(RAYWHITE);
-    BeginMode2D(camera);
-    EndMode2D();
-    DrawText("Image Manip", 0, 0, OFFSET, DARKGRAY);
-    DrawTexturePro(RaylibTexture, sourceRec, destRec, origin, (float)0,
-                   RAYWHITE);
-    /*
-    uint32_t x = 0x49, y = 0x4A;
-    uint32_t dx = 0x69 - x, dy = 0x6E - y;
-    x = (SCREEN_WIDTH*x)/width;
-    y = SCREEN_HEIGHT-((SCREEN_HEIGHT-OFFSET)*y)/height;
-    dx = (SCREEN_WIDTH*dx)/width;
-    dy = SCREEN_HEIGHT-((SCREEN_HEIGHT-OFFSET)*dy)/height;
-    DrawRectangleGradientH(x, y, dx, dy, BLUE, PURPLE);
-    */
-    EndDrawing();
-    //-----------------------------------------------
-  }
-
-  //-----------------------------------------------
-  //-SAVE-MASK-AS-BINARY-AND-PNG-------------------
-  //-----------------------------------------------
-  if (masks != NULL) {
-    for (size_t y = 0; y < height; y++) {
-      for (size_t x = 0; x < width; x++) {
-	/// Restore labels from RGBA
-	masks[x + y*width] &= 0xFFF0;
-	masks[x + y*width] >>= 4;
-      }
-    }
-    struct bitmap_t* bitmap = uint16_to_bitmap(masks, width, height);
-    if (bitmap != NULL) {
-      save_png(bitmap, png_file);
-      free(bitmap);
-    }
-    write_array(bin_file, masks, width*height*sizeof(uint16_t));
-    free(masks);
-  }
-  CloseWindow();
diff --git a/src/prog.c b/src/prog.c
index 5350797..bf58a7d 100644
--- a/src/prog.c
+++ b/src/prog.c
@@ -2,10 +2,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#ifdef VISUAL
-#include <raylib.h>
-#endif
-
 #include <lib/lib.h>
 #include <lib/png.h>
 #include <lib/bool.h>
@@ -195,9 +191,6 @@ int main(int argc, char** argv)
   //-END-OF-PROCESSING-----------------------------
   //-----------------------------------------------
 
-#ifdef VISUAL
-#include <snippets/raylib_block.c>
-#else
   //-----------------------------------------------
   //-SAVE-MASK-AS-BINARY-AND-PNG-------------------
   //-----------------------------------------------
@@ -210,7 +203,6 @@ int main(int argc, char** argv)
     write_array(bin_file, masks, width*height*sizeof(uint16_t));
     free(masks);
   }
-#endif
   TIME(ts_g_end);
   if (!silent) {
     printf("Finished in %f ms\n", 1000*diff_time(&ts_g_end, &ts_g_start));
diff --git a/src/visual.c b/src/visual.c
new file mode 100644
index 0000000..ac6f63d
--- /dev/null
+++ b/src/visual.c
@@ -0,0 +1,311 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#ifdef VISUAL
+#include <raylib.h>
+#endif
+
+#include <lib/lib.h>
+#include <lib/png.h>
+#include <lib/bool.h>
+#include <lib/monad.h>
+#include <lib/dir.h>
+#include <lib/file.h>
+#include <lib/time.h>
+#include <lib/color.h>
+#include <lib/algo/flood_fill.h>
+#include <lib/algo/avl_tree.h>
+#include <lib/seg/util.h>
+#include <lib/seg/mask_data.h>
+
+#define OFFSET 16
+
+#define MIN_AREA 500
+#define MIN_PERIMETER 0
+
+int main(int argc, char** argv)
+{
+  char opt;
+  char* directory = NULL;
+  char* png_file = "../out.png";
+  char* bin_file = "../out.bin";
+  size_t closeup_pixel_count = 10;
+  bool_t silent = FALSE;
+  //-----------------------------------------------
+  //-GET-COMMAND-LINE-ARGUMENTS--------------------
+  //-----------------------------------------------
+  while ((opt = getopt(argc, argv, "d:b:p:n:s")) != -1) {
+    switch (opt) {
+    case 's':
+      silent = TRUE;
+      break;
+    case 'd':
+      if (!silent) {
+        printf("Parse Directory: %s\n", optarg);
+      }
+      directory = optarg;
+      break;
+    case 'b':
+      if (!silent) {
+	printf("Bin File: %s\n", optarg);
+      }
+      bin_file = optarg;
+      break;
+    case 'p':
+      if (!silent) {
+	printf("PNG File: %s\n", optarg);
+      }
+      png_file = optarg;
+      break;
+    case 'n':
+      if (!silent) {
+	printf("Closeup Size: %d\n", atoi(optarg));
+      }
+      closeup_pixel_count = atoi(optarg);
+      break;
+    case ':':
+      if (!silent) {
+	printf("Option requires value\n");
+      }
+      break;
+    case '?':
+      if (!silent) {
+	printf("Unknown option: %c\n", optopt);
+      }
+      break;
+    }
+  }
+  if (!silent) {
+    for (;optind < argc; optind++) {
+      printf("Extra arguments: %s\n", argv[optind]);
+    }
+  }
+  TIME(ts_g_start);
+  //-----------------------------------------------
+  //-PROCESS-FILES-IN-DIRECTORY--------------------
+  //-----------------------------------------------
+  char** file_list = NULL;
+  uint32_t width, height;
+  uint16_t starting_label = 1;
+  uint16_t *masks = NULL;
+  // Expect a directory to be passed as the first argument
+  if (directory != NULL) {
+    // Ensure the directory exists
+    if (is_directory(directory)) {
+      // List files in the ddirectory
+      file_list = list_directory(directory);
+      if (file_list != NULL) {
+	for (size_t index = 0; file_list[index] != NULL; index++) {
+	  char* fname = file_list[index];
+	  if (is_tif_ext(fname) == FALSE) {
+	    free(file_list[index]);
+	    continue;
+	  }
+	  // If we have a tiff file
+	  //  1. Convert to labels
+	  //  2. Find contiguous regions
+	  //  3. Combine with current total mask
+	  //  4. Free up allocations made in this process
+	  char* fpath = full_path(directory, fname);
+	  if (fpath == NULL) {
+	    free(file_list[index]);
+	    continue;
+	  }
+	  if (!silent) {
+	    printf("Loading %s...\n", fpath);
+	  }
+	  //-----------------------------------------------
+	  //-PROCESS-TIFF-TO-LABELS------------------------
+	  //-----------------------------------------------
+	  uint16_t *file_labels = tif_to_labels(fpath, &width, &height, &starting_label);
+	  if (file_labels == NULL) {
+	    free(fpath);
+	    free(file_list[index]);
+	    continue;
+	  }
+	  //-----------------------------------------------
+	  //-COMBINE-LABELS-TO-GLOBAL-MASK-----------------
+	  //-----------------------------------------------
+	  masks = combine_masks(masks, file_labels, width, height);
+	  free(file_labels);
+	  free(fpath);
+	  free(file_list[index]);
+	}
+	free(file_list);
+      }
+    }
+  }
+  if (masks == NULL) {
+    fprintf(stderr, "No masks found!\n");
+    return 1;
+  }
+
+  //-----------------------------------------------
+  //-FIND-CONTIGUOUS-REGIONS-----------------------
+  //-----------------------------------------------
+  reduce_contiguous_regions(&masks, width, height, &starting_label);
+  if (!silent) {
+    printf("%u labels found\n", starting_label-1);
+    printf("Mask dimensions: %u %u\n", width, height);
+  }
+  //-----------------------------------------------
+  //-FILTER-SMALL-REGIONS-OUT----------------------
+  //-----------------------------------------------
+  TIME(ts_filter_start);
+  filter_small_masks(masks, width, height, MIN_AREA, MIN_PERIMETER);
+  TIME(ts_filter_end);
+  if (!silent) {
+    printf("Removing small labels took %f ms\n", 1000*diff_time(&ts_filter_end, &ts_filter_start));
+  }
+  //-----------------------------------------------
+  //-FIND-CONTIGUOUS-REGIONS-----------------------
+  //-----------------------------------------------
+  //--to-make-labels-span-1-to-n-------------------
+  //-----------------------------------------------
+  reduce_contiguous_regions(&masks, width, height, &starting_label);
+  if (!silent) {
+    printf("%u remaining labels found\n", starting_label-1);
+    printf("Mask dimensions: %u %u\n", width, height);
+  }
+#ifdef AVL_INFO
+  //-----------------------------------------------
+  //-OPTIONAL:-------------------------------------
+  //-GET-MASK-META-INFORMATION---------------------
+  //-----------------------------------------------
+  struct AVLNode* root = NULL;
+  root = get_mask_data(masks, width, height);
+  if (!silent) {
+    printf("Inorder traversal of AVL tree: ");
+    print_label(root);
+    printf("\n");
+  }
+  free_avl_tree_nodes(root);
+#endif
+  //-----------------------------------------------
+  //-CLOSE-UP-SMALL-GAPS-BETWEEN-REGIONS-----------
+  //-----------------------------------------------
+  TIME(ts_start);
+  closeup(&masks, width, height, closeup_pixel_count);
+  TIME(ts_end);
+  if (!silent) {
+    printf("Closing (%lu) up took %f ms\n", closeup_pixel_count, 1000*diff_time(&ts_end, &ts_start));
+  }
+  //-----------------------------------------------
+  //-END-OF-PROCESSING-----------------------------
+  //-----------------------------------------------
+
+#ifdef VISUAL
+  //-----------------------------------------------
+  //-RAYLIB-INIT-----------------------------------
+  //-----------------------------------------------
+  SetTraceLogLevel(LOG_ERROR);
+  SetConfigFlags(FLAG_WINDOW_RESIZABLE);
+  const char* gui_title = "Image Manip - Useful for segmentations!";
+  InitWindow(SCREEN_WIDTH, SCREEN_HEIGHT, gui_title);
+
+  //-----------------------------------------------
+  // (When treating this as RGBA, last bits should ensure opaque)
+  //  This assumes 4096 (2^12) > labels
+  for (size_t y = 0; y < height; y++) {
+    for (size_t x = 0; x < width; x++) {
+      /// RGBA channels: Move labels to RGB
+      masks[x + y*width] <<= 4;
+      masks[x + y*width] |= 0x000F;
+    }
+  }
+  //-----------------------------------------------
+
+  //-----------------------------------------------
+  //-RAYLIB-IMAGE-STRUCTURING----------------------
+  //-----------------------------------------------
+  Image RaylibImage;
+  RaylibImage.width  = width;
+  RaylibImage.height = height;
+  RaylibImage.mipmaps = 1;
+  // Use Contiguous Labels
+  RaylibImage.data = masks;
+  RaylibImage.format = PIXELFORMAT_UNCOMPRESSED_R4G4B4A4;
+  //-----------------------------------------------
+
+  // Image to a Texture
+  Texture2D RaylibTexture = LoadTextureFromImage(RaylibImage);
+
+  // Scale the image to the viewport
+  /// Source Rectangle: Original Size
+  Rectangle sourceRec = { 0.0f, 0.0f, (float)width, (float)height };
+  /// Destination Rectangle: Transformed Size
+  Rectangle destRec = { 0.0f, 0.0f, (float)SCREEN_WIDTH, (float)(SCREEN_HEIGHT-OFFSET) };
+  /// Location to begin drawing
+  Vector2 origin = { (float)0, (float)-OFFSET };
+
+  // Raylib boilerplate
+  SetTargetFPS(60);
+  Camera2D camera = { 0 };
+  camera.zoom = 1.0f;
+
+  // GUI Loop
+  while (!WindowShouldClose()) {
+    //-----------------------------------------------
+    //-DRAWING---------------------------------------
+    //-----------------------------------------------
+    BeginDrawing();
+    ClearBackground(RAYWHITE);
+    BeginMode2D(camera);
+    EndMode2D();
+    DrawText("Image Manip", 0, 0, OFFSET, DARKGRAY);
+    DrawTexturePro(RaylibTexture, sourceRec, destRec, origin, (float)0,
+                   RAYWHITE);
+    /*
+    uint32_t x = 0x49, y = 0x4A;
+    uint32_t dx = 0x69 - x, dy = 0x6E - y;
+    x = (SCREEN_WIDTH*x)/width;
+    y = SCREEN_HEIGHT-((SCREEN_HEIGHT-OFFSET)*y)/height;
+    dx = (SCREEN_WIDTH*dx)/width;
+    dy = SCREEN_HEIGHT-((SCREEN_HEIGHT-OFFSET)*dy)/height;
+    DrawRectangleGradientH(x, y, dx, dy, BLUE, PURPLE);
+    */
+    EndDrawing();
+    //-----------------------------------------------
+  }
+
+  //-----------------------------------------------
+  //-SAVE-MASK-AS-BINARY-AND-PNG-------------------
+  //-----------------------------------------------
+  if (masks != NULL) {
+    for (size_t y = 0; y < height; y++) {
+      for (size_t x = 0; x < width; x++) {
+	/// Restore labels from RGBA
+	masks[x + y*width] &= 0xFFF0;
+	masks[x + y*width] >>= 4;
+      }
+    }
+    struct bitmap_t* bitmap = uint16_to_bitmap(masks, width, height);
+    if (bitmap != NULL) {
+      save_png(bitmap, png_file);
+      free(bitmap);
+    }
+    write_array(bin_file, masks, width*height*sizeof(uint16_t));
+    free(masks);
+  }
+  CloseWindow();
+#else
+  //-----------------------------------------------
+  //-SAVE-MASK-AS-BINARY-AND-PNG-------------------
+  //-----------------------------------------------
+  if (masks != NULL) {
+    struct bitmap_t* bitmap = uint16_to_bitmap(masks, width, height);
+    if (bitmap != NULL) {
+      save_png(bitmap, png_file);
+      free(bitmap);
+    }
+    write_array(bin_file, masks, width*height*sizeof(uint16_t));
+    free(masks);
+  }
+#endif
+  TIME(ts_g_end);
+  if (!silent) {
+    printf("Finished in %f ms\n", 1000*diff_time(&ts_g_end, &ts_g_start));
+  }
+  return 0;
+}