Changeset 1595

Timestamp:

03/02/10 22:54:42 (3 years ago)

Author:

mauser

Message:

Rotaries are now operable via midi

Location:

branches/advancedMidiLearn/gui/src/widgets

Files:

• MidiLearnable.h (modified) (1 diff)
• Rotary.cpp (modified) (4 diffs)
• Rotary.h (modified) (2 diffs)

branches/advancedMidiLearn/gui/src/widgets/MidiLearnable.h

@@ -26 +26 @@
 
 #include <hydrogen/action.h>
+
 
 

branches/advancedMidiLearn/gui/src/widgets/Rotary.cpp

@@ -114 +114 @@
         QPainter painter(this);
 
-        float fRange = abs( m_fMax ) + abs( m_fMin );
-        float fValue = abs( m_fMin ) + m_fValue;
+        float fRange = fabs( m_fMax ) + fabs( m_fMin );
+        float fValue = fabs( m_fMin ) + m_fValue;
 
         int nFrame;
@@ -180 +180 @@
                 m_pValueToolTip->showTip( mapToGlobal( QPoint( -38, 1 ) ), QString( tmp ) );
         }
+
+        if ( ev->button() == Qt::LeftButton && ev->modifiers() == Qt::AltModifier ){
+                MidiSenseWidget midiSense( this, true, this->getAction() );
+                midiSense.exec();
+        }
 }
 
@@ -208 +213 @@
         }
         if ( !m_bUseIntSteps ) {
-                float fRange = abs( m_fMax ) + abs( m_fMin );
+                float fRange = fabs( m_fMax ) + fabs( m_fMin );
                 delta = fRange / 100.0;
         }
@@ -221 +226 @@
 
  void Rotary::mouseMoveEvent( QMouseEvent *ev ) {
-        float fRange = abs( m_fMax ) + abs( m_fMin );
+        float fRange = fabs( m_fMax ) + fabs( m_fMin );
 
         float deltaY = ev->y() - m_fMousePressY;

branches/advancedMidiLearn/gui/src/widgets/Rotary.h

@@ -25 +25 @@
 
 #include "config.h"
+#include "MidiLearnable.h"
+#include "MidiSenseWidget.h"
+
 #include <QtGui>
 
@@ -44 +47 @@
 
 
-class Rotary : public QWidget, public Object
+class Rotary : public QWidget, public Object, public MidiLearnable
 {
         Q_OBJECT