audacia/audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
bd5d2bf114
audacia/src/TrackPanel.cpp

3291 lines
96 KiB
C++
Raw Normal View History

Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
/**********************************************************************
Audacity: A Digital Audio Editor
TrackPanel.cpp
Dominic Mazzoni
and lots of other contributors
Implements TrackPanel and TrackInfo.
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
********************************************************************//*!
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
\todo
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
Refactoring of the TrackPanel, possibly as described
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
in \ref TrackPanelRefactor
*//*****************************************************************//*!
\file TrackPanel.cpp
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
\brief
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Implements TrackPanel and TrackInfo.
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
TrackPanel.cpp is currently some of the worst code in Audacity.
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
It's not really unreadable, there's just way too much stuff in this
one file. Rather than apply a quick fix, the long-term plan
is to create a GUITrack class that knows how to draw itself
and handle events. Then this class just helps coordinate
between tracks.
Plans under discussion are described in \ref TrackPanelRefactor
*//********************************************************************/
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
// Documentation: Rather than have a lengthy \todo section, having
// a \todo a \file and a \page in EXACTLY that order gets Doxygen to
"new"->"NEW" in comments, easier to find remaining naked operator new
2016-02-13 15:43:16 +00:00
// put the following lengthy description of refactoring on a NEW page
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// and link to it from the docs.
/*****************************************************************//**
\class TrackPanel
\brief
The TrackPanel class coordinates updates and operations on the
main part of the screen which contains multiple tracks.
It uses many other classes, but in particular it uses the
(Sync-Lock) Commented out the one call to TrackInfo::DrawBordersWithin(). This eliminates all the dark lines within the TrackInfo, in an effort to make the sync-lock icon not look like a button. It leaves some lighter borders, and I think that's an aesthetic improvement, though it make be worse in terms of accessibility. I can also remove the light border above the sync-lock icon, but I think this looks best overall. In Track::IsSyncLockSelected(), for the "// Not in a sync-locked group." conditional, it returned true if the track was selected. I made it do so only if track kind is Wave or Label. Among other things, this means Time and Note tracks will never show the sync-lock icon. I think this is correct by definition, but Al, please let me know if this will have negative repercussions elsewhere. There are *lots* of calls to that method and I can move the track-type check to the code that draws the sync-lock icon.. Fixed the bug Gale pointed out where, if a WaveTrack is shrunk such that the sync-lock icon is over a TrackInfo control, such as pan slider, it didn't intercept the mouse event, and passed it on to the control. Now, clicking on the sync-lock icon does nothing. Fixed a bug where the sync-lock icon was redrawn dark when the minimize button is down. Now not redrawn at all in that case. Added some clarifying comments, especially about the term "Label" as used in TrackPanel.*.
2010-09-09 00:46:40 +00:00
TrackInfo class to draw the controls area on the left of a track,
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
and the TrackArtist class to draw the actual waveforms.
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
Note that in some of the older code here, e.g., GetLabelWidth(),
"Label" means the TrackInfo plus the vertical ruler.
(Sync-Lock) Commented out the one call to TrackInfo::DrawBordersWithin(). This eliminates all the dark lines within the TrackInfo, in an effort to make the sync-lock icon not look like a button. It leaves some lighter borders, and I think that's an aesthetic improvement, though it make be worse in terms of accessibility. I can also remove the light border above the sync-lock icon, but I think this looks best overall. In Track::IsSyncLockSelected(), for the "// Not in a sync-locked group." conditional, it returned true if the track was selected. I made it do so only if track kind is Wave or Label. Among other things, this means Time and Note tracks will never show the sync-lock icon. I think this is correct by definition, but Al, please let me know if this will have negative repercussions elsewhere. There are *lots* of calls to that method and I can move the track-type check to the code that draws the sync-lock icon.. Fixed the bug Gale pointed out where, if a WaveTrack is shrunk such that the sync-lock icon is over a TrackInfo control, such as pan slider, it didn't intercept the mouse event, and passed it on to the control. Now, clicking on the sync-lock icon does nothing. Fixed a bug where the sync-lock icon was redrawn dark when the minimize button is down. Now not redrawn at all in that case. Added some clarifying comments, especially about the term "Label" as used in TrackPanel.*.
2010-09-09 00:46:40 +00:00
Confusing relative to LabelTrack labels.
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
The TrackPanel manages multiple tracks and their TrackInfos.
Note that with stereo tracks there will be one TrackInfo
being used by two wavetracks.
*//*****************************************************************//**
\class TrackInfo
\brief
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
The TrackInfo is shown to the side of a track
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
It has the menus, pan and gain controls displayed in it.
(Sync-Lock) Commented out the one call to TrackInfo::DrawBordersWithin(). This eliminates all the dark lines within the TrackInfo, in an effort to make the sync-lock icon not look like a button. It leaves some lighter borders, and I think that's an aesthetic improvement, though it make be worse in terms of accessibility. I can also remove the light border above the sync-lock icon, but I think this looks best overall. In Track::IsSyncLockSelected(), for the "// Not in a sync-locked group." conditional, it returned true if the track was selected. I made it do so only if track kind is Wave or Label. Among other things, this means Time and Note tracks will never show the sync-lock icon. I think this is correct by definition, but Al, please let me know if this will have negative repercussions elsewhere. There are *lots* of calls to that method and I can move the track-type check to the code that draws the sync-lock icon.. Fixed the bug Gale pointed out where, if a WaveTrack is shrunk such that the sync-lock icon is over a TrackInfo control, such as pan slider, it didn't intercept the mouse event, and passed it on to the control. Now, clicking on the sync-lock icon does nothing. Fixed a bug where the sync-lock icon was redrawn dark when the minimize button is down. Now not redrawn at all in that case. Added some clarifying comments, especially about the term "Label" as used in TrackPanel.*.
2010-09-09 00:46:40 +00:00
So "Info" is somewhat a misnomer. Should possibly be "TrackControls".
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
TrackPanel and not TrackInfo takes care of the functionality for
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
each of the buttons in that panel.
In its current implementation TrackInfo is not derived from a
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
wxWindow. Following the original coding style, it has
been coded as a 'flyweight' class, which is passed
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
state as needed, except for the array of gains and pans.
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
If we'd instead coded it as a wxWindow, we would have an instance
of this class for each instance displayed.
*//**************************************************************//**
\class TrackPanelListener
\brief A now badly named class which is used to give access to a
(sync-lock) Change sync-lock tile and icons to be clock instead of chain link. (Yet to change sync-lock button image.) Make click on sync-lock icon select track. Remove bevels on regions holding controls, so that bevels are only on controls themselves. This removes confusing border line above sync-lock icon, and simplifies the TrackInfo. Be more specific about class methods vs stand-alone functions in comments.
2010-09-12 05:11:43 +00:00
subset of the TrackPanel methods from all over the place.
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
*//**************************************************************//**
\class TrackList
\brief A list of TrackListNode items.
*//**************************************************************//**
\class TrackListIterator
\brief An iterator for a TrackList.
*//**************************************************************//**
\class TrackListNode
\brief Used by TrackList, points to a Track.
*//**************************************************************//**
\class TrackPanel::AudacityTimer
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
\brief Timer class dedicated to infomring the TrackPanel that it
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
is time to refresh some aspect of the screen.
*//*****************************************************************//**
\page TrackPanelRefactor Track Panel Refactor
\brief Planned refactoring of TrackPanel.cpp
- Move menus from current TrackPanel into TrackInfo.
- Convert TrackInfo from 'flyweight' to heavyweight.
- Split GuiStereoTrack and GuiWaveTrack out from TrackPanel.
JKC: Incremental refactoring started April/2003
Possibly aiming for Gui classes something like this - it's under
discussion:
<pre>
+----------------------------------------------------+
| AdornedRulerPanel |
+----------------------------------------------------+
+----------------------------------------------------+
|+------------+ +-----------------------------------+|
|| | | (L) GuiWaveTrack ||
One more round of effects changes. The big thing is the common efffects UI. Right now Ladspa and VST have been converted to use it and Audiounits will be next. It makes everything nice and consistent while reducing the clutter in the dialog. Other goodies are: Ladspa effects now show output controls when supplied by the effect Ladspa effects now work fine as Analyze type effects Ladspa now has user presets VST effects dialog is now less cluttered...leaving more room for the effect Ladspa and VST effects now share a common UI Ladspa and VST effects are now usable in chains Ladspa and VST effects now handle user presets the same way Currently active effects settings automatically saved and reloaded Can now do numeric range checking on input fields. And, as always, plenty of critter squashing.
2014-11-14 03:03:17 +00:00
|| TrackInfo | +-----------------------------------+|
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
|| | +-----------------------------------+|
|| | | (R) GuiWaveTrack ||
|+------------+ +-----------------------------------+|
+-------- GuiStereoTrack ----------------------------+
+----------------------------------------------------+
|+------------+ +-----------------------------------+|
|| | | (L) GuiWaveTrack ||
One more round of effects changes. The big thing is the common efffects UI. Right now Ladspa and VST have been converted to use it and Audiounits will be next. It makes everything nice and consistent while reducing the clutter in the dialog. Other goodies are: Ladspa effects now show output controls when supplied by the effect Ladspa effects now work fine as Analyze type effects Ladspa now has user presets VST effects dialog is now less cluttered...leaving more room for the effect Ladspa and VST effects now share a common UI Ladspa and VST effects are now usable in chains Ladspa and VST effects now handle user presets the same way Currently active effects settings automatically saved and reloaded Can now do numeric range checking on input fields. And, as always, plenty of critter squashing.
2014-11-14 03:03:17 +00:00
|| TrackInfo | +-----------------------------------+|
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
|| | +-----------------------------------+|
|| | | (R) GuiWaveTrack ||
|+------------+ +-----------------------------------+|
+-------- GuiStereoTrack ----------------------------+
</pre>
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
With the whole lot sitting in a TrackPanel which forwards
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
events to the sub objects.
The GuiStereoTrack class will do the special logic for
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
Stereo channel grouping.
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
The precise names of the classes are subject to revision.
new -> NEW in comments, so text search for naked new excludes them
2016-08-08 13:50:55 +00:00
Have deliberately not created NEW files for the NEW classes
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
such as AdornedRulerPanel and TrackInfo - yet.
*//*****************************************************************/
#include "Audacity.h"
#include "Experimental.h"
#include "TrackPanel.h"
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
#include "Project.h"
Define TrackPanelOverlay, use it to reimplement play indicator and cursor... ... but scrub speed display is disabled
2015-08-25 17:35:32 +00:00
#include "TrackPanelCellIterator.h"
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
#include "TrackPanelMouseEvent.h"
Move track resizing code out of TrackPanel.cpp, though it still... ... cooperates more closely with TrackPanel than the other UIHandle subclasses do.
2015-08-10 03:41:08 +00:00
#include "TrackPanelResizeHandle.h"
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
//#define DEBUG_DRAW_TIMING 1
Paul Licameli's Spectral Editing Patch. This relies on three new nyquist scripts to actually do the editing. The peak-snapping code in FrequencyWindow has been extracted into a new class, SpectrumAnalyst, to provide peak-snapping in spectrogram too.
2014-10-18 14:19:38 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#include "AColor.h"
#include "AllThemeResources.h"
#include "AudioIO.h"
#include "float_cast.h"
#include "Prefs.h"
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
#include "RefreshCode.h"
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#include "TrackArtist.h"
#include "TrackPanelAx.h"
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
#include "UIHandle.h"
#include "HitTestResult.h"
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#include "WaveTrack.h"
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
#ifdef EXPERIMENTAL_MIDI_OUT
#include "NoteTrack.h"
#endif
Created a global structure to hold spectrogram preferences... Don't read "/Spectrum/" preferences anywhere but in SpectrumPrefs.cpp. Don't store global values in TrackArtist. Possibly some day, there will be other instances of SpectrogramSettings so we can have independent per-track settings.
2015-06-04 04:05:46 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#include "toolbars/ControlToolBar.h"
#include "toolbars/ToolsToolBar.h"
//This loads the appropriate set of cursors, depending on platform.
#include "../images/Cursors.h"
TrackPanel no longer implements track selection click or rearrange drag... ... also implement ESC key for the drag
2015-08-09 17:48:27 +00:00
#include "widgets/ASlider.h"
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
#include "widgets/Ruler.h"
#include <algorithm>
TrackPanel no longer implements track selection click or rearrange drag... ... also implement ESC key for the drag
2015-08-09 17:48:27 +00:00
Bug1075, and define and use new event type for TrackPanel timer ticks... ... Thus allowing TrackPanel.cpp to work without including Lyrics headers. Also eliminates some of its direct notification of MixerBoard.
2015-07-12 12:47:56 +00:00
DEFINE_EVENT_TYPE(EVT_TRACK_PANEL_TIMER)
Add one big, artistic comment to TrackPanel.cpp explaining the track rectangle
2015-08-20 19:52:56 +00:00
/*
This is a diagram of TrackPanel's division of one (non-stereo) track rectangle.
Total height equals Track::GetHeight()'s value. Total width is the wxWindow's width.
Each charater that is not . represents one pixel.
Inset space of this track, and top inset of the next track, are used to draw the focus highlight.
Top inset of the right channel of a stereo track, and bottom shadow line of the
left channel, are used for the channel separator.
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
"Margin" is a term used for inset plus border (top and left) or inset plus
shadow plus border (right and bottom).
Add one big, artistic comment to TrackPanel.cpp explaining the track rectangle
2015-08-20 19:52:56 +00:00
TrackInfo::GetTrackInfoWidth() == GetVRulerOffset()
counts columns from the left edge up to and including controls, and is a constant.
GetVRulerWidth() is variable -- all tracks have the same ruler width at any time,
but that width may be adjusted when tracks change their vertical scales.
GetLabelWidth() counts columns up to and including the VRuler.
GetLeftOffset() is yet one more -- it counts the "one pixel" column.
Exclude left, top, bottom margins from rectangles describing TCP
2017-06-06 15:43:58 +00:00
FindCell() for label returns a rectangle that OMITS left, top, and bottom
margins
Exclude bottom margin from vruler rectangle reported from FindCell... ... Fixes a small discrepancy between drawing and interpretation of mouse drag events
2017-06-06 15:43:34 +00:00
Adjust details of hit tests on tracks, labels, vrulers... ... ALWAYS exclude margins from the reported rectangles! All three cases. This fixes minor discrepancies between display and interaction in other hit tests, such as for spectral selection, draw tool, and envelope.
2017-06-15 02:10:26 +00:00
FindCell() for vruler returns a rectangle right of the label,
up to and including the One Pixel column, and OMITS top and bottom margins
Add one big, artistic comment to TrackPanel.cpp explaining the track rectangle
2015-08-20 19:52:56 +00:00
Adjust details of hit tests on tracks, labels, vrulers... ... ALWAYS exclude margins from the reported rectangles! All three cases. This fixes minor discrepancies between display and interaction in other hit tests, such as for spectral selection, draw tool, and envelope.
2017-06-15 02:10:26 +00:00
FindCell() for track returns a rectangle with x == GetLeftOffset(), and OMITS
right top, and bottom margins
Add one big, artistic comment to TrackPanel.cpp explaining the track rectangle
2015-08-20 19:52:56 +00:00
+--------------- ... ------ ... --------------------- ... ... -------------+
| Top Inset |
| |
| +------------ ... ------ ... --------------------- ... ... ----------+ |
| L|+-Border---- ... ------ ... --------------------- ... ... -Border-+ |R |
| e||+---------- ... -++--- ... -+++----------------- ... ... -------+| |i |
| f|B| || ||| |BS|g |
| t|o| Controls || V |O| The good stuff |oh|h |
| |r| || R |n| |ra|t |
| I|d| || u |e| |dd| |
| n|e| || l | | |eo|I |
| s|r| || e |P| |rw|n |
| e||| || r |i| ||||s |
| t||| || |x| ||||e |
| ||| || |e| ||||t |
| ||| || |l| |||| |
| ||| || ||| |||| |
. ... .. ... .... .
. ... .. ... .... .
. ... .. ... .... .
| ||| || ||| |||| |
| ||+---------- -++-- ... -+++----------------- ... ... -------+||| |
| |+-Border---- ... ----- ... --------------------- ... ... -Border-+|| |
| | Shadow---- ... ----- ... --------------------- ... ... --Shadow-+| |
*/
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// Is the distance between A and B less than D?
template < class A, class B, class DIST > bool within(A a, B b, DIST d)
{
return (a > b - d) && (a < b + d);
}
New base classes of TrackPanel just for the bitmap backing and overlay system... ... to make it reusable by other classes. Also, don't create a second DC when repainting TrackPanel.
2016-05-07 17:00:48 +00:00
BEGIN_EVENT_TABLE(TrackPanel, OverlayPanel)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
EVT_MOUSE_EVENTS(TrackPanel::OnMouseEvent)
EVT_MOUSE_CAPTURE_LOST(TrackPanel::OnCaptureLost)
EVT_COMMAND(wxID_ANY, EVT_CAPTURE_KEY, TrackPanel::OnCaptureKey)
EVT_KEY_DOWN(TrackPanel::OnKeyDown)
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
EVT_KEY_UP(TrackPanel::OnKeyUp)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
EVT_CHAR(TrackPanel::OnChar)
EVT_PAINT(TrackPanel::OnPaint)
EVT_SET_FOCUS(TrackPanel::OnSetFocus)
EVT_KILL_FOCUS(TrackPanel::OnKillFocus)
EVT_CONTEXT_MENU(TrackPanel::OnContextMenu)
Merged a couple of patches from Debian, one of which should fix bug #1147
2015-08-26 03:50:23 +00:00
EVT_TIMER(wxID_ANY, TrackPanel::OnTimer)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
END_EVENT_TABLE()
/// Makes a cursor from an XPM, uses CursorId as a fallback.
Let MakeCursor be called elsewhere than from TrackPanel.cpp
2015-07-07 23:51:48 +00:00
/// TODO: Move this function to some other source file for reuse elsewhere.
MakeCursor returns smart pointer; TrackPanel stores smart pointers to cursors
2016-04-10 03:06:10 +00:00
std::unique_ptr<wxCursor> MakeCursor( int WXUNUSED(CursorId), const char * pXpm[36], int HotX, int HotY )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
#ifdef CURSORS_SIZE32
const int HotAdjust =0;
#else
const int HotAdjust =8;
#endif
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
wxImage Image = wxImage(wxBitmap(pXpm).ConvertToImage());
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Image.SetMaskColour(255,0,0);
Image.SetMask();// Enable mask.
Image.SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_X, HotX-HotAdjust );
Image.SetOption( wxIMAGE_OPTION_CUR_HOTSPOT_Y, HotY-HotAdjust );
MakeCursor returns smart pointer; TrackPanel stores smart pointers to cursors
2016-04-10 03:06:10 +00:00
return std::make_unique<wxCursor>( Image );
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
// Don't warn us about using 'this' in the base member initializer list.
#ifndef __WXGTK__ //Get rid if this pragma for gtk
#pragma warning( disable: 4355 )
#endif
TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
const wxPoint & pos,
const wxSize & size,
BHug1488: Don't crash exiting from command-line benchmark test... Problem was that cfd7648fce2388ec8ae35b38004f2ae111c484af fixed a memory leak but created a dangling pointer bug, which does not happen during usual run of Audacity because AudacityProject::OnCloseWindow is reached then before destroying AudacityProject. Fixed it by using a std::shared_pointer for the TrackList that both AudacityProject and TrackPanel must use.
2016-08-20 17:58:56 +00:00
const std::shared_ptr<TrackList> &tracks,
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
ViewInfo * viewInfo,
TrackPanelListener * listener,
AdornedRulerPanel * ruler)
New base classes of TrackPanel just for the bitmap backing and overlay system... ... to make it reusable by other classes. Also, don't create a second DC when repainting TrackPanel.
2016-05-07 17:00:48 +00:00
: OverlayPanel(parent, id, pos, size, wxWANTS_CHARS | wxNO_BORDER),
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
mTrackInfo(this),
mListener(listener),
mTracks(tracks),
mViewInfo(viewInfo),
mRuler(ruler),
Remove some naked new amd delete in: TrackPanel
2016-08-03 01:25:05 +00:00
mTrackArtist(nullptr),
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
mRefreshBacking(false),
Fix lots of snapping problems by moving snap-to-time into SnapManager. Do a 'make dep' after updating, some #includes are added.
2010-02-02 19:43:52 +00:00
vrulerSize(36,0)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#ifndef __WXGTK__ //Get rid if this pragma for gtk
#pragma warning( default: 4355 )
#endif
{
SetLabel(_("Track Panel"));
SetName(_("Track Panel"));
Appearance on OSX is now back to normal or better Some additional wx3 cleanup as well.
2015-08-24 01:25:01 +00:00
SetBackgroundStyle(wxBG_STYLE_PAINT);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Remove some naked new amd delete in: TrackPanel::mAx
2016-08-03 01:24:53 +00:00
{
auto pAx = std::make_unique <TrackPanelAx>( this );
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#if wxUSE_ACCESSIBILITY
Remove some naked new amd delete in: TrackPanel::mAx
2016-08-03 01:24:53 +00:00
// wxWidgets owns the accessible object
SetAccessible(mAx = pAx.release());
#else
Reviewed uses of release(); prefer Destroy_ptr to hold window objects
2017-03-14 23:54:11 +00:00
// wxWidgets does not own the object, but we need to retain it
Remove some naked new amd delete in: TrackPanel::mAx
2016-08-03 01:24:53 +00:00
mAx = std::move(pAx);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#endif
Remove some naked new amd delete in: TrackPanel::mAx
2016-08-03 01:24:53 +00:00
}
Appearance on OSX is now back to normal or better Some additional wx3 cleanup as well.
2015-08-24 01:25:01 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
mRedrawAfterStop = false;
Remove some naked new amd delete in: TrackPanel
2016-08-03 01:25:05 +00:00
mTrackArtist = std::make_unique<TrackArtist>();
pop-up menus for vertical ruler
2015-06-23 03:56:36 +00:00
Change some names in TrackArtist to match terminology in TrackPanel
2017-06-06 16:34:57 +00:00
mTrackArtist->SetMargins(1, kTopMargin, kRightMargin, kBottomMargin);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
mTimeCount = 0;
mTimer.parent = this;
Bug 1401 - Wait for window visibility before starting timer
2017-02-25 21:16:42 +00:00
// Timer is started after the window is visible
GetProject()->Bind(wxEVT_IDLE, &TrackPanel::OnIdle, this);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// Register for tracklist updates
Clarify what the TrackList events are for... Also fixes this bug: Vertical rulers did not narrow as needed after deletion of the lowest track.
2017-06-25 05:33:31 +00:00
mTracks->Connect(EVT_TRACKLIST_RESIZING,
wxCommandEventHandler(TrackPanel::OnTrackListResizing),
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
NULL,
this);
Clarify what the TrackList events are for... Also fixes this bug: Vertical rulers did not narrow as needed after deletion of the lowest track.
2017-06-25 05:33:31 +00:00
mTracks->Connect(EVT_TRACKLIST_DELETION,
wxCommandEventHandler(TrackPanel::OnTrackListDeletion),
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
NULL,
this);
Still better cursor handling: change cursor at once... ... on start or stop of transport, in cases as described in the previous commit comment, even if the pointer does not move.
2017-06-16 19:39:38 +00:00
wxTheApp->Connect(EVT_AUDIOIO_PLAYBACK,
wxCommandEventHandler(TrackPanel::OnPlayback),
NULL,
this);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Bugs 994, 1030: Scrubbing behavior with pointer outside of the track panel... ... first: suspend scrubbing only when the application is deactivated -- not necessarily when track panel loses focus; resume when reactivated. second: click and drag to seek happens only when the pointer is in the track panel, and either over a wave track, or over no track.
2015-08-18 15:03:56 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
TrackPanel::~TrackPanel()
{
mTimer.Stop();
// Unregister for tracklist updates
Clarify what the TrackList events are for... Also fixes this bug: Vertical rulers did not narrow as needed after deletion of the lowest track.
2017-06-25 05:33:31 +00:00
mTracks->Disconnect(EVT_TRACKLIST_DELETION,
wxCommandEventHandler(TrackPanel::OnTrackListDeletion),
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
NULL,
this);
Clarify what the TrackList events are for... Also fixes this bug: Vertical rulers did not narrow as needed after deletion of the lowest track.
2017-06-25 05:33:31 +00:00
mTracks->Disconnect(EVT_TRACKLIST_RESIZING,
wxCommandEventHandler(TrackPanel::OnTrackListResizing),
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
NULL,
this);
Still better cursor handling: change cursor at once... ... on start or stop of transport, in cases as described in the previous commit comment, even if the pointer does not move.
2017-06-16 19:39:38 +00:00
wxTheApp->Disconnect(EVT_AUDIOIO_PLAYBACK,
wxCommandEventHandler(TrackPanel::OnPlayback),
NULL,
this);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// This can happen if a label is being edited and the user presses
// ALT+F4 or Command+Q
if (HasCapture())
ReleaseMouse();
}
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
LWSlider *TrackPanel::GainSlider( const WaveTrack *wt )
{
auto rect = FindTrackRect( wt, true );
wxRect sliderRect;
TrackInfo::GetGainRect( rect.GetTopLeft(), sliderRect );
return TrackInfo::GainSlider(sliderRect, wt, false, this);
}
LWSlider *TrackPanel::PanSlider( const WaveTrack *wt )
{
auto rect = FindTrackRect( wt, true );
wxRect sliderRect;
TrackInfo::GetPanRect( rect.GetTopLeft(), sliderRect );
return TrackInfo::PanSlider(sliderRect, wt, false, this);
}
#ifdef EXPERIMENTAL_MIDI_OUT
LWSlider *TrackPanel::VelocitySlider( const NoteTrack *nt )
{
auto rect = FindTrackRect( nt, true );
wxRect sliderRect;
TrackInfo::GetVelocityRect( rect.GetTopLeft(), sliderRect );
return TrackInfo::VelocitySlider(sliderRect, nt, false, this);
}
#endif
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
void TrackPanel::UpdateVirtualStereoOrder()
{
Make EXPERIMENTAL_OUTPUT_DISPLAY compile
2017-01-06 16:23:02 +00:00
TrackListOfKindIterator iter(Track::Wave, GetTracks());
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
Track *t;
int temp;
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
for (t = iter.First(); t; t = iter.Next()) {
Fewer C-style pointer casts of tracks; comments justify static_cast
2016-09-15 13:54:38 +00:00
const auto wt = static_cast<WaveTrack*>(t);
if(t->GetChannel() == Track::MonoChannel){
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
if(WaveTrack::mMonoAsVirtualStereo && wt->GetPan() != 0){
temp = wt->GetHeight();
wt->SetHeight(temp*wt->GetVirtualTrackPercentage());
wt->SetHeight(temp - wt->GetHeight(),true);
}else if(!WaveTrack::mMonoAsVirtualStereo && wt->GetPan() != 0){
wt->SetHeight(wt->GetHeight() + wt->GetHeight(true));
}
}
}
t = iter.First();
if(t){
t->ReorderList(false);
}
}
#endif
TrackPanel::HasSoloButton is static and public
2017-06-13 12:05:17 +00:00
wxString TrackPanel::gSoloPref;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
void TrackPanel::UpdatePrefs()
{
gPrefs->Read(wxT("/GUI/AutoScroll"), &mViewInfo->bUpdateTrackIndicator,
Move PositionToTime, TimeToPosition into class ZoomInfo ... ... and use them in many more places in TrackPanel.cpp, so there are fewer direct uses of ZoomInfo::zoom. Also use then in horizontal scrolling code
2015-04-19 21:12:06 +00:00
true);
TrackPanel::HasSoloButton is static and public
2017-06-13 12:05:17 +00:00
gPrefs->Read(wxT("/GUI/Solo"), &gSoloPref, wxT("Simple"));
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
bool temp = WaveTrack::mMonoAsVirtualStereo;
gPrefs->Read(wxT("/GUI/MonoAsVirtualStereo"), &WaveTrack::mMonoAsVirtualStereo,
Move PositionToTime, TimeToPosition into class ZoomInfo ... ... and use them in many more places in TrackPanel.cpp, so there are fewer direct uses of ZoomInfo::zoom. Also use then in horizontal scrolling code
2015-04-19 21:12:06 +00:00
false);
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
if(WaveTrack::mMonoAsVirtualStereo != temp)
UpdateVirtualStereoOrder();
#endif
Move mdBr from TrackPanel to ViewInfo, no more lookup of prefs in Envelope.cpp
2015-07-07 04:51:14 +00:00
mViewInfo->UpdatePrefs();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
if (mTrackArtist) {
mTrackArtist->UpdatePrefs();
}
// All vertical rulers must be recalculated since the minimum and maximum
// frequences may have been changed.
UpdateVRulers();
Computing best font size for TrackInfo is redone when preferences change
2016-05-01 21:55:48 +00:00
mTrackInfo.UpdatePrefs();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Refresh();
}
Update slider in tracks on theme change.
2017-04-05 19:16:12 +00:00
void TrackPanel::ApplyUpdatedTheme()
{
mTrackInfo.ReCreateSliders();
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
void TrackPanel::GetTracksUsableArea(int *width, int *height) const
{
GetSize(width, height);
Allow NULL arguments in TrackPanel::GetTracksUsableArea()
2015-08-21 16:02:48 +00:00
if (width) {
*width -= GetLeftOffset();
*width -= kRightMargin;
*width = std::max(0, *width);
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
/// Gets the pointer to the AudacityProject that
/// goes with this track panel.
AudacityProject * TrackPanel::GetProject() const
{
//JKC casting away constness here.
//Do it in two stages in case 'this' is not a wxWindow.
//when the compiler will flag the error.
wxWindow const * const pConstWind = this;
wxWindow * pWind=(wxWindow*)pConstWind;
#ifdef EXPERIMENTAL_NOTEBOOK
pWind = pWind->GetParent(); //Page
wxASSERT( pWind );
pWind = pWind->GetParent(); //Notebook
wxASSERT( pWind );
#endif
pWind = pWind->GetParent(); //MainPanel
wxASSERT( pWind );
pWind = pWind->GetParent(); //Project
wxASSERT( pWind );
return (AudacityProject*)pWind;
}
Bug 1401 - Wait for window visibility before starting timer
2017-02-25 21:16:42 +00:00
void TrackPanel::OnIdle(wxIdleEvent& event)
{
// The window must be ready when the timer fires (#1401)
if (IsShownOnScreen())
{
mTimer.Start(kTimerInterval, FALSE);
// Timer is started, we don't need the event anymore
GetProject()->Unbind(wxEVT_IDLE, &TrackPanel::OnIdle, this);
}
else
{
// Get another idle event, wx only guarantees we get one
// event after "some other normal events occur"
event.RequestMore();
}
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
/// AS: This gets called on our wx timer events.
Bug1169: end the separate treatment of lin vs. log display bounds for spectrum... ... also make WaveTrack responsible for storing and validating the bounds ... also let the bounds vary per-track even though other settings are default ... also change some code names to mention "period" not "undertone"
2015-09-06 22:09:16 +00:00
void TrackPanel::OnTimer(wxTimerEvent& )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Bug1431: Undocked toolbars should hide when project window minimizes
2016-06-29 19:13:38 +00:00
#ifdef __WXMAC__
// Unfortunate part of fix for bug 1431
// Without this, the toolbars hide only every other time that you press
// the yellow title bar button. For some reason, not every press sends
// us a deactivate event for the application.
{
auto project = GetProject();
if (project->IsIconized())
project->MacShowUndockedToolbars(false);
}
#endif
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
mTimeCount++;
Reorder some things that happen in the track panel timer update.
2015-08-26 21:57:02 +00:00
AudacityProject *const p = GetProject();
Add user interface for scrubbing and Experimental.h switches EXPERIMENTAL_SCRUBBING_BASIC enables middle-click-drag to scrub, or to seek when shift is down. EXPERIMENTAL_SCRUBBING_SMOOTH_SCROLL adds middle-double-click-drag to scrub or (with SHIFT down) to seek while keeping the playhead at the midline of the track display. EXPERIMENTAL_SCRUBBING_SCROLL_WHEEL allows control wheel to vary the speed limit, while scrubbing (not seeking). All three are enabled in this commit. Also notice the changes to status bar messages and the Mouse Preferences dialog. Scrubbing works only in Select and Multi tools.
2015-04-17 18:09:35 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// Check whether we were playing or recording, but the stream has stopped.
More uses if IsUnsafe() or IsAudioActive()
2015-07-06 20:55:04 +00:00
if (p->GetAudioIOToken()>0 && !IsAudioActive())
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
{
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
//the stream may have been started up after this one finished (by some other project)
//in that case reset the buttons don't stop the stream
p->GetControlToolBar()->StopPlaying(!gAudioIO->IsStreamActive());
}
// Next, check to see if we were playing or recording
// audio, but now Audio I/O is completely finished.
if (p->GetAudioIOToken()>0 &&
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
!gAudioIO->IsAudioTokenActive(p->GetAudioIOToken()))
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Make sure display refreshes after audio I/O stops What looked simple in r13811 was not so simple apparently. (We REALLY need a gAudioIO->IsCapturing())
2014-12-29 22:28:32 +00:00
p->FixScrollbars();
Fix for bug #806 This was my bad. I'd reset the number of capture channels in AudioIO when the stream was stopped. Unfortunately, two methods depended on it being valid AFTER the stream had stopped. Those methods, TrackPanel::OnTimer and AudacityProjecT::OnCloseWindow, were using it as an indicator if recording had been taking place before they stopped the stream. They then flushed the tracks, pushed the state onto the undo stack and did some other post-recording tasks. Turns out that the tracks are already flushed as part of the normal AudioIO::StopStream processing, so that was redundant. And, instead of duplicating the process, I've relocated most of each methods processing to AudacityProject::OnAudioIOStopRecording.
2014-12-28 08:53:57 +00:00
p->SetAudioIOToken(0);
Make sure display refreshes after audio I/O stops What looked simple in r13811 was not so simple apparently. (We REALLY need a gAudioIO->IsCapturing())
2014-12-29 22:28:32 +00:00
p->RedrawProject();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
mRedrawAfterStop = false;
Campbell Barton's patch to turn many, many tabs to our 3-space convenbtion
2013-02-20 23:42:58 +00:00
//ANSWER-ME: Was DisplaySelection added to solve a repaint problem?
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
DisplaySelection();
}
Improve responsiveness of drag seek during click-scrub... .. by refreshing the TrackPanel window less often.
2016-05-23 21:56:06 +00:00
if (mLastDrawnSelectedRegion != mViewInfo->selectedRegion) {
UpdateSelectionDisplay();
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Reorder some things that happen in the track panel timer update.
2015-08-26 21:57:02 +00:00
// Notify listeners for timer ticks
{
wxCommandEvent e(EVT_TRACK_PANEL_TIMER);
p->GetEventHandler()->ProcessEvent(e);
}
Reorganize code for drawing cursor and indicator, so it can generalize to... ... other things (like scrub speed)
2015-08-13 14:59:42 +00:00
DrawOverlays(false);
Insert calls to DrawOverlays() on the ruler, though they do nothing yet
2016-05-08 19:48:51 +00:00
mRuler->DrawOverlays(false);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
More uses if IsUnsafe() or IsAudioActive()
2015-07-06 20:55:04 +00:00
if(IsAudioActive() && gAudioIO->GetNumCaptureChannels()) {
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// Periodically update the display while recording
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
if (!mRedrawAfterStop) {
mRedrawAfterStop = true;
MakeParentRedrawScrollbars();
mListener->TP_ScrollUpDown( 99999999 );
Refresh( false );
}
else {
if ((mTimeCount % 5) == 0) {
// Must tell OnPaint() to recreate the backing bitmap
// since we've not done a full refresh.
mRefreshBacking = true;
Refresh( false );
}
}
}
if(mTimeCount > 1000)
mTimeCount = 0;
}
ViewInfo does not redundantly (or inconsistently!) store the screen width
2015-08-21 17:22:44 +00:00
double TrackPanel::GetScreenEndTime() const
{
int width;
GetTracksUsableArea(&width, NULL);
Fix minor error in some position to time calculations
2016-05-18 18:55:03 +00:00
return mViewInfo->PositionToTime(width, 0, true);
ViewInfo does not redundantly (or inconsistently!) store the screen width
2015-08-21 17:22:44 +00:00
}
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
/// AS: OnPaint( ) is called during the normal course of
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
/// completing a repaint operation.
void TrackPanel::OnPaint(wxPaintEvent & /* event */)
{
Improve responsiveness of drag seek during click-scrub... .. by refreshing the TrackPanel window less often.
2016-05-23 21:56:06 +00:00
mLastDrawnSelectedRegion = mViewInfo->selectedRegion;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#if DEBUG_DRAW_TIMING
wxStopWatch sw;
#endif
{
Stack-allocate where possible! ... ... Removed many unnecessary naked news and deletes.
2016-02-01 01:39:24 +00:00
wxPaintDC dc(this);
// Retrieve the damage rectangle
wxRect box = GetUpdateRegion().GetBox();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Stack-allocate where possible! ... ... Removed many unnecessary naked news and deletes.
2016-02-01 01:39:24 +00:00
// Recreate the backing bitmap if we have a full refresh
// (See TrackPanel::Refresh())
if (mRefreshBacking || (box == GetRect()))
Appearance on OSX is now back to normal or better Some additional wx3 cleanup as well.
2015-08-24 01:25:01 +00:00
{
Stack-allocate where possible! ... ... Removed many unnecessary naked news and deletes.
2016-02-01 01:39:24 +00:00
// Reset (should a mutex be used???)
mRefreshBacking = false;
Appearance on OSX is now back to normal or better Some additional wx3 cleanup as well.
2015-08-24 01:25:01 +00:00
Stack-allocate where possible! ... ... Removed many unnecessary naked news and deletes.
2016-02-01 01:39:24 +00:00
// Redraw the backing bitmap
New base classes of TrackPanel just for the bitmap backing and overlay system... ... to make it reusable by other classes. Also, don't create a second DC when repainting TrackPanel.
2016-05-07 17:00:48 +00:00
DrawTracks(&GetBackingDCForRepaint());
Appearance on OSX is now back to normal or better Some additional wx3 cleanup as well.
2015-08-24 01:25:01 +00:00
Stack-allocate where possible! ... ... Removed many unnecessary naked news and deletes.
2016-02-01 01:39:24 +00:00
// Copy it to the display
New base classes of TrackPanel just for the bitmap backing and overlay system... ... to make it reusable by other classes. Also, don't create a second DC when repainting TrackPanel.
2016-05-07 17:00:48 +00:00
DisplayBitmap(dc);
Stack-allocate where possible! ... ... Removed many unnecessary naked news and deletes.
2016-02-01 01:39:24 +00:00
}
else
{
// Copy full, possibly clipped, damage rectangle
New base classes of TrackPanel just for the bitmap backing and overlay system... ... to make it reusable by other classes. Also, don't create a second DC when repainting TrackPanel.
2016-05-07 17:00:48 +00:00
RepairBitmap(dc, box.x, box.y, box.width, box.height);
Stack-allocate where possible! ... ... Removed many unnecessary naked news and deletes.
2016-02-01 01:39:24 +00:00
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Stack-allocate where possible! ... ... Removed many unnecessary naked news and deletes.
2016-02-01 01:39:24 +00:00
// Done with the clipped DC
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
New base classes of TrackPanel just for the bitmap backing and overlay system... ... to make it reusable by other classes. Also, don't create a second DC when repainting TrackPanel.
2016-05-07 17:00:48 +00:00
// Drawing now goes directly to the client area.
// DrawOverlays() may need to draw outside the clipped region.
new -> NEW in comments, so text search for naked new excludes them
2016-08-08 13:50:55 +00:00
// (Used to make a NEW, separate wxClientDC, but that risks flashing
New base classes of TrackPanel just for the bitmap backing and overlay system... ... to make it reusable by other classes. Also, don't create a second DC when repainting TrackPanel.
2016-05-07 17:00:48 +00:00
// problems on Mac.)
dc.DestroyClippingRegion();
DrawOverlays(true, &dc);
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#if DEBUG_DRAW_TIMING
Appearance on OSX is now back to normal or better Some additional wx3 cleanup as well.
2015-08-24 01:25:01 +00:00
sw.Pause();
wxLogDebug(wxT("Total: %ld milliseconds"), sw.Time());
wxPrintf(wxT("Total: %ld milliseconds\n"), sw.Time());
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
#endif
}
Norm's patch to improve selection speed on large projects by reducing the number of unnecessary auto-saves. Maybe vertical zooming should also not trigger an auto-save?
2013-12-30 00:41:18 +00:00
void TrackPanel::MakeParentModifyState(bool bWantsAutoSave)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Norm's patch to improve selection speed on large projects by reducing the number of unnecessary auto-saves. Maybe vertical zooming should also not trigger an auto-save?
2013-12-30 00:41:18 +00:00
mListener->TP_ModifyState(bWantsAutoSave);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
void TrackPanel::MakeParentRedrawScrollbars()
{
mListener->TP_RedrawScrollbars();
}
Fix incidentals to Bug 1331, though not the bug itself... ... See comments #1 and #2 at http://bugzilla.audacityteam.org/show_bug.cgi?id=1331 Don't make strange undo history if, e.g., R to record (or other keystroke with undoable effects) interrupts a drag with undoable effects (like time shift). Ensure that by first simulating a mouse button up event to stop the drag, before dispatching the keystroke. Don't crash if certain other drags, that do not have undoable effects, such as selection or vertical ruler drag -- are interrupted by a keystroke command (Ctrl+C in particular could cause crash). However, in these cases, the drag is still allowed to continue.
2016-05-22 03:19:09 +00:00
void TrackPanel::HandleInterruptedDrag()
{
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
if (mUIHandle && mUIHandle->StopsOnKeystroke() ) {
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
// The bogus id isn't used anywhere, but may help with debugging.
// as this is sending a bogus mouse up. The mouse button is still actually down
// and may go up again.
const int idBogusUp = 2;
wxMouseEvent evt { wxEVT_LEFT_UP };
evt.SetId( idBogusUp );
evt.SetPosition(this->ScreenToClient(::wxGetMousePosition()));
this->ProcessEvent(evt);
}
}
namespace
{
void ProcessUIHandleResult
(TrackPanel *panel, AdornedRulerPanel *ruler,
Track *pClickedTrack, Track *pLatestTrack,
UIHandle::Result refreshResult)
{
// TODO: make a finer distinction between refreshing the track control area,
// and the waveform area. As it is, redraw both whenever you must redraw either.
using namespace RefreshCode;
panel->UpdateViewIfNoTracks();
if (refreshResult & DestroyedCell) {
// Beware stale pointer!
if (pLatestTrack == pClickedTrack)
pLatestTrack = NULL;
pClickedTrack = NULL;
}
if (pClickedTrack && (refreshResult & UpdateVRuler))
panel->UpdateVRuler(pClickedTrack);
if (refreshResult & DrawOverlays) {
panel->DrawOverlays(false);
ruler->DrawOverlays(false);
}
// Refresh all if told to do so, or if told to refresh a track that
// is not known.
const bool refreshAll =
( (refreshResult & RefreshAll)
|| ((refreshResult & RefreshCell) && !pClickedTrack)
|| ((refreshResult & RefreshLatestCell) && !pLatestTrack));
if (refreshAll)
panel->Refresh(false);
else {
if (refreshResult & RefreshCell)
panel->RefreshTrack(pClickedTrack);
if (refreshResult & RefreshLatestCell)
panel->RefreshTrack(pLatestTrack);
}
if (refreshResult & FixScrollbars)
panel->MakeParentRedrawScrollbars();
if (refreshResult & Resize)
panel->GetListener()->TP_HandleResize();
// This flag is superfluous if you do full refresh,
// because TrackPanel::Refresh() does this too
if (refreshResult & UpdateSelection) {
panel->DisplaySelection();
{
// Formerly in TrackPanel::UpdateSelectionDisplay():
// Make sure the ruler follows suit.
// mRuler->DrawSelection();
// ... but that too is superfluous it does nothing but refresh
// the ruler, while DisplaySelection calls TP_DisplaySelection which
// also always refreshes the ruler.
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
}
Paul Licameli's Spectral Editing Patch. This relies on three new nyquist scripts to actually do the editing. The peak-snapping code in FrequencyWindow has been extracted into a new class, SpectrumAnalyst, to provide peak-snapping in spectrogram too.
2014-10-18 14:19:38 +00:00
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
if ((refreshResult & EnsureVisible) && pClickedTrack)
panel->EnsureVisible(pClickedTrack);
Paul Licameli's Spectral Editing Patch. This relies on three new nyquist scripts to actually do the editing. The peak-snapping code in FrequencyWindow has been extracted into a new class, SpectrumAnalyst, to provide peak-snapping in spectrogram too.
2014-10-18 14:19:38 +00:00
}
}
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
void TrackPanel::Uncapture(wxMouseEvent *pEvent)
{
if (HasCapture())
ReleaseMouse();
HandleCursor( pEvent );
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::CancelDragging()
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
{
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
if (mUIHandle) {
UIHandle::Result refreshResult = mUIHandle->Cancel(GetProject());
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
{
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
// TODO: avoid dangling pointers to mpClickedTrack
// when the undo stack management of the typical Cancel override
// causes it to relocate. That is implement some means to
// re-fetch the track according to its position in the list.
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
// (Or should all Tracks be managed always by std::shared_ptr?)
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
mpClickedTrack = NULL;
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
ProcessUIHandleResult(this, mRuler, mpClickedTrack, NULL, refreshResult);
mpClickedTrack = NULL;
mUIHandle = NULL;
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
Uncapture();
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
}
}
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
bool TrackPanel::HandleEscapeKey(bool down)
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
{
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
if (!down)
return false;
if (mUIHandle) {
// UIHANDLE CANCEL
CancelDragging();
return true;
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
// Not escaping from a mouse drag
return false;
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::HandleAltKey(bool down)
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
{
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
mLastMouseEvent.m_altDown = down;
HandleCursorForLastMouseEvent();
}
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::HandleShiftKey(bool down)
{
mLastMouseEvent.m_shiftDown = down;
HandleCursorForLastMouseEvent();
}
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::HandleControlKey(bool down)
{
mLastMouseEvent.m_controlDown = down;
HandleCursorForLastMouseEvent();
}
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::HandlePageUpKey()
{
mListener->TP_ScrollWindow(2 * mViewInfo->h - GetScreenEndTime());
}
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::HandlePageDownKey()
{
mListener->TP_ScrollWindow(GetScreenEndTime());
}
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::HandleCursorForLastMouseEvent()
{
comments
2017-06-17 02:57:03 +00:00
// Come here on modifier key transitions,
// or on starting or stopping of play or record,
// and change the cursor appropriately.
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
HandleCursor( &mLastMouseEvent );
Preview cursor for Stretch can take left, right, or center form
2017-05-11 18:53:03 +00:00
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
bool TrackPanel::IsAudioActive()
{
AudacityProject *p = GetProject();
return p->IsAudioActive();
}
Extensive changes to improve NoteTrack display and (some) editing, NoteTrack playback via MIDI, and Midi-to-Audio alignment.
2010-09-18 21:02:36 +00:00
Make MIDI track stretch path-independent
2017-05-11 17:41:26 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
/// TrackPanel::HandleCursor( ) sets the cursor drawn at the mouse location.
/// As this procedure checks which region the mouse is over, it is
/// appropriate to establish the message in the status bar.
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
void TrackPanel::HandleCursor( wxMouseEvent *pEvent )
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
{
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
wxMouseEvent dummy;
if (!pEvent)
pEvent = &dummy;
else
mLastMouseEvent = *pEvent;
auto &event = *pEvent;
Make MIDI track stretch path-independent
2017-05-11 17:41:26 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
const auto foundCell = FindCell( event.m_x, event.m_y );
auto &track = foundCell.pTrack;
auto &rect = foundCell.rect;
auto &pCell = foundCell.pCell;
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
const auto size = GetSize();
const TrackPanelMouseEvent tpmEvent{ event, rect, size, pCell };
Further regularize the odd case of hit-test on the resizer region
2017-06-16 20:49:49 +00:00
HandleCursor( tpmEvent );
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
}
Sync lock adjustment for NoteTrack stretch... ... It applies only at button-up, not in a previewing fashion during the drag. Realizing that preview is more work than I want to do right now.
2017-05-12 21:41:57 +00:00
Further regularize the odd case of hit-test on the resizer region
2017-06-16 20:49:49 +00:00
void TrackPanel::HandleCursor( const TrackPanelMouseEvent &tpmEvent )
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
{
if ( mUIHandle ) {
// UIHANDLE PREVIEW
// Update status message and cursor during drag
HitTestPreview preview = mUIHandle->Preview( tpmEvent, GetProject() );
mListener->TP_DisplayStatusMessage( preview.message );
if ( preview.cursor )
SetCursor( *preview.cursor );
Extensive changes to improve NoteTrack display and (some) editing, NoteTrack playback via MIDI, and Midi-to-Audio alignment.
2010-09-18 21:02:36 +00:00
}
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
else {
wxCursor *pCursor = NULL;
wxString tip;
// Are we within the vertical resize area?
// (Add margin back to bottom of the rectangle)
auto pCell = tpmEvent.pCell;
auto track = static_cast<CommonTrackPanelCell*>( pCell )->FindTrack();
if (pCell && pCursor == NULL && tip == wxString()) {
const auto size = GetSize();
HitTestResult hitTest( pCell->HitTest(tpmEvent, GetProject()) );
tip = hitTest.preview.message;
ProcessUIHandleResult(this, mRuler, track, track, hitTest.preview.refreshCode);
pCursor = hitTest.preview.cursor;
if (pCursor)
SetCursor(*pCursor);
}
if (pCursor != NULL || tip != wxString())
mListener->TP_DisplayStatusMessage(tip);
Extensive changes to improve NoteTrack display and (some) editing, NoteTrack playback via MIDI, and Midi-to-Audio alignment.
2010-09-18 21:02:36 +00:00
}
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::UpdateSelectionDisplay()
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
// Full refresh since the label area may need to indicate
// newly selected tracks.
Refresh(false);
Paul Licameli's Spectral Editing Patch. This relies on three new nyquist scripts to actually do the editing. The peak-snapping code in FrequencyWindow has been extracted into a new class, SpectrumAnalyst, to provide peak-snapping in spectrogram too.
2014-10-18 14:19:38 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
// Make sure the ruler follows suit.
mRuler->DrawSelection();
Paul Licameli's Spectral Editing Patch. This relies on three new nyquist scripts to actually do the editing. The peak-snapping code in FrequencyWindow has been extracted into a new class, SpectrumAnalyst, to provide peak-snapping in spectrogram too.
2014-10-18 14:19:38 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
// As well as the SelectionBar.
DisplaySelection();
Paul Licameli's Spectral Editing Patch. This relies on three new nyquist scripts to actually do the editing. The peak-snapping code in FrequencyWindow has been extracted into a new class, SpectrumAnalyst, to provide peak-snapping in spectrogram too.
2014-10-18 14:19:38 +00:00
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::UpdateAccessibility()
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
{
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
if (mAx)
mAx->Updated();
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
// Counts tracks, counting stereo tracks as one track.
size_t TrackPanel::GetTrackCount() const
Changes to seeking and scrubbing from Paul Licameli. These are mostly under an EXPERIMENTAL_ #ifdef. Also has a change for the prompt string for preferences so the displayed keybinding is adjusted when in multitool mode.
2014-11-29 22:09:57 +00:00
{
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
size_t count = 0;
TrackListConstIterator iter(GetTracks());
for (auto t = iter.First(); t; t = iter.Next()) {
count += 1;
if( t->GetLinked() ){
t = iter.Next();
if( !t )
break;
}
Changes to seeking and scrubbing from Paul Licameli. These are mostly under an EXPERIMENTAL_ #ifdef. Also has a change for the prompt string for preferences so the displayed keybinding is adjusted when in multitool mode.
2014-11-29 22:09:57 +00:00
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
return count;
}
Changes to seeking and scrubbing from Paul Licameli. These are mostly under an EXPERIMENTAL_ #ifdef. Also has a change for the prompt string for preferences so the displayed keybinding is adjusted when in multitool mode.
2014-11-29 22:09:57 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
// Counts selected tracks, counting stereo tracks as one track.
size_t TrackPanel::GetSelectedTrackCount() const
{
size_t count = 0;
Changes to seeking and scrubbing from Paul Licameli. These are mostly under an EXPERIMENTAL_ #ifdef. Also has a change for the prompt string for preferences so the displayed keybinding is adjusted when in multitool mode.
2014-11-29 22:09:57 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
TrackListConstIterator iter(GetTracks());
for (auto t = iter.First(); t; t = iter.Next()) {
count += t->GetSelected() ? 1:0;
if( t->GetLinked() ){
t = iter.Next();
if( !t )
break;
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
}
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
return count;
}
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
void TrackPanel::MessageForScreenReader(const wxString& message)
{
if (mAx)
mAx->MessageForScreenReader(message);
Patch from Paul Licameli Improving Spectral Selection ESC Key toggles snapping of center frequency to peaks (no visual indication of snap to yet) Description added to mouse prefs - fix later. Shift now required to keep top/bottom frequency pinned whilst (re)dragging the other one. Code for status bar messages simplified and made more consistent, and no longer hard codes assumption that preferences is Ctrl-P when prompting user about it.
2014-10-25 22:05:45 +00:00
}
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
/// Determines if a modal tool is active
commit fix for crash if you undo whilst time-shifting a track, found and produced by Campbell Barton
2012-12-04 16:41:43 +00:00
bool TrackPanel::IsMouseCaptured()
{
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
return mUIHandle != NULL;
commit fix for crash if you undo whilst time-shifting a track, found and produced by Campbell Barton
2012-12-04 16:41:43 +00:00
}
Fix bug 181.
2012-08-16 23:41:09 +00:00
void TrackPanel::UpdateViewIfNoTracks()
{
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
if (mTracks->IsEmpty())
Fix bug 181.
2012-08-16 23:41:09 +00:00
{
// BG: There are no more tracks on screen
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
//BG: Set zoom to normal
Add and use some ZoomInfo and ViewInfo member functions, so we can eliminate... ... miscellaneous direct uses of ZoomInfo::zoom to test and set zoom level. This includes all the remaining assignments to it. But moving TrackInfo::PositionToTime and TrackInfo::TimeToPosition into ZoomInfo and using them is needed to eliminate many more uses. Also #if'd out the unused AudacityProject::OnZoomToggle().
2015-04-19 23:26:36 +00:00
mViewInfo->SetZoom(ZoomInfo::GetDefaultZoom());
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
//STM: Set selection to 0,0
Paul L's new SelectedRegion class replacing use of t0 and t1. Also LabelTrack.h no longer in TrackPanel.h includes. This change is believed to be a direct refactoring that does not change functionality. It paves the way for more complex kinds of selection, such as selections involving frequency as well as time. It also reduces risk of left and right edges being swapped in future code using SelectedRegion, as the default is to swap on assignment if needed.
2014-10-05 17:10:09 +00:00
//PRL: and default the rest of the selection information
mViewInfo->selectedRegion = SelectedRegion();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Bug972, again: Recording into empty project aligns time 0 with left edge. Also has this effect: Generate sound, scroll left, then delete the (sole) track. Create new track from menu. Formerly, the track did not align 0 to left edge. Now it does.
2015-05-27 00:20:04 +00:00
// PRL: Following causes the time ruler to align 0 with left edge.
// Bug 972
mViewInfo->h = 0;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
mListener->TP_RedrawScrollbars();
TrackPanel still draws Miminize and Close, but no longer handles... clicks on them... ... also implemented ESC key for those drags
2015-07-18 20:07:46 +00:00
mListener->TP_HandleResize();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
mListener->TP_DisplayStatusMessage(wxT("")); //STM: Clear message if all tracks are removed
}
}
Still better cursor handling: change cursor at once... ... on start or stop of transport, in cases as described in the previous commit comment, even if the pointer does not move.
2017-06-16 19:39:38 +00:00
void TrackPanel::OnPlayback(wxCommandEvent &e)
{
e.Skip();
CallAfter( [this] { HandleCursorForLastMouseEvent(); } );
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// The tracks positions within the list have changed, so update the vertical
// ruler size for the track that triggered the event.
Clarify what the TrackList events are for... Also fixes this bug: Vertical rulers did not narrow as needed after deletion of the lowest track.
2017-06-25 05:33:31 +00:00
void TrackPanel::OnTrackListResizing(wxCommandEvent & e)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Track *t = (Track *) e.GetClientData();
UpdateVRuler(t);
e.Skip();
}
Clarify what the TrackList events are for... Also fixes this bug: Vertical rulers did not narrow as needed after deletion of the lowest track.
2017-06-25 05:33:31 +00:00
// Tracks have been removed from the list.
void TrackPanel::OnTrackListDeletion(wxCommandEvent & e)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
if (mUIHandle)
mUIHandle->OnProjectChange(GetProject());
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// Tracks may have been deleted, so check to see if the focused track was on of them.
if (!mTracks->Contains(GetFocusedTrack())) {
SetFocusedTrack(NULL);
}
Clarify what the TrackList events are for... Also fixes this bug: Vertical rulers did not narrow as needed after deletion of the lowest track.
2017-06-25 05:33:31 +00:00
UpdateVRulerSize();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
e.Skip();
}
Cleanup: Fixed lots of trivial MSVC warnings.
2013-08-25 21:51:26 +00:00
void TrackPanel::OnContextMenu(wxContextMenuEvent & WXUNUSED(event))
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
OnTrackMenu();
}
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
struct TrackInfo::TCPLine {
using DrawFunction = void (*)(
wxDC *dc,
const wxRect &rect,
const Track *maybeNULL,
int pressed, // a value from MouseCaptureEnum; TODO: make it bool
bool captured
);
unsigned items; // a bitwise OR of values of the enum above
int height;
int extraSpace;
DrawFunction drawFunction;
};
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
namespace {
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
#define RANGE(array) (array), (array) + sizeof(array)/sizeof(*(array))
using TCPLines = std::vector< TrackInfo::TCPLine >;
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
enum : unsigned {
// The sequence is not significant, just keep bits distinct
kItemBarButtons = 1 << 0,
Don't overlap WaveTrack status and title bar by one pixel... ...Placement of status text lines in TCP is also table-driven
2017-06-05 19:45:47 +00:00
kItemStatusInfo1 = 1 << 1,
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
kItemMute = 1 << 2,
kItemSolo = 1 << 3,
kItemGain = 1 << 4,
kItemPan = 1 << 5,
Don't overlap MIDI channel buttons with menu button & slider... ... and placement of them, and of velocity slider, is also by table
2017-06-05 00:47:43 +00:00
kItemVelocity = 1 << 6,
kItemMidiControlsRect = 1 << 7,
Placement of minimize button and sync-lock icon are also table driven
2017-06-05 15:29:21 +00:00
kItemMinimize = 1 << 8,
kItemSyncLock = 1 << 9,
Don't overlap WaveTrack status and title bar by one pixel... ...Placement of status text lines in TCP is also table-driven
2017-06-05 19:45:47 +00:00
kItemStatusInfo2 = 1 << 10,
Hidden buttons and sliders in narrow tracks are never clickable
2017-06-05 15:32:19 +00:00
kHighestBottomItem = kItemMinimize,
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
};
#ifdef EXPERIMENTAL_DA
Simplify macros
2017-06-13 02:04:09 +00:00
#define TITLE_ITEMS \
Table includes draw function for Close and Title
2017-06-12 17:23:00 +00:00
{ kItemBarButtons, kTrackInfoBtnSize, 4, \
&TrackInfo::CloseTitleDrawFunction },
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
// DA: Has Mute and Solo on separate lines.
#define MUTE_SOLO_ITEMS(extra) \
Table includes draw functions for Mute and Solo
2017-06-13 12:02:44 +00:00
{ kItemMute, kTrackInfoBtnSize + 1, 1, \
&TrackInfo::WideMuteDrawFunction }, \
{ kItemSolo, kTrackInfoBtnSize + 1, extra, \
&TrackInfo::WideSoloDrawFunction },
Move track info below track controls
2017-06-12 09:46:20 +00:00
// DA: Does not have status information for a track.
#define STATUS_ITEMS
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
#else
Simplify macros
2017-06-13 02:04:09 +00:00
#define TITLE_ITEMS \
Table includes draw function for Close and Title
2017-06-12 17:23:00 +00:00
{ kItemBarButtons, kTrackInfoBtnSize, 0, \
&TrackInfo::CloseTitleDrawFunction },
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
#define MUTE_SOLO_ITEMS(extra) \
Table includes draw functions for Mute and Solo
2017-06-13 12:02:44 +00:00
{ kItemMute | kItemSolo, kTrackInfoBtnSize + 1, extra, \
&TrackInfo::MuteAndSoloDrawFunction },
Move track info below track controls
2017-06-12 09:46:20 +00:00
#define STATUS_ITEMS \
Table includes draw functions for status items
2017-06-13 13:14:58 +00:00
{ kItemStatusInfo1, 12, 0, \
&TrackInfo::Status1DrawFunction }, \
{ kItemStatusInfo2, 12, 0, \
&TrackInfo::Status2DrawFunction },
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
#endif
Simplify macros
2017-06-13 02:04:09 +00:00
#define COMMON_ITEMS \
TITLE_ITEMS
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
const TrackInfo::TCPLine defaultCommonTrackTCPLines[] = {
Simplify macros
2017-06-13 02:04:09 +00:00
COMMON_ITEMS
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
};
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
TCPLines commonTrackTCPLines{ RANGE(defaultCommonTrackTCPLines) };
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
const TrackInfo::TCPLine defaultWaveTrackTCPLines[] = {
Simplify macros
2017-06-13 02:04:09 +00:00
COMMON_ITEMS
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
MUTE_SOLO_ITEMS(2)
Table includes draw functions for sliders
2017-06-12 20:10:03 +00:00
{ kItemGain, kTrackInfoSliderHeight, kTrackInfoSliderExtra,
&TrackInfo::GainSliderDrawFunction },
{ kItemPan, kTrackInfoSliderHeight, kTrackInfoSliderExtra,
&TrackInfo::PanSliderDrawFunction },
Move track info below track controls
2017-06-12 09:46:20 +00:00
STATUS_ITEMS
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
};
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
TCPLines waveTrackTCPLines{ RANGE(defaultWaveTrackTCPLines) };
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
const TrackInfo::TCPLine defaultNoteTrackTCPLines[] = {
Simplify macros
2017-06-13 02:04:09 +00:00
COMMON_ITEMS
EXPERIMENTAL_MIDI_OUT off -- then no invisible channel buttons... ... They were still clickable before this commit.
2017-06-07 01:47:13 +00:00
#ifdef EXPERIMENTAL_MIDI_OUT
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
MUTE_SOLO_ITEMS(0)
Table includes draw function for Midi controls
2017-06-12 19:51:06 +00:00
{ kItemMidiControlsRect, kMidiCellHeight * 4, 0,
&TrackInfo::MidiControlsDrawFunction },
Table includes draw functions for sliders
2017-06-12 20:10:03 +00:00
{ kItemVelocity, kTrackInfoSliderHeight, kTrackInfoSliderExtra,
&TrackInfo::VelocitySliderDrawFunction },
EXPERIMENTAL_MIDI_OUT off -- then no invisible channel buttons... ... They were still clickable before this commit.
2017-06-07 01:47:13 +00:00
#endif
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
};
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
TCPLines noteTrackTCPLines{ RANGE(defaultNoteTrackTCPLines) };
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
int totalTCPLines( const TCPLines &lines, bool omitLastExtra )
Default MIDI track height is enough to display velocity slider... ... It is computed from the layout table, and in fact comes to 158 pixels, versus 150 for other tracks.
2017-06-07 01:40:58 +00:00
{
int total = 0;
Redo calculation of default track heights
2017-06-12 23:03:09 +00:00
int lastExtra = 0;
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
for ( const auto line : lines ) {
lastExtra = line.extraSpace;
total += line.height + lastExtra;
Default MIDI track height is enough to display velocity slider... ... It is computed from the layout table, and in fact comes to 158 pixels, versus 150 for other tracks.
2017-06-07 01:40:58 +00:00
}
Redo calculation of default track heights
2017-06-12 23:03:09 +00:00
if (omitLastExtra)
total -= lastExtra;
Default MIDI track height is enough to display velocity slider... ... It is computed from the layout table, and in fact comes to 158 pixels, versus 150 for other tracks.
2017-06-07 01:40:58 +00:00
return total;
}
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
const TCPLines &getTCPLines( const Track &track )
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
{
#ifdef USE_MIDI
if ( track.GetKind() == Track::Note )
return noteTrackTCPLines;
#endif
if ( track.GetKind() == Track::Wave )
return waveTrackTCPLines;
return commonTrackTCPLines;
}
// return y value and height
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
std::pair< int, int > CalcItemY( const TCPLines &lines, unsigned iItem )
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
{
Exclude left, top, bottom margins from rectangles describing TCP
2017-06-06 15:43:58 +00:00
int y = 0;
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
auto pLines = lines.begin();
while ( pLines != lines.end() &&
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
0 == (pLines->items & iItem) ) {
y += pLines->height + pLines->extraSpace;
++pLines;
}
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
int height = 0;
if ( pLines != lines.end() )
height = pLines->height;
return { y, height };
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
}
Placement of minimize button and sync-lock icon are also table driven
2017-06-05 15:29:21 +00:00
// Items for the bottom of the panel, listed bottom-upwards
// As also with the top items, the extra space is below the item
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
const TrackInfo::TCPLine defaultCommonTrackTCPBottomLines[] = {
Tweak TCP minimize button Position It now doesn't impinge on the bottom edge of the TCP, and it is left aligned flush with the left edge. Minimum track height increased accordingly.
2017-06-10 09:10:38 +00:00
// The '0' avoids impinging on bottom line of TCP
// Use -1 if you do want to do so.
Table includes draw function for Minimize and Sync-lock icon
2017-06-12 19:17:26 +00:00
{ kItemSyncLock | kItemMinimize, kTrackInfoBtnSize, 0,
&TrackInfo::MinimizeSyncLockDrawFunction },
Placement of minimize button and sync-lock icon are also table driven
2017-06-05 15:29:21 +00:00
};
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
TCPLines commonTrackTCPBottomLines{ RANGE(defaultCommonTrackTCPBottomLines) };
Placement of minimize button and sync-lock icon are also table driven
2017-06-05 15:29:21 +00:00
// return y value and height
std::pair< int, int > CalcBottomItemY
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
( const TCPLines &lines, unsigned iItem, int height )
Placement of minimize button and sync-lock icon are also table driven
2017-06-05 15:29:21 +00:00
{
int y = height;
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
auto pLines = lines.begin();
while ( pLines != lines.end() &&
Placement of minimize button and sync-lock icon are also table driven
2017-06-05 15:29:21 +00:00
0 == (pLines->items & iItem) ) {
y -= pLines->height + pLines->extraSpace;
++pLines;
}
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
if (pLines != lines.end())
y -= (pLines->height + pLines->extraSpace );
return { y, pLines->height };
Placement of minimize button and sync-lock icon are also table driven
2017-06-05 15:29:21 +00:00
}
Move HideTopItem into class TrackInfo, for later use
2017-06-07 14:39:47 +00:00
}
bool TrackInfo::HideTopItem( const wxRect &rect, const wxRect &subRect,
int allowance ) {
Hidden buttons and sliders in narrow tracks are never clickable
2017-06-05 15:32:19 +00:00
auto limit = CalcBottomItemY
Move HideTopItem into class TrackInfo, for later use
2017-06-07 14:39:47 +00:00
( commonTrackTCPBottomLines, kHighestBottomItem, rect.height).first;
Hidden buttons and sliders in narrow tracks are never clickable
2017-06-05 15:32:19 +00:00
// Return true if the rectangle is even touching the limit
// without an overlap. That was the behavior as of 2.1.3.
Make gain slider again visible in default sized WaveTrack
2017-06-07 01:19:57 +00:00
return subRect.y + subRect.height - allowance >= rect.y + limit;
Hidden buttons and sliders in narrow tracks are never clickable
2017-06-05 15:32:19 +00:00
}
Fix missing feature in code comment.
2012-02-13 20:38:24 +00:00
/// Handle mouse wheel rotation (for zoom in/out, vertical and horizontal scrolling)
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
void TrackPanel::HandleWheelRotation( TrackPanelMouseEvent &tpmEvent )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
auto pCell = tpmEvent.pCell;
if (!pCell)
return;
auto &event = tpmEvent.event;
Pinch and spread gestures on Mac touchpad, if EVT_MAGNIFY is defined
2016-07-03 16:14:08 +00:00
double steps {};
#if defined(__WXMAC__) && defined(EVT_MAGNIFY)
// PRL:
// Pinch and spread implemented in wxWidgets 3.1.0, or cherry-picked from
// the future in custom build of 3.0.2
if (event.Magnify()) {
event.SetControlDown(true);
steps = 2 * event.GetMagnification();
}
else
#endif
{
steps = event.m_wheelRotation /
(event.m_wheelDelta > 0 ? (double)event.m_wheelDelta : 120.0);
}
Two-fingered horizontal swipe on mac touchpad scrolls the wave
2016-05-25 16:31:30 +00:00
if(event.GetWheelAxis() == wxMOUSE_WHEEL_HORIZONTAL) {
// Two-fingered horizontal swipe on mac is treated like shift-mousewheel
event.SetShiftDown(true);
// This makes the wave move in the same direction as the fingers, and the scrollbar
// thumb moves oppositely
Pinch and spread gestures on Mac touchpad, if EVT_MAGNIFY is defined
2016-07-03 16:14:08 +00:00
steps *= -1;
Two-fingered horizontal swipe on mac touchpad scrolls the wave
2016-05-25 16:31:30 +00:00
}
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
tpmEvent.steps = steps;
Control scrub with motion, click, drag, wheel almost anywhere in main window... ... if the event is not handled and skipped by sub-windows first, such as for toolbar button clicks. (But track panel clicks are skipped even after doing something, so they may also cause seeking besides other responses. So click can seek AND set cursor.) This is meant to make drag to seek and wheel for change of speed easier, without needing to keep the mouse in the narrow time ruler. Also lets you click in the ruler, then move in any direction, and not miss the motion event that should start the scrub playback. The event handling is a bit of a hack, using propagation. It does not use capture.
2016-04-22 00:59:38 +00:00
if(!event.HasAnyModifiers()) {
// We will later un-skip if we do anything, but if we don't,
// propagate the event up for the sake of the scrubber
event.Skip();
event.ResumePropagation(wxEVENT_PROPAGATE_MAX);
}
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
unsigned result =
pCell->HandleWheelRotation( tpmEvent, GetProject() );
auto pTrack = static_cast<CommonTrackPanelCell*>(pCell)->FindTrack();
ProcessUIHandleResult(this, mRuler, pTrack, pTrack, result);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
/// Filter captured keys typed into LabelTracks.
void TrackPanel::OnCaptureKey(wxCommandEvent & event)
{
Do not HandleInterruptedDrag for ESC key, it would be redundant
2017-06-07 16:21:33 +00:00
wxKeyEvent *kevent = static_cast<wxKeyEvent *>(event.GetEventObject());
if ( WXK_ESCAPE != kevent->GetKeyCode() )
HandleInterruptedDrag();
Fix incidentals to Bug 1331, though not the bug itself... ... See comments #1 and #2 at http://bugzilla.audacityteam.org/show_bug.cgi?id=1331 Don't make strange undo history if, e.g., R to record (or other keystroke with undoable effects) interrupts a drag with undoable effects (like time shift). Ensure that by first simulating a mouse button up event to stop the drag, before dispatching the keystroke. Don't crash if certain other drags, that do not have undoable effects, such as selection or vertical ruler drag -- are interrupted by a keystroke command (Ctrl+C in particular could cause crash). However, in these cases, the drag is still allowed to continue.
2016-05-22 03:19:09 +00:00
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
Track * const t = GetFocusedTrack();
if (t) {
const unsigned refreshResult =
((TrackPanelCell*)t)->CaptureKey(*kevent, *mViewInfo, this);
ProcessUIHandleResult(this, mRuler, t, t, refreshResult);
Fix keystroke handling in TrackPanel (such as Shift+M)
2017-06-16 01:22:14 +00:00
event.Skip(kevent->GetSkipped());
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
else
event.Skip();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
void TrackPanel::OnKeyDown(wxKeyEvent & event)
{
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
switch (event.GetKeyCode())
{
case WXK_ESCAPE:
Rework the ESC key to stop playback as an application event handler... ... So it does not depend on the focused window, and can work when selection toolbar has focus. But TrackPanel's escape handling may still take precedence over it.
2016-04-20 19:34:49 +00:00
if(HandleEscapeKey(true))
// Don't skip the event, eat it so that
// AudacityApp does not also stop any playback.
return;
else
break;
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
case WXK_ALT:
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
HandleAltKey(true);
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
break;
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
case WXK_SHIFT:
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
HandleShiftKey(true);
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
break;
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
case WXK_CONTROL:
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
HandleControlKey(true);
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
break;
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
// Allow PageUp and PageDown keys to
//scroll the Track Panel left and right
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
case WXK_PAGEUP:
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
HandlePageUpKey();
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
return;
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
case WXK_PAGEDOWN:
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
HandlePageDownKey();
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
return;
}
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
Track *const t = GetFocusedTrack();
Paul Licameli's Spectral Editing Patch. This relies on three new nyquist scripts to actually do the editing. The peak-snapping code in FrequencyWindow has been extracted into a new class, SpectrumAnalyst, to provide peak-snapping in spectrogram too.
2014-10-18 14:19:38 +00:00
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
if (t) {
const unsigned refreshResult =
((TrackPanelCell*)t)->KeyDown(event, *mViewInfo, this);
ProcessUIHandleResult(this, mRuler, t, t, refreshResult);
}
else
event.Skip();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
void TrackPanel::OnChar(wxKeyEvent & event)
{
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
switch (event.GetKeyCode())
{
case WXK_ESCAPE:
case WXK_ALT:
case WXK_SHIFT:
case WXK_CONTROL:
case WXK_PAGEUP:
case WXK_PAGEDOWN:
return;
}
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
Track *const t = GetFocusedTrack();
if (t) {
const unsigned refreshResult =
((TrackPanelCell*)t)->Char(event, *mViewInfo, this);
ProcessUIHandleResult(this, mRuler, t, t, refreshResult);
}
else
event.Skip();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
void TrackPanel::OnKeyUp(wxKeyEvent & event)
{
Rework the ESC key to stop playback as an application event handler... ... So it does not depend on the focused window, and can work when selection toolbar has focus. But TrackPanel's escape handling may still take precedence over it.
2016-04-20 19:34:49 +00:00
bool didSomething = false;
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
switch (event.GetKeyCode())
{
case WXK_ESCAPE:
Rework the ESC key to stop playback as an application event handler... ... So it does not depend on the focused window, and can work when selection toolbar has focus. But TrackPanel's escape handling may still take precedence over it.
2016-04-20 19:34:49 +00:00
didSomething = HandleEscapeKey(false);
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
break;
case WXK_ALT:
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
HandleAltKey(false);
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
break;
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
case WXK_SHIFT:
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
HandleShiftKey(false);
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
break;
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
case WXK_CONTROL:
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
HandleControlKey(false);
Further fixes for keyboard handling I'm pretty sure this gets all of the currently known issues, including the SHIFT+M not working, the Play buttons responding to SHIFT and CTRL, the ESC key canceling drags, and I'm pretty sure it even fixes but #784.
2015-08-10 18:15:15 +00:00
break;
}
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
if (didSomething)
return;
Track * const t = GetFocusedTrack();
if (t) {
const unsigned refreshResult =
((TrackPanelCell*)t)->KeyUp(event, *mViewInfo, this);
ProcessUIHandleResult(this, mRuler, t, t, refreshResult);
return;
}
event.Skip();
Move TrackPanel keyboard handling out of AudacityProject... ...and into TrackPanel where it should be.
2015-08-09 23:26:29 +00:00
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
/// Should handle the case when the mouse capture is lost.
Cleanup: Fixed lots of trivial MSVC warnings.
2013-08-25 21:51:26 +00:00
void TrackPanel::OnCaptureLost(wxMouseCaptureLostEvent & WXUNUSED(event))
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
wxMouseEvent e(wxEVT_LEFT_UP);
e.m_x = mMouseMostRecentX;
e.m_y = mMouseMostRecentY;
OnMouseEvent(e);
}
/// This handles just generic mouse events. Then, based
/// on our current state, we forward the mouse events to
/// various interested parties.
void TrackPanel::OnMouseEvent(wxMouseEvent & event)
TrackPanel aborts any dragging action when an exception escapes
2016-12-18 20:57:03 +00:00
try
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
const auto foundCell = FindCell( event.m_x, event.m_y );
auto &rect = foundCell.rect;
auto &pCell = foundCell.pCell;
auto &pTrack = foundCell.pTrack;
const auto size = GetSize();
TrackPanelMouseEvent tpmEvent{ event, rect, size, pCell };
Pinch and spread gestures on Mac touchpad, if EVT_MAGNIFY is defined
2016-07-03 16:14:08 +00:00
#if defined(__WXMAC__) && defined(EVT_MAGNIFY)
// PRL:
// Pinch and spread implemented in wxWidgets 3.1.0, or cherry-picked from
// the future in custom build of 3.0.2
if (event.Magnify()) {
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
HandleWheelRotation( tpmEvent );
Pinch and spread gestures on Mac touchpad, if EVT_MAGNIFY is defined
2016-07-03 16:14:08 +00:00
}
#endif
Fix for bug 613: menu key deselects track. When the menu key is pressed, mouse events are also generated, and one of these was interpreted as a mouse click outside the tracks, which deselected the tracks. A possible fix would have been to make a change in TrackPanel::HandleTrackSpecificMouseEvent() so that only left clicks outside of tracks would deselect tracks. However, I decided that a better fix was to modify TrackPanel::OnMouseEvent to ignore the mouse events generated when the menu key is pressed. This should prevent these mouse events from causing bugs in any new code.
2017-03-20 13:23:59 +00:00
// If a mouse event originates from a keyboard context menu event then
// event.GetPosition() == wxDefaultPosition. wxContextMenu events are handled in
// TrackPanel::OnContextMenu(), and therefore associated mouse events are ignored here.
// Not ignoring them was causing bug 613: the mouse events were interpreted as clicking
// outside the tracks.
if (event.GetPosition() == wxDefaultPosition && (event.RightDown() || event.RightUp())) {
event.Skip();
return;
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
if (event.m_wheelRotation != 0)
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
HandleWheelRotation( tpmEvent );
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Control scrub with motion, click, drag, wheel almost anywhere in main window... ... if the event is not handled and skipped by sub-windows first, such as for toolbar button clicks. (But track panel clicks are skipped even after doing something, so they may also cause seeking besides other responses. So click can seek AND set cursor.) This is meant to make drag to seek and wheel for change of speed easier, without needing to keep the mouse in the narrow time ruler. Also lets you click in the ruler, then move in any direction, and not miss the motion event that should start the scrub playback. The event handling is a bit of a hack, using propagation. It does not use capture.
2016-04-22 00:59:38 +00:00
if (event.LeftDown() || event.LeftIsDown() || event.Moving()) {
// Skip, even if we do something, so that the left click or drag
// may have an additional effect in the scrubber.
event.Skip();
event.ResumePropagation(wxEVENT_PROPAGATE_MAX);
}
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
mMouseMostRecentX = event.m_x;
mMouseMostRecentY = event.m_y;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
if (event.LeftDown()) {
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
// The activate event is used to make the
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// parent window 'come alive' if it didn't have focus.
wxActivateEvent e;
Preliminary changes for wxWidgets 3.0.1 We can't go to 3.0.1 yet as there are still build issues on Linux and OSX. You can get Windows to build, but there's still some display issues. These changes should work with wxWidgets 2.8.12 as well, so we can take our time to get things working properly before switching over.
2014-10-06 08:10:50 +00:00
GetParent()->GetEventHandler()->ProcessEvent(e);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// wxTimers seem to be a little unreliable, so this
// "primes" it to make sure it keeps going for a while...
// When this timer fires, we call TrackPanel::OnTimer and
// possibly update the screen for offscreen scrolling.
mTimer.Stop();
mTimer.Start(kTimerInterval, FALSE);
}
if (event.ButtonDown()) {
SetFocus();
}
Bug1325: A better fix that avoids platform dependent code and still ... ... distinguishes button state as we wanted to.
2016-05-03 18:46:24 +00:00
if (event.Leaving())
Fix for bug #756 The problem was that the mouse capture was not being reset when the pointer left the track panel. In that case, as long as no buttons are down, the capture state needs to be reset so that when the mouse re-enters the track panel it figures out what is going on from a clean slate.
2014-12-06 10:15:18 +00:00
{
Bug1325: A better fix that avoids platform dependent code and still ... ... distinguishes button state as we wanted to.
2016-05-03 18:46:24 +00:00
auto buttons =
// Bug 1325: button state in Leaving events is unreliable on Mac.
// Poll the global state instead.
// event.ButtonIsDown(wxMOUSE_BTN_ANY);
::wxGetMouseState().ButtonIsDown(wxMOUSE_BTN_ANY);
Bug1325: Drag-scrolling now works again on Mac. ... ... The explanation was not, as I had thought, that mouse capture is simply broken in wxWidgets 3.0.2 for Mac. Instead, it now appears that Leaving mouse events always falsely report no buttons are down, which confused our code.
2016-05-03 18:18:00 +00:00
Bug1325: A better fix that avoids platform dependent code and still ... ... distinguishes button state as we wanted to.
2016-05-03 18:46:24 +00:00
if(!buttons) {
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
HandleEscapeKey( true );
Bug1325: Drag-scrolling now works again on Mac. ... ... The explanation was not, as I had thought, that mouse capture is simply broken in wxWidgets 3.0.2 for Mac. Instead, it now appears that Leaving mouse events always falsely report no buttons are down, which confused our code.
2016-05-03 18:18:00 +00:00
Bug1325: A better fix that avoids platform dependent code and still ... ... distinguishes button state as we wanted to.
2016-05-03 18:46:24 +00:00
#if defined(__WXMAC__)
Bug1325: Drag-scrolling now works again on Mac. ... ... The explanation was not, as I had thought, that mouse capture is simply broken in wxWidgets 3.0.2 for Mac. Instead, it now appears that Leaving mouse events always falsely report no buttons are down, which confused our code.
2016-05-03 18:18:00 +00:00
Bug1325: A better fix that avoids platform dependent code and still ... ... distinguishes button state as we wanted to.
2016-05-03 18:46:24 +00:00
// We must install the cursor ourselves since the window under
// the mouse is no longer this one and wx2.8.12 makes that check.
// Should re-evaluate with wx3.
wxSTANDARD_CURSOR->MacInstall();
Fix for unwanted cursor persistence outside of project window This seems to only happen on the Mac and has to do with how wx2.8.12 handles cursor setting.
2014-12-12 21:56:49 +00:00
#endif
Bug1325: A better fix that avoids platform dependent code and still ... ... distinguishes button state as we wanted to.
2016-05-03 18:46:24 +00:00
}
Fix for bug #756 The problem was that the mouse capture was not being reset when the pointer left the track panel. In that case, as long as no buttons are down, the capture state needs to be reset so that when the mouse re-enters the track panel it figures out what is going on from a clean slate.
2014-12-06 10:15:18 +00:00
}
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
if (mUIHandle) {
if (event.Dragging()) {
// UIHANDLE DRAG
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
const UIHandle::Result refreshResult =
mUIHandle->Drag( tpmEvent, GetProject() );
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
ProcessUIHandleResult(this, mRuler, mpClickedTrack, pTrack, refreshResult);
if (refreshResult & RefreshCode::Cancelled) {
// Drag decided to abort itself
mUIHandle = NULL;
mpClickedTrack = NULL;
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
Uncapture( &event );
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
}
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
else
HandleCursor( tpmEvent );
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
}
else if (event.ButtonUp()) {
// UIHANDLE RELEASE
Fix crashes in TCP popup menu items on Windows
2017-06-17 23:53:56 +00:00
auto uiHandle = mUIHandle;
// Null this pointer out first before calling Release -- because on Windows, we can
// come back recursively to this place during handling of the context menu,
// because of a capture lost event.
mUIHandle = nullptr;
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
UIHandle::Result refreshResult =
Fix crashes in TCP popup menu items on Windows
2017-06-17 23:53:56 +00:00
uiHandle->Release( tpmEvent, GetProject(), this );
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
ProcessUIHandleResult(this, mRuler, mpClickedTrack, pTrack, refreshResult);
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
mpClickedTrack = NULL;
// will also Uncapture() below
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
}
}
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
else if ( event.GetEventType() == wxEVT_MOTION )
// Update status message and cursor, not during drag
comment
2017-06-17 15:45:42 +00:00
// consider it not a drag, even if button is down during motion, if
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
// mUIHandle is null, as it becomes during interrupted drag
// (e.g. by hitting space to play while dragging an envelope point)
HandleCursor( &event );
comment
2017-06-17 15:45:42 +00:00
else if ( event.ButtonDown() || event.ButtonDClick() )
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
HandleClick( tpmEvent );
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Capture mouse for button-down only after deciding on the drag mode.
2015-07-08 05:37:06 +00:00
if (event.ButtonDown() && IsMouseCaptured()) {
if (!HasCapture())
CaptureMouse();
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
//EnsureVisible should be called after the up-click.
if (event.ButtonUp()) {
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
Uncapture( &event );
Rename some variables
2015-08-03 17:49:53 +00:00
wxRect rect;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Rewrite TrackPanel::FindTrack as FindCell ... ... which reports disjoint rectangles for the track control panel, the vertical ruler, and the proper track area.
2017-01-10 20:53:19 +00:00
const auto foundCell = FindCell(event.m_x, event.m_y);
auto t = foundCell.pTrack;
Further regularize the odd case of hit-test on the resizer region
2017-06-16 20:49:49 +00:00
if ( t )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
EnsureVisible(t);
}
}
TrackPanel aborts any dragging action when an exception escapes
2016-12-18 20:57:03 +00:00
catch( ... )
{
// Abort any dragging, as if by hitting Esc
if ( HandleEscapeKey( true ) )
;
else {
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
Uncapture();
TrackPanel aborts any dragging action when an exception escapes
2016-12-18 20:57:03 +00:00
Refresh(false);
}
throw;
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
void TrackPanel::HandleClick( const TrackPanelMouseEvent &tpmEvent )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
const auto &event = tpmEvent.event;
auto pCell = tpmEvent.pCell;
const auto &rect = tpmEvent.rect;
auto pTrack = static_cast<CommonTrackPanelCell *>( pCell )->FindTrack();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
if ( !mUIHandle && pCell )
mUIHandle =
pCell->HitTest( tpmEvent, GetProject() ).handle;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
TrackPanel simplifications; improved cursor handling... ... in cases such as: dragging an envelope point, then hitting space to play, which forces the drag to finish early. If you move the mouse, cursor will remain "ban", even while the mouse button remains down but no drag is really happening.
2017-06-08 21:27:41 +00:00
if (mUIHandle) {
// UIHANDLE CLICK
UIHandle::Result refreshResult =
mUIHandle->Click( tpmEvent, GetProject() );
if (refreshResult & RefreshCode::Cancelled)
mUIHandle = NULL;
else
mpClickedTrack = pTrack;
ProcessUIHandleResult(this, mRuler, pTrack, pTrack, refreshResult);
HandleCursor( tpmEvent );
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Extensive changes to improve NoteTrack display and (some) editing, NoteTrack playback via MIDI, and Midi-to-Audio alignment.
2010-09-18 21:02:36 +00:00
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
double TrackPanel::GetMostRecentXPos()
{
Move PositionToTime, TimeToPosition into class ZoomInfo ... ... and use them in many more places in TrackPanel.cpp, so there are fewer direct uses of ZoomInfo::zoom. Also use then in horizontal scrolling code
2015-04-19 21:12:06 +00:00
return mViewInfo->PositionToTime(mMouseMostRecentX, GetLabelWidth());
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
void TrackPanel::RefreshTrack(Track *trk, bool refreshbacking)
{
Bug 406 (P2) - (partial?) Fix for labeltracks in large projects being slow/laggy/jerky. Undoes Roger's fixes for bug 255/148, as this was one component of the bug. This fix restores TrackPanel::RefreshTrack to using a cliprect instead of doing an entire refresh. It does it by using a repair flag in TrackPanel::DoDrawIndicator that does not advance the indicator time (so the only place the time can advance is in OnTimer) I tested to make sure both bugs were okay after my fix. This fix may restore usability enough to resolve the bug, but I note that there are other potential optimizations we can make, discussed on the bug 406 bugzilla comments.
2011-06-04 02:41:16 +00:00
Track *link = trk->GetLink();
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Bug 406 (P2) - (partial?) Fix for labeltracks in large projects being slow/laggy/jerky. Undoes Roger's fixes for bug 255/148, as this was one component of the bug. This fix restores TrackPanel::RefreshTrack to using a cliprect instead of doing an entire refresh. It does it by using a repair flag in TrackPanel::DoDrawIndicator that does not advance the indicator time (so the only place the time can advance is in OnTimer) I tested to make sure both bugs were okay after my fix. This fix may restore usability enough to resolve the bug, but I note that there are other potential optimizations we can make, discussed on the bug 406 bugzilla comments.
2011-06-04 02:41:16 +00:00
if (link && !trk->GetLinked()) {
trk = link;
link = trk->GetLink();
}
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Replace some unexplained magic numbers with constants, add comments... ... This commit changes no behavior, fixes no bugs
2015-08-21 00:57:24 +00:00
// subtract insets and shadows from the rectangle, but not border
// This matters because some separators do paint over the border
Rename some variables
2015-08-03 17:49:53 +00:00
wxRect rect(kLeftInset,
Bug 406 (P2) - (partial?) Fix for labeltracks in large projects being slow/laggy/jerky. Undoes Roger's fixes for bug 255/148, as this was one component of the bug. This fix restores TrackPanel::RefreshTrack to using a cliprect instead of doing an entire refresh. It does it by using a repair flag in TrackPanel::DoDrawIndicator that does not advance the indicator time (so the only place the time can advance is in OnTimer) I tested to make sure both bugs were okay after my fix. This fix may restore usability enough to resolve the bug, but I note that there are other potential optimizations we can make, discussed on the bug 406 bugzilla comments.
2011-06-04 02:41:16 +00:00
-mViewInfo->vpos + trk->GetY() + kTopInset,
Replace some unexplained magic numbers with constants, add comments... ... This commit changes no behavior, fixes no bugs
2015-08-21 00:57:24 +00:00
GetRect().GetWidth() - kLeftInset - kRightInset - kShadowThickness,
trk->GetHeight() - kTopInset - kShadowThickness);
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Bug 406 (P2) - (partial?) Fix for labeltracks in large projects being slow/laggy/jerky. Undoes Roger's fixes for bug 255/148, as this was one component of the bug. This fix restores TrackPanel::RefreshTrack to using a cliprect instead of doing an entire refresh. It does it by using a repair flag in TrackPanel::DoDrawIndicator that does not advance the indicator time (so the only place the time can advance is in OnTimer) I tested to make sure both bugs were okay after my fix. This fix may restore usability enough to resolve the bug, but I note that there are other potential optimizations we can make, discussed on the bug 406 bugzilla comments.
2011-06-04 02:41:16 +00:00
if (link) {
Rename some variables
2015-08-03 17:49:53 +00:00
rect.height += link->GetHeight();
Bug 406 (P2) - (partial?) Fix for labeltracks in large projects being slow/laggy/jerky. Undoes Roger's fixes for bug 255/148, as this was one component of the bug. This fix restores TrackPanel::RefreshTrack to using a cliprect instead of doing an entire refresh. It does it by using a repair flag in TrackPanel::DoDrawIndicator that does not advance the indicator time (so the only place the time can advance is in OnTimer) I tested to make sure both bugs were okay after my fix. This fix may restore usability enough to resolve the bug, but I note that there are other potential optimizations we can make, discussed on the bug 406 bugzilla comments.
2011-06-04 02:41:16 +00:00
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
else if(MONO_WAVE_PAN(trk)){
Rename some variables
2015-08-03 17:49:53 +00:00
rect.height += trk->GetHeight(true);
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
}
#endif
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
if( refreshbacking )
{
mRefreshBacking = true;
}
Rename some variables
2015-08-03 17:49:53 +00:00
Refresh( false, &rect );
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
/// This method overrides Refresh() of wxWindow so that the
Bug 406 (P2) - (partial?) Fix for labeltracks in large projects being slow/laggy/jerky. Undoes Roger's fixes for bug 255/148, as this was one component of the bug. This fix restores TrackPanel::RefreshTrack to using a cliprect instead of doing an entire refresh. It does it by using a repair flag in TrackPanel::DoDrawIndicator that does not advance the indicator time (so the only place the time can advance is in OnTimer) I tested to make sure both bugs were okay after my fix. This fix may restore usability enough to resolve the bug, but I note that there are other potential optimizations we can make, discussed on the bug 406 bugzilla comments.
2011-06-04 02:41:16 +00:00
/// boolean play indictaor can be set to false, so that an old play indicator that is
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
/// no longer there won't get XORed (to erase it), thus redrawing it on the
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
/// TrackPanel
void TrackPanel::Refresh(bool eraseBackground /* = TRUE */,
const wxRect *rect /* = NULL */)
{
// Tell OnPaint() to refresh the backing bitmap.
//
// Originally I had the check within the OnPaint() routine and it
// was working fine. That was until I found that, even though a full
// refresh was requested, Windows only set the onscreen portion of a
// window as damaged.
//
// So, if any part of the trackpanel was off the screen, full refreshes
// didn't work and the display got corrupted.
if( !rect || ( *rect == GetRect() ) )
{
mRefreshBacking = true;
}
wxWindow::Refresh(eraseBackground, rect);
DisplaySelection();
}
/// Draw the actual track areas. We only draw the borders
/// and the little buttons and menues and whatnot here, the
/// actual contents of each track are drawn by the TrackArtist.
void TrackPanel::DrawTracks(wxDC * dc)
{
wxRegion region = GetUpdateRegion();
some const
2017-06-04 15:52:56 +00:00
const wxRect clip = GetRect();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
wxRect panelRect = clip;
panelRect.y = -mViewInfo->vpos;
wxRect tracksRect = panelRect;
tracksRect.x += GetLabelWidth();
tracksRect.width -= GetLabelWidth();
ToolsToolBar *pTtb = mListener->TP_GetToolsToolBar();
bool bMultiToolDown = pTtb->IsDown(multiTool);
bool envelopeFlag = pTtb->IsDown(envelopeTool) || bMultiToolDown;
TrackArtist, LabelTrack, TimeTrack, Envelope functions take ZoomInfo... ... and SelectedRegion, and not ViewInfo or zoom level as a double. Also some leftOffset arguments. Assumptions of uniform zoom level persist in TrackArtist::DrawClipSpectrum and in TrackArtist::DrawClipWaveform but no longer in the rest.
2015-06-09 14:45:14 +00:00
bool bigPointsFlag = pTtb->IsDown(drawTool) || bMultiToolDown;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
bool sliderFlag = bMultiToolDown;
// The track artist actually draws the stuff inside each track
BHug1488: Don't crash exiting from command-line benchmark test... Problem was that cfd7648fce2388ec8ae35b38004f2ae111c484af fixed a memory leak but created a dangling pointer bug, which does not happen during usual run of Audacity because AudacityProject::OnCloseWindow is reached then before destroying AudacityProject. Fixed it by using a std::shared_pointer for the TrackList that both AudacityProject and TrackPanel must use.
2016-08-20 17:58:56 +00:00
mTrackArtist->DrawTracks(GetTracks(), GetProject()->GetFirstVisible(),
TrackArtist, LabelTrack, TimeTrack, Envelope functions take ZoomInfo... ... and SelectedRegion, and not ViewInfo or zoom level as a double. Also some leftOffset arguments. Assumptions of uniform zoom level persist in TrackArtist::DrawClipSpectrum and in TrackArtist::DrawClipWaveform but no longer in the rest.
2015-06-09 14:45:14 +00:00
*dc, region, tracksRect, clip,
mViewInfo->selectedRegion, *mViewInfo,
envelopeFlag, bigPointsFlag, sliderFlag);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Variable cleanup
2015-04-23 16:30:38 +00:00
DrawEverythingElse(dc, region, clip);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
/// Draws 'Everything else'. In particular it draws:
/// - Drop shadow for tracks and vertical rulers.
/// - Zooming Indicators.
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
/// - Fills in space below the tracks.
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
void TrackPanel::DrawEverythingElse(wxDC * dc,
Performance improvements
2015-04-23 14:07:25 +00:00
const wxRegion &region,
const wxRect & clip)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
// We draw everything else
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
wxRect focusRect(-1, -1, 0, 0);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
wxRect trackRect = clip;
trackRect.height = 0; // for drawing background in no tracks case.
VisibleTrackIterator iter(GetProject());
for (Track *t = iter.First(); t; t = iter.Next()) {
trackRect.y = t->GetY() - mViewInfo->vpos;
trackRect.height = t->GetHeight();
// If this track is linked to the next one, display a common
// border for both, otherwise draw a normal border
Rename some variables
2015-08-03 17:49:53 +00:00
wxRect rect = trackRect;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
bool skipBorder = false;
Track *l = t->GetLink();
if (t->GetLinked()) {
Rename some variables
2015-08-03 17:49:53 +00:00
rect.height += l->GetHeight();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
else if (l && trackRect.y >= 0) {
skipBorder = true;
}
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
if(MONO_WAVE_PAN(t)){
Rename some variables
2015-08-03 17:49:53 +00:00
rect.height += t->GetHeight(true);
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
}
#endif
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// If the previous track is linked to this one but isn't on the screen
// (and thus would have been skipped by VisibleTrackIterator) we need to
// draw that track's border instead.
Track *borderTrack = t;
Remove argument of DrawOutside that is no longer used... ... This only was a source of confusions.
2017-06-05 22:16:55 +00:00
wxRect borderRect = rect;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
if (l && !t->GetLinked() && trackRect.y < 0)
{
borderTrack = l;
Remove argument of DrawOutside that is no longer used... ... This only was a source of confusions.
2017-06-05 22:16:55 +00:00
borderRect = trackRect;
borderRect.y = l->GetY() - mViewInfo->vpos;
borderRect.height = l->GetHeight();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
borderRect.height += t->GetHeight();
}
if (!skipBorder) {
if (mAx->IsFocused(t)) {
focusRect = borderRect;
}
Remove argument of DrawOutside that is no longer used... ... This only was a source of confusions.
2017-06-05 22:16:55 +00:00
DrawOutside(borderTrack, dc, borderRect);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
// Believe it or not, we can speed up redrawing if we don't
// redraw the vertical ruler when only the waveform data has
// changed. An example is during recording.
#if DEBUG_DRAW_TIMING
// wxRect rbox = region.GetBox();
// wxPrintf(wxT("Update Region: %d %d %d %d\n"),
// rbox.x, rbox.y, rbox.width, rbox.height);
#endif
if (region.Contains(0, trackRect.y, GetLeftOffset(), trackRect.height)) {
Rename some variables
2015-08-03 17:49:53 +00:00
wxRect rect = trackRect;
rect.x += GetVRulerOffset();
Bug1156, fix inconsistencies in mapping pixel heights to track vertical scales
2015-08-21 15:04:30 +00:00
rect.y += kTopMargin;
Rename some variables
2015-08-03 17:49:53 +00:00
rect.width = GetVRulerWidth();
Bug1156, fix inconsistencies in mapping pixel heights to track vertical scales
2015-08-21 15:04:30 +00:00
rect.height -= (kTopMargin + kBottomMargin);
Rename some variables
2015-08-03 17:49:53 +00:00
mTrackArtist->DrawVRuler(t, dc, rect);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
if(MONO_WAVE_PAN(t)){
trackRect.y = t->GetY(true) - mViewInfo->vpos;
trackRect.height = t->GetHeight(true);
if (region.Contains(0, trackRect.y, GetLeftOffset(), trackRect.height)) {
Rename some variables
2015-08-03 17:49:53 +00:00
wxRect rect = trackRect;
rect.x += GetVRulerOffset();
Bug1156, fix inconsistencies in mapping pixel heights to track vertical scales
2015-08-21 15:04:30 +00:00
rect.y += kTopMargin;
Rename some variables
2015-08-03 17:49:53 +00:00
rect.width = GetVRulerWidth();
Bug1156, fix inconsistencies in mapping pixel heights to track vertical scales
2015-08-21 15:04:30 +00:00
rect.height -= (kTopMargin + kBottomMargin);
Rename some variables
2015-08-03 17:49:53 +00:00
mTrackArtist->DrawVRuler(t, dc, rect);
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
}
}
#endif
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
if (mUIHandle)
mUIHandle->DrawExtras(UIHandle::Cells, dc, region, clip);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// Paint over the part below the tracks
trackRect.y += trackRect.height;
if (trackRect.y < clip.GetBottom()) {
AColor::TrackPanelBackground(dc, false);
dc->DrawRectangle(trackRect.x,
trackRect.y,
trackRect.width,
clip.height - trackRect.y);
}
Apply modified version Roger Dannenberg's patch to remedy some problems from commit r10680 and fix some bugs.
2011-10-19 23:06:53 +00:00
// Sometimes highlight is not drawn on backing bitmap. I thought
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
// it was because FindFocus did not return "this" on Mac, but
Apply modified version Roger Dannenberg's patch to remedy some problems from commit r10680 and fix some bugs.
2011-10-19 23:06:53 +00:00
// when I removed that test, yielding this condition:
// if (GetFocusedTrack() != NULL) {
// the highlight was reportedly drawn even when something else
// was the focus and no highlight should be drawn. -RBD
if (GetFocusedTrack() != NULL && wxWindow::FindFocus() == this) {
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
HighlightFocusedTrack(dc, focusRect);
}
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
if (mUIHandle)
mUIHandle->DrawExtras(UIHandle::Panel, dc, region, clip);
Draw scrub speed like cursor or indicator: without a full refresh.
2015-08-13 23:49:09 +00:00
}
Add user interface for scrubbing and Experimental.h switches EXPERIMENTAL_SCRUBBING_BASIC enables middle-click-drag to scrub, or to seek when shift is down. EXPERIMENTAL_SCRUBBING_SMOOTH_SCROLL adds middle-double-click-drag to scrub or (with SHIFT down) to seek while keeping the playhead at the midline of the track display. EXPERIMENTAL_SCRUBBING_SCROLL_WHEEL allows control wheel to vary the speed limit, while scrubbing (not seeking). All three are enabled in this commit. Also notice the changes to status bar messages and the Mouse Preferences dialog. Scrubbing works only in Select and Multi tools.
2015-04-17 18:09:35 +00:00
Temporary hack lets us defer encapsulation of track control panel drawing... ... while we can work on encapsulating the click-drag actions.
2015-07-14 17:17:08 +00:00
// Make this #include go away!
#include "tracks/ui/TrackControls.h"
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
void TrackInfo::DrawItems
( wxDC *dc, const wxRect &rect, const Track &track,
int mouseCapture, bool captured )
{
const auto topLines = getTCPLines( track );
const auto bottomLines = commonTrackTCPBottomLines;
DrawItems
( dc, rect, &track, topLines, bottomLines, mouseCapture, captured );
}
void TrackInfo::DrawItems
( wxDC *dc, const wxRect &rect, const Track *pTrack,
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
const std::vector<TCPLine> &topLines, const std::vector<TCPLine> &bottomLines,
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
int mouseCapture, bool captured )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
TrackInfo::SetTrackInfoFont(dc);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
dc->SetTextForeground(theTheme.Colour(clrTrackPanelText));
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
{
int yy = 0;
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
for ( const auto &line : topLines ) {
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
wxRect itemRect{
rect.x, rect.y + yy,
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
rect.width, line.height
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
};
if ( !TrackInfo::HideTopItem( rect, itemRect ) &&
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
line.drawFunction )
line.drawFunction( dc, itemRect, pTrack, mouseCapture, captured );
yy += line.height + line.extraSpace;
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
}
}
{
int yy = rect.height;
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
for ( const auto &line : bottomLines ) {
yy -= line.height + line.extraSpace;
if ( line.drawFunction ) {
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
wxRect itemRect{
rect.x, rect.y + yy,
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
rect.width, line.height
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
};
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
line.drawFunction( dc, itemRect, pTrack, mouseCapture, captured );
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
}
}
}
}
Table includes draw function for Close and Title
2017-06-12 17:23:00 +00:00
void TrackInfo::CloseTitleDrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int pressed, bool captured )
{
bool selected = pTrack ? pTrack->GetSelected() : true;
{
bool down = captured && (pressed == TrackPanel::IsClosing);
wxRect bev = rect;
GetCloseBoxHorizontalBounds( rect, bev );
AColor::Bevel2(*dc, !down, bev, selected );
#ifdef EXPERIMENTAL_THEMING
wxPen pen( theTheme.Colour( clrTrackPanelText ));
dc->SetPen( pen );
#else
dc->SetPen(*wxBLACK_PEN);
#endif
bev.Inflate( -1, -1 );
// Draw the "X"
const int s = 6;
int ls = bev.x + ((bev.width - s) / 2);
int ts = bev.y + ((bev.height - s) / 2);
int rs = ls + s;
int bs = ts + s;
AColor::Line(*dc, ls, ts, rs, bs);
AColor::Line(*dc, ls + 1, ts, rs + 1, bs);
AColor::Line(*dc, rs, ts, ls, bs);
AColor::Line(*dc, rs + 1, ts, ls + 1, bs);
// bev.Inflate(-1, -1);
}
{
wxString titleStr =
pTrack ? pTrack->GetName() : _("Name");
bool down = captured && (pressed == TrackPanel::IsPopping);
wxRect bev = rect;
GetTitleBarHorizontalBounds( rect, bev );
//bev.Inflate(-1, -1);
AColor::Bevel2(*dc, !down, bev, selected);
// Draw title text
SetTrackInfoFont(dc);
Bug 1660 - (Windows) Default track name appears as "Audio Trac ".
2017-06-18 11:42:12 +00:00
// Bug 1660 The 'k' of 'Audio Track' was being truncated.
// Constant of 32 found by counting pixels on a windows machine.
// I believe it's the size of the X close button + the size of the
// drop down arrow.
int allowableWidth = rect.width - 32;
Table includes draw function for Close and Title
2017-06-12 17:23:00 +00:00
wxCoord textWidth, textHeight;
dc->GetTextExtent(titleStr, &textWidth, &textHeight);
while (textWidth > allowableWidth) {
titleStr = titleStr.Left(titleStr.Length() - 1);
dc->GetTextExtent(titleStr, &textWidth, &textHeight);
}
// Pop-up triangle
#ifdef EXPERIMENTAL_THEMING
wxColour c = theTheme.Colour( clrTrackPanelText );
#else
wxColour c = *wxBLACK;
#endif
// wxGTK leaves little scraps (antialiasing?) of the
// characters if they are repeatedly drawn. This
// happens when holding down mouse button and moving
// in and out of the title bar. So clear it first.
// AColor::MediumTrackInfo(dc, t->GetSelected());
// dc->DrawRectangle(bev);
dc->SetTextForeground( c );
dc->SetTextBackground( wxTRANSPARENT );
dc->DrawText(titleStr, bev.x + 2, bev.y + (bev.height - textHeight) / 2);
dc->SetPen(c);
dc->SetBrush(c);
int s = 10; // Width of dropdown arrow...height is half of width
AColor::Arrow(*dc,
bev.GetRight() - s - 3, // 3 to offset from right border
bev.y + ((bev.height - (s / 2)) / 2),
s);
}
}
Table includes draw function for Minimize and Sync-lock icon
2017-06-12 19:17:26 +00:00
void TrackInfo::MinimizeSyncLockDrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int pressed, bool captured )
{
bool selected = pTrack ? pTrack->GetSelected() : true;
bool syncLockSelected = pTrack ? pTrack->IsSyncLockSelected() : true;
bool minimized = pTrack ? pTrack->GetMinimized() : false;
{
bool down = captured && (pressed == TrackPanel::IsMinimizing);
wxRect bev = rect;
GetMinimizeHorizontalBounds(rect, bev);
// Clear background to get rid of previous arrow
//AColor::MediumTrackInfo(dc, t->GetSelected());
//dc->DrawRectangle(bev);
AColor::Bevel2(*dc, !down, bev, selected);
#ifdef EXPERIMENTAL_THEMING
wxColour c = theTheme.Colour(clrTrackPanelText);
dc->SetBrush(c);
dc->SetPen(c);
#else
AColor::Dark(dc, selected);
#endif
AColor::Arrow(*dc,
bev.x - 5 + bev.width / 2,
bev.y - 2 + bev.height / 2,
10,
minimized);
}
// Draw the sync-lock indicator if this track is in a sync-lock selected group.
if (syncLockSelected)
{
wxRect syncLockIconRect = rect;
GetSyncLockHorizontalBounds( rect, syncLockIconRect );
wxBitmap syncLockBitmap(theTheme.Image(bmpSyncLockIcon));
// Icon is 12x12 and syncLockIconRect is 16x16.
dc->DrawBitmap(syncLockBitmap,
syncLockIconRect.x + 3,
syncLockIconRect.y + 2,
true);
}
}
Table includes draw function for Midi controls
2017-06-12 19:51:06 +00:00
void TrackInfo::MidiControlsDrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int, bool )
{
#ifdef EXPERIMENTAL_MIDI_OUT
wxRect midiRect = rect;
GetMidiControlsHorizontalBounds(rect, midiRect);
NoteTrack::DrawLabelControls
( static_cast<const NoteTrack *>(pTrack), *dc, midiRect );
#endif // EXPERIMENTAL_MIDI_OUT
}
Table includes draw functions for sliders
2017-06-12 20:10:03 +00:00
template<typename TrackClass>
void TrackInfo::SliderDrawFunction
( LWSlider *(*Selector)
(const wxRect &sliderRect, const TrackClass *t, bool captured, wxWindow*),
wxDC *dc, const wxRect &rect, const Track *pTrack, bool captured )
{
wxRect sliderRect = rect;
TrackInfo::GetSliderHorizontalBounds( rect.GetTopLeft(), sliderRect );
auto wt = static_cast<const TrackClass*>( pTrack );
Selector( sliderRect, wt, captured, nullptr )->OnPaint(*dc);
}
void TrackInfo::PanSliderDrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int, bool captured )
{
SliderDrawFunction<WaveTrack>
( &TrackInfo::PanSlider, dc, rect, pTrack, captured);
}
void TrackInfo::GainSliderDrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int, bool captured )
{
SliderDrawFunction<WaveTrack>
( &TrackInfo::GainSlider, dc, rect, pTrack, captured);
}
#ifdef EXPERIMENTAL_MIDI_OUT
void TrackInfo::VelocitySliderDrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int, bool captured )
{
SliderDrawFunction<NoteTrack>
( &TrackInfo::VelocitySlider, dc, rect, pTrack, captured);
}
#endif
Table includes draw functions for Mute and Solo
2017-06-13 12:02:44 +00:00
void TrackInfo::MuteOrSoloDrawFunction
( wxDC *dc, const wxRect &bev, const Track *pTrack, int pressed, bool captured,
bool solo )
{
bool down = captured &&
(pressed == ( solo ? TrackPanel::IsSoloing : TrackPanel::IsMuting ));
//bev.Inflate(-1, -1);
bool selected = pTrack ? pTrack->GetSelected() : true;
auto pt = dynamic_cast<const PlayableTrack *>(pTrack);
bool value = pt ? (solo ? pt->GetSolo() : pt->GetMute()) : false;
#if 0
AColor::MediumTrackInfo( dc, t->GetSelected());
if( solo )
{
if( pt && pt->GetSolo() )
{
AColor::Solo(dc, pt->GetSolo(), t->GetSelected());
}
}
else
{
if( pt && pt->GetMute() )
{
AColor::Mute(dc, pt->GetMute(), t->GetSelected(), pt->GetSolo());
}
}
//(solo) ? AColor::Solo(dc, t->GetSolo(), t->GetSelected()) :
// AColor::Mute(dc, t->GetMute(), t->GetSelected(), t->GetSolo());
dc->SetPen( *wxTRANSPARENT_PEN );//No border!
dc->DrawRectangle(bev);
#endif
wxCoord textWidth, textHeight;
wxString str = (solo) ?
/* i18n-hint: This is on a button that will silence all the other tracks.*/
_("Solo") :
/* i18n-hint: This is on a button that will silence this track.*/
_("Mute");
AColor::Bevel2(
*dc,
value == down,
bev,
selected
);
SetTrackInfoFont(dc);
dc->GetTextExtent(str, &textWidth, &textHeight);
dc->DrawText(str, bev.x + (bev.width - textWidth) / 2, bev.y + (bev.height - textHeight) / 2);
}
void TrackInfo::WideMuteDrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int pressed, bool captured )
{
wxRect bev = rect;
GetWideMuteSoloHorizontalBounds( rect, bev );
MuteOrSoloDrawFunction( dc, bev, pTrack, pressed, captured, false );
}
void TrackInfo::WideSoloDrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int pressed, bool captured )
{
wxRect bev = rect;
GetWideMuteSoloHorizontalBounds( rect, bev );
MuteOrSoloDrawFunction( dc, bev, pTrack, pressed, captured, true );
}
void TrackInfo::MuteAndSoloDrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int pressed, bool captured )
{
bool bHasSoloButton = TrackPanel::HasSoloButton();
wxRect bev = rect;
if ( bHasSoloButton )
GetNarrowMuteHorizontalBounds( rect, bev );
else
GetWideMuteSoloHorizontalBounds( rect, bev );
MuteOrSoloDrawFunction( dc, bev, pTrack, pressed, captured, false );
if( !bHasSoloButton )
return;
GetNarrowSoloHorizontalBounds( rect, bev );
MuteOrSoloDrawFunction( dc, bev, pTrack, pressed, captured, true );
}
Table includes draw functions for status items
2017-06-13 13:14:58 +00:00
void TrackInfo::StatusDrawFunction
( const wxString &string, wxDC *dc, const wxRect &rect )
{
static const int offset = 3;
dc->DrawText(string, rect.x + offset, rect.y);
}
void TrackInfo::Status1DrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int, bool )
{
auto wt = static_cast<const WaveTrack*>(pTrack);
/// Returns the string to be displayed in the track label
/// indicating whether the track is mono, left, right, or
/// stereo and what sample rate it's using.
auto rate = wt ? wt->GetRate() : 44100.0;
wxString s = wxString::Format(wxT("%dHz"), (int) (rate + 0.5));
if (!wt || (wt->GetLinked()
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
&& wt->GetChannel() != Track::MonoChannel
#endif
))
s = _("Stereo, ") + s;
else {
if (wt->GetChannel() == Track::MonoChannel)
s = _("Mono, ") + s;
else if (wt->GetChannel() == Track::LeftChannel)
s = _("Left, ") + s;
else if (wt->GetChannel() == Track::RightChannel)
s = _("Right, ") + s;
}
StatusDrawFunction( s, dc, rect );
}
void TrackInfo::Status2DrawFunction
( wxDC *dc, const wxRect &rect, const Track *pTrack, int, bool )
{
auto wt = static_cast<const WaveTrack*>(pTrack);
auto format = wt ? wt->GetSampleFormat() : floatSample;
auto s = GetSampleFormatStr(format);
StatusDrawFunction( s, dc, rect );
}
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
void TrackPanel::DrawOutside(Track * t, wxDC * dc, const wxRect & rec)
{
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
bool bIsWave = (t->GetKind() == Track::Wave);
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// Draw things that extend right of track control panel
{
// Start with whole track rect
wxRect rect = rec;
DrawOutsideOfTrack(t, dc, rect);
// Now exclude left, right, and top insets
rect.x += kLeftInset;
rect.y += kTopInset;
rect.width -= kLeftInset * 2;
rect.height -= kTopInset;
int labelw = GetLabelWidth();
int vrul = GetVRulerOffset();
mTrackInfo.DrawBackground(dc, rect, t->GetSelected(), bIsWave, labelw, vrul);
// Vaughan, 2010-08-24: No longer doing this.
// Draw sync-lock tiles in ruler area.
//if (t->IsSyncLockSelected()) {
// wxRect tileFill = rect;
// tileFill.x = GetVRulerOffset();
// tileFill.width = GetVRulerWidth();
// TrackArtist::DrawSyncLockTiles(dc, tileFill);
//}
DrawBordersAroundTrack(t, dc, rect, labelw, vrul);
DrawShadow(t, dc, rect);
}
// Draw things within the track control panel
wxRect rect = rec;
Exclude left, top, bottom margins from rectangles describing TCP
2017-06-06 15:43:58 +00:00
rect.x += kLeftMargin;
Rewrite drawing routines equivalently without kTrackInfoWidth... ... using rect.width instead; and making no changes in appearance. Some routines, like that for the sync lock icon, are pleasingly simplified. But see comments about some questionable things that may have been based on the misunderstanding that kTrackInfoWidth was the width between bounding lines, when in fact, that width was 5 less.
2017-06-06 18:18:27 +00:00
rect.width = kTrackInfoWidth - kLeftMargin;
Exclude left, top, bottom margins from rectangles describing TCP
2017-06-06 15:43:58 +00:00
rect.y += kTopMargin;
rect.height -= (kBottomMargin + kTopMargin);
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
Temporary hack lets us defer encapsulation of track control panel drawing... ... while we can work on encapsulating the click-drag actions.
2015-07-14 17:17:08 +00:00
// Need to know which button, if any, to draw as pressed.
const MouseCaptureEnum mouseCapture =
// This public global variable is a hack for now, which should go away
// when TrackPanelCell gets a virtual function into which we move this
// drawing code.
TrackPanel no longer implements the selection tool or MIDI stretch... This one's big! Also restores the effect of ctrl-click on label track. Also adds ESC key handling for the Stretch.
2015-09-09 01:15:35 +00:00
MouseCaptureEnum(TrackControls::gCaptureState);
const bool captured = (t == mpClickedTrack);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Temporary hack lets us defer encapsulation of track control panel drawing... ... while we can work on encapsulating the click-drag actions.
2015-07-14 17:17:08 +00:00
TrackInfo::DrawItems( dc, rect, *t, mouseCapture, captured );
Add a slot for drawing functions to the TCP lines table
2017-06-12 16:28:20 +00:00
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
//mTrackInfo.DrawBordersWithin( dc, rect, *t );
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// Given rectangle should be the whole track rectangle
// Paint the inset areas left, top, and right in a background color
// If linked to a following channel, also paint the separator area, which
// overlaps the next track rectangle's top
Rename some variables
2015-08-03 17:49:53 +00:00
void TrackPanel::DrawOutsideOfTrack(Track * t, wxDC * dc, const wxRect & rect)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
// Fill in area outside of the track
AColor::TrackPanelBackground(dc, false);
wxRect side;
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// Area between panel border and left track border
Rename some variables
2015-08-03 17:49:53 +00:00
side = rect;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
side.width = kLeftInset;
dc->DrawRectangle(side);
// Area between panel border and top track border
Rename some variables
2015-08-03 17:49:53 +00:00
side = rect;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
side.height = kTopInset;
dc->DrawRectangle(side);
// Area between panel border and right track border
Rename some variables
2015-08-03 17:49:53 +00:00
side = rect;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
side.x += side.width - kTopInset;
side.width = kTopInset;
dc->DrawRectangle(side);
// Area between tracks of stereo group
Remove some duplication, fix EXPERIMENTAL_OUTPUT_DISPLAY and Esc key
2017-01-11 19:20:24 +00:00
if (t->GetLinked()
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
Remove some duplication, fix EXPERIMENTAL_OUTPUT_DISPLAY and Esc key
2017-01-11 19:20:24 +00:00
|| MONO_WAVE_PAN(t)
#endif
) {
Replace some unexplained magic numbers with constants, add comments... ... This commit changes no behavior, fixes no bugs
2015-08-21 00:57:24 +00:00
// Paint the channel separator over (what would be) the shadow of the top
// channel, and the top inset of the bottom channel
Rename some variables
2015-08-03 17:49:53 +00:00
side = rect;
Replace some unexplained magic numbers with constants, add comments... ... This commit changes no behavior, fixes no bugs
2015-08-21 00:57:24 +00:00
side.y += t->GetHeight() - kShadowThickness;
side.height = kTopInset + kShadowThickness;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
dc->DrawRectangle(side);
}
}
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
void TrackPanel::SetBackgroundCell
(const std::shared_ptr< TrackPanelCell > &pCell)
{
mpBackground = pCell;
}
TrackPanelCellIterator visits all cells, and FindCell simply uses it
2017-06-17 05:26:36 +00:00
std::shared_ptr< TrackPanelCell > TrackPanel::GetBackgroundCell()
{
return mpBackground;
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
/// Draw a three-level highlight gradient around the focused track.
Rename some variables
2015-08-03 17:49:53 +00:00
void TrackPanel::HighlightFocusedTrack(wxDC * dc, const wxRect & rect)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Rename some variables
2015-08-03 17:49:53 +00:00
wxRect theRect = rect;
theRect.x += kLeftInset;
theRect.y += kTopInset;
theRect.width -= kLeftInset * 2;
theRect.height -= kTopInset;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
dc->SetBrush(*wxTRANSPARENT_BRUSH);
AColor::TrackFocusPen(dc, 0);
Rename some variables
2015-08-03 17:49:53 +00:00
dc->DrawRectangle(theRect.x - 1, theRect.y - 1, theRect.width + 2, theRect.height + 2);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
AColor::TrackFocusPen(dc, 1);
Rename some variables
2015-08-03 17:49:53 +00:00
dc->DrawRectangle(theRect.x - 2, theRect.y - 2, theRect.width + 4, theRect.height + 4);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
AColor::TrackFocusPen(dc, 2);
Rename some variables
2015-08-03 17:49:53 +00:00
dc->DrawRectangle(theRect.x - 3, theRect.y - 3, theRect.width + 6, theRect.height + 6);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
void TrackPanel::UpdateVRulers()
{
BHug1488: Don't crash exiting from command-line benchmark test... Problem was that cfd7648fce2388ec8ae35b38004f2ae111c484af fixed a memory leak but created a dangling pointer bug, which does not happen during usual run of Audacity because AudacityProject::OnCloseWindow is reached then before destroying AudacityProject. Fixed it by using a std::shared_pointer for the TrackList that both AudacityProject and TrackPanel must use.
2016-08-20 17:58:56 +00:00
TrackListOfKindIterator iter(Track::Wave, GetTracks());
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
for (Track *t = iter.First(); t; t = iter.Next()) {
UpdateTrackVRuler(t);
}
UpdateVRulerSize();
}
void TrackPanel::UpdateVRuler(Track *t)
{
Clarify what the TrackList events are for... Also fixes this bug: Vertical rulers did not narrow as needed after deletion of the lowest track.
2017-06-25 05:33:31 +00:00
if (t)
UpdateTrackVRuler(t);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
UpdateVRulerSize();
}
More const and override
2017-02-22 19:23:35 +00:00
void TrackPanel::UpdateTrackVRuler(const Track *t)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Add an assert for possible null pointer dereference detected by cppcheck.
2011-11-10 20:17:44 +00:00
wxASSERT(t);
Fix further possible, and comment on definite null pointer derefs per cppcheck.
2011-11-20 07:09:46 +00:00
if (!t)
return;
Rename some variables
2015-08-03 17:49:53 +00:00
wxRect rect(GetVRulerOffset(),
Bug1156, fix inconsistencies in mapping pixel heights to track vertical scales
2015-08-21 15:04:30 +00:00
kTopMargin,
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
GetVRulerWidth(),
Bug1156, fix inconsistencies in mapping pixel heights to track vertical scales
2015-08-21 15:04:30 +00:00
t->GetHeight() - (kTopMargin + kBottomMargin));
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Rename some variables
2015-08-03 17:49:53 +00:00
mTrackArtist->UpdateVRuler(t, rect);
More const and override
2017-02-22 19:23:35 +00:00
const Track *l = t->GetLink();
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
if (l)
Fix further possible, and comment on definite null pointer derefs per cppcheck.
2011-11-20 07:09:46 +00:00
{
Bug1156, fix inconsistencies in mapping pixel heights to track vertical scales
2015-08-21 15:04:30 +00:00
rect.height = l->GetHeight() - (kTopMargin + kBottomMargin);
Rename some variables
2015-08-03 17:49:53 +00:00
mTrackArtist->UpdateVRuler(l, rect);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
else if(MONO_WAVE_PAN(t)){
Bug1156, fix inconsistencies in mapping pixel heights to track vertical scales
2015-08-21 15:04:30 +00:00
rect.height = t->GetHeight(true) - (kTopMargin + kBottomMargin);
Rename some variables
2015-08-03 17:49:53 +00:00
mTrackArtist->UpdateVRuler(t, rect);
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
}
#endif
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
void TrackPanel::UpdateVRulerSize()
{
BHug1488: Don't crash exiting from command-line benchmark test... Problem was that cfd7648fce2388ec8ae35b38004f2ae111c484af fixed a memory leak but created a dangling pointer bug, which does not happen during usual run of Audacity because AudacityProject::OnCloseWindow is reached then before destroying AudacityProject. Fixed it by using a std::shared_pointer for the TrackList that both AudacityProject and TrackPanel must use.
2016-08-20 17:58:56 +00:00
TrackListIterator iter(GetTracks());
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Track *t = iter.First();
if (t) {
wxSize s = t->vrulerSize;
while (t) {
s.IncTo(t->vrulerSize);
t = iter.Next();
}
Revert "Avoid wasteful Refresh() in stereo track spectrogram view. Was believed to cause other problems, namely with ruler not lining up with selection.
2016-09-19 18:41:49 +00:00
if (vrulerSize != s) {
vrulerSize = s;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
mRuler->SetLeftOffset(GetLeftOffset()); // bevel on AdornedRuler
mRuler->Refresh();
}
}
Refresh(false);
}
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
// Make sure selection edge is in view
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
void TrackPanel::ScrollIntoView(double pos)
{
Allow NULL arguments in TrackPanel::GetTracksUsableArea()
2015-08-21 16:02:48 +00:00
int w;
GetTracksUsableArea( &w, NULL );
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Add and use some ZoomInfo and ViewInfo member functions, so we can eliminate... ... miscellaneous direct uses of ZoomInfo::zoom to test and set zoom level. This includes all the remaining assignments to it. But moving TrackInfo::PositionToTime and TrackInfo::TimeToPosition into ZoomInfo and using them is needed to eliminate many more uses. Also #if'd out the unused AudacityProject::OnZoomToggle().
2015-04-19 23:26:36 +00:00
int pixel = mViewInfo->TimeToPosition(pos);
ViewInfo does not redundantly (or inconsistently!) store the screen width
2015-08-21 17:22:44 +00:00
if (pixel < 0 || pixel >= w)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Move PositionToTime, TimeToPosition into class ZoomInfo ... ... and use them in many more places in TrackPanel.cpp, so there are fewer direct uses of ZoomInfo::zoom. Also use then in horizontal scrolling code
2015-04-19 21:12:06 +00:00
mListener->TP_ScrollWindow
(mViewInfo->OffsetTimeByPixels(pos, -(w / 2)));
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Refresh(false);
}
}
void TrackPanel::ScrollIntoView(int x)
{
Move PositionToTime, TimeToPosition into class ZoomInfo ... ... and use them in many more places in TrackPanel.cpp, so there are fewer direct uses of ZoomInfo::zoom. Also use then in horizontal scrolling code
2015-04-19 21:12:06 +00:00
ScrollIntoView(mViewInfo->PositionToTime(x, GetLeftOffset()));
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
void TrackPanel::OnTrackMenu(Track *t)
{
if(!t) {
t = GetFocusedTrack();
Move code for handling the menu button out of TrackPanel, but... ... Still to do, move out the code for menu items. They remain accessible from Shift-M but not from the menu button. And ESC key is now implemented.
2015-07-30 18:57:13 +00:00
if(!t)
return;
}
Clean up last bits of old popup menu code
2017-06-10 21:02:01 +00:00
TrackPanelCell *const pCell = t->GetTrackControl();
const wxRect rect(FindTrackRect(t, true));
const UIHandle::Result refreshResult =
pCell->DoContextMenu(rect, this, NULL);
ProcessUIHandleResult(this, mRuler, t, t, refreshResult);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Track * TrackPanel::GetFirstSelectedTrack()
{
BHug1488: Don't crash exiting from command-line benchmark test... Problem was that cfd7648fce2388ec8ae35b38004f2ae111c484af fixed a memory leak but created a dangling pointer bug, which does not happen during usual run of Audacity because AudacityProject::OnCloseWindow is reached then before destroying AudacityProject. Fixed it by using a std::shared_pointer for the TrackList that both AudacityProject and TrackPanel must use.
2016-08-20 17:58:56 +00:00
TrackListIterator iter(GetTracks());
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Track * t;
for ( t = iter.First();t!=NULL;t=iter.Next())
{
//Find the first selected track
if(t->GetSelected())
{
return t;
}
}
//if nothing is selected, return the first track
t = iter.First();
if(t)
return t;
else
return NULL;
}
void TrackPanel::EnsureVisible(Track * t)
{
BHug1488: Don't crash exiting from command-line benchmark test... Problem was that cfd7648fce2388ec8ae35b38004f2ae111c484af fixed a memory leak but created a dangling pointer bug, which does not happen during usual run of Audacity because AudacityProject::OnCloseWindow is reached then before destroying AudacityProject. Fixed it by using a std::shared_pointer for the TrackList that both AudacityProject and TrackPanel must use.
2016-08-20 17:58:56 +00:00
TrackListIterator iter(GetTracks());
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Track *it = NULL;
Track *nt = NULL;
SetFocusedTrack(t);
int trackTop = 0;
int trackHeight =0;
for (it = iter.First(); it; it = iter.Next()) {
trackTop += trackHeight;
trackHeight = it->GetHeight();
//find the second track if this is stereo
if (it->GetLinked()) {
nt = iter.Next();
trackHeight += nt->GetHeight();
}
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
else if(MONO_WAVE_PAN(it)){
trackHeight += it->GetHeight(true);
}
#endif
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
else {
nt = it;
}
//We have found the track we want to ensure is visible.
if ((it == t) || (nt == t)) {
more whitespace cleanup, and make blank lines not have spaces on them, patch by Steve the Fiddle
2013-10-29 21:49:45 +00:00
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
//Get the size of the trackpanel.
int width, height;
GetSize(&width, &height);
if (trackTop < mViewInfo->vpos) {
height = mViewInfo->vpos - trackTop + mViewInfo->scrollStep;
height /= mViewInfo->scrollStep;
mListener->TP_ScrollUpDown(-height);
}
else if (trackTop + trackHeight > mViewInfo->vpos + height) {
height = (trackTop + trackHeight) - (mViewInfo->vpos + height);
height = (height + mViewInfo->scrollStep + 1) / mViewInfo->scrollStep;
mListener->TP_ScrollUpDown(height);
}
break;
}
}
Refresh(false);
}
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// Given rectangle excludes the insets left, right, and top
// Draw a rectangular border and also a vertical separator of track controls
// from the rest (ruler and proper track area)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
void TrackPanel::DrawBordersAroundTrack(Track * t, wxDC * dc,
Fix a confusion in argument names. No change in behavior
2017-06-06 15:38:11 +00:00
const wxRect & rect, const int labelw,
const int vrul)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
// Border around track and label area
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// leaving room for the shadow
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
dc->SetBrush(*wxTRANSPARENT_BRUSH);
dc->SetPen(*wxBLACK_PEN);
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
dc->DrawRectangle(rect.x, rect.y,
rect.width - kShadowThickness,
rect.height - kShadowThickness);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Fix a confusion in argument names. No change in behavior
2017-06-06 15:38:11 +00:00
// between vruler and TrackInfo
AColor::Line(*dc, vrul, rect.y, vrul, rect.y + rect.height - 1);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// The lines at bottom of 1st track and top of second track of stereo group
// Possibly replace with DrawRectangle to add left border.
Remove some duplication, fix EXPERIMENTAL_OUTPUT_DISPLAY and Esc key
2017-01-11 19:20:24 +00:00
if (t->GetLinked()
John (Thales) code to make the waveform display look like the output of the gain and pan sliders, rather than the input. Added as EXPERIMENTAL_OUTPUT_DISPLAY since there is work to do, but I think this deserves wider input/views.
2013-05-30 23:14:25 +00:00
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
Remove some duplication, fix EXPERIMENTAL_OUTPUT_DISPLAY and Esc key
2017-01-11 19:20:24 +00:00
|| MONO_WAVE_PAN(t)
#endif
) {
Replace some unexplained magic numbers with constants, add comments... ... This commit changes no behavior, fixes no bugs
2015-08-21 00:57:24 +00:00
// The given rect has had the top inset subtracted
Rename some variables
2015-08-03 17:49:53 +00:00
int h1 = rect.y + t->GetHeight() - kTopInset;
Replace some unexplained magic numbers with constants, add comments... ... This commit changes no behavior, fixes no bugs
2015-08-21 00:57:24 +00:00
// h1 is the top coordinate of the second tracks' rectangle
// Draw (part of) the bottom border of the top channel and top border of the bottom
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// At left it extends between the vertical rulers too
// These lines stroke over what is otherwise "border" of each channel
Fix a confusion in argument names. No change in behavior
2017-06-06 15:38:11 +00:00
AColor::Line(*dc, labelw, h1 - kBottomMargin, rect.x + rect.width - 1, h1 - kBottomMargin);
AColor::Line(*dc, labelw, h1 + kTopInset, rect.x + rect.width - 1, h1 + kTopInset);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
}
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// Given rectangle has insets subtracted left, right, and top
// Stroke lines along bottom and right, which are slightly short at
// bottom-left and top-right
Rename some variables
2015-08-03 17:49:53 +00:00
void TrackPanel::DrawShadow(Track * /* t */ , wxDC * dc, const wxRect & rect)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Rename some variables
2015-08-03 17:49:53 +00:00
int right = rect.x + rect.width - 1;
int bottom = rect.y + rect.height - 1;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// shadow color for lines
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
dc->SetPen(*wxBLACK_PEN);
// bottom
Rename some variables
2015-08-03 17:49:53 +00:00
AColor::Line(*dc, rect.x, bottom, right, bottom);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// right
Rename some variables
2015-08-03 17:49:53 +00:00
AColor::Line(*dc, right, rect.y, right, bottom);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// background color erases small parts of those lines
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
AColor::Dark(dc, false);
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// bottom-left
Rename some variables
2015-08-03 17:49:53 +00:00
AColor::Line(*dc, rect.x, bottom, rect.x + 1, bottom);
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// top-right
Rename some variables
2015-08-03 17:49:53 +00:00
AColor::Line(*dc, right, rect.y, right, rect.y + 1);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Adjust details of hit tests on tracks, labels, vrulers... ... ALWAYS exclude margins from the reported rectangles! All three cases. This fixes minor discrepancies between display and interaction in other hit tests, such as for spectral selection, draw tool, and envelope.
2017-06-15 02:10:26 +00:00
/// Determines which cell is under the mouse
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
/// @param mouseX - mouse X position.
/// @param mouseY - mouse Y position.
Rewrite TrackPanel::FindTrack as FindCell ... ... which reports disjoint rectangles for the track control panel, the vertical ruler, and the proper track area.
2017-01-10 20:53:19 +00:00
TrackPanel::FoundCell TrackPanel::FindCell(int mouseX, int mouseY)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
TrackPanelCellIterator visits all cells, and FindCell simply uses it
2017-06-17 05:26:36 +00:00
auto range = Cells();
auto &iter = range.first, &end = range.second;
auto prev = iter;
while
( iter != end &&
!(*iter).second.Contains( mouseX, mouseY ) )
prev = iter++;
if ( iter == end )
// Default to the background cell, which is always last in the sequence,
// even if it does not contain the point
iter = prev;
auto found = *iter;
return {
static_cast<CommonTrackPanelCell*>( found.first )->FindTrack(),
found.first,
found.second
Rewrite TrackPanel::FindTrack as FindCell ... ... which reports disjoint rectangles for the track control panel, the vertical ruler, and the proper track area.
2017-01-10 20:53:19 +00:00
};
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
comments
2017-06-17 02:57:03 +00:00
// This finds the rectangle of a given track (including all channels),
// either that of the label 'adornment' or the track itself
// The given track is assumed to be the first channel
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
wxRect TrackPanel::FindTrackRect( const Track * target, bool label )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
if (!target) {
FindTrackRect omits all margins; better screen reader focus rects... ... Formerly it was outside of the yellow focus at the right side. Now it follows the yellow consistently on four sides. The constant dx in TrackPanelAx::GetLocation might be adjusted. No change of behavior is intended at other uses of FindTrackRect
2017-06-04 14:55:46 +00:00
return { 0, 0, 0, 0 };
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
FindTrackRect omits all margins; better screen reader focus rects... ... Formerly it was outside of the yellow focus at the right side. Now it follows the yellow consistently on four sides. The constant dx in TrackPanelAx::GetLocation might be adjusted. No change of behavior is intended at other uses of FindTrackRect
2017-06-04 14:55:46 +00:00
wxRect rect{
0,
target->GetY() - mViewInfo->vpos,
GetSize().GetWidth(),
target->GetHeight()
};
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// The check for a null linked track is necessary because there's
// a possible race condition between the time the 2 linked tracks
(sync-lock) Change sync-lock tile and icons to be clock instead of chain link. (Yet to change sync-lock button image.) Make click on sync-lock icon select track. Remove bevels on regions holding controls, so that bevels are only on controls themselves. This removes confusing border line above sync-lock icon, and simplifies the TrackInfo. Be more specific about class methods vs stand-alone functions in comments.
2010-09-12 05:11:43 +00:00
// are added and when wxAccessible methods are called. This is
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// most evident when using Jaws.
if (target->GetLinked() && target->GetLink()) {
Rename some variables
2015-08-03 17:49:53 +00:00
rect.height += target->GetLink()->GetHeight();
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
FindTrackRect omits all margins; better screen reader focus rects... ... Formerly it was outside of the yellow focus at the right side. Now it follows the yellow consistently on four sides. The constant dx in TrackPanelAx::GetLocation might be adjusted. No change of behavior is intended at other uses of FindTrackRect
2017-06-04 14:55:46 +00:00
rect.x += kLeftMargin;
if (label)
rect.width = GetVRulerOffset() - kLeftMargin;
else
rect.width -= (kLeftMargin + kRightMargin);
rect.y += kTopMargin;
rect.height -= (kTopMargin + kBottomMargin);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Rename some variables
2015-08-03 17:49:53 +00:00
return rect;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
int TrackPanel::GetVRulerWidth() const
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
return vrulerSize.x;
}
/// Displays the bounds of the selection in the status bar.
void TrackPanel::DisplaySelection()
{
if (!mListener)
return;
// DM: Note that the Selection Bar can actually MODIFY the selection
// if snap-to mode is on!!!
mListener->TP_DisplaySelection();
}
Track *TrackPanel::GetFocusedTrack()
{
return mAx->GetFocus();
}
void TrackPanel::SetFocusedTrack( Track *t )
{
// Make sure we always have the first linked track of a stereo track
if (t && !t->GetLinked() && t->GetLink())
t = (WaveTrack*)t->GetLink();
Make key navigation to ruler work on Windows
2016-05-06 22:13:24 +00:00
if (t && AudacityProject::GetKeyboardCaptureHandler()) {
Menu shortcut hiding has been removed It had been causing problems in Unity for a while now and they were missing on OSX as well in wx3. So, the old menu Open/Close method of hiding has been removed and replaced with an event filter/monitor which looks for wxEVT_CHAR_HOOK events to pass key events to the handler that has the keyboard captured.
2015-07-28 19:35:09 +00:00
AudacityProject::ReleaseKeyboard(this);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Fix incidentals to Bug 1331, though not the bug itself... ... See comments #1 and #2 at http://bugzilla.audacityteam.org/show_bug.cgi?id=1331 Don't make strange undo history if, e.g., R to record (or other keystroke with undoable effects) interrupts a drag with undoable effects (like time shift). Ensure that by first simulating a mouse button up event to stop the drag, before dispatching the keystroke. Don't crash if certain other drags, that do not have undoable effects, such as selection or vertical ruler drag -- are interrupted by a keystroke command (Ctrl+C in particular could cause crash). However, in these cases, the drag is still allowed to continue.
2016-05-22 03:19:09 +00:00
if (t) {
Menu shortcut hiding has been removed It had been causing problems in Unity for a while now and they were missing on OSX as well in wx3. So, the old menu Open/Close method of hiding has been removed and replaced with an event filter/monitor which looks for wxEVT_CHAR_HOOK events to pass key events to the handler that has the keyboard captured.
2015-07-28 19:35:09 +00:00
AudacityProject::CaptureKeyboard(this);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
mAx->SetFocus( t );
Refresh( false );
}
Cleanup: Fixed lots of trivial MSVC warnings.
2013-08-25 21:51:26 +00:00
void TrackPanel::OnSetFocus(wxFocusEvent & WXUNUSED(event))
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
SetFocusedTrack( GetFocusedTrack() );
Refresh( false );
}
Cleanup: Fixed lots of trivial MSVC warnings.
2013-08-25 21:51:26 +00:00
void TrackPanel::OnKillFocus(wxFocusEvent & WXUNUSED(event))
Bugs 994, 1030: Scrubbing behavior with pointer outside of the track panel... ... first: suspend scrubbing only when the application is deactivated -- not necessarily when track panel loses focus; resume when reactivated. second: click and drag to seek happens only when the pointer is in the track panel, and either over a wave track, or over no track.
2015-08-18 15:03:56 +00:00
{
Fix for TrackPanel not releasing keyboard capture when losing focus. Previously the TrackPanel didn't release keyboard capture when losing focus. This led to bugs of this nature, which are now fixed: 1. On a label track, move the cursor to a position where there isn't a label. 2. Press ctrl+shift+f6 to move to the toolbars. 3. Press R. A label is created in the label track, rather than recording started.
2015-08-19 07:46:57 +00:00
if (AudacityProject::HasKeyboardCapture(this))
{
AudacityProject::ReleaseKeyboard(this);
}
Bugs 994, 1030: Scrubbing behavior with pointer outside of the track panel... ... first: suspend scrubbing only when the application is deactivated -- not necessarily when track panel loses focus; resume when reactivated. second: click and drag to seek happens only when the pointer is in the track panel, and either over a wave track, or over no track.
2015-08-18 15:03:56 +00:00
Refresh( false);
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
/**********************************************************************
TrackInfo code is destined to move out of this file.
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
Code should become a lot cleaner when we have sizers.
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
**********************************************************************/
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
TrackInfo::TrackInfo(TrackPanel * pParentIn)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
pParent = pParentIn;
Keep a constant set of gain/pan sliders -- this allows Audacity to open projects with very large numbers of tracks without crashes (Windows) or major slowdows.
2010-04-21 05:03:24 +00:00
Update slider in tracks on theme change.
2017-04-05 19:16:12 +00:00
ReCreateSliders();
UpdatePrefs();
}
TrackInfo::~TrackInfo()
{
}
void TrackInfo::ReCreateSliders(){
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
const wxPoint point{ 0, 0 };
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
wxRect sliderRect;
Remove some uses of Track::GetHeight()... Pass top-left point, not a rectangle, to places that did not use width or height.
2017-06-04 12:29:32 +00:00
GetGainRect(point, sliderRect);
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
Update slider in tracks on theme change.
2017-04-05 19:16:12 +00:00
float defPos = 1.0;
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
/* i18n-hint: Title of the Gain slider, used to adjust the volume */
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gGain = std::make_unique<LWSlider>(pParent, _("Gain"),
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
wxPoint(sliderRect.x, sliderRect.y),
wxSize(sliderRect.width, sliderRect.height),
DB_SLIDER);
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gGain->SetDefaultValue(defPos);
Update slider in tracks on theme change.
2017-04-05 19:16:12 +00:00
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gGainCaptured = std::make_unique<LWSlider>(pParent, _("Gain"),
Fix for bug #1191
2015-09-08 16:24:59 +00:00
wxPoint(sliderRect.x, sliderRect.y),
wxSize(sliderRect.width, sliderRect.height),
DB_SLIDER);
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gGainCaptured->SetDefaultValue(defPos);
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
Remove some uses of Track::GetHeight()... Pass top-left point, not a rectangle, to places that did not use width or height.
2017-06-04 12:29:32 +00:00
GetPanRect(point, sliderRect);
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
Update slider in tracks on theme change.
2017-04-05 19:16:12 +00:00
defPos = 0.0;
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
/* i18n-hint: Title of the Pan slider, used to move the sound left or right */
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gPan = std::make_unique<LWSlider>(pParent, _("Pan"),
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
wxPoint(sliderRect.x, sliderRect.y),
wxSize(sliderRect.width, sliderRect.height),
PAN_SLIDER);
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gPan->SetDefaultValue(defPos);
Update slider in tracks on theme change.
2017-04-05 19:16:12 +00:00
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gPanCaptured = std::make_unique<LWSlider>(pParent, _("Pan"),
Fix for bug #1191
2015-09-08 16:24:59 +00:00
wxPoint(sliderRect.x, sliderRect.y),
wxSize(sliderRect.width, sliderRect.height),
PAN_SLIDER);
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gPanCaptured->SetDefaultValue(defPos);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
#ifdef EXPERIMENTAL_MIDI_OUT
Remove some uses of Track::GetHeight()... Pass top-left point, not a rectangle, to places that did not use width or height.
2017-06-04 12:29:32 +00:00
GetVelocityRect(point, sliderRect);
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
/* i18n-hint: Title of the Velocity slider, used to adjust the volume of note tracks */
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gVelocity = std::make_unique<LWSlider>(pParent, _("Velocity"),
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
wxPoint(sliderRect.x, sliderRect.y),
wxSize(sliderRect.width, sliderRect.height),
VEL_SLIDER);
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gVelocity->SetDefaultValue(0.0);
gVelocityCaptured = std::make_unique<LWSlider>(pParent, _("Velocity"),
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
wxPoint(sliderRect.x, sliderRect.y),
wxSize(sliderRect.width, sliderRect.height),
VEL_SLIDER);
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gVelocityCaptured->SetDefaultValue(0.0);
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
#endif
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
int TrackInfo::GetTrackInfoWidth() const
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
(sync-lock) Further shrink minimize button width and center the button in the TrackInfo, so there's a blank to left and blank-or-sync-lock-icon to right, so track can be selected easily even when minimized. (TrackInfo::DrawBordersWithin) Instead of gray line spanning TrackInfo at top of minimize button, draw it just the width of the button, and add one to the left of the minimize button. Separate sync-lock icon drawing from minimize button drawing. Make some magic numbers become named constants. Some renames for clarity. Clean up some unused stuff.
2010-09-16 23:08:33 +00:00
return kTrackInfoWidth;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
void TrackInfo::GetCloseBoxHorizontalBounds( const wxRect & rect, wxRect &dest )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Exclude left, top, bottom margins from rectangles describing TCP
2017-06-06 15:43:58 +00:00
dest.x = rect.x;
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
dest.width = kTrackInfoBtnSize;
}
void TrackInfo::GetCloseBoxRect(const wxRect & rect, wxRect & dest)
{
GetCloseBoxHorizontalBounds( rect, dest );
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
auto results = CalcItemY( commonTrackTCPLines, kItemBarButtons );
dest.y = rect.y + results.first;
dest.height = results.second;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
static const int TitleSoloBorderOverlap = 1;
void TrackInfo::GetTitleBarHorizontalBounds( const wxRect & rect, wxRect &dest )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Rewrite drawing routines equivalently without kTrackInfoWidth... ... using rect.width instead; and making no changes in appearance. Some routines, like that for the sync lock icon, are pleasingly simplified. But see comments about some questionable things that may have been based on the misunderstanding that kTrackInfoWidth was the width between bounding lines, when in fact, that width was 5 less.
2017-06-06 18:18:27 +00:00
// to right of CloseBoxRect, plus a little more
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
wxRect closeRect;
GetCloseBoxHorizontalBounds( rect, closeRect );
dest.x = rect.x + closeRect.width + 1;
dest.width = rect.x + rect.width - dest.x + TitleSoloBorderOverlap;
}
void TrackInfo::GetTitleBarRect(const wxRect & rect, wxRect & dest)
{
GetTitleBarHorizontalBounds( rect, dest );
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
auto results = CalcItemY( commonTrackTCPLines, kItemBarButtons );
dest.y = rect.y + results.first;
dest.height = results.second;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
void TrackInfo::GetNarrowMuteHorizontalBounds( const wxRect & rect, wxRect &dest )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Exclude left, top, bottom margins from rectangles describing TCP
2017-06-06 15:43:58 +00:00
dest.x = rect.x;
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
dest.width = rect.width / 2 + 1;
}
void TrackInfo::GetNarrowSoloHorizontalBounds( const wxRect & rect, wxRect &dest )
{
wxRect muteRect;
GetNarrowMuteHorizontalBounds( rect, muteRect );
dest.x = rect.x + muteRect.width;
dest.width = rect.width - muteRect.width + TitleSoloBorderOverlap;
}
void TrackInfo::GetWideMuteSoloHorizontalBounds( const wxRect & rect, wxRect &dest )
{
// Larger button, symmetrically placed intended.
// On windows this gives 15 pixels each side.
dest.width = rect.width - 2 * kTrackInfoBtnSize + 6;
dest.x = rect.x + kTrackInfoBtnSize -3;
}
void TrackInfo::GetMuteSoloRect
(const wxRect & rect, wxRect & dest, bool solo, bool bHasSoloButton,
const Track *pTrack)
{
Sync with DarkAudacity
2017-04-02 22:07:13 +00:00
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
auto resultsM = CalcItemY( getTCPLines( *pTrack ), kItemMute );
auto resultsS = CalcItemY( getTCPLines( *pTrack ), kItemSolo );
dest.height = resultsS.second;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
int yMute = resultsM.first;
int ySolo = resultsS.first;
Sync with DarkAudacity
2017-04-02 22:07:13 +00:00
bool bSameRow = ( yMute == ySolo );
bool bNarrow = bSameRow && bHasSoloButton;
if( bNarrow )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
if( solo )
GetNarrowSoloHorizontalBounds( rect, dest );
else
GetNarrowMuteHorizontalBounds( rect, dest );
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Sync with DarkAudacity
2017-04-02 22:07:13 +00:00
else
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
GetWideMuteSoloHorizontalBounds( rect, dest );
Sync with DarkAudacity
2017-04-02 22:07:13 +00:00
if( bSameRow || !solo )
dest.y = rect.y + yMute;
else
dest.y = rect.y + ySolo;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
void TrackInfo::GetSliderHorizontalBounds( const wxPoint &topleft, wxRect &dest )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Exclude left, top, bottom margins from rectangles describing TCP
2017-06-06 15:43:58 +00:00
dest.x = topleft.x + 6;
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
dest.width = kTrackInfoSliderWidth;
}
void TrackInfo::GetGainRect(const wxPoint &topleft, wxRect & dest)
{
GetSliderHorizontalBounds( topleft, dest );
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
auto results = CalcItemY( waveTrackTCPLines, kItemGain );
dest.y = topleft.y + results.first;
dest.height = results.second;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Make TrackInfo routines that calculate rectangles static
2017-06-12 17:33:07 +00:00
void TrackInfo::GetPanRect(const wxPoint &topleft, wxRect & dest)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Remove some uses of Track::GetHeight()... Pass top-left point, not a rectangle, to places that did not use width or height.
2017-06-04 12:29:32 +00:00
GetGainRect( topleft, dest );
CalcItemY is table-driven; stack Mute & Solo for NoteTrack too in DA
2017-06-05 00:13:48 +00:00
auto results = CalcItemY( waveTrackTCPLines, kItemPan );
dest.y = topleft.y + results.first;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
#ifdef EXPERIMENTAL_MIDI_OUT
Make TrackInfo routines that calculate rectangles static
2017-06-12 17:33:07 +00:00
void TrackInfo::GetVelocityRect(const wxPoint &topleft, wxRect & dest)
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
{
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
GetSliderHorizontalBounds( topleft, dest );
Don't overlap MIDI channel buttons with menu button & slider... ... and placement of them, and of velocity slider, is also by table
2017-06-05 00:47:43 +00:00
auto results = CalcItemY( noteTrackTCPLines, kItemVelocity );
dest.y = topleft.y + results.first;
dest.height = results.second;
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
}
#endif
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
void TrackInfo::GetMinimizeHorizontalBounds( const wxRect &rect, wxRect &dest )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Tweak TCP minimize button Position It now doesn't impinge on the bottom edge of the TCP, and it is left aligned flush with the left edge. Minimum track height increased accordingly.
2017-06-10 09:10:38 +00:00
const int space = 0;// was 3.
Rewrite drawing routines equivalently without kTrackInfoWidth... ... using rect.width instead; and making no changes in appearance. Some routines, like that for the sync lock icon, are pleasingly simplified. But see comments about some questionable things that may have been based on the misunderstanding that kTrackInfoWidth was the width between bounding lines, when in fact, that width was 5 less.
2017-06-06 18:18:27 +00:00
dest.x = rect.x + space;
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
wxRect syncLockRect;
GetSyncLockHorizontalBounds( rect, syncLockRect );
// Width is rect.width less space on left for track select
// and on right for sync-lock icon.
dest.width = rect.width - (space + syncLockRect.width);
}
void TrackInfo::GetMinimizeRect(const wxRect & rect, wxRect &dest)
{
GetMinimizeHorizontalBounds( rect, dest );
Placement of minimize button and sync-lock icon are also table driven
2017-06-05 15:29:21 +00:00
auto results = CalcBottomItemY
( commonTrackTCPBottomLines, kItemMinimize, rect.height);
dest.y = rect.y + results.first;
dest.height = results.second;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
void TrackInfo::GetSyncLockHorizontalBounds( const wxRect &rect, wxRect &dest )
{
dest.width = kTrackInfoBtnSize;
dest.x = rect.x + rect.width - dest.width;
}
Make TrackInfo routines that calculate rectangles static
2017-06-12 17:33:07 +00:00
void TrackInfo::GetSyncLockIconRect(const wxRect & rect, wxRect &dest)
(sync-lock) Further shrink minimize button width and center the button in the TrackInfo, so there's a blank to left and blank-or-sync-lock-icon to right, so track can be selected easily even when minimized. (TrackInfo::DrawBordersWithin) Instead of gray line spanning TrackInfo at top of minimize button, draw it just the width of the button, and add one to the left of the minimize button. Separate sync-lock icon drawing from minimize button drawing. Make some magic numbers become named constants. Some renames for clarity. Clean up some unused stuff.
2010-09-16 23:08:33 +00:00
{
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
GetSyncLockHorizontalBounds( rect, dest );
Placement of minimize button and sync-lock icon are also table driven
2017-06-05 15:29:21 +00:00
auto results = CalcBottomItemY
( commonTrackTCPBottomLines, kItemSyncLock, rect.height);
dest.y = rect.y + results.first;
dest.height = results.second;
(sync-lock) Further shrink minimize button width and center the button in the TrackInfo, so there's a blank to left and blank-or-sync-lock-icon to right, so track can be selected easily even when minimized. (TrackInfo::DrawBordersWithin) Instead of gray line spanning TrackInfo at top of minimize button, draw it just the width of the button, and add one to the left of the minimize button. Separate sync-lock icon drawing from minimize button drawing. Make some magic numbers become named constants. Some renames for clarity. Clean up some unused stuff.
2010-09-16 23:08:33 +00:00
}
Fix midi channel toggling This reintroduces the buttons to toggle display of individual midi channels, and cleans up the code behind that feature. This functionality has actually been present in production versions of audacity for a while, at least for clicking. However, the buttons themselves were not drawn, making it exteremly painful (but possible) to use. As requested by PRL, this is always enabled if USE_MIDI is defined.
2017-03-28 18:29:40 +00:00
#ifdef USE_MIDI
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
void TrackInfo::GetMidiControlsHorizontalBounds
( const wxRect &rect, wxRect &dest )
Fix midi channel toggling This reintroduces the buttons to toggle display of individual midi channels, and cleans up the code behind that feature. This functionality has actually been present in production versions of audacity for a while, at least for clicking. However, the buttons themselves were not drawn, making it exteremly painful (but possible) to use. As requested by PRL, this is always enabled if USE_MIDI is defined.
2017-03-28 18:29:40 +00:00
{
Exclude left, top, bottom margins from rectangles describing TCP
2017-06-06 15:43:58 +00:00
dest.x = rect.x + 1; // To center slightly
Rewrite drawing routines equivalently without kTrackInfoWidth... ... using rect.width instead; and making no changes in appearance. Some routines, like that for the sync lock icon, are pleasingly simplified. But see comments about some questionable things that may have been based on the misunderstanding that kTrackInfoWidth was the width between bounding lines, when in fact, that width was 5 less.
2017-06-06 18:18:27 +00:00
// PRL: TODO: kMidiCellWidth is defined in terms of the other constant
// kTrackInfoWidth but I am trying to avoid use of that constant.
// Can cell width be computed from dest.width instead?
Fix midi channel toggling This reintroduces the buttons to toggle display of individual midi channels, and cleans up the code behind that feature. This functionality has actually been present in production versions of audacity for a while, at least for clicking. However, the buttons themselves were not drawn, making it exteremly painful (but possible) to use. As requested by PRL, this is always enabled if USE_MIDI is defined.
2017-03-28 18:29:40 +00:00
dest.width = kMidiCellWidth * 4;
Separate functions defining the horizontal bounds of TCP items
2017-06-12 17:39:23 +00:00
}
void TrackInfo::GetMidiControlsRect(const wxRect & rect, wxRect & dest)
{
GetMidiControlsHorizontalBounds( rect, dest );
Don't overlap MIDI channel buttons with menu button & slider... ... and placement of them, and of velocity slider, is also by table
2017-06-05 00:47:43 +00:00
auto results = CalcItemY( noteTrackTCPLines, kItemMidiControlsRect );
dest.y = rect.y + results.first;
dest.height = results.second;
Fix midi channel toggling This reintroduces the buttons to toggle display of individual midi channels, and cleans up the code behind that feature. This functionality has actually been present in production versions of audacity for a while, at least for clicking. However, the buttons themselves were not drawn, making it exteremly painful (but possible) to use. As requested by PRL, this is always enabled if USE_MIDI is defined.
2017-03-28 18:29:40 +00:00
}
#endif
(sync-lock) Further shrink minimize button width and center the button in the TrackInfo, so there's a blank to left and blank-or-sync-lock-icon to right, so track can be selected easily even when minimized. (TrackInfo::DrawBordersWithin) Instead of gray line spanning TrackInfo at top of minimize button, draw it just the width of the button, and add one to the left of the minimize button. Separate sync-lock icon drawing from minimize button drawing. Make some magic numbers become named constants. Some renames for clarity. Clean up some unused stuff.
2010-09-16 23:08:33 +00:00
TrackInfo::SetTrackInfoFont is static
2017-06-12 19:02:28 +00:00
wxFont TrackInfo::gFont;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
/// \todo Probably should move to 'Utils.cpp'.
TrackInfo::SetTrackInfoFont is static
2017-06-12 19:02:28 +00:00
void TrackInfo::SetTrackInfoFont(wxDC * dc)
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
TrackInfo::SetTrackInfoFont is static
2017-06-12 19:02:28 +00:00
dc->SetFont(gFont);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
void TrackInfo::DrawBordersWithin
( wxDC* dc, const wxRect & rect, const Track &track ) const
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
(sync-lock) Further shrink minimize button width and center the button in the TrackInfo, so there's a blank to left and blank-or-sync-lock-icon to right, so track can be selected easily even when minimized. (TrackInfo::DrawBordersWithin) Instead of gray line spanning TrackInfo at top of minimize button, draw it just the width of the button, and add one to the left of the minimize button. Separate sync-lock icon drawing from minimize button drawing. Make some magic numbers become named constants. Some renames for clarity. Clean up some unused stuff.
2010-09-16 23:08:33 +00:00
AColor::Dark(dc, false); // same color as border of toolbars (ToolBar::OnPaint())
Change "Sync-Lock Tracks" button image from chain-link to clock. EXPERIMENTAL_LINKING -> EXPERIMENTAL_SYNC_LOCK Restore some "border" lines in TrackInfo. Get rid of unused DEFINE_COLOUR( clrTrackInfoSyncLockSel...). Clean out some undocumented commented-out code. Add/remove some comments.
2010-09-14 05:52:01 +00:00
(sync-lock) Further shrink minimize button width and center the button in the TrackInfo, so there's a blank to left and blank-or-sync-lock-icon to right, so track can be selected easily even when minimized. (TrackInfo::DrawBordersWithin) Instead of gray line spanning TrackInfo at top of minimize button, draw it just the width of the button, and add one to the left of the minimize button. Separate sync-lock icon drawing from minimize button drawing. Make some magic numbers become named constants. Some renames for clarity. Clean up some unused stuff.
2010-09-16 23:08:33 +00:00
// below close box and title bar
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
wxRect buttonRect;
GetTitleBarRect( rect, buttonRect );
AColor::Line
Rewrite the unused DrawBordersWithin... ... Remembering inclusivity of the endpoints in AColor::Line, and avoiding use of the constant kTrackInfoWidth
2017-06-06 19:43:42 +00:00
(*dc, rect.x, buttonRect.y + buttonRect.height,
rect.width - 1, buttonRect.y + buttonRect.height);
(sync-lock) Further shrink minimize button width and center the button in the TrackInfo, so there's a blank to left and blank-or-sync-lock-icon to right, so track can be selected easily even when minimized. (TrackInfo::DrawBordersWithin) Instead of gray line spanning TrackInfo at top of minimize button, draw it just the width of the button, and add one to the left of the minimize button. Separate sync-lock icon drawing from minimize button drawing. Make some magic numbers become named constants. Some renames for clarity. Clean up some unused stuff.
2010-09-16 23:08:33 +00:00
// between close box and title bar
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
AColor::Line
(*dc, buttonRect.x, buttonRect.y,
Rewrite the unused DrawBordersWithin... ... Remembering inclusivity of the endpoints in AColor::Line, and avoiding use of the constant kTrackInfoWidth
2017-06-06 19:43:42 +00:00
buttonRect.x, buttonRect.y + buttonRect.height - 1);
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
GetMuteSoloRect( rect, buttonRect, false, true, &track );
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
bool bHasMuteSolo = dynamic_cast<const PlayableTrack*>( &track );
Move HideTopItem into class TrackInfo, for later use
2017-06-07 14:39:47 +00:00
if( bHasMuteSolo && !TrackInfo::HideTopItem( rect, buttonRect ) )
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
// above mute/solo
AColor::Line
(*dc, rect.x, buttonRect.y,
Rewrite the unused DrawBordersWithin... ... Remembering inclusivity of the endpoints in AColor::Line, and avoiding use of the constant kTrackInfoWidth
2017-06-06 19:43:42 +00:00
rect.width - 1, buttonRect.y);
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
// between mute/solo
// Draw this little line; if there is no solo, wide mute button will
// overpaint it later:
AColor::Line
(*dc, buttonRect.x + buttonRect.width, buttonRect.y,
Rewrite the unused DrawBordersWithin... ... Remembering inclusivity of the endpoints in AColor::Line, and avoiding use of the constant kTrackInfoWidth
2017-06-06 19:43:42 +00:00
buttonRect.x + buttonRect.width, buttonRect.y + buttonRect.height - 1);
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
// below mute/solo
AColor::Line
(*dc, rect.x, buttonRect.y + buttonRect.height,
Rewrite the unused DrawBordersWithin... ... Remembering inclusivity of the endpoints in AColor::Line, and avoiding use of the constant kTrackInfoWidth
2017-06-06 19:43:42 +00:00
rect.width - 1, buttonRect.y + buttonRect.height);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
(sync-lock) Further shrink minimize button width and center the button in the TrackInfo, so there's a blank to left and blank-or-sync-lock-icon to right, so track can be selected easily even when minimized. (TrackInfo::DrawBordersWithin) Instead of gray line spanning TrackInfo at top of minimize button, draw it just the width of the button, and add one to the left of the minimize button. Separate sync-lock icon drawing from minimize button drawing. Make some magic numbers become named constants. Some renames for clarity. Clean up some unused stuff.
2010-09-16 23:08:33 +00:00
// left of and above minimize button
wxRect minimizeRect;
Rename some variables
2015-08-03 17:49:53 +00:00
this->GetMinimizeRect(rect, minimizeRect);
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
AColor::Line
(*dc, minimizeRect.x - 1, minimizeRect.y,
Rewrite the unused DrawBordersWithin... ... Remembering inclusivity of the endpoints in AColor::Line, and avoiding use of the constant kTrackInfoWidth
2017-06-06 19:43:42 +00:00
minimizeRect.x - 1, minimizeRect.y + minimizeRect.height - 1);
Fix NoteTrack stray lines; no magic numbers in DrawBordersWithin... ... even though we are now skipping that drawing step.
2017-06-05 16:47:29 +00:00
AColor::Line
Rewrite the unused DrawBordersWithin... ... Remembering inclusivity of the endpoints in AColor::Line, and avoiding use of the constant kTrackInfoWidth
2017-06-06 19:43:42 +00:00
(*dc, minimizeRect.x, minimizeRect.y - 1,
minimizeRect.x + minimizeRect.width - 1, minimizeRect.y - 1);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Restored bevels on TrackInfo. Aesthetic choice, currently disabled in run up to 2.1.3. Lowest edge of bevels now hidden correctly on smaller panels (if bevels enabled).
2016-08-21 17:17:02 +00:00
//#define USE_BEVELS
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// Paint the whole given rectangle some fill color
Restored bevels on TrackInfo. Aesthetic choice, currently disabled in run up to 2.1.3. Lowest edge of bevels now hidden correctly on smaller panels (if bevels enabled).
2016-08-21 17:17:02 +00:00
void TrackInfo::DrawBackground(wxDC * dc, const wxRect & rect, bool bSelected,
bool bHasMuteSolo, const int labelw, const int vrul) const
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
{
Add rotated pip Also remove dead code from theming.
2017-04-26 21:29:57 +00:00
//compiler food.
bHasMuteSolo;
vrul;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
// fill in label
Rename some variables
2015-08-03 17:49:53 +00:00
wxRect fill = rect;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
fill.width = labelw-4;
Implements darkchains_mod2a style linking indication. This may not be final but it's a big improvement. Reversed a couple changes from original indication scheme that are no longer necessary. Unfortunately it's really hard to remove colors from AllThemeResources.h.
2010-03-09 04:59:26 +00:00
AColor::MediumTrackInfo(dc, bSelected);
Remove trailing spaces.
2014-06-03 20:30:19 +00:00
dc->DrawRectangle(fill);
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Restored bevels on TrackInfo. Aesthetic choice, currently disabled in run up to 2.1.3. Lowest edge of bevels now hidden correctly on smaller panels (if bevels enabled).
2016-08-21 17:17:02 +00:00
#ifdef USE_BEVELS
Explanatory comments in TrackPanel drawing; fewer magic numbers
2017-06-06 15:24:03 +00:00
// This branch is not now used
// PRL: todo: banish magic numbers
Restored bevels on TrackInfo. Aesthetic choice, currently disabled in run up to 2.1.3. Lowest edge of bevels now hidden correctly on smaller panels (if bevels enabled).
2016-08-21 17:17:02 +00:00
if( bHasMuteSolo )
{
int ylast = rect.height-20;
int ybutton = wxMin(32,ylast-17);
int ybuttonEnd = 67;
fill=wxRect( rect.x+1, rect.y+17, vrul-6, ybutton);
AColor::BevelTrackInfo( *dc, true, fill );
if( ybuttonEnd < ylast ){
fill=wxRect( rect.x+1, rect.y+ybuttonEnd, fill.width, ylast - ybuttonEnd);
AColor::BevelTrackInfo( *dc, true, fill );
}
}
else
{
fill=wxRect( rect.x+1, rect.y+17, vrul-6, rect.height-37);
AColor::BevelTrackInfo( *dc, true, fill );
}
#endif
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Redo calculation of default track heights
2017-06-12 23:03:09 +00:00
namespace {
Redo layout tables as std::vector
2017-06-13 17:34:12 +00:00
unsigned DefaultTrackHeight( const TCPLines &topLines )
Default MIDI track height is enough to display velocity slider... ... It is computed from the layout table, and in fact comes to 158 pixels, versus 150 for other tracks.
2017-06-07 01:40:58 +00:00
{
int needed =
kTopMargin + kBottomMargin +
Redo calculation of default track heights
2017-06-12 23:03:09 +00:00
totalTCPLines( topLines, true ) +
totalTCPLines( commonTrackTCPBottomLines, false ) + 1;
Compute default WaveTrack height analogously to NoteTrack... ... though in fact this comes to the same 150 pixels as before, given the present layout table.
2017-06-07 02:37:24 +00:00
return (unsigned) std::max( needed, (int) Track::DefaultHeight );
}
Redo calculation of default track heights
2017-06-12 23:03:09 +00:00
}
unsigned TrackInfo::DefaultNoteTrackHeight()
{
return DefaultTrackHeight( noteTrackTCPLines );
}
Compute default WaveTrack height analogously to NoteTrack... ... though in fact this comes to the same 150 pixels as before, given the present layout table.
2017-06-07 02:37:24 +00:00
unsigned TrackInfo::DefaultWaveTrackHeight()
{
Redo calculation of default track heights
2017-06-12 23:03:09 +00:00
return DefaultTrackHeight( waveTrackTCPLines );
Default MIDI track height is enough to display velocity slider... ... It is computed from the layout table, and in fact comes to 158 pixels, versus 150 for other tracks.
2017-06-07 01:40:58 +00:00
}
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
std::unique_ptr<LWSlider>
TrackInfo::gGainCaptured
, TrackInfo::gPanCaptured
, TrackInfo::gGain
, TrackInfo::gPan
#ifdef EXPERIMENTAL_MIDI_OUT
, TrackInfo::gVelocityCaptured
, TrackInfo::gVelocity
#endif
;
Keep a constant set of gain/pan sliders -- this allows Audacity to open projects with very large numbers of tracks without crashes (Windows) or major slowdows.
2010-04-21 05:03:24 +00:00
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
LWSlider * TrackInfo::GainSlider
(const wxRect &sliderRect, const WaveTrack *t, bool captured, wxWindow *pParent)
{
Fix for bug #1191
2015-09-08 16:24:59 +00:00
wxPoint pos = sliderRect.GetPosition();
Table includes draw functions for sliders
2017-06-12 20:10:03 +00:00
float gain = t ? t->GetGain() : 1.0;
Keep a constant set of gain/pan sliders -- this allows Audacity to open projects with very large numbers of tracks without crashes (Windows) or major slowdows.
2010-04-21 05:03:24 +00:00
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gGain->Move(pos);
gGain->Set(gain);
gGainCaptured->Move(pos);
gGainCaptured->Set(gain);
Fix for bug #1191
2015-09-08 16:24:59 +00:00
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
auto slider = (captured ? gGainCaptured : gGain).get();
slider->SetParent( pParent ? pParent : ::GetActiveProject() );
return slider;
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
}
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
LWSlider * TrackInfo::PanSlider
(const wxRect &sliderRect, const WaveTrack *t, bool captured, wxWindow *pParent)
Keep a constant set of gain/pan sliders -- this allows Audacity to open projects with very large numbers of tracks without crashes (Windows) or major slowdows.
2010-04-21 05:03:24 +00:00
{
Fix for bug #1191
2015-09-08 16:24:59 +00:00
wxPoint pos = sliderRect.GetPosition();
Table includes draw functions for sliders
2017-06-12 20:10:03 +00:00
float pan = t ? t->GetPan() : 0.0;
Fix for bug #1191
2015-09-08 16:24:59 +00:00
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gPan->Move(pos);
gPan->Set(pan);
gPanCaptured->Move(pos);
gPanCaptured->Set(pan);
Fix for bug #949 This removes the TrackInfo's slider "cache". Originally, the cache would build to the maximum number of tracks you had created in an Audacity session. So, if you created 128 tracks and then reduced that to 1, you'd still have 256 sliders, 1 gain and 1 pan per track. But, the only real thing the cache did was prevent continuous allocations of sliders since the allocated sliders position and values wer still being updated nearly with ever interaction since they were redrawn each time. In April 2010, the slider cache was changed to reduce its size by creating a sort of ring buffer based on how many tracks were displayed and how many tracks were in the project (I guess). Unfortunately, it didn't really handle large number of tracks and this bug was born. While trying to find the proper fix for this, I realized that the cache really wasn't saving anything. Maybe a little when dragging the thumb, but during normal track redraws and interaction, it really didn't serve a purpose, other than use additional memory. So, I've removed the cache and have allocated a single gain and a single pan slider. As before, their position and value are changed as needed when drawn and manipulated.
2015-05-25 03:54:10 +00:00
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
auto slider = (captured ? gPanCaptured : gPan).get();
slider->SetParent( pParent ? pParent : ::GetActiveProject() );
return slider;
Keep a constant set of gain/pan sliders -- this allows Audacity to open projects with very large numbers of tracks without crashes (Windows) or major slowdows.
2010-04-21 05:03:24 +00:00
}
Locate and position the current Audacity source code, and clear a variety of old junk out of the way into junk-branches
2010-01-23 19:44:49 +00:00
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
#ifdef EXPERIMENTAL_MIDI_OUT
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
LWSlider * TrackInfo::VelocitySlider
(const wxRect &sliderRect, const NoteTrack *t, bool captured, wxWindow *pParent)
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
{
wxPoint pos = sliderRect.GetPosition();
Table includes draw functions for sliders
2017-06-12 20:10:03 +00:00
float velocity = t ? t->GetVelocity() : 0.0;
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
gVelocity->Move(pos);
gVelocity->Set(velocity);
gVelocityCaptured->Move(pos);
gVelocityCaptured->Set(velocity);
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
Static TrackInfo slider accessors, const Track* arguments
2017-06-12 20:54:12 +00:00
auto slider = (captured ? gVelocityCaptured : gVelocity).get();
slider->SetParent( pParent ? pParent : ::GetActiveProject() );
return slider;
Use a dedicated velocity slider for note tracks This gets rid of the offset rectangle hack that was needed to re-use gain sliders for note track velocities. It also removes the need for changing the style of a single slider. Perhaps most importantly, it fixes link errors regarding GainSlider(int). See https://sourceforge.net/p/audacity/mailman/message/35752524/ for details on why this change is needed and what caused it.
2017-02-22 02:05:35 +00:00
}
#endif
Computing best font size for TrackInfo is redone when preferences change
2016-05-01 21:55:48 +00:00
void TrackInfo::UpdatePrefs()
{
// Calculation of best font size depends on language, so it should be redone in case
// the language preference changed.
int fontSize = 10;
TrackInfo::SetTrackInfoFont is static
2017-06-12 19:02:28 +00:00
gFont.Create(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
Computing best font size for TrackInfo is redone when preferences change
2016-05-01 21:55:48 +00:00
int allowableWidth = GetTrackInfoWidth() - 2; // 2 to allow for left/right borders
int textWidth, textHeight;
do {
TrackInfo::SetTrackInfoFont is static
2017-06-12 19:02:28 +00:00
gFont.SetPointSize(fontSize);
Computing best font size for TrackInfo is redone when preferences change
2016-05-01 21:55:48 +00:00
pParent->GetTextExtent(_("Stereo, 999999Hz"),
&textWidth,
&textHeight,
NULL,
NULL,
TrackInfo::SetTrackInfoFont is static
2017-06-12 19:02:28 +00:00
&gFont);
Computing best font size for TrackInfo is redone when preferences change
2016-05-01 21:55:48 +00:00
fontSize--;
} while (textWidth >= allowableWidth);
}
Simplify iterations over TrackPanelCells with range-for
2017-06-17 02:57:08 +00:00
IteratorRange< TrackPanelCellIterator > TrackPanel::Cells()
{
return {
TrackPanelCellIterator( this, true ),
TrackPanelCellIterator( this, false )
};
}
Define TrackPanelOverlay, use it to reimplement play indicator and cursor... ... but scrub speed display is disabled
2015-08-25 17:35:32 +00:00
TrackPanelCellIterator::TrackPanelCellIterator(TrackPanel *trackPanel, bool begin)
TrackPanelCellIterator visits all cells, and FindCell simply uses it
2017-06-17 05:26:36 +00:00
: mPanel{ trackPanel }
, mIter{ trackPanel->GetProject() }
, mpTrack{ begin ? mIter.First() : nullptr }
, mpCell{ begin
? ( mpTrack ? mpTrack : trackPanel->GetBackgroundCell().get() )
: nullptr
}
Define TrackPanelOverlay, use it to reimplement play indicator and cursor... ... but scrub speed display is disabled
2015-08-25 17:35:32 +00:00
{
TrackPanelCellIterator visits all cells, and FindCell simply uses it
2017-06-17 05:26:36 +00:00
const auto size = mPanel->GetSize();
mRect = { 0, 0, size.x, size.y };
UpdateRect();
Define TrackPanelOverlay, use it to reimplement play indicator and cursor... ... but scrub speed display is disabled
2015-08-25 17:35:32 +00:00
}
TrackPanelCellIterator &TrackPanelCellIterator::operator++ ()
{
TrackPanelCellIterator visits all cells, and FindCell simply uses it
2017-06-17 05:26:36 +00:00
if ( mpTrack ) {
if ( ++ mType == CellType::Background )
mType = CellType::Track, mpTrack = mIter.Next();
}
if ( mpTrack ) {
if ( mType == CellType::Label &&
mpTrack->GetLink() && !mpTrack->GetLinked() )
// Visit label of stereo track only once
++mType;
switch ( mType ) {
case CellType::Track:
mpCell = mpTrack;
break;
case CellType::Label:
mpCell = mpTrack->GetTrackControl();
break;
case CellType::VRuler:
mpCell = mpTrack->GetVRulerControl();
break;
case CellType::Resizer: {
auto instance = &TrackPanelResizerCell::Instance();
instance->mpTrack = mpTrack;
mpCell = instance;
break;
}
default:
// should not happen
mpCell = nullptr;
break;
}
}
else if ( !mDidBackground )
mpCell = mPanel->GetBackgroundCell().get(), mDidBackground = true;
else
mpCell = nullptr;
UpdateRect();
Define TrackPanelOverlay, use it to reimplement play indicator and cursor... ... but scrub speed display is disabled
2015-08-25 17:35:32 +00:00
return *this;
}
TrackPanelCellIterator TrackPanelCellIterator::operator++ (int)
{
TrackPanelCellIterator copy(*this);
++ *this;
return copy;
}
auto TrackPanelCellIterator::operator* () const -> value_type
{
TrackPanelCellIterator visits all cells, and FindCell simply uses it
2017-06-17 05:26:36 +00:00
return { mpCell, mRect };
}
void TrackPanelCellIterator::UpdateRect()
{
// TODO: cooperate with EXPERIMENTAL_OUTPUT_DISPLAY
const auto size = mPanel->GetSize();
if ( mpTrack ) {
mRect = {
0,
mpTrack->GetY() - mPanel->GetViewInfo()->vpos,
size.x,
mpTrack->GetHeight()
};
switch ( mType ) {
case CellType::Track:
mRect.x = mPanel->GetLeftOffset();
mRect.width -= (mRect.x + kRightMargin);
mRect.y += kTopMargin;
mRect.height -= (kBottomMargin + kTopMargin);
break;
case CellType::Label: {
mRect.x = kLeftMargin;
mRect.width = kTrackInfoWidth - mRect.x;
mRect.y += kTopMargin;
mRect.height -= (kBottomMargin + kTopMargin);
auto partner = mpTrack->GetLink();
if ( partner && mpTrack->GetLinked() )
mRect.height += partner->GetHeight();
break;
}
case CellType::VRuler:
mRect.x = kTrackInfoWidth;
mRect.width = mPanel->GetLeftOffset() - mRect.x;
mRect.y += kTopMargin;
mRect.height -= (kBottomMargin + kTopMargin);
break;
case CellType::Resizer: {
// The resizer region encompasses the bottom margin proper to this
// track, plus the top margin of the next track (or, an equally
// tall zone below, in case there is no next track)
auto partner = mpTrack->GetLink();
if ( partner && mpTrack->GetLinked() )
Correct the left edge of sizer between channels
2017-06-17 19:56:21 +00:00
mRect.x = kTrackInfoWidth;
TrackPanelCellIterator visits all cells, and FindCell simply uses it
2017-06-17 05:26:36 +00:00
else
mRect.x = kLeftMargin;
mRect.width -= (mRect.x + kRightMargin);
mRect.y += (mRect.height - kBottomMargin);
mRect.height = (kBottomMargin + kTopMargin);
break;
}
default:
// should not happen
break;
}
}
else if ( mpCell ) {
// Find a disjoint, maybe empty, rectangle
// for the empty space appearing at bottom
Define TrackPanelOverlay, use it to reimplement play indicator and cursor... ... but scrub speed display is disabled
2015-08-25 17:35:32 +00:00
TrackPanelCellIterator visits all cells, and FindCell simply uses it
2017-06-17 05:26:36 +00:00
mRect.x = kLeftMargin;
mRect.width = size.x - (mRect.x + kRightMargin);
// Use previous value of the bottom, either the whole area if
// there were no tracks, or else the resizer of the last track
mRect.y =
std::min( size.y,
std::max( 0,
mRect.y + mRect.height ) );
mRect.height = size.y - mRect.y;
}
else
mRect = {};
Define TrackPanelOverlay, use it to reimplement play indicator and cursor... ... but scrub speed display is disabled
2015-08-25 17:35:32 +00:00
}
make functions which do not require access to class member variables static so they can be called without an object to do so with. Based on part of a patch by Campbell Barton
2013-09-21 19:34:12 +00:00
static TrackPanel * TrackPanelFactory(wxWindow * parent,
Changes to allow mod-track-panel.
2011-11-25 20:40:26 +00:00
wxWindowID id,
const wxPoint & pos,
const wxSize & size,
BHug1488: Don't crash exiting from command-line benchmark test... Problem was that cfd7648fce2388ec8ae35b38004f2ae111c484af fixed a memory leak but created a dangling pointer bug, which does not happen during usual run of Audacity because AudacityProject::OnCloseWindow is reached then before destroying AudacityProject. Fixed it by using a std::shared_pointer for the TrackList that both AudacityProject and TrackPanel must use.
2016-08-20 17:58:56 +00:00
const std::shared_ptr<TrackList> &tracks,
Changes to allow mod-track-panel.
2011-11-25 20:40:26 +00:00
ViewInfo * viewInfo,
TrackPanelListener * listener,
AdornedRulerPanel * ruler)
{
More uses of safenew for classes we derive from wxWindow classes... ... Also removed some unnecessary deletes of widgets that are managed by parent windows
2016-02-14 07:54:25 +00:00
wxASSERT(parent); // to justify safenew
return safenew TrackPanel(
Changes to allow mod-track-panel.
2011-11-25 20:40:26 +00:00
parent,
id,
pos,
size,
tracks,
viewInfo,
listener,
ruler);
}
// Declare the static factory function.
// We defined it in the class.
TrackPanel *(*TrackPanel::FactoryFunction)(
wxWindow * parent,
wxWindowID id,
const wxPoint & pos,
const wxSize & size,
BHug1488: Don't crash exiting from command-line benchmark test... Problem was that cfd7648fce2388ec8ae35b38004f2ae111c484af fixed a memory leak but created a dangling pointer bug, which does not happen during usual run of Audacity because AudacityProject::OnCloseWindow is reached then before destroying AudacityProject. Fixed it by using a std::shared_pointer for the TrackList that both AudacityProject and TrackPanel must use.
2016-08-20 17:58:56 +00:00
const std::shared_ptr<TrackList> &tracks,
Changes to allow mod-track-panel.
2011-11-25 20:40:26 +00:00
ViewInfo * viewInfo,
TrackPanelListener * listener,
AdornedRulerPanel * ruler) = TrackPanelFactory;
Define and use the UIHandle and TrackPanelCell protocols, but... ...no actions reimplemented to them yet. Later commits will move special cases one at a time from TrackPanel, preserving all click and drag capabilities at each step. With a few exceptions, but those lost abilities are restored in yet later commits. (Ctrl+Click on the Label track being one.)
2015-07-07 03:12:16 +00:00
TrackPanelCell::~TrackPanelCell()
{
}
unsigned TrackPanelCell::HandleWheelRotation
(const TrackPanelMouseEvent &, AudacityProject *)
{
return RefreshCode::Cancelled;
}
unsigned TrackPanelCell::DoContextMenu
(const wxRect &, wxWindow*, wxPoint *)
{
return RefreshCode::RefreshNone;
}
unsigned TrackPanelCell::CaptureKey(wxKeyEvent &event, ViewInfo &, wxWindow *)
{
event.Skip();
return RefreshCode::RefreshNone;
}
unsigned TrackPanelCell::KeyDown(wxKeyEvent &event, ViewInfo &, wxWindow *)
{
event.Skip();
return RefreshCode::RefreshNone;
}
unsigned TrackPanelCell::KeyUp(wxKeyEvent &event, ViewInfo &, wxWindow *)
{
event.Skip();
return RefreshCode::RefreshNone;
}
unsigned TrackPanelCell::Char(wxKeyEvent &event, ViewInfo &, wxWindow *)
{
event.Skip();
return RefreshCode::RefreshNone;
}
Reference in New Issue Copy Permalink