/*
- 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
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <cstdlib>
#include <list>
-#include <pbd/error.h>
+#include "pbd/error.h"
-#include <gtkmmext/utils.h>
-#include <gtkmmext/selector.h>
-#include <gtkmmext/gtk_ui.h>
+#include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/selector.h>
+#include <gtkmm2ext/gtk_ui.h>
-#include <ardour/session.h>
-#include <ardour/utils.h>
+#include "ardour/session.h"
+#include "ardour/utils.h"
#include "public_editor.h"
#include "axis_view.h"
#include "i18n.h"
+using namespace std;
using namespace Gtk;
-using namespace Gtkmmext;
+using namespace Gtkmm2ext;
-
-list<GdkColor> AxisView::used_colors;
+list<Gdk::Color> AxisView::used_colors;
AxisView::AxisView (ARDOUR::Session& sess) : _session(sess)
{
_selected = false;
+ _marked_for_display = false;
}
AxisView::~AxisView()
}
-GdkColor
+Gdk::Color
AxisView::unique_random_color()
{
- GdkColor newcolor;
-
+ Gdk::Color newcolor;
+
while (1) {
/* avoid neon/glowing tones by limiting them to the
const int32_t max_saturation = 48000; // 65535 would open up the whole color wheel
- newcolor.red = random() % max_saturation;
- newcolor.blue = random() % max_saturation;
- newcolor.green = random() % max_saturation;
+ 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<GdkColor>::iterator i = used_colors.begin(); i != used_colors.end(); ++i) {
- GdkColor c = *i;
+
+ for (list<Gdk::Color>::iterator i = used_colors.begin(); i != used_colors.end(); ++i) {
+ Gdk::Color c = *i;
float rdelta, bdelta, gdelta;
-
- rdelta = newcolor.red - c.red;
- bdelta = newcolor.blue - c.blue;
- gdelta = newcolor.green - c.green;
+
+ 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);