X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faxis_view.cc;h=43763abcc37166e33f10d2c0520d4f6fc4429dca;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=e4632dc9ca0bd8a105927168afb0783bf3ed4d9d;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index e4632dc9ca..43763abcc3 100644
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003 Paul Davis 
+    Copyright (C) 2003 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
@@ -26,6 +26,7 @@
 #include <list>
 
 #include "pbd/error.h"
+#include "pbd/convert.h"
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/selector.h>
@@ -35,62 +36,62 @@
 #include "ardour/utils.h"
 
 #include "public_editor.h"
+#include "ardour_ui.h"
+#include "gui_object.h"
 #include "axis_view.h"
+#include "utils.h"
 #include "i18n.h"
 
+using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
-
+using namespace ARDOUR;
 
 list<Gdk::Color> AxisView::used_colors;
 
-AxisView::AxisView (ARDOUR::Session& sess) : _session(sess)
+AxisView::AxisView (ARDOUR::Session* sess)
+	: SessionHandlePtr (sess)
 {
 	_selected = false;
-	_marked_for_display = false;
 }
 
 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);
+}
+
+string
+AxisView::gui_property (const string& property_name) const
+{
+	return gui_object_state().get_string (state_id(), property_name);
+}
+
+bool
+AxisView::marked_for_display () const
+{
+	string const v = gui_property ("visible");
+	return (v == "" || PBD::string_is_affirmative (v));
+}
+
+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;
+}
+
+GUIObjectState&
+AxisView::gui_object_state() 
+{
+	return *ARDOUR_UI::instance()->gui_object_state;
 }