diff options
| author | David Robillard <d@drobilla.net> | 2007-03-12 03:04:27 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-03-12 03:04:27 +0000 |
| commit | 218b41a2fbaab0540780e0bd45bea135c7c98bd3 (patch) | |
| tree | 0fee8bec4761b5f63c0d4509f689860a501c103e /src/gui | |
| parent | ee76743c774f64759daef42d416d3fb7bbc4a473 (diff) | |
| download | machina-218b41a2fbaab0540780e0bd45bea135c7c98bd3.tar.gz machina-218b41a2fbaab0540780e0bd45bea135c7c98bd3.tar.bz2 machina-218b41a2fbaab0540780e0bd45bea135c7c98bd3.zip | |
Fixed edge label size when zooming.
Importing of multi-track MIDI files.
git-svn-id: http://svn.drobilla.net/lad/machina@355 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/MachinaCanvas.cpp | 8 | ||||
| -rw-r--r-- | src/gui/MachinaGUI.cpp | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index 2c22791..327b2b0 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -177,17 +177,17 @@ MachinaCanvas::build(SharedPtr<Machina::Machine> machine) for (Machina::Machine::Nodes::const_iterator i = machine->nodes().begin(); i != machine->nodes().end(); ++i) { - const double x = 1600 + rand() % 300; - const double y = 1200 + rand() % 300; + //const double x = 1600 + rand() % 300; + //const double y = 1200 + rand() % 300; SharedPtr<NodeView> view(new NodeView((*i), shared_from_this(), - "", x, y)); + "", 10, 10)); view->signal_clicked.connect(sigc::bind<0>(sigc::mem_fun(this, &MachinaCanvas::node_clicked), WeakPtr<NodeView>(view))); add_item(view); - view->resize(); + //view->resize(); } for (ItemMap::iterator n = _items.begin(); n != _items.end(); ++n) { diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index 8f8e607..db5e70c 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -445,7 +445,7 @@ MachinaGUI::menu_import_midi() dialog.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); dialog.add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_OK); - Gtk::HBox* extra_widget = Gtk::manage(new Gtk::HBox()); + /*Gtk::HBox* extra_widget = Gtk::manage(new Gtk::HBox()); Gtk::SpinButton* track_sb = Gtk::manage(new Gtk::SpinButton()); track_sb->set_increments(1, 10); track_sb->set_range(1, 256); @@ -454,13 +454,15 @@ MachinaGUI::menu_import_midi() extra_widget->pack_start(*track_sb, false, false); dialog.set_extra_widget(*extra_widget); extra_widget->show_all(); + */ const int result = dialog.run(); if (result == Gtk::RESPONSE_OK) { SharedPtr<Machina::SMFDriver> file_driver(new Machina::SMFDriver()); - SharedPtr<Machina::Machine> machine = file_driver->learn(dialog.get_uri(), - track_sb->get_value_as_int()); + //SharedPtr<Machina::Machine> machine = file_driver->learn(dialog.get_uri(), + // track_sb->get_value_as_int()); + SharedPtr<Machina::Machine> machine = file_driver->learn(dialog.get_uri()); if (machine) { machine->activate(); |