diff options
| author | lecoanet | 2000-01-26 13:39:20 +0000 |
|---|---|---|
| committer | lecoanet | 2000-01-26 13:39:20 +0000 |
| commit | 9d2861b8fb77adc89682633330b312b55acb0288 (patch) | |
| tree | 96e66a3d4b56f0257112ee73e27415c327b6060a | |
| parent | 65c1342e3831bd04543e64c226ac6372bbaef905 (diff) | |
| download | tkzinc-9d2861b8fb77adc89682633330b312b55acb0288.zip tkzinc-9d2861b8fb77adc89682633330b312b55acb0288.tar.gz tkzinc-9d2861b8fb77adc89682633330b312b55acb0288.tar.bz2 tkzinc-9d2861b8fb77adc89682633330b312b55acb0288.tar.xz | |
*** empty log message ***
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | generic/Geo.h | 31 | ||||
| -rw-r--r-- | patchlvl.h | 4 | ||||
| -rw-r--r-- | sandbox/testarc.tcl | 9 |
4 files changed, 45 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 126b553..5f4f76f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xradar3-tk (3.1.8) unstable; urgency=low + + * Fin de réalisation de ToArea pour Curve. + * Mise à dispo de l'item Arc complet (sauf relief). + + -- Patrick Lecoanet <lecoanet@cena.dgac.fr> Wed, 26 Jan 2000 14:39:05 +0100 + xradar3-tk (3.1.7) unstable; urgency=low * Ajout des commandes clone, group, monitor, diff --git a/generic/Geo.h b/generic/Geo.h index 28e3dae..00382ea 100644 --- a/generic/Geo.h +++ b/generic/Geo.h @@ -49,7 +49,7 @@ #define ABS(a) ((a) < 0 ? -(a) : (a)) #endif #ifndef M_PI -#define M_PI 3.14159265358979323846 +#define M_PI 3.14159265358979323846264338327 #endif #ifndef M_PI_2 #define M_PI_2 1.57079632679489661923 @@ -152,6 +152,24 @@ OvalInBBox(RadarPoint *center, RadarBBox *bbox); RadarBool +HorizLineToArc(RadarReal x1, + RadarReal x2, + RadarReal y, + RadarReal rx, + RadarReal ry, + RadarReal start_angle, + RadarReal angle_extent); + +RadarBool +VertLineToArc(RadarReal x, + RadarReal y1, + RadarReal y2, + RadarReal rx, + RadarReal ry, + RadarReal start_angle, + RadarReal angle_extent); + +RadarBool PointInAngle(int start_angle, int angle_extent, RadarPoint *p); @@ -220,6 +238,11 @@ InsetPolygon(RadarPoint *p, RadarDim inset); void +BezierSubdivide(RadarPoint *controls, + RadarReal t, + RadarBool first); + +void SmoothPathWithBezier(RadarList from_points, RadarList to_points); @@ -228,6 +251,12 @@ GetBezierPath(RadarList from_points, RadarList to_points); void +GetArcPath(RadarReal start_angle, + RadarReal end_angle, + int type, + RadarList to_points); + +void GetLineEnd(RadarPoint *p1, RadarPoint *p2, unsigned int line_width, @@ -11,6 +11,6 @@ #ifndef XRADARVERSION #define XRADARVER 3 #define XRADARREV 1 -#define XRADARPLVL 7 -#define XRADARVERSION "xradar-version-317" +#define XRADARPLVL 8 +#define XRADARVERSION "xradar-version-318" #endif diff --git a/sandbox/testarc.tcl b/sandbox/testarc.tcl index 05e3922..6c3f777 100644 --- a/sandbox/testarc.tcl +++ b/sandbox/testarc.tcl @@ -15,11 +15,14 @@ pack .r -expand t -fill both #.r configure -drawbboxes t .r scale $top 1 -1 set view [.r add group $top -tags "controls"] +.r translate $view 200 -200 set view2 [.r add group $top] -.r translate $view2 100 -50 +.r translate $view2 300 -200 set arc [.r add arc $view "50 -10 200 -100" -linecolor bisque] -#.r itemconfigure $arc -startangle 10 -extent 90 -#.r itemconfigure $arc -startangle 0 -extent 360 +.r itemconfigure $arc -extent 200 +set arc2 [.r clone $arc -linecolor red -firstend "8 10 5"] +#.r rotate $arc2 10 +#.r translate $arc2 100 -100 source "controls.tcl" |