mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow interactive trimming of regions.

This commit is contained in:
Jonathan Moore Liles 2008-02-15 22:23:58 -06:00
parent 62781a70ed
commit 41ac62e2cd
3 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Region.C
View File

@ -37,6 +37,35 @@ Region::Region ( int X, int Y, int W, int H, const char *L=0 ) : Waveform( X, Y,
_track = NULL; _track = NULL;
} }
void
Region::trim ( enum trim_e t, int X )
{
switch ( t )
{
case LEFT:
{
int d = X - x();
_start += d;
resize( x() + d, y(), w() - d, h() );
break;
}
case RIGHT:
{
int d = (x() + w()) - X;
_end -= d;
resize( x(), y(), w() - d, h() );
break;
}
default:
return;
}
redraw();
parent()->redraw();
}
int int
Region::handle ( int m ) Region::handle ( int m )
{ {
@ -45,7 +74,7 @@ Region::handle ( int m )
return 1; return 1;
static int ox, oy; static int ox, oy;
static enum trim_e trimming;
switch ( m ) switch ( m )
{ {
@ -59,27 +88,15 @@ Region::handle ( int m )
switch ( Fl::event_button() ) switch ( Fl::event_button() )
{ {
case 1: case 1:
{ trim( trimming = LEFT, X );
/* trim */
int d = X - x();
_start += d;
resize( x() + d, y(), w() - d, h() );
redraw();
parent()->redraw();
break; break;
}
case 3: case 3:
{ trim( trimming = RIGHT, X );
int d = (x() + w()) - X;
_end -= d;
resize( x(), y(), w() - d, h() );
redraw();
parent()->redraw();
break; break;
}
default: default:
return 0; return 0;
} }
fl_cursor( FL_CURSOR_WE );
return 1; return 1;
} }
else else
@ -102,6 +119,15 @@ Region::handle ( int m )
return 1; return 1;
case FL_DRAG: case FL_DRAG:
if ( Fl::event_state() & FL_CTRL )
if ( trimming )
{
trim( trimming, Fl::event_x() );
return 1;
}
else
return 0;
if ( ox + Fl::event_x() >= _track->x() ) if ( ox + Fl::event_x() >= _track->x() )
position( ox + Fl::event_x(), y() ); position( ox + Fl::event_x(), y() );
@ -135,7 +161,11 @@ Region::draw ( void )
{ {
draw_box(); draw_box();
// fl_push_clip( x() + Fl::box_dx( box() ), y(), w() - Fl::box_dw( box() ), h() );
Waveform::draw(); Waveform::draw();
// fl_pop_clip();
draw_label(); draw_label();
} }

4
Region.H
View File

@ -28,6 +28,10 @@ class Region : public Waveform
Track *_track; Track *_track;
enum trim_e { NO, LEFT, RIGHT };
void trim ( enum trim_e t, int X );
public: public:
Region ( int X, int Y, int W, int H, const char *L ); Region ( int X, int Y, int W, int H, const char *L );

9
main.C
View File

@ -20,6 +20,7 @@
#include <FL/Fl.H> #include <FL/Fl.H>
#include <FL/Fl_Window.H> #include <FL/Fl_Window.H>
#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Scroll.H> #include <FL/Fl_Scroll.H>
#include <FL/Fl_Pack.H> #include <FL/Fl_Pack.H>
#include <FL/Fl_Group.H> #include <FL/Fl_Group.H>
@ -50,13 +51,15 @@ main ( int argc, char **argv )
init_colors(); init_colors();
Fl_Window *main_window = new Fl_Window( 0, 0, 800, 600 ); Fl_Double_Window *main_window = new Fl_Double_Window( 0, 0, 800, 600 );
Fl_Scroll *scroll = new Fl_Scroll( 0, 0, 800, 600 ); Fl_Scroll *scroll = new Fl_Scroll( 0, 0, 800, 600 );
Fl_Pack *tracks = new Fl_Pack( 0, 0, 5000, 5000 ); Fl_Pack *tracks = new Fl_Pack( 0, 0, 5000, 5000 );
tracks->type( Fl_Pack::VERTICAL ); tracks->type( Fl_Pack::VERTICAL );
Fl::get_system_colors();
Fl::scheme( "plastic" );
// Fl_Group *pack = new Fl_Group( 0, 0, 5000, 600 ); // Fl_Group *pack = new Fl_Group( 0, 0, 5000, 600 );
@ -103,8 +106,8 @@ main ( int argc, char **argv )
Region *wave2 = new Region( 0, 0, 350, 100, "bar" ); Region *wave2 = new Region( 0, 0, 350, 100, "bar" );
wave2->peaks( peaks ); wave2->peaks( peaks );
wave2->start( 0 ); wave2->start( 300 );
wave2->end( len / 2 ); wave2->end( len );
track2->add( wave2 ); track2->add( wave2 );