/[svn]/gigedit/trunk/src/gigedit/regionchooser.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/regionchooser.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1303 by persson, Sun Aug 26 09:29:52 2007 UTC revision 1623 by persson, Fri Jan 4 19:42:45 2008 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2006, 2007 Andreas Persson   * Copyright (C) 2006-2008 Andreas Persson
3   *   *
4   * This program is free software; you can redistribute it and/or   * This program is free software; you can redistribute it and/or
5   * modify it under the terms of the GNU General Public License as   * modify it under the terms of the GNU General Public License as
# Line 18  Line 18 
18   */   */
19    
20  #include "regionchooser.h"  #include "regionchooser.h"
21    #include <algorithm>
22  #include <gdkmm/cursor.h>  #include <gdkmm/cursor.h>
23  #include <gtkmm/stock.h>  #include <gtkmm/stock.h>
24  #include <gtkmm/spinbutton.h>  #include <gtkmm/spinbutton.h>
25  #include <gtkmm/dialog.h>  #include <gtkmm/dialog.h>
 #include <libintl.h>  
26  #include <math.h>  #include <math.h>
27    
28  #define _(String) gettext(String)  #include "global.h"
29    
30    void SortedRegions::update(gig::Instrument* instrument) {
31        // Usually, the regions in a gig file are ordered after their key
32        // range, but there are files where they are not. The
33        // RegionChooser code needs a sorted list of regions.
34        regions.clear();
35        if (instrument) {
36            for (gig::Region *r = instrument->GetFirstRegion() ;
37                 r ;
38                 r = instrument->GetNextRegion()) {
39                regions.push_back(r);
40            }
41            sort(regions.begin(), regions.end(), *this);
42        }
43    }
44    
45    gig::Region* SortedRegions::first() {
46        region_iterator = regions.begin();
47        return region_iterator == regions.end() ? 0 : *region_iterator;
48    }
49    
50    gig::Region* SortedRegions::next() {
51        region_iterator++;
52        return region_iterator == regions.end() ? 0 : *region_iterator;
53    }
54    
55    
56    
57  RegionChooser::RegionChooser()  RegionChooser::RegionChooser()
58  {  {
# Line 42  RegionChooser::RegionChooser() Line 69  RegionChooser::RegionChooser()
69      move.active = false;      move.active = false;
70      cursor_is_resize = false;      cursor_is_resize = false;
71      h1 = 20;      h1 = 20;
     width = 800;  
72    
73      actionGroup = Gtk::ActionGroup::create();      actionGroup = Gtk::ActionGroup::create();
74      actionGroup->add(Gtk::Action::create("Properties",      actionGroup->add(Gtk::Action::create("Properties",
# Line 79  RegionChooser::RegionChooser() Line 105  RegionChooser::RegionChooser()
105      add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK |      add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK |
106                 Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK);                 Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK);
107    
108      dimensionManager.articulation_changed_signal.connect(      dimensionManager.region_to_be_changed_signal.connect(
109          sigc::mem_fun(*this, &RegionChooser::on_dimension_manager_changed)          region_to_be_changed_signal.make_slot()
110        );
111        dimensionManager.region_changed_signal.connect(
112            region_changed_signal.make_slot()
113        );
114        dimensionManager.region_changed_signal.connect(
115            sigc::hide(
116                sigc::mem_fun(*this, &RegionChooser::on_dimension_manager_changed)
117            )
118      );      );
119  }  }
120    
# Line 104  bool RegionChooser::on_expose_event(GdkE Line 138  bool RegionChooser::on_expose_event(GdkE
138      Glib::RefPtr<Gdk::Window> window = get_window();      Glib::RefPtr<Gdk::Window> window = get_window();
139      window->clear();      window->clear();
140      const int h = 40;      const int h = 40;
141      const int w = width - 1;      const int w = get_width() - 1;
142      const int bh = int(h * 0.55);      const int bh = int(h * 0.55);
143    
144      Glib::RefPtr<const Gdk::GC> black = get_style()->get_black_gc();      Glib::RefPtr<const Gdk::GC> black = get_style()->get_black_gc();
# Line 138  bool RegionChooser::on_expose_event(GdkE Line 172  bool RegionChooser::on_expose_event(GdkE
172          }          }
173          if (note == 3) {          if (note == 3) {
174              char buf[30];              char buf[30];
175              sprintf(buf, "<span size=\"x-small\">%d</span>", octave);              sprintf(buf, "<span size=\"8000\">%d</span>", octave);
176              layout->set_markup(buf);              layout->set_markup(buf);
177              Pango::Rectangle rectangle = layout->get_logical_extents();              Pango::Rectangle rectangle = layout->get_logical_extents();
178              double text_w = double(rectangle.get_width()) / Pango::SCALE;              double text_w = double(rectangle.get_width()) / Pango::SCALE;
# Line 154  bool RegionChooser::on_expose_event(GdkE Line 188  bool RegionChooser::on_expose_event(GdkE
188          int i = 0;          int i = 0;
189          gig::Region *next_region;          gig::Region *next_region;
190          int x3 = -1;          int x3 = -1;
191          for (gig::Region *r = instrument->GetFirstRegion() ;          for (gig::Region *r = regions.first() ; r ; r = next_region) {
              r ;  
              r = next_region) {  
192    
193              if (x3 < 0) x3 = int(w * (r->KeyRange.low) / 128.0 + 0.5);              if (x3 < 0) x3 = int(w * (r->KeyRange.low) / 128.0 + 0.5);
194              next_region = instrument->GetNextRegion();              next_region = regions.next();
195              if (!next_region || r->KeyRange.high + 1 != next_region->KeyRange.low) {              if (!next_region || r->KeyRange.high + 1 != next_region->KeyRange.low) {
196                  int x2 = int(w * (r->KeyRange.high + 1) / 128.0 + 0.5);                  int x2 = int(w * (r->KeyRange.high + 1) / 128.0 + 0.5);
197                  window->draw_line(black, x3, 0, x2, 0);                  window->draw_line(black, x3, 0, x2, 0);
# Line 171  bool RegionChooser::on_expose_event(GdkE Line 203  bool RegionChooser::on_expose_event(GdkE
203              i++;              i++;
204          }          }
205    
206          for (gig::Region *r = instrument->GetFirstRegion() ;          for (gig::Region *r = regions.first() ; r ; r = regions.next()) {
              r ;  
              r = instrument->GetNextRegion()) {  
207              int x = int(w * (r->KeyRange.low) / 128.0 + 0.5);              int x = int(w * (r->KeyRange.low) / 128.0 + 0.5);
208              window->draw_line(black, x, 1, x, h1 - 2);              window->draw_line(black, x, 1, x, h1 - 2);
209          }          }
# Line 201  void RegionChooser::on_size_request(GtkR Line 231  void RegionChooser::on_size_request(GtkR
231  void RegionChooser::draw_region(int from, int to, const Gdk::Color& color)  void RegionChooser::draw_region(int from, int to, const Gdk::Color& color)
232  {  {
233      const int h = 40;      const int h = 40;
234      const int w = width;      const int w = get_width();
235      const int bh = int(h * 0.55);      const int bh = int(h * 0.55);
236    
237      Glib::RefPtr<Gdk::Window> window = get_window();      Glib::RefPtr<Gdk::Window> window = get_window();
# Line 237  void RegionChooser::draw_region(int from Line 267  void RegionChooser::draw_region(int from
267  void RegionChooser::set_instrument(gig::Instrument* instrument)  void RegionChooser::set_instrument(gig::Instrument* instrument)
268  {  {
269      this->instrument = instrument;      this->instrument = instrument;
270      region = instrument ? instrument->GetFirstRegion() : 0;      regions.update(instrument);
271        region = regions.first();
272      queue_draw();      queue_draw();
273      region_selected();      region_selected();
274  }  }
# Line 250  bool RegionChooser::on_button_release_ev Line 281  bool RegionChooser::on_button_release_ev
281    
282          if (resize.mode == resize.moving_high_limit) {          if (resize.mode == resize.moving_high_limit) {
283              if (resize.region->KeyRange.high != resize.pos - 1) {              if (resize.region->KeyRange.high != resize.pos - 1) {
284                  resize.region->KeyRange.high = resize.pos - 1;                  instrument_struct_to_be_changed_signal.emit(instrument);
285                  instrument_changed();                  resize.region->SetKeyRange(
286                        resize.region->KeyRange.low, // low
287                        resize.pos - 1 // high
288                    );
289                    regions.update(instrument);
290                    instrument_changed.emit();
291                    instrument_struct_changed_signal.emit(instrument);
292              }              }
293          } else if (resize.mode == resize.moving_low_limit) {          } else if (resize.mode == resize.moving_low_limit) {
294              if (resize.region->KeyRange.low != resize.pos) {              if (resize.region->KeyRange.low != resize.pos) {
295                  resize.region->KeyRange.low = resize.pos;                  instrument_struct_to_be_changed_signal.emit(instrument);
296                  instrument_changed();                  resize.region->SetKeyRange(
297                        resize.pos, // low
298                        resize.region->KeyRange.high // high
299                    );
300                    regions.update(instrument);
301                    instrument_changed.emit();
302                    instrument_struct_changed_signal.emit(instrument);
303              }              }
304          }          }
305    
# Line 269  bool RegionChooser::on_button_release_ev Line 312  bool RegionChooser::on_button_release_ev
312          move.active = false;          move.active = false;
313    
314          if (move.pos) {          if (move.pos) {
315              region->KeyRange.low += move.pos;              instrument_struct_to_be_changed_signal.emit(instrument);
316              region->KeyRange.high += move.pos;              region->SetKeyRange(
317                    region->KeyRange.low  + move.pos,
318              // find the r which is the first one to the right of region                  region->KeyRange.high + move.pos
319              // at its new position              );
320              gig::Region* r;              regions.update(instrument);
321              gig::Region* prev_region = 0;              instrument_changed.emit();
322              for (r = instrument->GetFirstRegion() ; r ; r = instrument->GetNextRegion()) {              instrument_struct_changed_signal.emit(instrument);
                 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);  
             }  
323          }          }
324    
325          if (is_in_resize_zone(event->x, event->y)) {          if (is_in_resize_zone(event->x, event->y)) {
# Line 299  bool RegionChooser::on_button_press_even Line 334  bool RegionChooser::on_button_press_even
334  {  {
335      if (!instrument) return true;      if (!instrument) return true;
336    
337      int k = int(event->x / (width - 1) * 128.0);      int k = int(event->x / (get_width() - 1) * 128.0);
338    
339      if (event->type == GDK_BUTTON_PRESS && event->button == 3) {      if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
340          gig::Region* r = get_region(k);          gig::Region* r = get_region(k);
# Line 345  gig::Region* RegionChooser::get_region(i Line 380  gig::Region* RegionChooser::get_region(i
380  {  {
381      gig::Region* prev_region = 0;      gig::Region* prev_region = 0;
382      gig::Region* next_region;      gig::Region* next_region;
383      for (gig::Region *r = instrument->GetFirstRegion() ; r ;      for (gig::Region *r = regions.first() ; r ; r = next_region) {
384           r = next_region) {          next_region = regions.next();
         next_region = instrument->GetNextRegion();  
385    
386          if (key < r->KeyRange.low) return 0;          if (key < r->KeyRange.low) return 0;
387          if (key <= r->KeyRange.high) {          if (key <= r->KeyRange.high) {
# Line 362  gig::Region* RegionChooser::get_region(i Line 396  gig::Region* RegionChooser::get_region(i
396    
397  void RegionChooser::motion_resize_region(int x, int y)  void RegionChooser::motion_resize_region(int x, int y)
398  {  {
399      const int w = width - 1;      const int w = get_width() - 1;
400      Glib::RefPtr<Gdk::Window> window = get_window();      Glib::RefPtr<Gdk::Window> window = get_window();
401    
402      int k = int(double(x) / w * 128.0 + 0.5);      int k = int(double(x) / w * 128.0 + 0.5);
# Line 419  void RegionChooser::motion_resize_region Line 453  void RegionChooser::motion_resize_region
453    
454  void RegionChooser::motion_move_region(int x, int y)  void RegionChooser::motion_move_region(int x, int y)
455  {  {
456      const int w = width - 1;      const int w = get_width() - 1;
457      Glib::RefPtr<Gdk::Window> window = get_window();      Glib::RefPtr<Gdk::Window> window = get_window();
458    
459      int k = int(double(x - move.from_x) / w * 128.0 + 0.5);      int k = int(double(x - move.from_x) / w * 128.0 + 0.5);
# Line 429  void RegionChooser::motion_move_region(i Line 463  void RegionChooser::motion_move_region(i
463      bool new_touch_right;      bool new_touch_right;
464      int a = 0;      int a = 0;
465      if (k > move.pos) {      if (k > move.pos) {
466          for (gig::Region* r = instrument->GetFirstRegion() ; ;          for (gig::Region* r = regions.first() ; ; r = regions.next()) {
              r = instrument->GetNextRegion()) {  
467              if (r != region) {              if (r != region) {
468                  int b = r ? r->KeyRange.low : 128;                  int b = r ? r->KeyRange.low : 128;
469    
# Line 460  void RegionChooser::motion_move_region(i Line 493  void RegionChooser::motion_move_region(i
493              }              }
494          }          }
495      } else {      } else {
496          for (gig::Region* r = instrument->GetFirstRegion() ; ;          for (gig::Region* r = regions.first() ; ; r = regions.next()) {
              r = instrument->GetNextRegion()) {  
497              if (r != region) {              if (r != region) {
498                  int b = r ? r->KeyRange.low : 128;                  int b = r ? r->KeyRange.low : 128;
499    
# Line 559  bool RegionChooser::on_motion_notify_eve Line 591  bool RegionChooser::on_motion_notify_eve
591  }  }
592    
593  bool RegionChooser::is_in_resize_zone(double x, double y) {  bool RegionChooser::is_in_resize_zone(double x, double y) {
594      const int w = width - 1;      const int w = get_width() - 1;
595    
596      if (instrument && y >= 0 && y <= h1) {      if (instrument && y >= 0 && y <= h1) {
597          gig::Region* prev_region = 0;          gig::Region* prev_region = 0;
598          gig::Region* next_region;          gig::Region* next_region;
599          for (gig::Region* r = instrument->GetFirstRegion() ; r ; r = next_region) {          for (gig::Region* r = regions.first(); r ; r = next_region) {
600              next_region = instrument->GetNextRegion();              next_region = regions.next();
601    
602              int lo = int(w * (r->KeyRange.low) / 128.0 + 0.5);              int lo = int(w * (r->KeyRange.low) / 128.0 + 0.5);
603              if (x <= lo - 2) break;              if (x <= lo - 2) break;
# Line 581  bool RegionChooser::is_in_resize_zone(do Line 613  bool RegionChooser::is_in_resize_zone(do
613                      resize.mode = resize.undecided;                      resize.mode = resize.undecided;
614                      resize.min = prev_region->KeyRange.low + 1;                      resize.min = prev_region->KeyRange.low + 1;
615                      resize.prev_region = prev_region;                      resize.prev_region = prev_region;
616                      return true;                      return resize.min != resize.max;
617                  }                  }
618    
619                  // edit low limit                  // edit low limit
620                  resize.mode = resize.moving_low_limit;                  resize.mode = resize.moving_low_limit;
621                  resize.min = prev_region ? prev_region->KeyRange.high + 1 : 0;                  resize.min = prev_region ? prev_region->KeyRange.high + 1 : 0;
622                  return true;                  return resize.min != resize.max;
623              }              }
624              if (!next_region || r->KeyRange.high + 1 != next_region->KeyRange.low) {              if (!next_region || r->KeyRange.high + 1 != next_region->KeyRange.low) {
625                  int hi = int(w * (r->KeyRange.high + 1) / 128.0 + 0.5);                  int hi = int(w * (r->KeyRange.high + 1) / 128.0 + 0.5);
# Line 599  bool RegionChooser::is_in_resize_zone(do Line 631  bool RegionChooser::is_in_resize_zone(do
631                      resize.mode = resize.moving_high_limit;                      resize.mode = resize.moving_high_limit;
632                      resize.min = r->KeyRange.low + 1;                      resize.min = r->KeyRange.low + 1;
633                      resize.max = next_region ? next_region->KeyRange.low : 128;                      resize.max = next_region ? next_region->KeyRange.low : 128;
634                      return true;                      return resize.min != resize.max;
635                  }                  }
636              }              }
637              prev_region = r;              prev_region = r;
# Line 608  bool RegionChooser::is_in_resize_zone(do Line 640  bool RegionChooser::is_in_resize_zone(do
640      return false;      return false;
641  }  }
642    
643  sigc::signal<void> RegionChooser::signal_region_selected()  sigc::signal<void>& RegionChooser::signal_region_selected()
644  {  {
645      return region_selected;      return region_selected;
646  }  }
647    
648  sigc::signal<void> RegionChooser::signal_instrument_changed()  sigc::signal<void>& RegionChooser::signal_instrument_changed()
649  {  {
650      return instrument_changed;      return instrument_changed;
651  }  }
# Line 645  void RegionChooser::show_region_properti Line 677  void RegionChooser::show_region_properti
677    
678  void RegionChooser::add_region()  void RegionChooser::add_region()
679  {  {
680      gig::Region* r;      instrument_struct_to_be_changed_signal.emit(instrument);
     for (r = instrument->GetFirstRegion() ; r ; r = instrument->GetNextRegion()) {  
         if (r->KeyRange.low > new_region_pos) break;  
     }  
681    
682      region = instrument->AddRegion();      region = instrument->AddRegion();
683      region->KeyRange.low = region->KeyRange.high = new_region_pos;      region->SetKeyRange(new_region_pos, new_region_pos);
684    
685        instrument_struct_changed_signal.emit(instrument);
686        regions.update(instrument);
687    
     instrument->MoveRegion(region, r);  
688      queue_draw();      queue_draw();
689      region_selected();      region_selected();
690      instrument_changed();      instrument_changed();
# Line 661  void RegionChooser::add_region() Line 692  void RegionChooser::add_region()
692    
693  void RegionChooser::delete_region()  void RegionChooser::delete_region()
694  {  {
695        instrument_struct_to_be_changed_signal.emit(instrument);
696      instrument->DeleteRegion(region);      instrument->DeleteRegion(region);
697        instrument_struct_changed_signal.emit(instrument);
698        regions.update(instrument);
699    
700      region = 0;      region = 0;
701      queue_draw();      queue_draw();
702      region_selected();      region_selected();
# Line 679  void RegionChooser::on_dimension_manager Line 714  void RegionChooser::on_dimension_manager
714      region_selected();      region_selected();
715      instrument_changed();      instrument_changed();
716  }  }
717    
718    sigc::signal<void, gig::Instrument*>& RegionChooser::signal_instrument_struct_to_be_changed() {
719        return instrument_struct_to_be_changed_signal;
720    }
721    
722    sigc::signal<void, gig::Instrument*>& RegionChooser::signal_instrument_struct_changed() {
723        return instrument_struct_changed_signal;
724    }
725    
726    sigc::signal<void, gig::Region*>& RegionChooser::signal_region_to_be_changed() {
727        return region_to_be_changed_signal;
728    }
729    
730    sigc::signal<void, gig::Region*>& RegionChooser::signal_region_changed_signal() {
731        return region_changed_signal;
732    }

Legend:
Removed from v.1303  
changed lines
  Added in v.1623

  ViewVC Help
Powered by ViewVC