LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement connect/disconnect commands

This commit is contained in:
Nedko Arnaudov 2009-08-12 19:12:10 +03:00
parent 6bf15d3be1
commit ec2421a996
3 changed files with 127 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
gui/canvas.cpp
View File

@ -31,41 +31,75 @@
#include "canvas.h"
struct canvas
class canvas_cls: public FlowCanvas::Canvas
{
boost::shared_ptr<FlowCanvas::Canvas> * flowcanvas;
public:
canvas_cls(
double width,
double height,
void (* connect_request)(void * port1_context, void * port2_context),
void (* disconnect_request)(void * port1_context, void * port2_context))
: FlowCanvas::Canvas(width, height)
, m_connect_request(connect_request)
, m_disconnect_request(disconnect_request)
{};
virtual ~canvas_cls() {};
virtual void connect(boost::shared_ptr<FlowCanvas::Connectable> port1, boost::shared_ptr<FlowCanvas::Connectable> port2);
virtual void disconnect(boost::shared_ptr<FlowCanvas::Connectable> port1, boost::shared_ptr<FlowCanvas::Connectable> port2);
void (* m_connect_request)(void * port1_context, void * port2_context);
void (* m_disconnect_request)(void * port1_context, void * port2_context);
};
class port_cls: public FlowCanvas::Port
{
public:
port_cls(
boost::shared_ptr<FlowCanvas::Module> module,
const std::string& name,
bool is_input,
uint32_t color,
void * port_context)
: FlowCanvas::Port(module, name, is_input, color)
, context(port_context)
{};
virtual ~port_cls() {};
void * context;
};
bool
canvas_create(
int width,
int height,
double width,
double height,
void (* connect_request)(void * port1_context, void * port2_context),
void (* disconnect_request)(void * port1_context, void * port2_context),
canvas_handle * canvas_handle_ptr)
{
struct canvas * canvas_ptr;
boost::shared_ptr<canvas_cls> * canvas;
canvas_ptr = new canvas;
canvas_ptr->flowcanvas = new boost::shared_ptr<FlowCanvas::Canvas>(new FlowCanvas::Canvas(width, height));
canvas = new boost::shared_ptr<canvas_cls>(new canvas_cls(width, height, connect_request, disconnect_request));
*canvas_handle_ptr = (canvas_handle)canvas_ptr;
*canvas_handle_ptr = (canvas_handle)canvas;
return true;
}
#define canvas_ptr ((struct canvas *)canvas)
#define canvas_ptr ((boost::shared_ptr<canvas_cls> *)canvas)
GtkWidget *
canvas_get_widget(
canvas_handle canvas)
{
return ((Gtk::Widget *)canvas_ptr->flowcanvas->get())->gobj();
return ((Gtk::Widget *)canvas_ptr->get())->gobj();
}
void
canvas_destroy(
canvas_handle canvas)
{
delete canvas_ptr->flowcanvas;
delete canvas_ptr;
}
@ -73,7 +107,7 @@ void
canvas_clear(
canvas_handle canvas)
{
FlowCanvas::ItemList modules = canvas_ptr->flowcanvas->get()->items(); // copy
FlowCanvas::ItemList modules = canvas_ptr->get()->items(); // copy
for (FlowCanvas::ItemList::iterator m = modules.begin(); m != modules.end(); ++m)
{
boost::shared_ptr<FlowCanvas::Module> module = boost::dynamic_pointer_cast<FlowCanvas::Module>(*m);
@ -90,7 +124,7 @@ canvas_clear(
}
assert(module->ports().empty());
canvas_ptr->flowcanvas->get()->remove_item(module);
canvas_ptr->get()->remove_item(module);
}
}
@ -99,14 +133,14 @@ canvas_set_zoom(
canvas_handle canvas,
double pix_per_unit)
{
canvas_ptr->flowcanvas->get()->set_zoom(pix_per_unit);
canvas_ptr->get()->set_zoom(pix_per_unit);
}
void
canvas_arrange(
canvas_handle canvas)
{
canvas_ptr->flowcanvas->get()->arrange();
canvas_ptr->get()->arrange();
}
bool
@ -121,8 +155,8 @@ canvas_create_module(
{
boost::shared_ptr<FlowCanvas::Module> * module;
module = new boost::shared_ptr<FlowCanvas::Module>(new FlowCanvas::Module(*canvas_ptr->flowcanvas, name, x, y, show_title, show_port_labels));
canvas_ptr->flowcanvas->get()->add_item(*module);
module = new boost::shared_ptr<FlowCanvas::Module>(new FlowCanvas::Module(*canvas_ptr, name, x, y, show_title, show_port_labels));
canvas_ptr->get()->add_item(*module);
module->get()->resize();
*module_handle_ptr = (canvas_module_handle)module;
@ -137,7 +171,7 @@ canvas_destroy_module(
canvas_handle canvas,
canvas_module_handle module)
{
canvas_ptr->flowcanvas->get()->remove_item(*module_ptr);
canvas_ptr->get()->remove_item(*module_ptr);
delete module_ptr;
return true;
}
@ -149,11 +183,13 @@ canvas_create_port(
const char * name,
bool is_input,
int color,
void * port_context,
canvas_port_handle * port_handle_ptr)
{
boost::shared_ptr<FlowCanvas::Port> * port;
boost::shared_ptr<port_cls> * port;
port = new boost::shared_ptr<port_cls>(new port_cls(*module_ptr, name, is_input, color, port_context));
port = new boost::shared_ptr<FlowCanvas::Port>(new FlowCanvas::Port(*module_ptr, name, is_input, color));
module_ptr->get()->add_port(*port);
module_ptr->get()->resize();
@ -163,7 +199,7 @@ canvas_create_port(
}
#undef module_ptr
#define port_ptr ((boost::shared_ptr<FlowCanvas::Port> *)port)
#define port_ptr ((boost::shared_ptr<port_cls> *)port)
bool
canvas_destroy_port(
@ -185,8 +221,8 @@ canvas_get_port_color(
}
#undef port_ptr
#define port1_ptr ((boost::shared_ptr<FlowCanvas::Port> *)port1)
#define port2_ptr ((boost::shared_ptr<FlowCanvas::Port> *)port2)
#define port1_ptr ((boost::shared_ptr<port_cls> *)port1)
#define port2_ptr ((boost::shared_ptr<port_cls> *)port2)
bool
canvas_add_connection(
@ -195,7 +231,7 @@ canvas_add_connection(
canvas_port_handle port2,
uint32_t color)
{
canvas_ptr->flowcanvas->get()->add_connection(*port1_ptr, *port2_ptr, color);
canvas_ptr->get()->add_connection(*port1_ptr, *port2_ptr, color);
return true;
}
@ -205,13 +241,39 @@ canvas_remove_connection(
canvas_port_handle port1,
canvas_port_handle port2)
{
canvas_ptr->flowcanvas->get()->remove_connection(*port1_ptr, *port2_ptr);
canvas_ptr->get()->remove_connection(*port1_ptr, *port2_ptr);
return true;
}
#undef port1_ptr
#undef port2_ptr
void
canvas_cls::connect(
boost::shared_ptr<FlowCanvas::Connectable> c1,
boost::shared_ptr<FlowCanvas::Connectable> c2)
{
if (m_connect_request != NULL)
{
boost::shared_ptr<port_cls> port1 = boost::dynamic_pointer_cast<port_cls>(c1);
boost::shared_ptr<port_cls> port2 = boost::dynamic_pointer_cast<port_cls>(c2);
m_connect_request(port1->context, port2->context);
}
}
void
canvas_cls::disconnect(
boost::shared_ptr<FlowCanvas::Connectable> c1,
boost::shared_ptr<FlowCanvas::Connectable> c2)
{
if (m_disconnect_request != NULL)
{
boost::shared_ptr<port_cls> port1 = boost::dynamic_pointer_cast<port_cls>(c1);
boost::shared_ptr<port_cls> port2 = boost::dynamic_pointer_cast<port_cls>(c2);
m_disconnect_request(port1->context, port2->context);
}
}
bool
canvas_enum_modules(
canvas_handle canvas,

7
gui/canvas.h
View File

@ -43,8 +43,10 @@ extern "C" {
bool
canvas_create(
int width,
int height,
double width,
double height,
void (* connect_request)(void * port1_context, void * port2_context),
void (* disconnect_request)(void * port1_context, void * port2_context),
canvas_handle * canvas_handle_ptr);
GtkWidget *
@ -90,6 +92,7 @@ canvas_create_port(
const char * name,
bool is_input,
int color,
void * port_context,
canvas_port_handle * port_handle_ptr);
bool

37
gui/graph_canvas.c
View File

@ -51,6 +51,7 @@ struct port
struct list_head siblings;
uint64_t id;
canvas_port_handle canvas_port;
struct graph_canvas * graph_canvas;
};
static
@ -95,6 +96,37 @@ find_port(
return NULL;
}
#define port1_ptr ((struct port *)port1_context)
#define port2_ptr ((struct port *)port2_context)
static
void
connect_request(
void * port1_context,
void * port2_context)
{
lash_info("connect request(%"PRIu64", %"PRIu64")", port1_ptr->id, port2_ptr->id);
assert(port1_ptr->graph_canvas == port2_ptr->graph_canvas);
graph_connect_ports(port1_ptr->graph_canvas->graph, port1_ptr->id, port2_ptr->id);
}
void
disconnect_request(
void * port1_context,
void * port2_context)
{
lash_info("disconnect request(%"PRIu64", %"PRIu64")", port1_ptr->id, port2_ptr->id);
assert(port1_ptr->graph_canvas == port2_ptr->graph_canvas);
graph_disconnect_ports(port1_ptr->graph_canvas->graph, port1_ptr->id, port2_ptr->id);
}
#undef port1_ptr
#undef port2_ptr
bool
graph_canvas_create(
int width,
@ -109,7 +141,7 @@ graph_canvas_create(
return false;
}
if (!canvas_create(width, height, &graph_canvas_ptr->canvas))
if (!canvas_create(width, height, connect_request, disconnect_request, &graph_canvas_ptr->canvas))
{
free(graph_canvas_ptr);
return false;
@ -219,6 +251,7 @@ port_appeared(
}
port_ptr->id = port_id;
port_ptr->graph_canvas = graph_canvas_ptr;
// Darkest tango palette colour, with S -= 6, V -= 6, w/ transparency
if (is_midi)
@ -230,7 +263,7 @@ port_appeared(
color = 0x244678C0;
}
if (!canvas_create_port(graph_canvas_ptr->canvas, client_ptr->canvas_module, port_name, is_input, color, &port_ptr->canvas_port))
if (!canvas_create_port(graph_canvas_ptr->canvas, client_ptr->canvas_module, port_name, is_input, color, port_ptr, &port_ptr->canvas_port))
{
lash_error("canvas_create_port(\"%s\") failed", port_name);
free(client_ptr);