This commit is contained in:
xenakios 2018-01-20 22:39:33 +02:00
parent 72e1cae026
commit a2ab8d285f

View File

@ -424,15 +424,19 @@ void WaveformComponent::paint(Graphics & g)
//m_thumb->drawChannels(g, { 0,m_topmargin,getWidth(),getHeight()-m_topmargin }, //m_thumb->drawChannels(g, { 0,m_topmargin,getWidth(),getHeight()-m_topmargin },
// 0.0, thumblen, 1.0f); // 0.0, thumblen, 1.0f);
g.setColour(Colours::white.withAlpha(0.5f)); g.setColour(Colours::white.withAlpha(0.5f));
int xcorleft = (int)jmap<double>(m_time_sel_start, m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth()); double sel_len = m_time_sel_end - m_time_sel_start;
int xcorright = (int)jmap<double>(m_time_sel_end, m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth()); //if (sel_len > 0.0 && sel_len < 1.0)
g.fillRect(xcorleft, m_topmargin, xcorright - xcorleft, getHeight() - m_topmargin); {
int xcorleft = (int)jmap<double>(m_time_sel_start, m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth());
int xcorright = (int)jmap<double>(m_time_sel_end, m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth());
g.fillRect(xcorleft, m_topmargin, xcorright - xcorleft, getHeight() - m_topmargin);
}
if (m_file_cached.first.getLength() > 0.0 && if (m_file_cached.first.getLength() > 0.0 &&
(bool)ShowFileCacheRange.getValue()) (bool)ShowFileCacheRange.getValue())
{ {
g.setColour(Colours::red.withAlpha(0.2f)); g.setColour(Colours::red.withAlpha(0.2f));
xcorleft = (int)jmap<double>(m_file_cached.first.getStart(), m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth()); int xcorleft = (int)jmap<double>(m_file_cached.first.getStart(), m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth());
xcorright = (int)jmap<double>(m_file_cached.first.getEnd(), m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth()); int xcorright = (int)jmap<double>(m_file_cached.first.getEnd(), m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth());
g.fillRect(xcorleft, 0, xcorright - xcorleft, m_topmargin / 2); g.fillRect(xcorleft, 0, xcorright - xcorleft, m_topmargin / 2);
xcorleft = (int)jmap<double>(m_file_cached.second.getStart(), m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth()); xcorleft = (int)jmap<double>(m_file_cached.second.getStart(), m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth());
xcorright = (int)jmap<double>(m_file_cached.second.getEnd(), m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth()); xcorright = (int)jmap<double>(m_file_cached.second.getEnd(), m_view_range.getStart(), m_view_range.getEnd(), 0, getWidth());