--- gigedit/trunk/src/gigedit/regionchooser.cpp 2007/07/22 15:07:08 1262 +++ gigedit/trunk/src/gigedit/regionchooser.cpp 2008/01/04 19:42:45 1623 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007 Andreas Persson + * Copyright (C) 2006-2008 Andreas Persson * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -18,14 +18,41 @@ */ #include "regionchooser.h" +#include #include #include #include #include -#include #include -#define _(String) gettext(String) +#include "global.h" + +void SortedRegions::update(gig::Instrument* instrument) { + // Usually, the regions in a gig file are ordered after their key + // range, but there are files where they are not. The + // RegionChooser code needs a sorted list of regions. + regions.clear(); + if (instrument) { + for (gig::Region *r = instrument->GetFirstRegion() ; + r ; + r = instrument->GetNextRegion()) { + regions.push_back(r); + } + sort(regions.begin(), regions.end(), *this); + } +} + +gig::Region* SortedRegions::first() { + region_iterator = regions.begin(); + return region_iterator == regions.end() ? 0 : *region_iterator; +} + +gig::Region* SortedRegions::next() { + region_iterator++; + return region_iterator == regions.end() ? 0 : *region_iterator; +} + + RegionChooser::RegionChooser() { @@ -39,9 +66,9 @@ instrument = 0; region = 0; resize.active = false; + move.active = false; cursor_is_resize = false; h1 = 20; - width = 800; actionGroup = Gtk::ActionGroup::create(); actionGroup->add(Gtk::Action::create("Properties", @@ -78,8 +105,16 @@ add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK); - dimensionManager.articulation_changed_signal.connect( - sigc::mem_fun(*this, &RegionChooser::on_dimension_manager_changed) + dimensionManager.region_to_be_changed_signal.connect( + region_to_be_changed_signal.make_slot() + ); + dimensionManager.region_changed_signal.connect( + region_changed_signal.make_slot() + ); + dimensionManager.region_changed_signal.connect( + sigc::hide( + sigc::mem_fun(*this, &RegionChooser::on_dimension_manager_changed) + ) ); } @@ -103,7 +138,7 @@ Glib::RefPtr window = get_window(); window->clear(); const int h = 40; - const int w = width - 1; + const int w = get_width() - 1; const int bh = int(h * 0.55); Glib::RefPtr black = get_style()->get_black_gc(); @@ -137,7 +172,7 @@ } if (note == 3) { char buf[30]; - sprintf(buf, "%d", octave); + sprintf(buf, "%d", octave); layout->set_markup(buf); Pango::Rectangle rectangle = layout->get_logical_extents(); double text_w = double(rectangle.get_width()) / Pango::SCALE; @@ -153,12 +188,10 @@ int i = 0; gig::Region *next_region; int x3 = -1; - for (gig::Region *r = instrument->GetFirstRegion() ; - r ; - r = next_region) { + for (gig::Region *r = regions.first() ; r ; r = next_region) { if (x3 < 0) x3 = int(w * (r->KeyRange.low) / 128.0 + 0.5); - next_region = instrument->GetNextRegion(); + next_region = regions.next(); if (!next_region || r->KeyRange.high + 1 != next_region->KeyRange.low) { int x2 = int(w * (r->KeyRange.high + 1) / 128.0 + 0.5); window->draw_line(black, x3, 0, x2, 0); @@ -170,9 +203,7 @@ i++; } - for (gig::Region *r = instrument->GetFirstRegion() ; - r ; - r = instrument->GetNextRegion()) { + for (gig::Region *r = regions.first() ; r ; r = regions.next()) { int x = int(w * (r->KeyRange.low) / 128.0 + 0.5); window->draw_line(black, x, 1, x, h1 - 2); } @@ -200,7 +231,7 @@ void RegionChooser::draw_region(int from, int to, const Gdk::Color& color) { const int h = 40; - const int w = width; + const int w = get_width(); const int bh = int(h * 0.55); Glib::RefPtr window = get_window(); @@ -236,7 +267,8 @@ void RegionChooser::set_instrument(gig::Instrument* instrument) { this->instrument = instrument; - region = instrument ? instrument->GetFirstRegion() : 0; + regions.update(instrument); + region = regions.first(); queue_draw(); region_selected(); } @@ -249,13 +281,25 @@ if (resize.mode == resize.moving_high_limit) { if (resize.region->KeyRange.high != resize.pos - 1) { - resize.region->KeyRange.high = resize.pos - 1; - instrument_changed(); + instrument_struct_to_be_changed_signal.emit(instrument); + resize.region->SetKeyRange( + resize.region->KeyRange.low, // low + resize.pos - 1 // high + ); + regions.update(instrument); + instrument_changed.emit(); + instrument_struct_changed_signal.emit(instrument); } } else if (resize.mode == resize.moving_low_limit) { if (resize.region->KeyRange.low != resize.pos) { - resize.region->KeyRange.low = resize.pos; - instrument_changed(); + instrument_struct_to_be_changed_signal.emit(instrument); + resize.region->SetKeyRange( + resize.pos, // low + resize.region->KeyRange.high // high + ); + regions.update(instrument); + instrument_changed.emit(); + instrument_struct_changed_signal.emit(instrument); } } @@ -268,22 +312,14 @@ move.active = false; if (move.pos) { - region->KeyRange.low += move.pos; - region->KeyRange.high += move.pos; - - // find the r which is the first one to the right of region - // at its new position - gig::Region* r; - gig::Region* prev_region = 0; - for (r = instrument->GetFirstRegion() ; r ; r = instrument->GetNextRegion()) { - if (r->KeyRange.low > region->KeyRange.low) break; - prev_region = r; - } - - // place region before r if it's not already there - if (prev_region != region) { - instrument->MoveRegion(region, r); - } + instrument_struct_to_be_changed_signal.emit(instrument); + region->SetKeyRange( + region->KeyRange.low + move.pos, + region->KeyRange.high + move.pos + ); + regions.update(instrument); + instrument_changed.emit(); + instrument_struct_changed_signal.emit(instrument); } if (is_in_resize_zone(event->x, event->y)) { @@ -298,7 +334,7 @@ { if (!instrument) return true; - int k = int(event->x / (width - 1) * 128.0); + int k = int(event->x / (get_width() - 1) * 128.0); if (event->type == GDK_BUTTON_PRESS && event->button == 3) { gig::Region* r = get_region(k); @@ -344,9 +380,8 @@ { gig::Region* prev_region = 0; gig::Region* next_region; - for (gig::Region *r = instrument->GetFirstRegion() ; r ; - r = next_region) { - next_region = instrument->GetNextRegion(); + for (gig::Region *r = regions.first() ; r ; r = next_region) { + next_region = regions.next(); if (key < r->KeyRange.low) return 0; if (key <= r->KeyRange.high) { @@ -361,7 +396,7 @@ void RegionChooser::motion_resize_region(int x, int y) { - const int w = width - 1; + const int w = get_width() - 1; Glib::RefPtr window = get_window(); int k = int(double(x) / w * 128.0 + 0.5); @@ -418,7 +453,7 @@ void RegionChooser::motion_move_region(int x, int y) { - const int w = width - 1; + const int w = get_width() - 1; Glib::RefPtr window = get_window(); int k = int(double(x - move.from_x) / w * 128.0 + 0.5); @@ -428,8 +463,7 @@ bool new_touch_right; int a = 0; if (k > move.pos) { - for (gig::Region* r = instrument->GetFirstRegion() ; ; - r = instrument->GetNextRegion()) { + for (gig::Region* r = regions.first() ; ; r = regions.next()) { if (r != region) { int b = r ? r->KeyRange.low : 128; @@ -459,8 +493,7 @@ } } } else { - for (gig::Region* r = instrument->GetFirstRegion() ; ; - r = instrument->GetNextRegion()) { + for (gig::Region* r = regions.first() ; ; r = regions.next()) { if (r != region) { int b = r ? r->KeyRange.low : 128; @@ -558,13 +591,13 @@ } bool RegionChooser::is_in_resize_zone(double x, double y) { - const int w = width - 1; + const int w = get_width() - 1; if (instrument && y >= 0 && y <= h1) { gig::Region* prev_region = 0; gig::Region* next_region; - for (gig::Region* r = instrument->GetFirstRegion() ; r ; r = next_region) { - next_region = instrument->GetNextRegion(); + for (gig::Region* r = regions.first(); r ; r = next_region) { + next_region = regions.next(); int lo = int(w * (r->KeyRange.low) / 128.0 + 0.5); if (x <= lo - 2) break; @@ -580,13 +613,13 @@ resize.mode = resize.undecided; resize.min = prev_region->KeyRange.low + 1; resize.prev_region = prev_region; - return true; + return resize.min != resize.max; } // edit low limit resize.mode = resize.moving_low_limit; resize.min = prev_region ? prev_region->KeyRange.high + 1 : 0; - return true; + return resize.min != resize.max; } if (!next_region || r->KeyRange.high + 1 != next_region->KeyRange.low) { int hi = int(w * (r->KeyRange.high + 1) / 128.0 + 0.5); @@ -598,7 +631,7 @@ resize.mode = resize.moving_high_limit; resize.min = r->KeyRange.low + 1; resize.max = next_region ? next_region->KeyRange.low : 128; - return true; + return resize.min != resize.max; } } prev_region = r; @@ -607,12 +640,12 @@ return false; } -sigc::signal RegionChooser::signal_region_selected() +sigc::signal& RegionChooser::signal_region_selected() { return region_selected; } -sigc::signal RegionChooser::signal_instrument_changed() +sigc::signal& RegionChooser::signal_instrument_changed() { return instrument_changed; } @@ -644,15 +677,14 @@ void RegionChooser::add_region() { - gig::Region* r; - for (r = instrument->GetFirstRegion() ; r ; r = instrument->GetNextRegion()) { - if (r->KeyRange.low > new_region_pos) break; - } + instrument_struct_to_be_changed_signal.emit(instrument); region = instrument->AddRegion(); - region->KeyRange.low = region->KeyRange.high = new_region_pos; + region->SetKeyRange(new_region_pos, new_region_pos); + + instrument_struct_changed_signal.emit(instrument); + regions.update(instrument); - instrument->MoveRegion(region, r); queue_draw(); region_selected(); instrument_changed(); @@ -660,7 +692,11 @@ void RegionChooser::delete_region() { + instrument_struct_to_be_changed_signal.emit(instrument); instrument->DeleteRegion(region); + instrument_struct_changed_signal.emit(instrument); + regions.update(instrument); + region = 0; queue_draw(); region_selected(); @@ -678,3 +714,19 @@ region_selected(); instrument_changed(); } + +sigc::signal& RegionChooser::signal_instrument_struct_to_be_changed() { + return instrument_struct_to_be_changed_signal; +} + +sigc::signal& RegionChooser::signal_instrument_struct_changed() { + return instrument_struct_changed_signal; +} + +sigc::signal& RegionChooser::signal_region_to_be_changed() { + return region_to_be_changed_signal; +} + +sigc::signal& RegionChooser::signal_region_changed_signal() { + return region_changed_signal; +}