From 098c61c36dfc274a891ef90db2cb46b473c5fde3 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Sat, 3 Mar 2018 17:17:54 +1100 Subject: Added FLTK.Widgets.Valuators.Dials --- progress.txt | 4 +- src/c_fl_dial.cpp | 92 ++++++++++++++++++ src/c_fl_dial.h | 36 +++++++ src/fltk-widgets-valuators-dials.adb | 179 +++++++++++++++++++++++++++++++++++ src/fltk-widgets-valuators-dials.ads | 61 ++++++++++++ 5 files changed, 370 insertions(+), 2 deletions(-) create mode 100644 src/c_fl_dial.cpp create mode 100644 src/c_fl_dial.h create mode 100644 src/fltk-widgets-valuators-dials.adb create mode 100644 src/fltk-widgets-valuators-dials.ads diff --git a/progress.txt b/progress.txt index 554b935..7387ada 100644 --- a/progress.txt +++ b/progress.txt @@ -5,7 +5,7 @@ Approximate Progress List (Incomplete) -Overall estimate: 40-45% +Overall estimate: ???% @@ -49,6 +49,7 @@ FLTK.Widgets.Progress_Bars FLTK.Widgets.Valuators.Adjusters FLTK.Widgets.Valuators.Counters FLTK.Widgets.Valuators.Counters.Simple +FLTK.Widgets.Valuators.Dials @@ -98,7 +99,6 @@ FL_Tabs FL_Tile FL_Tree FL_Wizard -FL_Dial FL_Fill_Dial FL_Line_Dial FL_Roller diff --git a/src/c_fl_dial.cpp b/src/c_fl_dial.cpp new file mode 100644 index 0000000..1e88750 --- /dev/null +++ b/src/c_fl_dial.cpp @@ -0,0 +1,92 @@ + + +#include +#include "c_fl_dial.h" +#include "c_fl_type.h" + + + + +class My_Dial : public Fl_Dial { + public: + using Fl_Dial::Fl_Dial; + friend void dial_set_draw_hook(DIAL v, void * d); + friend void fl_dial_draw(DIAL v); + friend void dial_set_handle_hook(DIAL v, void * h); + friend int fl_dial_handle(DIAL v, 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_Dial::draw() { + (*draw_hook)(this->user_data()); +} + +void My_Dial::real_draw() { + Fl_Dial::draw(); +} + +int My_Dial::handle(int e) { + return (*handle_hook)(this->user_data(), e); +} + +int My_Dial::real_handle(int e) { + return Fl_Dial::handle(e); +} + +void dial_set_draw_hook(DIAL v, void * d) { + reinterpret_cast(v)->draw_hook = reinterpret_cast(d); +} + +void fl_dial_draw(DIAL v) { + reinterpret_cast(v)->real_draw(); +} + +void dial_set_handle_hook(DIAL v, void * h) { + reinterpret_cast(v)->handle_hook = reinterpret_cast(h); +} + +int fl_dial_handle(DIAL v, int e) { + return reinterpret_cast(v)->real_handle(e); +} + + + + +DIAL new_fl_dial(int x, int y, int w, int h, char* label) { + My_Dial *v = new My_Dial(x, y, w, h, label); + return v; +} + +void free_fl_dial(DIAL v) { + delete reinterpret_cast(v); +} + + + + +int fl_dial_get_angle1(DIAL v) { + return reinterpret_cast(v)->angle1(); +} + +void fl_dial_set_angle1(DIAL v, int t) { + reinterpret_cast(v)->angle1(t); +} + +int fl_dial_get_angle2(DIAL v) { + return reinterpret_cast(v)->angle2(); +} + +void fl_dial_set_angle2(DIAL v, int t) { + reinterpret_cast(v)->angle2(t); +} + +void fl_dial_set_angles(DIAL v, int a, int b) { + reinterpret_cast(v)->angles(a,b); +} + diff --git a/src/c_fl_dial.h b/src/c_fl_dial.h new file mode 100644 index 0000000..888dcca --- /dev/null +++ b/src/c_fl_dial.h @@ -0,0 +1,36 @@ + + +#ifndef FL_DIAL_GUARD +#define FL_DIAL_GUARD + + + + +typedef void* DIAL; + + + + +extern "C" void dial_set_draw_hook(DIAL v, void * d); +extern "C" void fl_dial_draw(DIAL v); +extern "C" void dial_set_handle_hook(DIAL v, void * h); +extern "C" int fl_dial_handle(DIAL v, int e); + + + + +extern "C" DIAL new_fl_dial(int x, int y, int w, int h, char* label); +extern "C" void free_fl_dial(DIAL v); + + + + +extern "C" int fl_dial_get_angle1(DIAL v); +extern "C" void fl_dial_set_angle1(DIAL v, int t); +extern "C" int fl_dial_get_angle2(DIAL v); +extern "C" void fl_dial_set_angle2(DIAL v, int t); +extern "C" void fl_dial_set_angles(DIAL v, int a, int b); + + +#endif + diff --git a/src/fltk-widgets-valuators-dials.adb b/src/fltk-widgets-valuators-dials.adb new file mode 100644 index 0000000..c66d655 --- /dev/null +++ b/src/fltk-widgets-valuators-dials.adb @@ -0,0 +1,179 @@ + + +with + + Interfaces.C.Strings, + System; + +use type + + System.Address; + + +package body FLTK.Widgets.Valuators.Dials is + + + procedure dial_set_draw_hook + (W, D : in System.Address); + pragma Import (C, dial_set_draw_hook, "dial_set_draw_hook"); + + procedure dial_set_handle_hook + (W, H : in System.Address); + pragma Import (C, dial_set_handle_hook, "dial_set_handle_hook"); + + + + + function new_fl_dial + (X, Y, W, H : in Interfaces.C.int; + Text : in Interfaces.C.char_array) + return System.Address; + pragma Import (C, new_fl_dial, "new_fl_dial"); + + procedure free_fl_dial + (D : in System.Address); + pragma Import (C, free_fl_dial, "free_fl_dial"); + + + + + function fl_dial_get_angle1 + (D : in System.Address) + return Interfaces.C.int; + pragma Import (C, fl_dial_get_angle1, "fl_dial_get_angle1"); + + procedure fl_dial_set_angle1 + (D : in System.Address; + T : in Interfaces.C.int); + pragma Import (C, fl_dial_set_angle1, "fl_dial_set_angle1"); + + function fl_dial_get_angle2 + (D : in System.Address) + return Interfaces.C.int; + pragma Import (C, fl_dial_get_angle2, "fl_dial_get_angle2"); + + procedure fl_dial_set_angle2 + (D : in System.Address; + T : in Interfaces.C.int); + pragma Import (C, fl_dial_set_angle2, "fl_dial_set_angle2"); + + procedure fl_dial_set_angles + (D : in System.Address; + A, B : in Interfaces.C.int); + pragma Import (C, fl_dial_set_angles, "fl_dial_set_angles"); + + + + + procedure fl_dial_draw + (W : in System.Address); + pragma Import (C, fl_dial_draw, "fl_dial_draw"); + + function fl_dial_handle + (W : in System.Address; + E : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_dial_handle, "fl_dial_handle"); + + + + + procedure Finalize + (This : in out Dial) is + begin + if This.Void_Ptr /= System.Null_Address and then + This in Dial'Class + then + free_fl_dial (This.Void_Ptr); + This.Void_Ptr := System.Null_Address; + end if; + Finalize (Valuator (This)); + end Finalize; + + + + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Dial is + begin + return This : Dial do + This.Void_Ptr := new_fl_dial + (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)); + dial_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + dial_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + + + + function Get_First_Angle + (This : in Dial) + return Integer is + begin + return Integer (fl_dial_get_angle1 (This.Void_Ptr)); + end Get_First_Angle; + + + procedure Set_First_Angle + (This : in out Dial; + To : in Integer) is + begin + fl_dial_set_angle1 (This.Void_Ptr, Interfaces.C.int (To)); + end Set_First_Angle; + + + function Get_Second_Angle + (This : in Dial) + return Integer is + begin + return Integer (fl_dial_get_angle2 (This.Void_Ptr)); + end Get_Second_Angle; + + + procedure Set_Second_Angle + (This : in out Dial; + To : in Integer) is + begin + fl_dial_set_angle2 (This.Void_Ptr, Interfaces.C.int (To)); + end Set_Second_Angle; + + + procedure Set_Angles + (This : in out Dial; + One, Two : in Integer) is + begin + fl_dial_set_angles (This.Void_Ptr, Interfaces.C.int (One), Interfaces.C.int (Two)); + end Set_Angles; + + + + + procedure Draw + (This : in out Dial) is + begin + fl_dial_draw (This.Void_Ptr); + end Draw; + + + function Handle + (This : in out Dial; + Event : in Event_Kind) + return Event_Outcome is + begin + return Event_Outcome'Val + (fl_dial_handle (This.Void_Ptr, Event_Kind'Pos (Event))); + end Handle; + + +end FLTK.Widgets.Valuators.Dials; + diff --git a/src/fltk-widgets-valuators-dials.ads b/src/fltk-widgets-valuators-dials.ads new file mode 100644 index 0000000..cb7d05d --- /dev/null +++ b/src/fltk-widgets-valuators-dials.ads @@ -0,0 +1,61 @@ + + +package FLTK.Widgets.Valuators.Dials is + + + type Dial is new Valuator with private; + + + + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Dial; + + + + + function Get_First_Angle + (This : in Dial) + return Integer; + + procedure Set_First_Angle + (This : in out Dial; + To : in Integer); + + function Get_Second_Angle + (This : in Dial) + return Integer; + + procedure Set_Second_Angle + (This : in out Dial; + To : in Integer); + + procedure Set_Angles + (This : in out Dial; + One, Two : in Integer); + + + + + procedure Draw + (This : in out Dial); + + function Handle + (This : in out Dial; + Event : in Event_Kind) + return Event_Outcome; + + +private + + + type Dial is new Valuator with null record; + + overriding procedure Finalize + (This : in out Dial); + + +end FLTK.Widgets.Valuators.Dials; + -- cgit