hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Automation Editor tension fix

Browse Source
This commit is contained in:
Lukas W
2014-12-12 10:51:15 +01:00
parent 787788870b
commit 11cb8b5d68
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/AutomationEditor.h
View File

@@ -266,6 +266,9 @@ public:
QSize sizeHint() const;
public slots:
void clearCurrentPattern();
signals:
void currentPatternChanged();

5
src/core/AutomationPattern.cpp
View File

@@ -79,11 +79,6 @@ AutomationPattern::AutomationPattern( const AutomationPattern & _pat_to_copy ) :
AutomationPattern::~AutomationPattern()
{
if( Engine::automationEditor() &&
Engine::automationEditor()->currentPattern() == this )
{
Engine::automationEditor()->setCurrentPattern( NULL );
}
}

24
src/gui/editors/AutomationEditor.cpp
View File

@@ -584,7 +584,6 @@ void AutomationEditor::mouseReleaseEvent(QMouseEvent * mouseEvent )
#include <stdio.h>
void AutomationEditor::mouseMoveEvent(QMouseEvent * mouseEvent )
{
QMutexLocker m( &m_patternMutex );
@@ -1999,8 +1998,6 @@ AutomationEditorWindow::AutomationEditorWindow() :
QAction* eraseAction = editModeGroup->addAction(embed::getIconPixmap("edit_erase"), tr("Erase mode (Shift+E)"));
eraseAction->setShortcut(Qt::SHIFT | Qt::Key_E);
drawAction->setChecked(true);
// TODO: m_selectButton and m_moveButton are broken.
// m_selectButton = new QAction(embed::getIconPixmap("edit_select"), tr("Select mode (Shift+S)"), editModeGroup);
// m_moveButton = new QAction(embed::getIconPixmap("edit_move"), tr("Move selection mode (Shift+M)"), editModeGroup);
@@ -2039,12 +2036,19 @@ AutomationEditorWindow::AutomationEditorWindow() :
m_cubicHermiteAction = progression_type_group->addAction(
embed::getIconPixmap("progression_cubic_hermite"), tr( "Cubic Hermite progression"));
m_discreteAction->setChecked( true );
connect(progression_type_group, SIGNAL(triggered(int)), m_editor, SLOT(setProgressionType(int)));
// setup tension-stuff
m_tensionKnob = new Knob( knobSmall_17, this, "Tension" );
m_tensionKnob->setModel(m_editor->m_tensionModel);
ToolTip::add(m_tensionKnob, tr("Tension value for spline"));
m_tensionKnob->setWhatsThis(
tr("A higher tension value may make a smoother curve "
"but overshoot some values. A low tension "
"value will cause the slope of the curve to "
"level off at each control point."));
connect(m_cubicHermiteAction, SIGNAL(toggled(bool)), m_tensionKnob, SLOT(setEnabled(bool)));
m_discreteAction->setWhatsThis(
tr( "Click here to choose discrete progressions for this "
@@ -2173,6 +2177,9 @@ AutomationEditorWindow::AutomationEditorWindow() :
m_toolBar->addWidget( quantize_lbl );
m_toolBar->addWidget( m_quantizeComboBox );
drawAction->setChecked(true);
m_discreteAction->setChecked(true);
// Setup our actual window
setFocusPolicy( Qt::StrongFocus );
setFocus();
@@ -2205,6 +2212,8 @@ void AutomationEditorWindow::setCurrentPattern(AutomationPattern* pattern)
break;
}
connect(pattern, SIGNAL(destroyed()), this, SLOT(clearCurrentPattern()));
emit currentPatternChanged();
}
@@ -2225,6 +2234,11 @@ QSize AutomationEditorWindow::sizeHint() const
return {INITIAL_WIDTH, INITIAL_HEIGHT};
}
void AutomationEditorWindow::clearCurrentPattern()
{
setCurrentPattern(nullptr);
}
void AutomationEditorWindow::play()
{
m_editor->play();