more option when selecting similar notes

lasconic · lasconic · commit 12595c2ed5c6 · 2016-09-22T16:07:47.000+02:00
diff --git a/libmscore/chord.cpp b/libmscore/chord.cpp
@@ -928,6 +928,8 @@ void Chord::write(Xml& xml) const
             case NoteType::GRACE32_AFTER:
                   xml.tagE("grace32after");
                   break;
+            default:
+                  break;
             }
 
       if (_noStem)
diff --git a/libmscore/glissando.cpp b/libmscore/glissando.cpp
@@ -530,11 +530,15 @@ Note* Glissando::guessInitialNote(Chord* chord)
                   else                          // no parent or parent is not a chord?
                         return nullptr;
             case NoteType::NORMAL:
+                  {
                   // if chord has grace notes before, the last one is the previous note
                   QVector<Chord*>graces = chord->graceNotesBefore();
                   if (graces.size() > 0)
                         return graces.last()->upNote();
+                  }
                   break;                        // else process to standard case
+            default:
+                  break;
             }
 
       // standard case (NORMAL or grace before chord)
@@ -619,10 +623,14 @@ Note* Glissando::guessFinalNote(Chord* chord)
                         return nullptr;
                   break;
             case NoteType::NORMAL:
+                  {
                   // if chord has grace notes after, the first one is the next note
                   QVector<Chord*>graces = chord->graceNotesAfter();
                   if (graces.size() > 0)
                         return graces.first()->upNote();
+                  }
+                  break;
+            default:
                   break;
             }
 
diff --git a/libmscore/mscore.h b/libmscore/mscore.h
@@ -295,7 +295,8 @@ enum class NoteType : unsigned char {
       GRACE32       = 0x10,
       GRACE8_AFTER  = 0x20,
       GRACE16_AFTER = 0x40,
-      GRACE32_AFTER = 0x80
+      GRACE32_AFTER = 0x80,
+      INVALID       = 0xFF
       };
 
 constexpr NoteType operator| (NoteType t1, NoteType t2) {
diff --git a/libmscore/note.h b/libmscore/note.h
@@ -47,6 +47,7 @@ enum class AccidentalType : char;
 
 static const int MAX_DOTS = 4;
 
+
 //---------------------------------------------------------
 //   @@ NoteHead
 //---------------------------------------------------------
diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -2885,19 +2885,9 @@ void Score::collectMatch(void* data, Element* e)
       if (p->type != int(e->type()))
             return;
 
-      if (p->subtypeValid) {
-            // HACK: grace note is different from normal note
-            // TODO: this disables the ability to distinguish noteheads in subtype
+      if (p->subtypeValid && p->subtype != e->subtype())
+            return;
 
-            if (p->type == int(Element::Type::NOTE)) {
-                  if (p->subtype != toNote(e)->chord()->isGrace())
-                        return;
-                  }
-            else {
-                  if (p->subtype != e->subtype())
-                        return;
-                  }
-            }
       if ((p->staffStart != -1)
          && ((p->staffStart > e->staffIdx()) || (p->staffEnd <= e->staffIdx())))
             return;
@@ -2919,6 +2909,30 @@ void Score::collectMatch(void* data, Element* e)
       p->el.append(e);
       }
 
+//---------------------------------------------------------
+//   collectNoteMatch
+//---------------------------------------------------------
+
+void Score::collectNoteMatch(void* data, Element* e)
+      {
+      NotePattern* p = static_cast<NotePattern*>(data);
+      if (!e->isNote())
+            return;
+      Note* n = toNote(e);
+      if (p->type != NoteType::INVALID && p->type != n->noteType())
+            return;
+      if (p->pitch != -1 && p->pitch != n->pitch())
+            return;
+      if (p->tpc != Tpc::TPC_INVALID && p->tpc != n->tpc())
+            return;
+      if (p->notehead != NoteHead::Group::HEAD_INVALID && p->notehead != n->headGroup())
+            return;
+      if (p->duration.type() != TDuration::DurationType::V_INVALID && p->duration != n->chord()->actualDurationType())
+            return;
+      p->el.append(n);
+      }
+
+
 //---------------------------------------------------------
 //   selectSimilar
 //---------------------------------------------------------
diff --git a/libmscore/score.h b/libmscore/score.h
@@ -734,6 +734,7 @@ class Score : public QObject, public ScoreElement {
       void selectSimilar(Element* e, bool sameStaff);
       void selectSimilarInRange(Element* e);
       static void collectMatch(void* data, Element* e);
+      static void collectNoteMatch(void* data, Element* e);
       void deselect(Element* obj);
       void deselectAll()                    { _selection.deselectAll(); }
       void updateSelection()                { _selection.update(); }
diff --git a/libmscore/select.h b/libmscore/select.h
@@ -13,6 +13,10 @@
 #ifndef __SELECT_H__
 #define __SELECT_H__
 
+#include "pitchspelling.h"
+#include "mscore.h"
+#include "durationtype.h"
+
 namespace Ms {
 
 class Score;
@@ -40,6 +44,23 @@ struct ElementPattern {
       bool subtypeValid;
       };
 
+//---------------------------------------------------------
+//   NotePattern
+//---------------------------------------------------------
+
+struct NotePattern {
+      QList<Note*> el;
+      int pitch = -1;
+      int tpc = Tpc::TPC_INVALID;;
+      NoteHead::Group notehead = NoteHead::Group::HEAD_INVALID;
+      TDuration duration = TDuration();
+      NoteType type = NoteType::INVALID;
+      int staffStart;
+      int staffEnd; // exclusive
+      int voice;
+      const System* system;
+      };
+
 //---------------------------------------------------------
 //   SelState
 //---------------------------------------------------------
diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
@@ -42,7 +42,7 @@ QT5_WRAP_UI (ui_headers
       editstaff.ui timesigproperties.ui
       instrwizard.ui timesigwizard.ui newwizard.ui aboutbox.ui aboutmusicxmlbox.ui
       transposedialog.ui lineproperties.ui excerptsdialog.ui  stafftext.ui tupletdialog.ui
-      articulation.ui metaedit.ui palette.ui select.ui
+      articulation.ui metaedit.ui palette.ui selectdialog.ui selectnotedialog.ui
       synthcontrol.ui splitstaff.ui cellproperties.ui keyedit.ui selectinstr.ui
       fretdprops.ui editstafftype.ui sectionbreak.ui  bend.ui tremolobar.ui textproperties.ui
       editpitch.ui editstringdata.ui editraster.ui mediadialog.ui textstyledialog.ui albummanager.ui layer.ui
@@ -254,7 +254,7 @@ add_executable ( ${ExecutableName}
       articulationprop.cpp textprop.cpp
       fretproperties.cpp sectionbreakprop.cpp
       bendproperties.cpp tremolobarprop.cpp file.cpp keyb.cpp osc.cpp
-      layer.cpp selectdialog.cpp propertymenu.cpp shortcut.cpp bb.cpp
+      layer.cpp selectdialog.cpp selectnotedialog.cpp propertymenu.cpp shortcut.cpp bb.cpp
       inspector/inspector.cpp dragelement.cpp svggenerator.cpp
       inspector/inspectorBase.cpp inspector/inspectorBeam.cpp masterpalette.cpp
       inspector/inspectorGroupElement.cpp dragdrop.cpp inspector/inspectorImage.cpp
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -64,6 +64,7 @@
 #include "mediadialog.h"
 #include "workspace.h"
 #include "selectdialog.h"
+#include "selectnotedialog.h"
 #include "transposedialog.h"
 #include "metaedit.h"
 #include "inspector/inspector.h"
@@ -4295,42 +4296,77 @@ void MuseScore::selectSimilarInRange(Element* e)
 void MuseScore::selectElementDialog(Element* e)
       {
       Score* score = e->score();
-      SelectDialog sd(e, 0);
-      if (sd.exec()) {
-            ElementPattern pattern;
-            sd.setPattern(&pattern);
-
-            if (sd.isInSelection())
-                  score->scanElementsInRange(&pattern, Score::collectMatch);
-            else
-                  score->scanElements(&pattern, Score::collectMatch);
+      if (e->isNote()) {
+            SelectNoteDialog sd(toNote(e), 0);
+            if (sd.exec()) {
+                  NotePattern pattern;
+                  sd.setPattern(&pattern);
+
+                  if (sd.isInSelection())
+                        score->scanElementsInRange(&pattern, Score::collectNoteMatch);
+                  else
+                        score->scanElements(&pattern, Score::collectNoteMatch);
 
-            if (sd.doReplace()) {
-                  score->select(0, SelectType::SINGLE, 0);
-                  foreach(Element* ee, pattern.el)
-                        score->select(ee, SelectType::ADD, 0);
-                  }
-            else if (sd.doSubtract()) {
-                  QList<Element*> sl(score->selection().elements());
-                  foreach(Element* ee, pattern.el)
-                        sl.removeOne(ee);
-                  score->select(0, SelectType::SINGLE, 0);
-                  foreach(Element* ee, sl)
-                        score->select(ee, SelectType::ADD, 0);
-                  }
-            else if (sd.doAdd()) {
-                  QList<Element*> sl(score->selection().elements());
-                  foreach(Element* ee, pattern.el) {
-                        if(!sl.contains(ee))
+                  if (sd.doReplace()) {
+                        score->select(0, SelectType::SINGLE, 0);
+                        for (Note* ee : pattern.el)
+                              score->select(ee, SelectType::ADD, 0);
+                        }
+                  else if (sd.doSubtract()) {
+                        QList<Element*> sl(score->selection().elements());
+                        for (Note* ee : pattern.el)
+                              sl.removeOne(ee);
+                        score->select(0, SelectType::SINGLE, 0);
+                        for (Element* ee : sl)
                               score->select(ee, SelectType::ADD, 0);
                         }
+                  else if (sd.doAdd()) {
+                        QList<Element*> sl(score->selection().elements());
+                        for (Note* ee : pattern.el) {
+                              if(!sl.contains(ee))
+                                    score->select(ee, SelectType::ADD, 0);
+                              }
+                        }
                   }
-            if (score->selectionChanged()) {
-                  score->setSelectionChanged(false);
-                  SelState ss = score->selection().state();
-                  selectionChanged(ss);
+            }
+      else {
+            SelectDialog sd(e, 0);
+            if (sd.exec()) {
+                  ElementPattern pattern;
+                  sd.setPattern(&pattern);
+
+                  if (sd.isInSelection())
+                        score->scanElementsInRange(&pattern, Score::collectMatch);
+                  else
+                        score->scanElements(&pattern, Score::collectMatch);
+
+                  if (sd.doReplace()) {
+                        score->select(0, SelectType::SINGLE, 0);
+                        for (Element* ee : pattern.el)
+                              score->select(ee, SelectType::ADD, 0);
+                        }
+                  else if (sd.doSubtract()) {
+                        QList<Element*> sl(score->selection().elements());
+                        for (Element* ee : pattern.el)
+                              sl.removeOne(ee);
+                        score->select(0, SelectType::SINGLE, 0);
+                        for (Element* ee : sl)
+                              score->select(ee, SelectType::ADD, 0);
+                        }
+                  else if (sd.doAdd()) {
+                        QList<Element*> sl(score->selection().elements());
+                        for (Element* ee : pattern.el) {
+                              if(!sl.contains(ee))
+                                    score->select(ee, SelectType::ADD, 0);
+                              }
+                        }
                   }
             }
+      if (score->selectionChanged()) {
+            score->setSelectionChanged(false);
+            SelState ss = score->selection().state();
+            selectionChanged(ss);
+            }
       }
 
 //---------------------------------------------------------
diff --git a/mscore/selectdialog.h b/mscore/selectdialog.h
@@ -21,7 +21,7 @@
 #ifndef __SELECTDIALOG_H__
 #define __SELECTDIALOG_H__
 
-#include "ui_select.h"
+#include "ui_selectdialog.h"
 
 namespace Ms {
 
diff --git a/mscore/selectdialog.ui b/mscore/selectdialog.ui
diff --git a/mscore/selectnotedialog.cpp b/mscore/selectnotedialog.cpp
@@ -0,0 +1,90 @@
+//=============================================================================
+//  MuseScore
+//  Linux Music Score Editor
+//  $Id: select.cpp -1   $
+//
+//  Copyright (C) 2002-2011 Werner Schweer and others
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License version 2.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//=============================================================================
+
+/**
+ \file
+ Implementation of class Selection plus other selection related functions.
+*/
+
+#include "libmscore/select.h"
+#include "selectnotedialog.h"
+#include "libmscore/element.h"
+#include "libmscore/system.h"
+#include "libmscore/score.h"
+#include "libmscore/chord.h"
+#include "libmscore/sym.h"
+
+namespace Ms {
+
+//---------------------------------------------------------
+//   SelectDialog
+//---------------------------------------------------------
+
+SelectNoteDialog::SelectNoteDialog(const Note* _n, QWidget* parent)
+   : QDialog(parent)
+      {
+      setupUi(this);
+      setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
+      n = _n;
+      notehead->setText(NoteHead::groupToGroupName(n->headGroup()));
+      pitch->setText(n->tpcUserName());
+      type->setText(n->noteTypeUserName());
+      duration->setText(n->chord()->durationUserName());
+      name->setText(tpc2name(n->tpc(), NoteSpellingType::STANDARD, NoteCaseType::AUTO, false));
+      inSelection->setEnabled(n->score()->selection().isRange());
+      }
+
+//---------------------------------------------------------
+//   setPattern
+//---------------------------------------------------------
+
+void SelectNoteDialog::setPattern(NotePattern* p)
+      {
+      if (sameNotehead->isChecked())
+            p->notehead = n->headGroup();
+      if (samePitch->isChecked())
+            p->pitch = n->pitch();
+      if (sameName->isChecked())
+            p->tpc = n->tpc();
+      if (sameType->isChecked())
+            p->type = n->noteType();
+      if (sameDuration->isChecked())
+            p->duration = n->chord()->actualDurationType();
+
+      if (sameStaff->isChecked()) {
+            p->staffStart = n->staffIdx();
+            p->staffEnd = n->staffIdx() + 1;
+            }
+      else if (inSelection->isChecked()) {
+            p->staffStart = n->score()->selection().staffStart();
+            p->staffEnd = n->score()->selection().staffEnd();
+            }
+      else {
+            p->staffStart = -1;
+            p->staffEnd = -1;
+            }
+
+      p->voice   = sameVoice->isChecked() ? n->voice() : -1;
+      p->system  = 0;
+      if (sameSystem->isChecked())
+            p->system = n->chord()->segment()->system();
+      }
+}
+
diff --git a/mscore/selectnotedialog.h b/mscore/selectnotedialog.h
diff --git a/mscore/selectnotedialog.ui b/mscore/selectnotedialog.ui

Original file line number	Diff line number	Diff line change
`@@ -928,6 +928,8 @@ void Chord::write(Xml& xml) const`
`928`	`928`	`case NoteType::GRACE32_AFTER:`
`929`	`929`	`xml.tagE("grace32after");`
`930`	`930`	`break;`
	`931`	`+ default:`
	`932`	`+ break;`
`931`	`933`	`}`
`932`	`934`
`933`	`935`	`if (_noStem)`