Bulk reformat.

git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4929 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 26 insertions, 15 deletions

diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index 1a92d40..6e3b188 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -49,7 +49,8 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
 	, _controller(new Machina::Controller(_engine, *_client_model.get()))
 	, _maid(new Raul::Maid())
 {
-	_canvas = boost::shared_ptr<MachinaCanvas>(new MachinaCanvas(this, 1600*2, 1200*2));
+	_canvas = boost::shared_ptr<MachinaCanvas>(
+		new MachinaCanvas(this, 1600*2, 1200*2));
 
 	Glib::RefPtr<Gtk::Builder> xml = WidgetFactory::create();
 
@@ -96,15 +97,16 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
 	_canvas_scrolledwindow->add(_canvas->widget());
 	_canvas_scrolledwindow->signal_event().connect(sigc::mem_fun(this,
 				&MachinaGUI::scrolled_window_event));
-	_canvas->scroll_to(static_cast<int>(_canvas->get_width()/2.0 - 320),
-	                   static_cast<int>(_canvas->get_height()/2.0 - 240)); // FIXME: hardcoded
 
 	_canvas_scrolledwindow->property_hadjustment().get_value()->set_step_increment(10);
 	_canvas_scrolledwindow->property_vadjustment().get_value()->set_step_increment(10);
 
-	_record_button->signal_toggled().connect(sigc::mem_fun(this, &MachinaGUI::record_toggled));
-	_stop_button->signal_clicked().connect(sigc::mem_fun(this, &MachinaGUI::stop_clicked));
-	_play_button->signal_toggled().connect(sigc::mem_fun(this, &MachinaGUI::play_toggled));
+	_record_button->signal_toggled().connect(
+		sigc::mem_fun(this, &MachinaGUI::record_toggled));
+	_stop_button->signal_clicked().connect(
+		sigc::mem_fun(this, &MachinaGUI::stop_clicked));
+	_play_button->signal_toggled().connect(
+		sigc::mem_fun(this, &MachinaGUI::play_toggled));
 
 	_zoom_normal_button->signal_clicked().connect(sigc::bind(
 		sigc::mem_fun(this, &MachinaGUI::zoom), 1.0));
@@ -145,7 +147,8 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
 		sigc::mem_fun(this, &MachinaGUI::quantize_changed));
 
 	_mutate_button->signal_clicked().connect(sigc::bind(
-		sigc::mem_fun(this, &MachinaGUI::random_mutation), SharedPtr<Machine>()));
+		sigc::mem_fun(this, &MachinaGUI::random_mutation),
+		SharedPtr<Machine>()));
 	_compress_button->signal_clicked().connect(sigc::hide_return(sigc::bind(
 		sigc::mem_fun(this, &MachinaGUI::mutate), SharedPtr<Machine>(), 0)));
 	_add_node_button->signal_clicked().connect(sigc::bind(
@@ -180,12 +183,16 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
 		1000);
 
 	// Idle callback to update node states
-	Glib::signal_timeout().connect(sigc::mem_fun(this, &MachinaGUI::idle_callback), 100);
+	Glib::signal_timeout().connect(
+		sigc::mem_fun(this, &MachinaGUI::idle_callback), 100);
 
 #ifdef HAVE_EUGENE
-	_load_target_button->signal_clicked().connect(sigc::mem_fun(this, &MachinaGUI::load_target_clicked));
-	_evolve_button->signal_clicked().connect(sigc::mem_fun(this, &MachinaGUI::evolve_toggled));
-	Glib::signal_timeout().connect(sigc::mem_fun(this, &MachinaGUI::evolve_callback), 1000);
+	_load_target_button->signal_clicked().connect(
+		sigc::mem_fun(this, &MachinaGUI::load_target_clicked));
+	_evolve_button->signal_clicked().connect(
+		sigc::mem_fun(this, &MachinaGUI::evolve_toggled));
+	Glib::signal_timeout().connect(
+		sigc::mem_fun(this, &MachinaGUI::evolve_callback), 1000);
 #else
 	_evolve_toolbar->set_sensitive(false);
 #endif
@@ -193,8 +200,10 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
 	_controller->announce(engine->machine());
 	_canvas->arrange();
 
-	_client_model->signal_new_object.connect(sigc::mem_fun(this, &MachinaGUI::on_new_object));
-	_client_model->signal_erase_object.connect(sigc::mem_fun(this, &MachinaGUI::on_erase_object));
+	_client_model->signal_new_object.connect(
+		sigc::mem_fun(this, &MachinaGUI::on_new_object));
+	_client_model->signal_erase_object.connect(
+		sigc::mem_fun(this, &MachinaGUI::on_erase_object));
 }
 
 MachinaGUI::~MachinaGUI()
@@ -280,7 +289,8 @@ void
 MachinaGUI::evolve_toggled()
 {
 	if (_evolve_button->get_active()) {
-		_evolver = SharedPtr<Evolver>(new Evolver(_unit, _target_filename, _engine->machine()));
+		_evolver = SharedPtr<Evolver>(
+			new Evolver(_unit, _target_filename, _engine->machine()));
 		_evolve = true;
 		stop_clicked();
 		_engine->driver()->set_machine(SharedPtr<Machine>());
@@ -288,7 +298,8 @@ MachinaGUI::evolve_toggled()
 	} else {
 		_evolver->stop();
 		_evolve = false;
-		SharedPtr<Machine> new_machine = SharedPtr<Machine>(new Machine(*_evolver->best()));
+		SharedPtr<Machine> new_machine = SharedPtr<Machine>(
+			new Machine(*_evolver->best()));
 		_engine->driver()->set_machine(new_machine);
 		_canvas->build(new_machine, _menu_view_labels->get_active());
 		new_machine->activate();