Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-01-02 14:17:07 +01:00
Code Issues Releases Wiki Activity

Bold, clickable, butting clip boundaries also in spectrum view

Browse Source
This commit is contained in:
Paul Licameli
2020-01-14 14:54:44 -05:00
parent 97b7572504
commit 9e0372cbea
5 changed files with 72 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp
View File

@@ -10,6 +10,8 @@ Paul Licameli split from TrackPanel.cpp
#include "WaveTrackView.h"
#include "CutlineHandle.h"
#include "../../../../Experimental.h"
#include <numeric>
@@ -423,11 +425,10 @@ std::pair<
> WaveTrackSubView::DoDetailedHitTest(
const TrackPanelMouseState &state,
const AudacityProject *pProject, int currentTool, bool bMultiTool,
const std::shared_ptr<WaveTrack> &wt,
CommonTrackView &view)
const std::shared_ptr<WaveTrack> &wt)
{
auto results = WaveTrackView::DoDetailedHitTest(
state, pProject, currentTool, bMultiTool, wt, view );
state, pProject, currentTool, bMultiTool, wt, *this );
if ( results.first )
return results;
@@ -438,10 +439,60 @@ std::pair<
if (pHandle)
results.second.push_back( pHandle );
}
if (auto result = CutlineHandle::HitTest(
mCutlineHandle, state.state, state.rect,
pProject, wt ))
// This overriding test applies in all tools
results.second.push_back(result);
return results;
}
void WaveTrackSubView::DrawBoldBoundaries(
TrackPanelDrawingContext &context, const WaveTrack *track,
const wxRect &rect )
{
auto &dc = context.dc;
const auto artist = TrackArtist::Get( context );
// Update cache for locations, e.g. cutlines and merge points
track->UpdateLocationsCache();
const auto &zoomInfo = *artist->pZoomInfo;
#ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING
auto target2 = dynamic_cast<CutlineHandle*>(context.target.get());
#endif
for (const auto loc : track->GetCachedLocations()) {
bool highlightLoc = false;
#ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING
highlightLoc =
target2 && target2->GetTrack().get() == track &&
target2->GetLocation() == loc;
#endif
const int xx = zoomInfo.TimeToPosition(loc.pos);
if (xx >= 0 && xx < rect.width) {
dc.SetPen( highlightLoc ? AColor::uglyPen : *wxGREY_PEN );
AColor::Line(dc, (int) (rect.x + xx - 1), rect.y, (int) (rect.x + xx - 1), rect.y + rect.height);
if (loc.typ == WaveTrackLocation::locationCutLine) {
dc.SetPen( highlightLoc ? AColor::uglyPen : *wxRED_PEN );
}
else {
#ifdef EXPERIMENTAL_DA
// JKC Black does not show up enough.
dc.SetPen(highlightLoc ? AColor::uglyPen : *wxWHITE_PEN);
#else
dc.SetPen(highlightLoc ? AColor::uglyPen : *wxBLACK_PEN);
#endif
}
AColor::Line(dc, (int) (rect.x + xx), rect.y, (int) (rect.x + xx), rect.y + rect.height);
dc.SetPen( highlightLoc ? AColor::uglyPen : *wxGREY_PEN );
AColor::Line(dc, (int) (rect.x + xx + 1), rect.y, (int) (rect.x + xx + 1), rect.y + rect.height);
}
}
}
WaveTrackView &WaveTrackView::Get( WaveTrack &track )
{
return static_cast< WaveTrackView& >( TrackView::Get( track ) );