summaryrefslogtreecommitdiff
path: root/app/bin/ccurve.h
diff options
context:
space:
mode:
Diffstat (limited to 'app/bin/ccurve.h')
-rw-r--r--app/bin/ccurve.h39
1 files changed, 20 insertions, 19 deletions
diff --git a/app/bin/ccurve.h b/app/bin/ccurve.h
index 0c00c46..07122f9 100644
--- a/app/bin/ccurve.h
+++ b/app/bin/ccurve.h
@@ -17,26 +17,24 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef HAVE_CCURVE_H
#define HAVE_CCURVE_H
-#include "draw.h"
-#include "track.h"
-#include "wlib.h"
-#include "utility.h"
+#include "common.h"
+#include "track.h" //- curveType_e
typedef struct {
- curveType_e type;
- coOrd curvePos;
- coOrd pos1;
- coOrd pos2;
- DIST_T curveRadius;
- ANGLE_T a0, a1;
- BOOL_T negative;
- } curveData_t;
+ curveType_e type;
+ coOrd curvePos;
+ coOrd pos1;
+ coOrd pos2;
+ DIST_T curveRadius;
+ ANGLE_T a0, a1;
+ BOOL_T negative;
+} curveData_t;
#define crvCmdFromEP1 (0)
#define crvCmdFromTangent (1)
@@ -48,15 +46,18 @@ typedef struct {
#define circleCmdFromTangent (1)
#define circleCmdFromCenter (2)
-typedef void (*curveMessageProc)( char *, ... );
-STATUS_T CreateCurve( wAction_t, coOrd, BOOL_T, wDrawColor, DIST_T, long, dynArr_t *,curveMessageProc );
+typedef void (*curveMessageProc)( const char *, ... );
+STATUS_T CreateCurve( wAction_t, coOrd, BOOL_T, wDrawColor, DIST_T, long,
+ dynArr_t *,curveMessageProc );
int IsCurveCircle( track_p );
-void PlotCurve( long, coOrd, coOrd, coOrd, curveData_t *, BOOL_T );
+void PlotCurve( long, coOrd, coOrd, coOrd, curveData_t *, BOOL_T, DIST_T );
track_p NewCurvedTrack( coOrd, DIST_T, ANGLE_T, ANGLE_T, long );
DIST_T CurveDescriptionDistance( coOrd, track_p, coOrd *, BOOL_T, BOOL_T * );
STATUS_T CurveDescriptionMove( track_p, wAction_t, coOrd );
-BOOL_T GetCurveMiddle( track_p , coOrd * );
-int DrawArrowHeads(trkSeg_p sp, coOrd pos, ANGLE_T angle, BOOL_T bidirectional, wDrawColor color );
-int DrawArrowHeadsArray(dynArr_t *anchor_array,coOrd pos,ANGLE_T angle,BOOL_T bidirectional,wDrawColor color );
+BOOL_T GetCurveMiddle( track_p, coOrd * );
+int DrawArrowHeads(trkSeg_p sp, coOrd pos, ANGLE_T angle, BOOL_T bidirectional,
+ wDrawColor color );
+int DrawArrowHeadsArray(dynArr_t *anchor_array,coOrd pos,ANGLE_T angle,
+ BOOL_T bidirectional,wDrawColor color );
#endif // !HAVE_CCURVE_H