Merge pull request #1302 from charbeljc/sample_editor_love

Sample editor love (on dev branch)

ChangeLog

@@ -10,6 +10,9 @@
  "Custom".
  - Via a colored button the particular line color can now be
  adjusted using a QColorDialog
+ * InstrumentEditor UX improvements:
+ - rework start/end/loop frame slider selection and motion.
+ - rework velocity/pan envelope editing
 
 20xx-xx-xx the hydrogen team <[email protected]>
  * Release 1.1

src/gui/src/InstrumentEditor/InstrumentEditorPanel.cpp

@@ -96,6 +96,9 @@ void InstrumentEditorPanel::selectLayer( int nLayer )
  m_nLayer = nLayer;
 }
 
-
+void InstrumentEditorPanel::updateWaveDisplay()
+{
+ selectLayer ( m_nLayer ); // trigger a redisplay of wave preview
+}
 
 

src/gui/src/InstrumentEditor/InstrumentEditorPanel.h

@@ -54,6 +54,8 @@ class InstrumentEditorPanel : public QWidget, private H2Core::Object, public Eve
  return m_nLayer;
  }
 
+ void updateWaveDisplay();
+
  public slots:
  void notifyOfDrumkitChange();
 

src/gui/src/SampleEditor/MainSampleWaveDisplay.cpp

@@ -54,14 +54,16 @@ MainSampleWaveDisplay::MainSampleWaveDisplay(QWidget* pParent)
  m_nStartFramePosition = 25;
  m_nLoopFramePosition = 25;
  m_nEndFramePosition = width() -25;
- m_bMove = false;
  m_nLocator = -1;
  m_bUpdatePosition = false;
  m_nSampleLength = 0;
 
  m_bStartSliderIsMoved = false;
  m_bLoopSliderIsMoved = false;
  m_bEndSliderIsmoved = false;
+
+ m_SelectedSlider = NONE;
+ setMouseTracking(true);
 }
 
 
@@ -87,6 +89,19 @@ void MainSampleWaveDisplay::paintLocatorEvent( int pos, bool updateposi)
  update();
 }
 
+static void set_paint_color(QPainter & painter, const QColor & color, bool selected, MainSampleWaveDisplay::Slider which)
+{
+ if (!selected) {
+ painter.setPen( color );
+ } else {
+ QColor highlight = QColor(std::min(255, color.red() + 20 + 20 * (which == MainSampleWaveDisplay::END)),
+ std::min(255, color.green() + 20 + 20 * (which == MainSampleWaveDisplay::START)),
+ std::min(255, color.blue() + 20 + 20 * (which == MainSampleWaveDisplay::LOOP)));
+
+ painter.setPen ( highlight );
+ }
+}
+
 void MainSampleWaveDisplay::paintEvent(QPaintEvent *ev)
 {
  QPainter painter( this );
@@ -125,18 +140,22 @@ void MainSampleWaveDisplay::paintEvent(QPaintEvent *ev)
  painter.drawLine( 0, VCenterr, width(),VCenterr );
 
  QFont font;
+
+ QColor startColor = QColor( 32, 173, 0, 200 );
+ QColor endColor = QColor( 217, 68, 0, 200 );
+ QColor loopColor = QColor( 93, 170, 254, 200 );
  font.setWeight( 63 );
  painter.setFont( font );
 //start frame pointer
- painter.setPen( QColor( 32, 173, 0, 200 ) );
+ set_paint_color(painter, startColor, m_SelectedSlider == START, m_SelectedSlider);
  painter.drawLine( m_nStartFramePosition, 4, m_nStartFramePosition, height() -4 ); 
  painter.drawText( m_nStartFramePosition -10, 250, 10,20, Qt::AlignRight, "S" );
 //endframe pointer
- painter.setPen( QColor( 217, 68, 0, 200 ) );
+ set_paint_color(painter, endColor, m_SelectedSlider == END, m_SelectedSlider);
  painter.drawLine( m_nEndFramePosition, 4, m_nEndFramePosition, height() -4 );
  painter.drawText( m_nEndFramePosition -10, 123, 10, 20, Qt::AlignRight, "E" );
 //loopframe pointer
- painter.setPen( QColor( 93, 170, 254, 200 ) );
+ set_paint_color(painter, loopColor, m_SelectedSlider == LOOP, m_SelectedSlider);
  painter.drawLine( m_nLoopFramePosition, 4, m_nLoopFramePosition, height() -4 );
  painter.drawText( m_nLoopFramePosition , 0, 10, 20, Qt::AlignLeft, "L" );
 
@@ -199,26 +218,41 @@ void MainSampleWaveDisplay::updateDisplay( const QString& filename )
  update();
 
 }
+void MainSampleWaveDisplay::mouseUpdateDone() {
+ HydrogenApp::get_instance()->getSampleEditor()->returnAllMainWaveDisplayValues();
+ m_bStartSliderIsMoved = false;
+ m_bLoopSliderIsMoved = false;
+ m_bEndSliderIsmoved = false;
+}
+
 
 void MainSampleWaveDisplay::mouseMoveEvent(QMouseEvent *ev)
 {
- testPosition( ev );
+ if (ev->buttons() && Qt::LeftButton) {
+ testPosition( ev );
+ } else {
+ chooseSlider( ev );
+ }
  update();
+ mouseUpdateDone();
 }
 
 void MainSampleWaveDisplay::mousePressEvent(QMouseEvent *ev)
 {
+ chooseSlider( ev );
  testPosition( ev );
  update();
+ mouseUpdateDone();
 }
 
 void MainSampleWaveDisplay::testPosition( QMouseEvent *ev )
 {
  assert(ev);
-
 //startframepointer
- if (ev->y()>=200 ) {
- m_nStartFramePosition = ev->x() ;
+ int x = std::min(width() - 25, std::max(25, ev->x()));
+
+ if ( m_SelectedSlider == START ) {
+ m_nStartFramePosition = x;
  m_bStartSliderIsMoved = true;
  if ( m_nStartFramePosition > m_nLoopFramePosition ){
  m_nLoopFramePosition = m_nStartFramePosition;
@@ -228,58 +262,58 @@ void MainSampleWaveDisplay::testPosition( QMouseEvent *ev )
  m_nEndFramePosition = m_nStartFramePosition;
  m_bEndSliderIsmoved = true;
  }
-// update();
  }
 
 //loopframeposition
- else if (ev->y()<=65 ) {
- m_nLoopFramePosition = ev->x() ;
- m_bLoopSliderIsMoved = true; 
- if ( m_nLoopFramePosition < m_nStartFramePosition ){
- m_nStartFramePosition = m_nLoopFramePosition;
- m_bStartSliderIsMoved = true;
- }
- if ( m_nLoopFramePosition > m_nEndFramePosition ){
- m_nEndFramePosition = m_nLoopFramePosition;
- m_bEndSliderIsmoved = true;
+ else if ( m_SelectedSlider == LOOP ) {
+ if (x >= m_nStartFramePosition && x <= m_nEndFramePosition ) {
+ m_nLoopFramePosition = x ;
+ m_bLoopSliderIsMoved = true;
  }
-// update();
  }
 //endframeposition
- else if ( ev->y() >= 86 && ev->y() <= 179 ) {
- m_nEndFramePosition = ev->x() ;
- m_bEndSliderIsmoved = true;
+ else if ( m_SelectedSlider == END) {
+ if (x >= m_nStartFramePosition) {
+ m_nEndFramePosition = x ;
+ m_bEndSliderIsmoved = true;
+ }
  if ( m_nEndFramePosition < m_nLoopFramePosition ){
  m_nLoopFramePosition = m_nEndFramePosition;
  m_bLoopSliderIsMoved = true;
  }
- if ( m_nEndFramePosition < m_nStartFramePosition ){
- m_nStartFramePosition = m_nEndFramePosition;
- m_bStartSliderIsMoved = true;
- }
-// update();
  }
-
- if ( ( m_nStartFramePosition ) >= width() -25 ) m_nStartFramePosition =width() -25;
- if ( ( m_nLoopFramePosition ) >= width() -25 ) m_nLoopFramePosition =width() -25;
- if ( ( m_nEndFramePosition ) >= width() -25 ) m_nEndFramePosition =width() -25;
- if ( ( m_nStartFramePosition ) <= 25 ) m_nStartFramePosition = 25;
- if ( ( m_nLoopFramePosition ) <= 25 ) m_nLoopFramePosition = 25;
- if ( ( m_nEndFramePosition ) <= 25 ) m_nEndFramePosition = 25;
 }
 
 
 void MainSampleWaveDisplay::mouseReleaseEvent(QMouseEvent *ev)
 {
+ m_SelectedSlider = NONE;
  update();
- bool test = HydrogenApp::get_instance()->getSampleEditor()->returnAllMainWaveDisplayValues();
-
- if (test){
- m_bStartSliderIsMoved = false;
- m_bLoopSliderIsMoved = false;
- m_bEndSliderIsmoved = false;
- }
+ mouseUpdateDone();
 }
 
 
 
+
+void MainSampleWaveDisplay::chooseSlider(QMouseEvent * ev)
+{
+ assert(ev);
+
+ QPoint start = QPoint(m_nStartFramePosition, height());
+ QPoint end = QPoint(m_nEndFramePosition, height() / 2);
+ QPoint loop = QPoint(m_nLoopFramePosition, 0);
+
+ int ds = (ev->pos() - start).manhattanLength();
+ int de = (ev->pos() - end).manhattanLength();
+ int dl = (ev->pos() - loop).manhattanLength();
+ m_SelectedSlider = NONE;
+
+ if (ds <= de && ds <= dl) {
+ m_SelectedSlider = START;
+ } else if (de < ds && de <= dl) {
+ m_SelectedSlider = END;
+ } else if (dl < ds && dl < de) {
+ m_SelectedSlider = LOOP;
+ }
+}
+

src/gui/src/SampleEditor/MainSampleWaveDisplay.h

@@ -36,6 +36,14 @@ class MainSampleWaveDisplay : public QWidget, public H2Core::Object
  Q_OBJECT
 
  public:
+
+ enum Slider {
+ NONE,
+ START,
+ LOOP,
+ END
+ };
+
  explicit MainSampleWaveDisplay(QWidget* pParent);
  ~MainSampleWaveDisplay();
 
@@ -50,17 +58,21 @@ class MainSampleWaveDisplay : public QWidget, public H2Core::Object
  int m_nStartFramePosition;
  int m_nLoopFramePosition;
  int m_nEndFramePosition;
- bool m_bMove;
+
  bool m_bStartSliderIsMoved;
  bool m_bLoopSliderIsMoved;
  bool m_bEndSliderIsmoved;
 
+ Slider m_SelectedSlider;
+
 
  private:
  virtual void mouseMoveEvent(QMouseEvent *ev);
  virtual void mousePressEvent(QMouseEvent *ev);
  virtual void mouseReleaseEvent(QMouseEvent *ev);
  void testPosition( QMouseEvent *ev );
+ void chooseSlider( QMouseEvent *ev );
+ void mouseUpdateDone();
 
  QPixmap m_background;
  int* m_pPeakDatal;