exercise subsurface rendering for x-fade curves

[ardour.git] / gtk2_ardour / automation_line.cc

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index a4d58cb53120fad787397f5e25f75385636b33e7..7e37c32eb734f3a37d22a0ad5e51f86a2623e7f4 100644 (file)
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -105,6 +105,7 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv
        CANVAS_DEBUG_NAME (line, "region gain envelope line");
        line->set_data ("line", this);
        line->set_outline_width (2.0);
+       line->set_covers_threshold (4.0);
 
        line->Event.connect (sigc::mem_fun (*this, &AutomationLine::event_handler));
 
@@ -137,7 +138,7 @@ AutomationLine::event_handler (GdkEvent* event)
 }
 
 void
-AutomationLine::show ()
+AutomationLine::update_visibility ()
 {
        if (_visible & Line) {
                /* Only show the line there are some points, otherwise we may show an out-of-date line
@@ -149,32 +150,32 @@ AutomationLine::show ()
                } else {
                        line->hide ();
                }
-       } else {
-               line->hide();
-               /* if the line is not visible, then no control points should be visible */
-               for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-                       (*i)->hide ();
-               }
-               return;
-       }
 
-       if (_visible & ControlPoints) {
-               for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-                       (*i)->show ();
-               }
-       } else if (_visible & SelectedControlPoints) {
-               for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
-                       if ((*i)->get_selected()) {
+               if (_visible & ControlPoints) {
+                       for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
                                (*i)->show ();
-                       } else {
+                       }
+               } else if (_visible & SelectedControlPoints) {
+                       for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+                               if ((*i)->get_selected()) {
+                                       (*i)->show ();
+                               } else {
+                                       (*i)->hide ();
+                               }
+                       }
+               } else {
+                       for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
                                (*i)->hide ();
                        }
                }
+
        } else {
+               line->hide ();
                for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
                        (*i)->hide ();
                }
        }
+
 }
 
 void
@@ -1006,9 +1007,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
 
                line->set (line_points);
 
-               if (_visible && alist->interpolation() != AutomationList::Discrete) {
-                       line->show();
-               }
+               update_visibility ();
        }
 
        set_selected_points (trackview.editor().get_selection().points);
@@ -1081,7 +1080,7 @@ AutomationLine::add_visibility (VisibleAspects va)
        _visible = VisibleAspects (_visible | va);
 
        if (old != _visible) {
-               show ();
+               update_visibility ();
        }
 }
 
@@ -1090,7 +1089,7 @@ AutomationLine::set_visibility (VisibleAspects va)
 {
        if (_visible != va) {
                _visible = va;
-               show ();
+               update_visibility ();
        }
 }
 
@@ -1102,7 +1101,7 @@ AutomationLine::remove_visibility (VisibleAspects va)
        _visible = VisibleAspects (_visible & ~va);
 
        if (old != _visible) {
-               show ();
+               update_visibility ();
        }
 }
 
@@ -1153,9 +1152,10 @@ AutomationLine::view_to_model_coord_y (double& y) const
                y = max (0.0, y);
                y = min (2.0, y);
        } else if (alist->parameter().type() == PanAzimuthAutomation ||
-                  alist->parameter().type() == PanElevationAutomation ||
-                  alist->parameter().type() == PanWidthAutomation) {
+                  alist->parameter().type() == PanElevationAutomation) {
                y = 1.0 - y;
+       } else if (alist->parameter().type() == PanWidthAutomation) {
+               y = 2.0 * y - 1.0;
        } else if (alist->parameter().type() == PluginAutomation) {
                y = y * (double)(alist->get_max_y()- alist->get_min_y()) + alist->get_min_y();
        } else {
@@ -1171,10 +1171,10 @@ AutomationLine::model_to_view_coord (double& x, double& y) const
            alist->parameter().type() == EnvelopeAutomation) {
                y = gain_to_slider_position_with_max (y, Config->get_max_gain());
        } else if (alist->parameter().type() == PanAzimuthAutomation ||
-                  alist->parameter().type() == PanElevationAutomation ||
-                  alist->parameter().type() == PanWidthAutomation) {
-               // vertical coordinate axis reversal
+                  alist->parameter().type() == PanElevationAutomation) {
                y = 1.0 - y;
+       } else if (alist->parameter().type() == PanWidthAutomation) {
+               y = .5 + y * .5;
        } else if (alist->parameter().type() == PluginAutomation) {
                y = (y - alist->get_min_y()) / (double)(alist->get_max_y()- alist->get_min_y());
        } else {