X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faxis_view.cc;h=016e57945f65d07e88384a1966c85a9a92736d71;hb=625240fe303fcd447bf7205396cdde57918b4d0c;hp=9bd91822018200ab2591cec704c2ab53e53ae616;hpb=c83389b8ec5fef9553a401e6123b7e55702af9e2;p=ardour.git

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index 9bd9182201..016e57945f 100644
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -26,31 +26,29 @@
 #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 "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;
-PBD::Signal1<void,AxisView*> AxisView::CatchDeletion;
 
-AxisView::AxisView (ARDOUR::Session* sess) 
-	: SessionHandlePtr (sess)
+AxisView::AxisView ()
 {
-	_selected = false;
-	_marked_for_display = false;
 }
 
 AxisView::~AxisView()
@@ -60,39 +58,58 @@ AxisView::~AxisView()
 Gdk::Color
 AxisView::unique_random_color()
 {
-  	Gdk::Color newcolor;
-
-	while (1) {
+	return ::unique_random_color (used_colors);
+}
 
-		/* avoid neon/glowing tones by limiting them to the
-		   "inner section" (paler) of a color wheel/circle.
-		*/
+string
+AxisView::gui_property (const string& property_name) const
+{
+	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;
+	}
+}
 
-		const int32_t max_saturation = 48000; // 65535 would open up the whole color wheel
+bool
+AxisView::marked_for_display () const
+{
+	string const v = gui_property ("visible");
+	return (v == "" || PBD::string_is_affirmative (v));
+}
 
-		newcolor.set_red (random() % max_saturation);
-		newcolor.set_blue (random() % max_saturation);
-		newcolor.set_green (random() % max_saturation);
+bool
+AxisView::set_marked_for_display (bool yn)
+{
+	string const v = gui_property ("visible");
+	if (v == "" || yn != PBD::string_is_affirmative (v)) {
+		set_gui_property ("visible", yn);
+		return true; // things changed
+	}
+	return false;
+}
 
-		if (used_colors.size() == 0) {
-			used_colors.push_back (newcolor);
-			return newcolor;
-		}
+GUIObjectState&
+AxisView::gui_object_state()
+{
+	return *ARDOUR_UI::instance()->gui_object_state;
+}
 
-		for (list<Gdk::Color>::iterator i = used_colors.begin(); i != used_colors.end(); ++i) {
-		  Gdk::Color c = *i;
-			float rdelta, bdelta, gdelta;
+void
+AxisView::set_selected (bool yn)
+{
+	if (selected() == yn) {
+		return;
+	}
 
-			rdelta = newcolor.get_red() - c.get_red();
-			bdelta = newcolor.get_blue() - c.get_blue();
-			gdelta = newcolor.get_green() - c.get_green();
+	Selectable::set_selected (yn);
 
-			if (sqrt (rdelta*rdelta + bdelta*bdelta + gdelta*gdelta) > 25.0) {
-				used_colors.push_back (newcolor);
-				return newcolor;
-			}
-		}
+	boost::shared_ptr<Stripable> s = stripable ();
 
-		/* XXX need throttle here to make sure we don't spin for ever */
+	if (s) {
+		s->presentation_info().set_selected (yn);
 	}
 }