Prefer testing the session instead of using a global variable

[ardour.git] / gtk2_ardour / axis_view.cc

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index 65a9f1b79abc96f1a939d93284d5bb71e58019b3..ebcca2a91443030d7c876da754ea8ca70da10592 100644 (file)
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -26,31 +26,31 @@
 #include <list>
 
 #include "pbd/error.h"
+#include "pbd/convert.h"
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
 
-#include "ardour/session.h"
-#include "ardour/utils.h"
+#include "ardour/selection.h"
 
 #include "public_editor.h"
 #include "ardour_ui.h"
 #include "gui_object.h"
 #include "axis_view.h"
-#include "i18n.h"
+#include "utils.h"
+
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 list<Gdk::Color> AxisView::used_colors;
 
-AxisView::AxisView (ARDOUR::Session* sess)
-       : SessionHandlePtr (sess)
+AxisView::AxisView ()
 {
-       _selected = false;
 }
 
 AxisView::~AxisView()
@@ -60,79 +60,77 @@ AxisView::~AxisView()
 Gdk::Color
 AxisView::unique_random_color()
 {
-       Gdk::Color newcolor;
-
-       while (1) {
-
-               /* avoid neon/glowing tones by limiting them to the
-                  "inner section" (paler) of a color wheel/circle.
-               */
-
-               const int32_t max_saturation = 48000; // 65535 would open up the whole color wheel
-
-               newcolor.set_red (random() % max_saturation);
-               newcolor.set_blue (random() % max_saturation);
-               newcolor.set_green (random() % max_saturation);
-
-               if (used_colors.size() == 0) {
-                       used_colors.push_back (newcolor);
-                       return newcolor;
-               }
-
-               for (list<Gdk::Color>::iterator i = used_colors.begin(); i != used_colors.end(); ++i) {
-                 Gdk::Color c = *i;
-                       float rdelta, bdelta, gdelta;
-
-                       rdelta = newcolor.get_red() - c.get_red();
-                       bdelta = newcolor.get_blue() - c.get_blue();
-                       gdelta = newcolor.get_green() - c.get_green();
-
-                       if (sqrt (rdelta*rdelta + bdelta*bdelta + gdelta*gdelta) > 25.0) {
-                               used_colors.push_back (newcolor);
-                               return newcolor;
-                       }
-               }
-
-               /* XXX need throttle here to make sure we don't spin for ever */
-       }
+       return ::unique_random_color (used_colors);
 }
 
-void
-AxisView::set_gui_property (const string& property_name, const string& value)
+string
+AxisView::gui_property (const string& property_name) const
 {
-       ARDOUR_UI::instance()->gui_object_state->set (state_id(), property_name, value);
+       if (property_hashtable.count(property_name)) {
+               return property_hashtable[property_name];
+       } else {
+               string rv = gui_object_state().get_string (state_id(), property_name);
+               property_hashtable.erase(property_name);
+               property_hashtable.emplace(property_name, rv);
+               return rv;
+       }
 }
 
-void
-AxisView::set_gui_property (const string& property_name, int value)
+bool
+AxisView::get_gui_property (const std::string& property_name, std::string& value) const
 {
-       ARDOUR_UI::instance()->gui_object_state->set (state_id(), property_name, value);
+       std::string str = gui_property(property_name);
+
+       if (!str.empty()) {
+               value = str;
+               return true;
+       }
+
+       return false;
 }
 
-string
-AxisView::gui_property (const string& property_name) const
+void
+AxisView::set_gui_property (const std::string& property_name, const std::string& value)
 {
-       return ARDOUR_UI::instance()->gui_object_state->get_string (state_id(), property_name);
+       property_hashtable.erase (property_name);
+       property_hashtable.emplace (property_name, value);
+       gui_object_state ().set_property (state_id (), property_name, value);
 }
 
 bool
 AxisView::marked_for_display () const
 {
-       return string_is_affirmative (gui_property ("visible"));
+       bool visible;
+       if (!get_gui_property ("visible", visible)) {
+               return true;
+       }
+       return visible;
 }
 
 bool
 AxisView::set_marked_for_display (bool yn)
 {
-       if (yn != marked_for_display()) {
-               if (yn) {
-                       set_gui_property ("visible", "yes");
-               } else {
-                       set_gui_property ("visible", "no");
-               }
-               return true; // things changed
+       bool visible;
+       if (get_gui_property ("visible", visible) && visible == yn) {
+               return false; // nothing changed
        }
 
-       return false;
+       set_gui_property ("visible", yn);
+       return true; // things changed
 }
 
+GUIObjectState&
+AxisView::gui_object_state()
+{
+       return *ARDOUR_UI::instance()->gui_object_state;
+}
+
+void
+AxisView::set_selected (bool yn)
+{
+       if (selected() == yn) {
+               return;
+       }
+
+       Selectable::set_selected (yn);
+}