#include <gtkmm/menu.h>
#include "pbd/error.h"
+#include "pbd/cartesian.h"
#include "ardour/panner.h"
#include <gtkmm2ext/gtk_ui.h>
using namespace std;
using namespace Gtk;
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using Gtkmm2ext::Keyboard;
-Panner2d::Target::Target (float xa, float ya, const char *txt)
- : x (xa, 0.0, 1.0, 0.01, 0.1)
- , y (ya, 0.0, 1.0, 0.01, 0.1)
- , azimuth (M_PI/2.0, 0.0, 2.0 * M_PI, 0.1, 0.5)
- , text (txt ? strdup (txt) : 0)
+Panner2d::Target::Target (const AngularVector& a, const char *txt)
+ : position (a)
+ , text (txt)
+ , _selected (false)
{
- azimuth.set_value ((random() / (double) INT_MAX) * (2.0 * M_PI));
}
Panner2d::Target::~Target ()
{
- if (text) {
- free (text);
- }
}
void
Panner2d::Target::set_text (const char* txt)
{
- if (text) {
- free (text);
- }
- text = strdup (txt);
+ text = txt;
}
Panner2d::Panner2d (boost::shared_ptr<Panner> p, int32_t h)
: panner (p), width (0), height (h)
{
- allow_x = false;
- allow_y = false;
- allow_target = false;
-
- panner->StateChanged.connect (mem_fun(*this, &Panner2d::handle_state_change));
- panner->Changed.connect (mem_fun(*this, &Panner2d::handle_position_change));
+ panner->StateChanged.connect (state_connection, invalidator (*this), boost::bind (&Panner2d::handle_state_change, this), gui_context());
+ panner->Changed.connect (change_connection, invalidator (*this), boost::bind (&Panner2d::handle_position_change, this), gui_context());
drag_target = 0;
set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
Panner2d::~Panner2d()
{
for (Targets::iterator i = targets.begin(); i != targets.end(); ++i) {
- delete i->second;
+ delete *i;
}
}
/* pucks */
while (pucks.size() < n_inputs) {
- add_puck ("", 0.0, 0.0);
+ add_puck ("", AngularVector());
}
- while (pucks.size() > n_inputs) {
- pucks.erase (pucks.begin());
- }
+ if (pucks.size() > n_inputs) {
+ for (uint32_t i = pucks.size(); i < n_inputs; ++i) {
+ delete pucks[i];
+ }
+ pucks.resize (n_inputs);
+ }
+
for (Targets::iterator x = pucks.begin(); x != pucks.end(); ++x) {
- (*x).second->visible = false;
+ (*x)->visible = false;
}
switch (n_inputs) {
case 1:
pucks[0]->set_text ("");
- pucks[0]->x.set_value (0.0);
- pucks[0]->y.set_value (0.5);
- pucks[0]->visible = true;
break;
case 2:
pucks[0]->set_text ("R");
- pucks[0]->visible = true;
pucks[1]->set_text ("L");
- if (existing_pucks < 2) {
- pucks[1]->x.set_value (0.25f);
- pucks[1]->y.set_value (0.5f);
- }
- pucks[1]->visible = true;
break;
default:
for (uint32_t i = 0; i < n_inputs; ++i) {
char buf[64];
- snprintf (buf, sizeof (buf), "%" PRIu32, i);
+ snprintf (buf, sizeof (buf), "%" PRIu32, i + 1);
pucks[i]->set_text (buf);
-
- if (existing_pucks < i) {
- float x, y;
- panner->streampanner (i).get_position (x, y);
- pucks[i]->x.set_value (x);
- pucks[i]->y.set_value (y);
- }
-
- pucks[i]->visible = true;
}
break;
}
+ for (uint32_t i = existing_pucks; i < n_inputs; ++i) {
+ pucks[i]->position = panner->streampanner (i).get_position ();
+ pucks[i]->visible = true;
+ }
+
/* add all outputs */
while (targets.size() < panner->nouts()) {
- add_target (0.0, 0.0);
+ add_target (AngularVector());
}
- while (targets.size() > panner->nouts()) {
- targets.erase (targets.begin());
+ if (targets.size() > panner->nouts()) {
+ for (uint32_t i = panner->nouts(); i < targets.size(); ++i) {
+ delete targets[i];
+ }
+
+ targets.resize (panner->nouts ());
}
for (Targets::iterator x = targets.begin(); x != targets.end(); ++x) {
- (*x).second->visible = false;
+ (*x)->visible = false;
}
for (uint32_t n = 0; n < panner->nouts(); ++n) {
snprintf (buf, sizeof (buf), "%d", n+1);
targets[n]->set_text (buf);
- targets[n]->x.set_value (panner->output(n).x);
- targets[n]->y.set_value (panner->output(n).y);
+ targets[n]->position = panner->output(n).position;
targets[n]->visible = true;
}
- allow_x_motion (true);
- allow_y_motion (true);
- allow_target_motion (true);
-
queue_draw ();
}
-Gtk::Adjustment&
-Panner2d::azimuth (uint32_t which)
-{
- assert (which < pucks.size());
- return pucks[which]->azimuth;
-}
-
void
Panner2d::on_size_allocate (Gtk::Allocation& alloc)
{
}
int
-Panner2d::add_puck (const char* text, float x, float y)
+Panner2d::add_puck (const char* text, const AngularVector& a)
{
- Target* puck = new Target (x, y, text);
-
- pair<int,Target *> newpair;
- newpair.first = pucks.size();
- newpair.second = puck;
-
- pucks.insert (newpair);
+ Target* puck = new Target (a, text);
+ pucks.push_back (puck);
puck->visible = true;
return 0;
}
int
-Panner2d::add_target (float x, float y)
+Panner2d::add_target (const AngularVector& a)
{
- Target *target = new Target (x, y, "");
-
- pair<int,Target *> newpair;
- newpair.first = targets.size();
- newpair.second = target;
-
- targets.insert (newpair);
+ Target* target = new Target (a, "");
+ targets.push_back (target);
target->visible = true;
queue_draw ();
- return newpair.first;
-}
-
-void
-Panner2d::drop_targets ()
-{
- for (Targets::iterator i = targets.begin(); i != targets.end(); ) {
-
- Targets::iterator tmp;
-
- tmp = i;
- ++tmp;
-
- delete i->second;
- targets.erase (i);
-
- i = tmp;
- }
-
- queue_draw ();
-}
-
-void
-Panner2d::remove_target (int which)
-{
- Targets::iterator i = targets.find (which);
-
- if (i != targets.end()) {
- delete i->second;
- targets.erase (i);
- queue_draw ();
- }
+ return targets.size() - 1;
}
void
Panner2d::handle_state_change ()
{
- ENSURE_GUI_THREAD(mem_fun(*this, &Panner2d::handle_state_change));
+ ENSURE_GUI_THREAD (*this, &Panner2d::handle_state_change)
queue_draw ();
}
Panner2d::handle_position_change ()
{
uint32_t n;
- ENSURE_GUI_THREAD(mem_fun(*this, &Panner2d::handle_position_change));
+ ENSURE_GUI_THREAD (*this, &Panner2d::handle_position_change)
for (n = 0; n < pucks.size(); ++n) {
- float x, y;
- panner->streampanner(n).get_position (x, y);
- pucks[n]->x.set_value (x);
- pucks[n]->y.set_value (y);
+ pucks[n]->position = panner->streampanner(n).get_position ();
}
for (n = 0; n < targets.size(); ++n) {
- targets[n]->x.set_value (panner->output(n).x);
- targets[n]->y.set_value (panner->output(n).y);
+ targets[n]->position = panner->output(n).position;
}
queue_draw ();
}
void
-Panner2d::move_target (int which, float x, float y)
+Panner2d::move_puck (int which, const AngularVector& a)
{
- Targets::iterator i = targets.find (which);
- Target *target;
-
- if (!allow_target) {
+ if (which >= int (targets.size())) {
return;
}
-
- if (i != targets.end()) {
- target = i->second;
- target->x.set_value (x);
- target->y.set_value (y);
-
- queue_draw ();
- }
-}
-
-void
-Panner2d::move_puck (int which, float x, float y)
-{
- Targets::iterator i = pucks.find (which);
- Target *target;
-
- if (i != pucks.end()) {
- target = i->second;
- target->x.set_value (x);
- target->y.set_value (y);
-
- queue_draw ();
- }
-}
-
-void
-Panner2d::show_puck (int which)
-{
- Targets::iterator i = pucks.find (which);
-
- if (i != pucks.end()) {
- Target* puck = i->second;
- if (!puck->visible) {
- puck->visible = true;
- queue_draw ();
- }
- }
-}
-
-void
-Panner2d::hide_puck (int which)
-{
- Targets::iterator i = pucks.find (which);
-
- if (i != pucks.end()) {
- Target* puck = i->second;
- if (!puck->visible) {
- puck->visible = false;
- queue_draw ();
- }
- }
-}
-
-void
-Panner2d::show_target (int which)
-{
- Targets::iterator i = targets.find (which);
- if (i != targets.end()) {
- if (!i->second->visible) {
- i->second->visible = true;
- queue_draw ();
- }
- }
-}
-
-void
-Panner2d::hide_target (int which)
-{
- Targets::iterator i = targets.find (which);
- if (i != targets.end()) {
- if (i->second->visible) {
- i->second->visible = false;
- queue_draw ();
- }
- }
+
+ targets[which]->position = a;
+ queue_draw ();
}
Panner2d::Target *
-Panner2d::find_closest_object (gdouble x, gdouble y, int& which, bool& is_puck) const
+Panner2d::find_closest_object (gdouble x, gdouble y, int& which) const
{
- gdouble efx, efy;
- gdouble cx, cy;
Target *closest = 0;
Target *candidate;
float distance;
float best_distance = FLT_MAX;
int pwhich;
- efx = x/width;
- efy = y/height;
which = 0;
pwhich = 0;
- is_puck = false;
- for (Targets::const_iterator i = targets.begin(); i != targets.end(); ++i, ++which) {
- candidate = i->second;
+ cerr << "@ " << x << ", " << y << endl;
- cx = candidate->x.get_value();
- cy = candidate->y.get_value();
-
- distance = sqrt ((cx - efx) * (cx - efx) +
- (cy - efy) * (cy - efy));
+ for (Targets::const_iterator i = pucks.begin(); i != pucks.end(); ++i, ++pwhich) {
+ candidate = *i;
- if (distance < best_distance) {
- closest = candidate;
- best_distance = distance;
- }
- }
+ CartesianVector c;
- for (Targets::const_iterator i = pucks.begin(); i != pucks.end(); ++i, ++pwhich) {
- candidate = i->second;
+ candidate->position.cartesian (c);
+ cart_to_gtk (c);
- cx = candidate->x.get_value();
- cy = candidate->y.get_value();
+ distance = sqrt ((c.x - x) * (c.x - x) +
+ (c.y - y) * (c.y - y));
- distance = sqrt ((cx - efx) * (cx - efx) +
- (cy - efy) * (cy - efy));
+ cerr << "\tConsider candiate " << candidate->text << " @ " << c.x << ", " << c.y << ", " << c.z << " distance = " << distance << endl;
if (distance < best_distance) {
closest = candidate;
best_distance = distance;
- is_puck = true;
which = pwhich;
}
}
+
+ if (best_distance > 20) { // arbitrary
+ return 0;
+ }
+
+ cerr << "the winner is " << closest->text << endl;
+
return closest;
}
Panner2d::on_expose_event (GdkEventExpose *event)
{
gint x, y;
- float fx, fy;
cairo_t* cr;
cr = gdk_cairo_create (get_window()->gobj());
cairo_translate (cr, 10.0, 10.0);
}
+ /* horizontal line of "crosshairs" */
+
cairo_set_source_rgb (cr, 0.0, 0.1, 0.7);
cairo_move_to (cr, 0.5, height/2.0+0.5);
- cairo_line_to (cr, height+0.5, height/2+0.5);
+ cairo_line_to (cr, width+0.5, height/2+0.5);
cairo_stroke (cr);
- cairo_move_to (cr, height/2+0.5, 0.5);
- cairo_line_to (cr, height/2+0.5, height+0.5);
+ /* vertical line of "crosshairs" */
+
+ cairo_move_to (cr, width/2+0.5, 0.5);
+ cairo_line_to (cr, width/2+0.5, height+0.5);
cairo_stroke (cr);
- cairo_arc (cr, height/2, height/2, height/2, 0, 2.0 * M_PI);
+ /* the circle on which signals live */
+
+ cairo_arc (cr, width/2, height/2, height/2, 0, 2.0 * M_PI);
cairo_stroke (cr);
if (!panner->bypassed()) {
for (Targets::iterator i = pucks.begin(); i != pucks.end(); ++i) {
- Target* puck = i->second;
+ Target* puck = *i;
if (puck->visible) {
/* redraw puck */
- fx = min (puck->x.get_value(), 1.0);
- fx = max (fx, -1.0f);
- x = (gint) floor (width * fx - 4);
-
- fy = min (puck->y.get_value(), 1.0);
- fy = max (fy, -1.0f);
- y = (gint) floor (height * fy - 4);
+ CartesianVector c;
+
+ puck->position.cartesian (c);
+ cart_to_gtk (c);
+
+ x = (gint) floor (c.x);
+ y = (gint) floor (c.y);
+ /* XXX need to shift circles so that they are centered on the circle */
+
cairo_arc (cr, x, y, arc_radius, 0, 2.0 * M_PI);
cairo_set_source_rgb (cr, 0.8, 0.2, 0.1);
cairo_close_path (cr);
cairo_fill (cr);
- /* arrow */
-
- if (height > 100.0f) {
-
- float endx, endy;
- endx = x;
- endy = y;
-
- cairo_save (cr);
- cairo_translate (cr, x, y);
- cairo_rotate (cr, puck->azimuth.get_value());
-
- /* horizontal left-to-right line (rotation will rotate it, duh) */
-
- endx = 30.0;
- endy = 0.0;
-
- /* stem */
- cairo_set_line_width (cr, 4.0);
- cairo_move_to (cr, 0.0, 0.0);
- cairo_line_to (cr, endx, endy);
- cairo_stroke (cr);
-
- /* arrow head */
-
- cairo_move_to (cr, endx - 10.0, endy + 10.0);
- cairo_line_to (cr, endx, endy);
- cairo_line_to (cr, endx - 10.0, endy - 10.0);
- cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
- cairo_stroke (cr);
-
- cairo_restore (cr);
- }
-
cairo_move_to (cr, x + 6, y + 6);
- cairo_show_text (cr, puck->text);
+
+ char buf[256];
+ snprintf (buf, sizeof (buf), "%s:%d", puck->text.c_str(), (int) lrint (puck->position.azi));
+ cairo_show_text (cr, buf);
}
}
int n = 0;
for (Targets::iterator i = targets.begin(); i != targets.end(); ++i) {
- Target *target = i->second;
+ Target *target = *i;
char buf[256];
++n;
if (target->visible) {
- fx = min (target->x.get_value(), 1.0);
- fx = max (fx, -1.0f);
- x = (gint) floor (width * fx);
-
- fy = min (target->y.get_value(), 1.0);
- fy = max (fy, -1.0f);
- y = (gint) floor (height * fy);
+ CartesianVector c;
+
+ target->position.cartesian (c);
+ cart_to_gtk (c);
+ x = (int) floor (c.x);
+ y = (int) floor (c.y);
+
snprintf (buf, sizeof (buf), "%d", n);
cairo_set_source_rgb (cr, 0.0, 0.8, 0.1);
cairo_fill (cr);
cairo_move_to (cr, x+6, y+6);
cairo_show_text (cr, buf);
+
}
}
}
switch (ev->button) {
case 1:
case 2:
- drag_target = find_closest_object (ev->x, ev->y, drag_index, drag_is_puck);
+ if ((drag_target = find_closest_object (ev->x, ev->y, drag_index)) != 0) {
+ drag_target->set_selected (true);
+ }
+
drag_x = (int) floor (ev->x);
drag_y = (int) floor (ev->y);
state = (GdkModifierType) ev->state;
y = (int) floor (ev->y);
state = (GdkModifierType) ev->state;
- if (drag_is_puck && (Keyboard::modifier_state_contains (state, Keyboard::TertiaryModifier))) {
-
-
+ if (Keyboard::modifier_state_contains (state, Keyboard::TertiaryModifier)) {
+
for (Targets::iterator i = pucks.begin(); i != pucks.end(); ++i) {
//Target* puck = i->second;
-
/* XXX DO SOMETHING TO SET PUCK BACK TO "normal" */
}
y = (int) floor (ev->y);
state = (GdkModifierType) ev->state;
- if (drag_is_puck && (Keyboard::modifier_state_contains (state, Keyboard::TertiaryModifier))) {
+ if (Keyboard::modifier_state_contains (state, Keyboard::TertiaryModifier)) {
toggle_bypass ();
ret = true;
} else {
return false;
}
- int x, y;
- bool need_move = false;
-
- if (!drag_is_puck && !allow_target) {
- cerr << "dip = " << drag_is_puck << " at = " << allow_target << endl;
- return true;
- }
if (state & GDK_BUTTON1_MASK && !(state & GDK_BUTTON2_MASK)) {
- if (allow_x || !drag_is_puck) {
- float new_x;
- x = min (evx, width - 1);
- x = max (x, 0);
- new_x = (float) x / (width - 1);
- if (new_x != drag_target->x.get_value()) {
- drag_target->x.set_value (new_x);
- need_move = true;
- }
- }
+ CartesianVector c;
+ bool need_move = false;
+
+ drag_target->position.cartesian (c);
+ cart_to_gtk (c);
- if (allow_y || drag_is_puck) {
- float new_y;
- y = min (evy, height - 1);
- y = max (y, 0);
- new_y = (float) y / (height - 1);
- if (new_y != drag_target->y.get_value()) {
- drag_target->y.set_value (new_y);
- need_move = true;
- }
- }
+ if ((evx != c.x) || (evy != c.y)) {
+ need_move = true;
+ }
- if (need_move) {
+ if (need_move) {
+ CartesianVector cp (evx, evy, 0.0);
- if (drag_is_puck) {
+ /* canonicalize position */
- panner->streampanner(drag_index).set_position (
- drag_target->x.get_value(), drag_target->y.get_value(), false);
+ gtk_to_cart (cp);
- } else {
+ /* position actual signal on circle */
- TargetMoved (drag_index);
- }
+ clamp_to_circle (cp.x, cp.y);
+
+ /* generate an angular representation and set drag target (GUI) position */
+
+ cp.angular (drag_target->position); /* sets drag target position */
+ panner->streampanner (drag_index).set_position (drag_target->position);
+
queue_draw ();
}
+ }
+ return true;
+}
- } else if ((state & GDK_BUTTON2_MASK) && !(state & GDK_BUTTON1_MASK)) {
+void
+Panner2d::cart_to_gtk (CartesianVector& c) const
+{
+ /* "c" uses a coordinate space that is:
+
+ center = 0.0
+ dimension = 2.0 * 2.0
+ so max values along each axis are -1..+1
- if (!drag_is_puck) {
- return false;
- }
+ GTK uses a coordinate space that is:
- int xdelta = drag_x - evx;
- int ydelta = drag_x - evy;
+ top left = 0.0
+ dimension = width * height
+ so max values along each axis are 0,width and
+ 0,height
+ */
- drag_target->azimuth.set_value (drag_target->azimuth.get_value() + (2 * M_PI) * ((float)ydelta)/height * ((float) -xdelta)/height);
- queue_draw ();
- }
+ c.x = (width / 2) * (c.x + 1);
+ c.y = (height / 2) * (1 - c.y);
- return true;
+ /* XXX z-axis not handled - 2D for now */
}
void
-Panner2d::toggle_bypass ()
+Panner2d::gtk_to_cart (CartesianVector& c) const
{
- panner->set_bypassed (!panner->bypassed());
-}
+ c.x = (c.x / (width / 2.0)) - 1.0;
+ c.y = -((c.y / (height / 2.0)) - 1.0);
-void
-Panner2d::allow_x_motion (bool yn)
-{
- allow_x = yn;
+ /* XXX z-axis not handled - 2D for now */
}
void
-Panner2d::allow_target_motion (bool yn)
+Panner2d::clamp_to_circle (double& x, double& y)
{
- allow_target = yn;
+ double azi, ele;
+ double z = 0.0;
+
+ PBD::cart_to_azi_ele (x, y, z, azi, ele);
+ PBD::azi_ele_to_cart (azi, ele, x, y, z);
}
void
-Panner2d::allow_y_motion (bool yn)
+Panner2d::toggle_bypass ()
{
- allow_y = yn;
+ panner->set_bypassed (!panner->bypassed());
}
Panner2dWindow::Panner2dWindow (boost::shared_ptr<Panner> p, int32_t h, uint32_t inputs)
{
widget.reset (n_inputs);
+#if 0
while (spinners.size() < n_inputs) {
- spinners.push_back (new Gtk::SpinButton (widget.azimuth (spinners.size())));
- spinner_box.pack_start (*spinners.back(), false, false);
- spinners.back()->set_digits (4);
+ // spinners.push_back (new Gtk::SpinButton (widget.azimuth (spinners.size())));
+ //spinner_box.pack_start (*spinners.back(), false, false);
+ //spinners.back()->set_digits (4);
spinners.back()->show ();
}
delete spinners.back();
spinners.erase (--spinners.end());
}
+#endif
}
projects / ardour.git / blobdiff