Skip to content

Automation point mouse wheel and double click (old) #5232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tecknixia wants to merge 17 commits into from
Closed

Automation point mouse wheel and double click (old) #5232

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8730b21
Update AutomationEditor.h
tecknixia Oct 8, 2019
21336ea
Update AutomationEditor.cpp
tecknixia Oct 8, 2019
d81e77d
Update AutomationEditor.h
tecknixia Oct 8, 2019
df886b0
Update AutomationEditor.cpp
tecknixia Oct 10, 2019
0a9d6d9
Merge remote-tracking branch 'upstream/master'
tecknixia Oct 13, 2019
2bb7a3e
Style review fixes
tecknixia Oct 15, 2019
453cad5
Style Review Addition
tecknixia Oct 15, 2019
9c5aaca
Fixed Indentation Inconsistencies
tecknixia Oct 15, 2019
fd2fab0
Removed Spaces Within Parameters
tecknixia Oct 15, 2019
b6b6aac
Tooltip Display Fix
tecknixia Oct 15, 2019
12dc2d3
Rewrite of Pull Request
tecknixia Oct 15, 2019
e9611f2
Merge remote-tracking branch 'upstream/master'
tecknixia Oct 15, 2019
41085b8
Whitespace fixes
tecknixia Oct 16, 2019
5e93d74
Added Double Click Input Dialog Functionality
tecknixia Oct 16, 2019
b6da78d
Engagement Area Enhancement
tecknixia Oct 17, 2019
05dbcb7
Mouse Control Enhancements
tecknixia Oct 17, 2019
4bc5a7f
Merge remote-tracking branch 'upstream/master'
tecknixia Oct 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Mouse Control Enhancements
  • Loading branch information
@tecknixia
tecknixia committed Oct 17, 2019
commit 05dbcb7ba24e5b7a2dd64009ff6db333d6226adc
23 changes: 11 additions & 12 deletions src/gui/editors/AutomationEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,11 +530,10 @@ void AutomationEditor::mousePressEvent( QMouseEvent* mouseEvent )
{
// and check whether the user clicked on an
// existing value
if( pos_ticks >= it.key() &&
( it+1==time_map.end() ||
pos_ticks <= (it+1).key() ) &&
( pos_ticks<= it.key() + MidiTime::ticksPerTact() *4 / m_ppt ) &&
( level == it.value() || mouseEvent->button() == Qt::RightButton ) )
if(pos_ticks >= it.key()
&& (it+1==time_map.end() || pos_ticks <= (it+1).key())
&& (pos_ticks<= it.key() + MidiTime::ticksPerTact() * 12 / m_ppt)
&& (level == it.value() || mouseEvent->button() == Qt::RightButton))
{
break;
}
Expand Down Expand Up @@ -957,9 +956,9 @@ void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent)
{
// and check whether the cursor is over an
// existing value
if (pos_ticks >= it.key() - MidiTime::ticksPerTact() *4 / m_ppt
if (pos_ticks >= it.key() - MidiTime::ticksPerTact() * 12 / m_ppt
&& (it+1==time_map.end() || pos_ticks <= (it+1).key())
&& (pos_ticks<= it.key() + MidiTime::ticksPerTact() *4 / m_ppt)
&& (pos_ticks<= it.key() + MidiTime::ticksPerTact() * 12 / m_ppt)
&& (mouseLevel > it.value() - maxLvlFraction)
&& (mouseLevel < it.value() + maxLvlFraction))
{
Expand Down Expand Up @@ -1105,9 +1104,9 @@ void AutomationEditor::mouseDoubleClickEvent(QMouseEvent * mouseEvent)
{
// and check whether the cursor is over an
// existing value
if (pos_ticks >= it.key() - MidiTime::ticksPerTact() *4 / m_ppt
if (pos_ticks >= it.key() - MidiTime::ticksPerTact() * 12 / m_ppt
&& (it+1==time_map.end() || pos_ticks <= (it+1).key())
&& (pos_ticks<= it.key() + MidiTime::ticksPerTact() *4 / m_ppt)
&& (pos_ticks<= it.key() + MidiTime::ticksPerTact() * 12 / m_ppt)
&& (mouseLevel > it.value() - maxLvlFraction)
&& (mouseLevel < it.value() + maxLvlFraction))
{
Expand All @@ -1118,7 +1117,7 @@ void AutomationEditor::mouseDoubleClickEvent(QMouseEvent * mouseEvent)

bool ok;
double d = QInputDialog::getDouble(this, tr("Edit Point"),
tr("Enter Y Coordinate:"), m_pointYLevel, 0, m_pattern->firstObject()->maxValue<float>(), 3, &ok);
tr("New Y Value:"), m_pointYLevel, 0, m_pattern->firstObject()->maxValue<float>(), 3, &ok);

if (ok)
{
Expand Down Expand Up @@ -1222,9 +1221,9 @@ void AutomationEditor::wheelEvent(QWheelEvent * we)
{
pos_ticks = (pos_ticks < 0) ? 0 : pos_ticks;

if (pos_ticks >= it.key() - MidiTime::ticksPerTact() *4 / m_ppt
if (pos_ticks >= it.key() - MidiTime::ticksPerTact() * 12 / m_ppt
&& (it+1==time_map.end() || pos_ticks <= (it+1).key())
&& (pos_ticks<= it.key() + MidiTime::ticksPerTact() *4 / m_ppt)
&& (pos_ticks<= it.key() + MidiTime::ticksPerTact() * 12 / m_ppt)
&& (level > it.value() - maxLvlFraction)
&& (level < it.value() + maxLvlFraction))
{
Expand Down