From 4fb627c3d81a7574490d2e9fa1f1af60979deafa Mon Sep 17 00:00:00 2001 From: Bill Spitzak Date: Sun, 28 Jan 2001 06:57:33 +0000 Subject: fl_curve uses a much better algorithim to figure out how many pieces to cut the curve into. Right-ctrl does not delete selected text in Fl_Input, until you type a composed character. Added simple fltk.3 and fluid.1 manual pages and "make install" in the documentation directory installs them. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1361 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Input.cxx | 9 +++--- src/fl_curve.cxx | 91 ++++++++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 47 deletions(-) (limited to 'src') diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx index 68a4b4ee6..c4950f4d9 100644 --- a/src/Fl_Input.cxx +++ b/src/Fl_Input.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Input.cxx,v 1.10.2.14 2001/01/22 15:13:39 easysw Exp $" +// "$Id: Fl_Input.cxx,v 1.10.2.15 2001/01/28 06:57:33 spitzak Exp $" // // Input widget for the Fast Light Tool Kit (FLTK). // @@ -81,8 +81,9 @@ int Fl_Input::handle_key() { return 1; } - replace(position(), del ? position()-del : mark(), - Fl::event_text(), Fl::event_length()); + if (del || Fl::event_length()) + replace(position(), del ? position()-del : mark(), + Fl::event_text(), Fl::event_length()); return 1; } @@ -276,5 +277,5 @@ Fl_Input::Fl_Input(int x, int y, int w, int h, const char *l) } // -// End of "$Id: Fl_Input.cxx,v 1.10.2.14 2001/01/22 15:13:39 easysw Exp $". +// End of "$Id: Fl_Input.cxx,v 1.10.2.15 2001/01/28 06:57:33 spitzak Exp $". // diff --git a/src/fl_curve.cxx b/src/fl_curve.cxx index 6cb3ecd06..40b92d087 100644 --- a/src/fl_curve.cxx +++ b/src/fl_curve.cxx @@ -1,9 +1,9 @@ // -// "$Id: fl_curve.cxx,v 1.4.2.3 2001/01/22 15:13:40 easysw Exp $" +// "$Id: fl_curve.cxx,v 1.4.2.4 2001/01/28 06:57:33 spitzak Exp $" // // Bezier curve functions for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2001 by Bill Spitzak and others. +// Copyright 1998-1999 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -20,7 +20,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 // USA. // -// Please report all bugs and problems to "fltk-bugs@fltk.org". +// Please report all bugs and problems to "fltk-bugs@easysw.com". // // Utility for drawing Bezier curves, adding the points to @@ -36,8 +36,13 @@ void fl_curve(double X0, double Y0, double X1, double Y1, double X2, double Y2, double X3, double Y3) { + double x = fl_transform_x(X0,Y0); double y = fl_transform_y(X0,Y0); + + // draw point 0: + fl_transformed_vertex(x,y); + double x1 = fl_transform_x(X1,Y1); double y1 = fl_transform_y(X1,Y1); double x2 = fl_transform_x(X2,Y2); @@ -45,55 +50,55 @@ void fl_curve(double X0, double Y0, double x3 = fl_transform_x(X3,Y3); double y3 = fl_transform_y(X3,Y3); - int n; { // find smaller size of bounding box - double lx = x; if (x1rx) rx=x1; if (x2>rx) rx=x2; if (x3>rx) rx=x3; - double ly = y; if (y1ry) ry=y1; if (y2>ry) ry=y2; if (y3>ry) ry=y3; - // calculate number of pieces to cut curve into: - n = int((rx-lx+ry-ly)/8); if (n < 3) n = 3; - } - double e = 1.0/n; + // find the area: + double a = fabs((x-x2)*(y3-y1)-(y-y2)*(x3-x1)); + double b = fabs((x-x3)*(y2-y1)-(y-y3)*(x2-x1)); + if (b > a) a = b; - // calculate the coefficients of 3rd order equation: - double xa = (x3-3*x2+3*x1-x); - double xb = 3*(x2-2*x1+x); - double xc = 3*(x1-x); - // calculate the forward differences: - double dx1 = ((xa*e+xb)*e+xc)*e; - double dx3 = 6*xa*e*e*e; - double dx2 = dx3 + 2*xb*e*e; + // use that to guess at the number of segments: + int n = int(sqrt(a)/4); + if (n > 1) { + if (n > 100) n = 100; // make huge curves not hang forever - // calculate the coefficients of 3rd order equation: - double ya = (y3-3*y2+3*y1-y); - double yb = 3*(y2-2*y1+y); - double yc = 3*(y1-y); - // calculate the forward differences: - double dy1 = ((ya*e+yb)*e+yc)*e; - double dy3 = 6*ya*e*e*e; - double dy2 = dy3 + 2*yb*e*e; + double e = 1.0/n; - // draw point 0: - fl_transformed_vertex(x,y); + // calculate the coefficients of 3rd order equation: + double xa = (x3-3*x2+3*x1-x); + double xb = 3*(x2-2*x1+x); + double xc = 3*(x1-x); + // calculate the forward differences: + double dx1 = ((xa*e+xb)*e+xc)*e; + double dx3 = 6*xa*e*e*e; + double dx2 = dx3 + 2*xb*e*e; - // draw points 1 .. n-2: - for (int m=2; m