This adds support for the Fl_Dial::angles() method. This seems to work

correctly, but it is likely that someone who remembers their high school
math could make it _much_ more efficient (I just hacked away 'till it
worked).

-Carl


git-svn-id: file:///fltk/svn/fltk/trunk@376 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 19 insertions, 15 deletions

diff --git a/test/valuators.fl b/test/valuators.fl
index f84809065..582a7d6f4 100644
--- a/test/valuators.fl
+++ b/test/valuators.fl
@@ -1,5 +1,7 @@
 # data file for the Fltk User Interface Designer (fluid)
-version 0.99 
+version 1.00 
+header_name {.h} 
+code_name {.cxx} 
 gridx 5 
 gridy 5 
 snap 3
@@ -7,12 +9,12 @@ Function {} {open
 } {
   Fl_Window {} {
     label {Valuator classes, showing values for type()} open
-    xywh {548 340 567 506} color 43 selection_color 43
+    xywh {414 83 567 506} color 43 selection_color 43
     code0 {\#include <stdio.h>} visible
   } {
     Fl_Box {} {
       label Fl_Slider
-      xywh {10 10 280 210} box ENGRAVED_BOX labelfont 1 labelsize 12 align 17
+      xywh {10 10 280 210} box ENGRAVED_BOX labelfont 1 align 17
     }
     Fl_Slider {} {
       label 0
@@ -34,7 +36,7 @@ fflush(stdout);}
     }
     Fl_Box {} {
       label Fl_Value_Slider
-      xywh {10 230 280 205} box ENGRAVED_BOX labelfont 1 labelsize 12 align 17
+      xywh {10 230 280 205} box ENGRAVED_BOX labelfont 1 align 17
     }
     Fl_Value_Slider {} {
       label 0
@@ -86,7 +88,7 @@ fflush(stdout);}
     }
     Fl_Box {} {
       label Fl_Adjuster
-      xywh {430 10 125 120} box ENGRAVED_BOX labelfont 1 labelsize 12 align 17
+      xywh {430 10 125 120} box ENGRAVED_BOX labelfont 1 align 17
     }
     Fl_Value_Slider {} {
       label FL_HOR_NICE_SLIDER
@@ -108,35 +110,37 @@ fflush(stdout);}
     }
     Fl_Box {} {
       label Fl_Counter
-      xywh {345 135 210 115} box ENGRAVED_BOX labelfont 1 labelsize 12 align 17
+      xywh {345 135 210 115} box ENGRAVED_BOX labelfont 1 align 17
     }
     Fl_Counter {} {
       label 0
       callback {printf("%g      \\r",o->value());
 fflush(stdout);}
-      xywh {360 160 180 30} labelsize 8 minimum -1e+06 maximum 1e+06
+      xywh {360 160 180 30} labelsize 8
     }
     Fl_Counter {} {
       label FL_SIMPLE_COUNTER
       callback {printf("%g      \\r",o->value());
 fflush(stdout);}
-      xywh {360 205 180 30} type Simple labelsize 8 minimum -1e+06 maximum 1e+06
+      xywh {360 205 180 30} type Simple labelsize 8
     }
     Fl_Box {} {
       label Fl_Dial
-      xywh {300 260 255 105} box ENGRAVED_BOX labelfont 1 labelsize 12 align 17
+      xywh {300 260 255 105} box ENGRAVED_BOX labelfont 1 align 17
     }
     Fl_Dial {} {
       label 0
       callback {printf("%g      \\r",o->value());
-fflush(stdout);}
+fflush(stdout);} selected
       xywh {315 280 65 65} color 10 selection_color 1 labelsize 8
+      code0 {o->angles(180,135);}
     }
     Fl_Dial {} {
       label FL_LINE_DIAL
       callback {printf("%g      \\r",o->value());
 fflush(stdout);}
       xywh {395 280 65 65} type Line color 10 selection_color 1 labelsize 8
+      code0 {o->angles(0,360);}
     }
     Fl_Dial {} {
       label FL_FILL_DIAL
@@ -146,7 +150,7 @@ fflush(stdout);}
     }
     Fl_Box {} {
       label Fl_Roller
-      xywh {300 375 145 120} box ENGRAVED_BOX labelfont 1 labelsize 12 align 17
+      xywh {300 375 145 120} box ENGRAVED_BOX labelfont 1 align 17
     }
     Fl_Roller {} {
       label 0
@@ -162,7 +166,7 @@ fflush(stdout);}
     }
     Fl_Box {} {
       label Fl_Value_Input
-      xywh {10 445 140 50} box ENGRAVED_BOX labelfont 1 labelsize 12 align 17
+      xywh {10 445 140 50} box ENGRAVED_BOX labelfont 1 align 17
     }
     Fl_Box {} {
       label {Some widgets have color(FL_GREEN) and color2(FL_RED) to show the areas these effect.}
@@ -170,12 +174,12 @@ fflush(stdout);}
     }
     Fl_Box {} {
       label Fl_Value_Output
-      xywh {155 445 135 50} box ENGRAVED_BOX labelfont 1 labelsize 12 align 17
+      xywh {155 445 135 50} box ENGRAVED_BOX labelfont 1 align 17
     }
     Fl_Value_Input {} {
       label 0
       callback {printf("%g      \\r",o->value());
-fflush(stdout);} selected
+fflush(stdout);}
       xywh {30 460 110 30} labelsize 8 maximum 100 step 0.1
     }
     Fl_Value_Output {} {
@@ -186,7 +190,7 @@ fflush(stdout);}
     }
     Fl_Box {} {
       label {   Fl_Scrollbar}
-      xywh {295 10 130 120} box ENGRAVED_BOX labelfont 1 labelsize 12 align 21
+      xywh {295 10 130 120} box ENGRAVED_BOX labelfont 1 align 21
     }
     Fl_Scrollbar {} {
       label 0