further tweaks to canvas tooltip mechanism

[ardour.git] / libs / canvas / canvas / curve.h

diff --git a/libs/canvas/canvas/curve.h b/libs/canvas/canvas/curve.h
index d63510c545bc56b3693a4d84a3de4504bd1aa552..d27291e3537732d979dd2ce4da8e6c2e9a68d3f0 100644 (file)
--- a/libs/canvas/canvas/curve.h
+++ b/libs/canvas/canvas/curve.h
@@ -1,35 +1,65 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    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., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
 #ifndef __CANVAS_CURVE_H__
 #define __CANVAS_CURVE_H__
 
+#include "canvas/visibility.h"
+
+#include "canvas/interpolated_curve.h"
 #include "canvas/poly_item.h"
+#include "canvas/fill.h"
 
 namespace ArdourCanvas {
 
-class Curve : public PolyItem
+class XFadeCurve;
+
+class LIBCANVAS_API Curve : public PolyItem, public InterpolatedCurve
 {
-public:
-    Curve (Group *);
-    
-    void compute_bounding_box () const;
+  public:
+    Curve (Canvas*);
+    Curve (Item*);
 
-    void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
+    enum CurveFill {
+           None,
+           Inside,
+           Outside,
+    };
 
+    void compute_bounding_box () const;
+    void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
     void set (Points const &);
 
-  protected:
-    void render_path (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
-    void render_curve (Rect const &, Cairo::RefPtr<Cairo::Context>) const;
-    
+    void set_points_per_segment (uint32_t n);
+
+    bool covers (Duple const &) const;
+    void set_fill_mode (CurveFill cf) { curve_fill = cf; }
+
   private:
-    Points first_control_points;
-    Points second_control_points;
+    Points samples;
+    Points::size_type n_samples;
+    uint32_t points_per_segment;
+    InterpolatedCurve::SplineType curve_type;
+    CurveFill curve_fill;
 
-    
-    static void compute_control_points (Points const &,
-                                       Points&, Points&);
-    static double* solve (std::vector<double> const&);
+    void interpolate ();
 };
-       
+
 }
 
 #endif