From 94b1a846375b818d683c3808b7df521b1d3ab8f3 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Mon, 19 Mar 2018 19:15:39 +1100 Subject: Added FLTK.Widgets.Charts --- progress.txt | 2 +- src/c_fl_chart.cpp | 147 +++++++++++++++++ src/c_fl_chart.h | 52 ++++++ src/fltk-widgets-charts.adb | 385 ++++++++++++++++++++++++++++++++++++++++++++ src/fltk-widgets-charts.ads | 126 +++++++++++++++ src/fltk.ads | 4 + 6 files changed, 715 insertions(+), 1 deletion(-) create mode 100644 src/c_fl_chart.cpp create mode 100644 src/c_fl_chart.h create mode 100644 src/fltk-widgets-charts.adb create mode 100644 src/fltk-widgets-charts.ads diff --git a/progress.txt b/progress.txt index ea35729..99247b3 100644 --- a/progress.txt +++ b/progress.txt @@ -30,6 +30,7 @@ FLTK.Widgets.Buttons.Light.Round.Radio FLTK.Widgets.Buttons.Radio FLTK.Widgets.Buttons.Repeat FLTK.Widgets.Buttons.Toggle +FLTK.Widgets.Charts FLTK.Widgets.Clocks FLTK.Widgets.Clocks.Updated FLTK.Widgets.Clocks.Updated.Round @@ -98,7 +99,6 @@ FL_GIF_Image FL_XPM_Image FL_Shared_Image FL_Tiled_Image -FL_Chart FL_Browser FL_Check_Browser FL_File_Browser diff --git a/src/c_fl_chart.cpp b/src/c_fl_chart.cpp new file mode 100644 index 0000000..ac79731 --- /dev/null +++ b/src/c_fl_chart.cpp @@ -0,0 +1,147 @@ + + +#include +#include "c_fl_chart.h" +#include "c_fl_type.h" + + + + +class My_Chart : public Fl_Chart { + public: + using Fl_Chart::Fl_Chart; + friend void chart_set_draw_hook(CHART n, void * d); + friend void fl_chart_draw(CHART n); + friend void chart_set_handle_hook(CHART n, void * h); + friend int fl_chart_handle(CHART n, int e); + protected: + void draw(); + void real_draw(); + int handle(int e); + int real_handle(int e); + d_hook_p draw_hook; + h_hook_p handle_hook; +}; + +void My_Chart::draw() { + (*draw_hook)(this->user_data()); +} + +void My_Chart::real_draw() { + Fl_Chart::draw(); +} + +int My_Chart::handle(int e) { + return (*handle_hook)(this->user_data(), e); +} + +int My_Chart::real_handle(int e) { + return Fl_Chart::handle(e); +} + +void chart_set_draw_hook(CHART n, void * d) { + reinterpret_cast(n)->draw_hook = reinterpret_cast(d); +} + +void fl_chart_draw(CHART n) { + reinterpret_cast(n)->real_draw(); +} + +void chart_set_handle_hook(CHART n, void * h) { + reinterpret_cast(n)->handle_hook = reinterpret_cast(h); +} + +int fl_chart_handle(CHART n, int e) { + return reinterpret_cast(n)->real_handle(e); +} + + + + +CHART new_fl_chart(int x, int y, int w, int h, char* label) { + My_Chart *b = new My_Chart(x, y, w, h, label); + return b; +} + +void free_fl_chart(CHART b) { + delete reinterpret_cast(b); +} + + + + +void fl_chart_add(CHART b, double v, char * s, unsigned int c) { + reinterpret_cast(b)->add(v,s,c); +} + +void fl_chart_insert(CHART b, int i, double v, char * s, unsigned int c) { + reinterpret_cast(b)->insert(i,v,s,c); +} + +void fl_chart_replace(CHART b, int i, double v, char * s, unsigned int c) { + reinterpret_cast(b)->replace(i,v,s,c); +} + +void fl_chart_clear(CHART b) { + reinterpret_cast(b)->clear(); +} + + + + +int fl_chart_get_autosize(CHART b) { + return reinterpret_cast(b)->autosize(); +} + +void fl_chart_set_autosize(CHART b, int a) { + reinterpret_cast(b)->autosize(a); +} + +void fl_chart_get_bounds(CHART b, double * l, double * u) { + reinterpret_cast(b)->bounds(l,u); +} + +void fl_chart_set_bounds(CHART b, double l, double u) { + reinterpret_cast(b)->bounds(l,u); +} + +int fl_chart_get_maxsize(CHART b) { + return reinterpret_cast(b)->maxsize(); +} + +void fl_chart_set_maxsize(CHART b, int m) { + reinterpret_cast(b)->maxsize(m); +} + +int fl_chart_size(CHART b) { + return reinterpret_cast(b)->size(); +} + + + + +unsigned int fl_chart_get_textcolor(CHART b) { + return reinterpret_cast(b)->textcolor(); +} + +void fl_chart_set_textcolor(CHART b, unsigned int c) { + reinterpret_cast(b)->textcolor(c); +} + +int fl_chart_get_textfont(CHART b) { + return reinterpret_cast(b)->textfont(); +} + +void fl_chart_set_textfont(CHART b, int f) { + reinterpret_cast(b)->textfont(f); +} + +int fl_chart_get_textsize(CHART b) { + return reinterpret_cast(b)->textsize(); +} + +void fl_chart_set_textsize(CHART b, int s) { + reinterpret_cast(b)->textsize(s); +} + + diff --git a/src/c_fl_chart.h b/src/c_fl_chart.h new file mode 100644 index 0000000..76e8e26 --- /dev/null +++ b/src/c_fl_chart.h @@ -0,0 +1,52 @@ + + +#ifndef FL_CHART_GUARD +#define FL_CHART_GUARD + + + + +typedef void* CHART; + + + + +extern "C" void chart_set_draw_hook(CHART n, void * d); +extern "C" void fl_chart_draw(CHART n); +extern "C" void chart_set_handle_hook(CHART n, void * h); +extern "C" int fl_chart_handle(CHART n, int e); + + + + +extern "C" CHART new_fl_chart(int x, int y, int w, int h, char * label); +extern "C" void free_fl_chart(CHART b); + + + + +extern "C" void fl_chart_add(CHART b, double v, char * s, unsigned int c); +extern "C" void fl_chart_insert(CHART b, int i, double v, char * s, unsigned int c); +extern "C" void fl_chart_replace(CHART b, int i, double v, char * s, unsigned int c); +extern "C" void fl_chart_clear(CHART b); + + +extern "C" int fl_chart_get_autosize(CHART b); +extern "C" void fl_chart_set_autosize(CHART b, int a); +extern "C" void fl_chart_get_bounds(CHART b, double * l, double * u); +extern "C" void fl_chart_set_bounds(CHART b, double l, double u); +extern "C" int fl_chart_get_maxsize(CHART b); +extern "C" void fl_chart_set_maxsize(CHART b, int m); +extern "C" int fl_chart_size(CHART b); + + +extern "C" unsigned int fl_chart_get_textcolor(CHART b); +extern "C" void fl_chart_set_textcolor(CHART b, unsigned int c); +extern "C" int fl_chart_get_textfont(CHART b); +extern "C" void fl_chart_set_textfont(CHART b, int f); +extern "C" int fl_chart_get_textsize(CHART b); +extern "C" void fl_chart_set_textsize(CHART b, int s); + + +#endif + diff --git a/src/fltk-widgets-charts.adb b/src/fltk-widgets-charts.adb new file mode 100644 index 0000000..f828576 --- /dev/null +++ b/src/fltk-widgets-charts.adb @@ -0,0 +1,385 @@ + + +with + + Interfaces.C, + System; + +use type + + Interfaces.C.int, + System.Address; + + +package body FLTK.Widgets.Charts is + + + procedure chart_set_draw_hook + (W, D : in System.Address); + pragma Import (C, chart_set_draw_hook, "chart_set_draw_hook"); + + procedure chart_set_handle_hook + (W, H : in System.Address); + pragma Import (C, chart_set_handle_hook, "chart_set_handle_hook"); + + + + + function new_fl_chart + (X, Y, W, H : in Interfaces.C.int; + Text : in Interfaces.C.char_array) + return System.Address; + pragma Import (C, new_fl_chart, "new_fl_chart"); + + procedure free_fl_chart + (B : in System.Address); + pragma Import (C, free_fl_chart, "free_fl_chart"); + + + + + procedure fl_chart_add + (C : in System.Address; + V : in Interfaces.C.double; + L : in Interfaces.C.char_array; + P : in Interfaces.C.unsigned); + pragma Import (C, fl_chart_add, "fl_chart_add"); + + procedure fl_chart_insert + (C : in System.Address; + I : in Interfaces.C.int; + V : in Interfaces.C.double; + L : in Interfaces.C.char_array; + P : in Interfaces.C.unsigned); + pragma Import (C, fl_chart_insert, "fl_chart_insert"); + + procedure fl_chart_replace + (C : in System.Address; + I : in Interfaces.C.int; + V : in Interfaces.C.double; + L : in Interfaces.C.char_array; + P : in Interfaces.C.unsigned); + pragma Import (C, fl_chart_replace, "fl_chart_replace"); + + procedure fl_chart_clear + (C : in System.Address); + pragma Import (C, fl_chart_clear, "fl_chart_clear"); + + + + + function fl_chart_get_autosize + (C : in System.Address) + return Interfaces.C.int; + pragma Import (C, fl_chart_get_autosize, "fl_chart_get_autosize"); + + procedure fl_chart_set_autosize + (C : in System.Address; + A : in Interfaces.C.int); + pragma Import (C, fl_chart_set_autosize, "fl_chart_set_autosize"); + + procedure fl_chart_get_bounds + (C : in System.Address; + L, U : out Interfaces.C.double); + pragma Import (C, fl_chart_get_bounds, "fl_chart_get_bounds"); + + procedure fl_chart_set_bounds + (C : in System.Address; + L, U : in Interfaces.C.double); + pragma Import (C, fl_chart_set_bounds, "fl_chart_set_bounds"); + + function fl_chart_get_maxsize + (C : in System.Address) + return Interfaces.C.int; + pragma Import (C, fl_chart_get_maxsize, "fl_chart_get_maxsize"); + + procedure fl_chart_set_maxsize + (C : in System.Address; + T : in Interfaces.C.int); + pragma Import (C, fl_chart_set_maxsize, "fl_chart_set_maxsize"); + + function fl_chart_size + (C : in System.Address) + return Interfaces.C.int; + pragma Import (C, fl_chart_size, "fl_chart_size"); + + + + + function fl_chart_get_textcolor + (C : in System.Address) + return Interfaces.C.unsigned; + pragma Import (C, fl_chart_get_textcolor, "fl_chart_get_textcolor"); + + procedure fl_chart_set_textcolor + (C : in System.Address; + T : in Interfaces.C.unsigned); + pragma Import (C, fl_chart_set_textcolor, "fl_chart_set_textcolor"); + + function fl_chart_get_textfont + (C : in System.Address) + return Interfaces.C.int; + pragma Import (C, fl_chart_get_textfont, "fl_chart_get_textfont"); + + procedure fl_chart_set_textfont + (C : in System.Address; + T : in Interfaces.C.int); + pragma Import (C, fl_chart_set_textfont, "fl_chart_set_textfont"); + + function fl_chart_get_textsize + (C : in System.Address) + return Interfaces.C.int; + pragma Import (C, fl_chart_get_textsize, "fl_chart_get_textsize"); + + procedure fl_chart_set_textsize + (C : in System.Address; + T : in Interfaces.C.int); + pragma Import (C, fl_chart_set_textsize, "fl_chart_set_textsize"); + + + + + procedure fl_chart_draw + (W : in System.Address); + pragma Import (C, fl_chart_draw, "fl_chart_draw"); + + function fl_chart_handle + (W : in System.Address; + E : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_chart_handle, "fl_chart_handle"); + + + + + procedure Finalize + (This : in out Chart) is + begin + if This.Void_Ptr /= System.Null_Address and then + This in Chart'Class + then + free_fl_chart (This.Void_Ptr); + This.Void_Ptr := System.Null_Address; + end if; + Finalize (Widget (This)); + end Finalize; + + + + + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Chart is + begin + return This : Chart do + This.Void_Ptr := new_fl_chart + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + chart_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + chart_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; + + + + + procedure Add + (This : in out Chart; + Data_Value : in Long_Float; + Data_Label : in String := ""; + Data_Color : in Color := No_Color) is + begin + fl_chart_add + (This.Void_Ptr, + Interfaces.C.double (Data_Value), + Interfaces.C.To_C (Data_Label), + Interfaces.C.unsigned (Data_Color)); + end Add; + + + procedure Insert + (This : in out Chart; + Position : in Natural; + Data_Value : in Long_Float; + Data_Label : in String := ""; + Data_Color : in Color := No_Color) is + begin + fl_chart_insert + (This.Void_Ptr, + Interfaces.C.int (Position), + Interfaces.C.double (Data_Value), + Interfaces.C.To_C (Data_Label), + Interfaces.C.unsigned (Data_Color)); + end Insert; + + + procedure Replace + (This : in out Chart; + Position : in Natural; + Data_Value : in Long_Float; + Data_Label : in String := ""; + Data_Color : in Color := No_Color) is + begin + fl_chart_replace + (This.Void_Ptr, + Interfaces.C.int (Position), + Interfaces.C.double (Data_Value), + Interfaces.C.To_C (Data_Label), + Interfaces.C.unsigned (Data_Color)); + end Replace; + + + procedure Clear + (This : in out Chart) is + begin + fl_chart_clear (This.Void_Ptr); + end Clear; + + + + + function Will_Autosize + (This : in Chart) + return Boolean is + begin + return fl_chart_get_autosize (This.Void_Ptr) /= 0; + end Will_Autosize; + + + procedure Set_Autosize + (This : in out Chart; + To : in Boolean) is + begin + fl_chart_set_autosize (This.Void_Ptr, Boolean'Pos (To)); + end Set_Autosize; + + + procedure Get_Bounds + (This : in Chart; + Lower, Upper : out Long_Float) + is + L, U : Interfaces.C.double; + begin + fl_chart_get_bounds (This.Void_Ptr, L, U); + Lower := Long_Float (L); + Upper := Long_Float (U); + end Get_Bounds; + + + procedure Set_Bounds + (This : in out Chart; + Lower, Upper : in Long_Float) is + begin + fl_chart_set_bounds + (This.Void_Ptr, + Interfaces.C.double (Lower), + Interfaces.C.double (Upper)); + end Set_Bounds; + + + function Get_Maximum_Size + (This : in Chart) + return Natural is + begin + return Natural (fl_chart_get_maxsize (This.Void_Ptr)); + end Get_Maximum_Size; + + + procedure Set_Maximum_Size + (This : in out Chart; + To : in Natural) is + begin + fl_chart_set_maxsize (This.Void_Ptr, Interfaces.C.int (To)); + end Set_Maximum_Size; + + + function Get_Size + (This : in Chart) + return Natural is + begin + return Natural (fl_chart_size (This.Void_Ptr)); + end Get_Size; + + + + + function Get_Text_Color + (This : in Chart) + return Color is + begin + return Color (fl_chart_get_textcolor (This.Void_Ptr)); + end Get_Text_Color; + + + procedure Set_Text_Color + (This : in out Chart; + To : in Color) is + begin + fl_chart_set_textcolor (This.Void_Ptr, Interfaces.C.unsigned (To)); + end Set_Text_Color; + + + function Get_Text_Font + (This : in Chart) + return Font_Kind is + begin + return Font_Kind'Val (fl_chart_get_textfont (This.Void_Ptr)); + end Get_Text_Font; + + + procedure Set_Text_Font + (This : in out Chart; + To : in Font_Kind) is + begin + fl_chart_set_textfont (This.Void_Ptr, Font_Kind'Pos (To)); + end Set_Text_Font; + + + function Get_Text_Size + (This : in Chart) + return Font_Size is + begin + return Font_Size (fl_chart_get_textsize (This.Void_Ptr)); + end Get_Text_Size; + + + procedure Set_Text_Size + (This : in out Chart; + To : in Font_Size) is + begin + fl_chart_set_textsize (This.Void_Ptr, Interfaces.C.int (To)); + end Set_Text_Size; + + + + + procedure Draw + (This : in out Chart) is + begin + fl_chart_draw (This.Void_Ptr); + end Draw; + + + function Handle + (This : in out Chart; + Event : in Event_Kind) + return Event_Outcome is + begin + return Event_Outcome'Val + (fl_chart_handle (This.Void_Ptr, Event_Kind'Pos (Event))); + end Handle; + + +end FLTK.Widgets.Charts; + diff --git a/src/fltk-widgets-charts.ads b/src/fltk-widgets-charts.ads new file mode 100644 index 0000000..50373b0 --- /dev/null +++ b/src/fltk-widgets-charts.ads @@ -0,0 +1,126 @@ + + +package FLTK.Widgets.Charts is + + + type Chart is new Widget with private; + + + + + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Chart; + + end Forge; + + + + + procedure Add + (This : in out Chart; + Data_Value : in Long_Float; + Data_Label : in String := ""; + Data_Color : in Color := No_Color); + + procedure Insert + (This : in out Chart; + Position : in Natural; + Data_Value : in Long_Float; + Data_Label : in String := ""; + Data_Color : in Color := No_Color); + + procedure Replace + (This : in out Chart; + Position : in Natural; + Data_Value : in Long_Float; + Data_Label : in String := ""; + Data_Color : in Color := No_Color); + + procedure Clear + (This : in out Chart); + + + + + function Will_Autosize + (This : in Chart) + return Boolean; + + procedure Set_Autosize + (This : in out Chart; + To : in Boolean); + + procedure Get_Bounds + (This : in Chart; + Lower, Upper : out Long_Float); + + procedure Set_Bounds + (This : in out Chart; + Lower, Upper : in Long_Float); + + function Get_Maximum_Size + (This : in Chart) + return Natural; + + procedure Set_Maximum_Size + (This : in out Chart; + To : in Natural); + + function Get_Size + (This : in Chart) + return Natural; + + + + + function Get_Text_Color + (This : in Chart) + return Color; + + procedure Set_Text_Color + (This : in out Chart; + To : in Color); + + function Get_Text_Font + (This : in Chart) + return Font_Kind; + + procedure Set_Text_Font + (This : in out Chart; + To : in Font_Kind); + + function Get_Text_Size + (This : in Chart) + return Font_Size; + + procedure Set_Text_Size + (This : in out Chart; + To : in Font_Size); + + + + + procedure Draw + (This : in out Chart); + + function Handle + (This : in out Chart; + Event : in Event_Kind) + return Event_Outcome; + + +private + + + type Chart is new Widget with null record; + + overriding procedure Finalize + (This : in out Chart); + + +end FLTK.Widgets.Charts; + diff --git a/src/fltk.ads b/src/fltk.ads index 91a7b94..025fe16 100644 --- a/src/fltk.ads +++ b/src/fltk.ads @@ -24,6 +24,7 @@ package FLTK is type Color is new Natural; + No_Color : constant Color; type Alignment is private; @@ -213,6 +214,9 @@ private (This : in out Wrapper); + No_Color : constant Color := 0; + + type Alignment is new Interfaces.Unsigned_16; Align_Center : constant Alignment := 0; Align_Top : constant Alignment := 1; -- cgit