diff options
author | Alejandro Colomar <alx.manpages@gmail.com> | 2021-07-02 01:43:39 +0200 |
---|---|---|
committer | Alejandro Colomar <alx.manpages@gmail.com> | 2021-07-02 01:43:39 +0200 |
commit | 35b63769a90b6b1daaf6018838757ad1db06df2b (patch) | |
tree | 12a9c86ff1a20baf52c0348f3f40bf554eb25b4d | |
parent | 06cd9e5f7b343b67b40cdaf8d7fbd9129df68658 (diff) |
Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
-rw-r--r-- | Makefile | 6 | ||||
-rw-r--r-- | inc/vision-artificial/save/save.hpp | 2 | ||||
-rw-r--r-- | inc/vision-artificial/user/iface.hpp | 2 | ||||
-rw-r--r-- | src/ctrl/start.c | 2 | ||||
-rw-r--r-- | src/image/iface.cpp | 10 | ||||
-rw-r--r-- | src/main.c | 12 | ||||
-rw-r--r-- | src/menu/tui.c | 48 | ||||
-rw-r--r-- | src/save/save.cpp | 8 | ||||
-rw-r--r-- | src/share/share.c | 4 | ||||
-rw-r--r-- | src/user/iface.c | 2 | ||||
-rw-r--r-- | src/user/tui.c | 26 |
11 files changed, 61 insertions, 61 deletions
@@ -130,7 +130,7 @@ CFLAGS_PKG = `pkg-config --cflags ncurses` CFLAGS_PKG += `pkg-config --cflags opencv4` CFLAGS_PKG += `pkg-config --cflags zbar` CFLAGS_PKG += `pkg-config --cflags libalx-base` -CFLAGS_PKG += `pkg-config --cflags libalx-ncurses` +CFLAGS_PKG += `pkg-config --cflags libalx-curses` CFLAGS_PKG += `pkg-config --cflags libalx-cv` CFLAGS_PKG += `pkg-config --cflags libalx-ocr` CFLAGS_PKG += `pkg-config --cflags libalx-zbar` @@ -169,7 +169,7 @@ CXXFLAGS_PKG = `pkg-config --cflags ncurses` CXXFLAGS_PKG += `pkg-config --cflags opencv4` CXXFLAGS_PKG += `pkg-config --cflags zbar` CXXFLAGS_PKG += `pkg-config --cflags libalx-base` -CXXFLAGS_PKG += `pkg-config --cflags libalx-ncurses` +CXXFLAGS_PKG += `pkg-config --cflags libalx-curses` CXXFLAGS_PKG += `pkg-config --cflags libalx-cv` CXXFLAGS_PKG += `pkg-config --cflags libalx-ocr` CXXFLAGS_PKG += `pkg-config --cflags libalx-zbar` @@ -199,7 +199,7 @@ LIBS_OPT += -flto LIBS_OPT += -fuse-linker-plugin LIBS_PKG_A += `pkg-config --libs --static libalx-base` -LIBS_PKG_A += `pkg-config --libs --static libalx-ncurses` +LIBS_PKG_A += `pkg-config --libs --static libalx-curses` LIBS_PKG_A += `pkg-config --libs --static libalx-zbar` LIBS_PKG_A += `pkg-config --libs libalx-cv` ## libalx-cv diff --git a/inc/vision-artificial/save/save.hpp b/inc/vision-artificial/save/save.hpp index 40bd109..aca389d 100644 --- a/inc/vision-artificial/save/save.hpp +++ b/inc/vision-artificial/save/save.hpp @@ -17,7 +17,7 @@ #include <opencv2/core/core.hpp> -#include <libalx/base/compiler/restrict.hxx> +#include <alx/base/compiler/restrict.hxx> /****************************************************************************** diff --git a/inc/vision-artificial/user/iface.hpp b/inc/vision-artificial/user/iface.hpp index ef60f6a..d6426b9 100644 --- a/inc/vision-artificial/user/iface.hpp +++ b/inc/vision-artificial/user/iface.hpp @@ -17,7 +17,7 @@ #include <cstddef> #include <cstdint> -#include <libalx/base/compiler.hxx> +#include <alx/base/compiler.hxx> /****************************************************************************** diff --git a/src/ctrl/start.c b/src/ctrl/start.c index 697660d..eb78e66 100644 --- a/src/ctrl/start.c +++ b/src/ctrl/start.c @@ -15,7 +15,7 @@ #include <string.h> #define ALX_NO_PREFIX -#include <libalx/base/errno.h> +#include <alx/base/errno.h> #include "vision-artificial/image/iface.h" #include "vision-artificial/save/save.h" diff --git a/src/image/iface.cpp b/src/image/iface.cpp index 77ef52e..9f00cda 100644 --- a/src/image/iface.cpp +++ b/src/image/iface.cpp @@ -24,11 +24,11 @@ #include <opencv2/ximgproc.hpp> #define ALX_NO_PREFIX -#include <libalx/base/compiler.hxx> -#include <libalx/base/stdio.hxx> -#include <libalx/extra/cv/cv.hxx> -#include <libalx/extra/ocr/ocr.hxx> -#include <libalx/extra/zbar/zbar.hxx> +#include <alx/base/compiler.hxx> +#include <alx/base/stdio.hxx> +#include <alx/cv/cv.hxx> +#include <alx/ocr/ocr.hxx> +#include <alx/zbar/zbar.hxx> #include "vision-artificial/image/calib3d.hpp" #include "vision-artificial/image/cv.hpp" @@ -9,8 +9,8 @@ ******************************************************************************/ #include <stdio.h> -#include <libalx/base/stdio.h> -#include <libalx/extra/ncurses/ncurses.h> +#include <alx/base/stdio.h> +#include <alx/curses/curses.h> #include "vision-artificial/image/iface.h" #include "vision-artificial/menu/iface.h" @@ -51,8 +51,8 @@ int main (int argc, char *argv[]) static void init (int argc, char *argv[]) { - alx_ncurses_init(); - alx_ncurses_pause(); + alx_curses_init(); + alx_curses_pause(); save_init(); @@ -66,8 +66,8 @@ static void deinit (void) img_iface_deinit(); - alx_ncurses_resume(); - alx_ncurses_deinit(); + alx_curses_resume(); + alx_curses_deinit(); } diff --git a/src/menu/tui.c b/src/menu/tui.c index f01cb8e..f2de57d 100644 --- a/src/menu/tui.c +++ b/src/menu/tui.c @@ -15,9 +15,9 @@ #include <ncurses.h> -#include <libalx/base/compiler.h> -#include <libalx/base/stdio.h> -#include <libalx/extra/ncurses/ncurses.h> +#include <alx/base/compiler.h> +#include <alx/base/stdio.h> +#include <alx/curses/curses.h> #include "vision-artificial/ctrl/start.h" #include "vision-artificial/save/save.h" @@ -57,7 +57,7 @@ static void menu_devel (void); ******************************************************************************/ void menu_tui (void) { - static const struct Alx_Ncurses_Menu mnu[] = { + static const struct Alx_Curses_Menu mnu[] = { {7, 4, "[0] Exit program"}, {2, 4, "[1] Continue"}, {4, 4, "[2] Disclaimer of warranty"}, @@ -67,14 +67,14 @@ void menu_tui (void) bool wh; int_fast8_t sw; - alx_ncurses_resume(); + alx_curses_resume(); h = 23; w = 80; wh = true; while (wh) { - sw = alx_ncurses_menu(h, w, ARRAY_SIZE(mnu), mnu, "MENU:"); + sw = alx_curses_menu(h, w, ARRAY_SIZE(mnu), mnu, "MENU:"); switch (sw) { case 0: @@ -84,19 +84,19 @@ void menu_tui (void) menu_continue(); break; case 2: - alx_ncurses_pause(); + alx_curses_pause(); print_share_file(SHARE_DISCLAIMER); - alx_ncurses_resume(); + alx_curses_resume(); break; case 3: - alx_ncurses_pause(); + alx_curses_pause(); print_share_file(SHARE_LICENSE); - alx_ncurses_resume(); + alx_curses_resume(); break; } } - alx_ncurses_pause(); + alx_curses_pause(); } @@ -105,7 +105,7 @@ void menu_tui (void) ******************************************************************************/ static void menu_continue (void) { - static const struct Alx_Ncurses_Menu mnu[] = { + static const struct Alx_Curses_Menu mnu[] = { {6, 4, "[0] Back"}, {2, 4, "[1] Start"}, {3, 4, "[2] Change file name"}, @@ -133,39 +133,39 @@ static void menu_continue (void) win = newwin(h, w, r, c); mvwprintw(win, mnu[1].r, mnu[1].c, "%s (File: \"%s\")", mnu[1].t, saved_name); - sw = alx_ncurses_menu_w(win, ARRAY_SIZE(mnu), mnu, "CONTINUE:"); + sw = alx_curses_menu_w(win, ARRAY_SIZE(mnu), mnu, "CONTINUE:"); switch (sw) { case 0: wh = false; break; case 1: - alx_ncurses_delwin(win); - alx_ncurses_pause(); + alx_curses_delwin(win); + alx_curses_pause(); start_switch(); printf("Press ENTER to continue"); alx_wait4enter(); - alx_ncurses_resume(); + alx_curses_resume(); break; case 2: save_reset_fpath(); - alx_ncurses_get_fname(saved_path, saved_name, true, + alx_curses_get_fname(saved_path, saved_name, true, w2, r2, txt[0], NULL, 2); - alx_ncurses_delwin(win); + alx_curses_delwin(win); break; case 3: - alx_ncurses_delwin(win); + alx_curses_delwin(win); menu_devel(); break; } } - alx_ncurses_delwin(win); + alx_curses_delwin(win); } static void menu_devel (void) { - static const struct Alx_Ncurses_Menu mnu[] = { + static const struct Alx_Curses_Menu mnu[] = { {4, 4, "[0] Back"}, {2, 4, "[1] Change log mode"} }; @@ -192,20 +192,20 @@ static void menu_devel (void) wh = true; while (wh) { - sw = alx_ncurses_menu_w(win, ARRAY_SIZE(mnu), mnu, + sw = alx_curses_menu_w(win, ARRAY_SIZE(mnu), mnu, "DEVELOPER OPTIONS:"); switch (sw) { case 0: wh = false; break; case 1: - user_iface_log.visible = alx_ncurses_get_u8(0, 2, 2, + user_iface_log.visible = alx_curses_get_u8(0, 2, 2, w2, r2, txt[0], NULL, 2); break; } } - alx_ncurses_delwin(win); + alx_curses_delwin(win); } diff --git a/src/save/save.cpp b/src/save/save.cpp index 9288243..37bf030 100644 --- a/src/save/save.cpp +++ b/src/save/save.cpp @@ -20,10 +20,10 @@ #include <opencv2/highgui/highgui.hpp> #define ALX_NO_PREFIX -#include <libalx/base/compiler.hxx> -#include <libalx/base/errno.hxx> -#include <libalx/base/stdio.hxx> -#include <libalx/extra/cv/cv.hxx> +#include <alx/base/compiler.hxx> +#include <alx/base/errno.hxx> +#include <alx/base/stdio.hxx> +#include <alx/cv/cv.hxx> #include "vision-artificial/user/iface.hpp" diff --git a/src/share/share.c b/src/share/share.c index 1a86dc2..93a9be0 100644 --- a/src/share/share.c +++ b/src/share/share.c @@ -15,8 +15,8 @@ #include <stdlib.h> #define ALX_NO_PREFIX -#include <libalx/base/errno.h> -#include <libalx/base/stdio.h> +#include <alx/base/errno.h> +#include <alx/base/stdio.h> /****************************************************************************** diff --git a/src/user/iface.c b/src/user/iface.c index c78c548..353cf59 100644 --- a/src/user/iface.c +++ b/src/user/iface.c @@ -13,7 +13,7 @@ #include <stdint.h> #include <stdio.h> -#include <libalx/base/stdio.h> +#include <alx/base/stdio.h> #include "vision-artificial/image/iface.h" #include "vision-artificial/user/tui.h" diff --git a/src/user/tui.c b/src/user/tui.c index f48a4f2..aa157d7 100644 --- a/src/user/tui.c +++ b/src/user/tui.c @@ -12,8 +12,8 @@ #include <inttypes.h> #include <ncurses.h> -#include <libalx/base/stdio.h> -#include <libalx/extra/ncurses/ncurses.h> +#include <alx/base/stdio.h> +#include <alx/curses/curses.h> #include "vision-artificial/image/iface.h" #include "vision-artificial/user/iface.h" @@ -57,7 +57,7 @@ void user_tui_init (void) int_fast8_t h1, w1, r1, c1; int_fast8_t h2, w2, r2, c2; - alx_ncurses_resume(); + alx_curses_resume(); /* Dimensions: log */ h1 = 54; @@ -82,9 +82,9 @@ void user_tui_cleanup (void) { /* Del wins & return to terminal mode */ - alx_ncurses_delwin(win_log); - alx_ncurses_delwin(win_help); - alx_ncurses_pause(); + alx_curses_delwin(win_log); + alx_curses_delwin(win_help); + alx_curses_pause(); } int user_tui (const char *restrict title, @@ -104,7 +104,7 @@ void user_tui_fname (const char *restrict fpath, w = 75; r = 10; - alx_ncurses_get_fname(fpath, fname, false, w, r, "File name:", + alx_curses_get_fname(fpath, fname, false, w, r, "File name:", "Valid extensions: .bmp .dib .jpeg .png .pbm .pgm .ppm .tiff", 2); } @@ -115,8 +115,8 @@ void user_tui_show_log (const char *restrict title, werase(win_log); box(win_log, 0, 0); - alx_ncurses_title(win_log, title); - alx_ncurses_subtitle(win_log, subtitle); + alx_curses_title(win_log, title); + alx_curses_subtitle(win_log, subtitle); log_loop(); wrefresh(win_log); @@ -131,7 +131,7 @@ double user_tui_getdbl (double m, double def, double M, w = 75; r = 10; - return alx_ncurses_get_dbl(m, def, M, w, r, title, help, 2); + return alx_curses_get_dbl(m, def, M, w, r, title, help, 2); } int user_tui_getint (int m, int def, int M, @@ -143,18 +143,18 @@ int user_tui_getint (int m, int def, int M, w = 75; r = 10; - return alx_ncurses_get_int(m, def, M, w, r, title, help, 2); + return alx_curses_get_int(m, def, M, w, r, title, help, 2); } void user_tui_show_ocr (void) { - alx_ncurses_pause(); + alx_curses_pause(); printf("%s", img_ocr_text); alx_wait4enter(); - alx_ncurses_resume(); + alx_curses_resume(); } |