Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-01 16:19:43 +02:00
Code Issues Releases Wiki Activity

Enable draw tool in Waveform dB view

Browse Source
This commit is contained in:
Paul Licameli 2015-06-03 01:52:35 -04:00
parent 00ab193246
commit 1b57335dca
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/TrackPanel.cpp
View File

@ -4957,11 +4957,21 @@ bool TrackPanel::IsSampleEditingPossible( wxMouseEvent & WXUNUSED(event), Track
//Get out of here if we shouldn't be drawing right now: //Get out of here if we shouldn't be drawing right now:
//If we aren't displaying the waveform, Display a message dialog //If we aren't displaying the waveform, Display a message dialog
WaveTrack *const wt = static_cast<WaveTrack*>(t); WaveTrack *const wt = static_cast<WaveTrack*>(t);
if(wt->GetDisplay() != WaveTrack::WaveformDisplay) const int display = wt->GetDisplay();
#if 1
if (!(WaveTrack::WaveformDisplay == display ||
WaveTrack::WaveformDBDisplay == display))
{
wxMessageBox(_("To use Draw, choose 'Waveform' or 'Waveform dB' in the Track Drop-down Menu."), wxT("Draw Tool"));
return false;
}
#else
if(WaveTrack::WaveformDisplay != display)
{ {
wxMessageBox(_("To use Draw, choose 'Waveform' in the Track Drop-down Menu."), wxT("Draw Tool")); wxMessageBox(_("To use Draw, choose 'Waveform' in the Track Drop-down Menu."), wxT("Draw Tool"));
return false; return false;
} }
#endif
//Get rate in order to calculate the critical zoom threshold //Get rate in order to calculate the critical zoom threshold
//Find out the zoom level //Find out the zoom level
@ -5043,10 +5053,6 @@ void TrackPanel::HandleSampleEditingClick( wxMouseEvent & event )
//First, calculate the starting sample. To get this, we need the time //First, calculate the starting sample. To get this, we need the time
double t0 = PositionToTime(event.m_x, GetLeftOffset()); double t0 = PositionToTime(event.m_x, GetLeftOffset());
// Default to zero for ALT case, so it doesn't cause a runtime fault on MSVC in
// the mDrawingLastDragSampleValue assignment at the bottom of this method.
float newLevel = 0.0f; //Declare this for use later
//convert t0 to samples //convert t0 to samples
mDrawingStartSample = mDrawingTrack->TimeToLongSamples(t0); mDrawingStartSample = mDrawingTrack->TimeToLongSamples(t0);
// quantize // quantize
@ -5166,18 +5172,18 @@ void TrackPanel::HandleSampleEditingDrag( wxMouseEvent & event )
sampleCount s0; //declare this for use below. It designates the sample number which to draw. sampleCount s0; //declare this for use below. It designates the sample number which to draw.
// Figure out what time the click was at
//Find the point that we want to redraw at. If the control button is down, //Find the point that we want to redraw at. If the control button is down,
//adjust only the originally clicked-on sample //adjust only the originally clicked-on sample
//*************************************************
//*** CTRL-DOWN (Hold Initial Sample Constant ***
//*************************************************
if( event.m_controlDown) { if( event.m_controlDown) {
//*************************************************
//*** CTRL-DOWN (Hold Initial Sample Constant ***
//*************************************************
s0 = mDrawingStartSample; s0 = mDrawingStartSample;
} }
else else {
{
//************************************************* //*************************************************
//*** Normal CLICK-drag (Normal drawing) *** //*** Normal CLICK-drag (Normal drawing) ***
//************************************************* //*************************************************
@ -7073,7 +7079,8 @@ bool TrackPanel::HitTestSamples(Track *track, wxRect &r, wxMouseEvent & event)
return false; return false;
int displayType = wavetrack->GetDisplay(); int displayType = wavetrack->GetDisplay();
if ( displayType > 1) bool dB = (WaveTrack::WaveformDBDisplay == displayType);
if (!(WaveTrack::WaveformDisplay == displayType) || dB)
return false; // Not a wave, so return. return false; // Not a wave, so return.
float oneSample; float oneSample;
@ -7085,7 +7092,6 @@ bool TrackPanel::HitTestSamples(Track *track, wxRect &r, wxMouseEvent & event)
wavetrack->Get((samplePtr)&oneSample, floatSample, s0, 1); wavetrack->Get((samplePtr)&oneSample, floatSample, s0, 1);
// Get y distance of envelope point from center line (in pixels). // Get y distance of envelope point from center line (in pixels).
bool dB = (displayType == 1);
float zoomMin, zoomMax; float zoomMin, zoomMax;
wavetrack->GetDisplayBounds(&zoomMin, &zoomMax); wavetrack->GetDisplayBounds(&zoomMin, &zoomMax);